From f7ecda68c92e48779f376f27fb30738ec617dd25 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 16 Mar 2015 15:33:12 +0100
Subject: [PATCH 1/3] Fix for unicode filenames in ContentModel (Fixes #2451)

---
 components/contentselector/model/contentmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index 3dc02af21..62f6d9014 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -449,7 +449,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
             ToUTF8::Utf8Encoder encoder =
             ToUTF8::calculateEncoding(mEncoding.toStdString());
             fileReader.setEncoder(&encoder);
-            fileReader.open(dir.absoluteFilePath(path).toStdString());
+            fileReader.open(std::string(dir.absoluteFilePath(path).toUtf8().constData()));
 
             EsmFile *file = new EsmFile(path);
 

From 19e8280f4550b1c3d14ca94c9fcccd7ae90fd1e8 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 16 Mar 2015 15:45:41 +0100
Subject: [PATCH 2/3] OpenCS window title unicode fixes

---
 apps/opencs/view/doc/loader.cpp      | 2 +-
 apps/opencs/view/doc/subview.cpp     | 2 +-
 apps/opencs/view/doc/view.cpp        | 2 +-
 apps/opencs/view/doc/viewmanager.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index 046eb5229..30235d0f5 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -20,7 +20,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
 CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
 : mDocument (document), mAborted (false), mMessages (0), mTotalRecords (0)
 {
-    setWindowTitle (("Opening " + document->getSavePath().filename().string()).c_str());
+    setWindowTitle (QString::fromUtf8((std::string("Opening ") + document->getSavePath().filename().string()).c_str()));
 
     setMinimumWidth (400);
 
diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index a399b5b5b..df1e7ee49 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -26,7 +26,7 @@ void CSVDoc::SubView::updateUserSetting (const QString &, const QStringList &)
 void CSVDoc::SubView::setUniversalId (const CSMWorld::UniversalId& id)
 {
     mUniversalId = id;
-    setWindowTitle (mUniversalId.toString().c_str());
+    setWindowTitle (QString::fromUtf8(mUniversalId.toString().c_str()));
 }
 
 void CSVDoc::SubView::closeEvent (QCloseEvent *event)
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 5d42902e8..cf2940b99 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -324,7 +324,7 @@ void CSVDoc::View::updateTitle()
     if (hideTitle)
         stream << " - " << mSubViews.at (0)->getTitle();
 
-    setWindowTitle (stream.str().c_str());
+    setWindowTitle (QString::fromUtf8(stream.str().c_str()));
 }
 
 void CSVDoc::View::updateSubViewIndicies(SubView *view)
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 5f6b6b46a..9fee26078 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -248,7 +248,7 @@ bool CSVDoc::ViewManager::showModifiedDocumentMessageBox (CSVDoc::View *view)
     QMessageBox messageBox(view);
     CSMDoc::Document *document = view->getDocument();
 
-    messageBox.setWindowTitle (document->getSavePath().filename().string().c_str());
+    messageBox.setWindowTitle (QString::fromUtf8(document->getSavePath().filename().string().c_str()));
     messageBox.setText ("The document has been modified.");
     messageBox.setInformativeText ("Do you want to save your changes?");
     messageBox.setStandardButtons (QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);

From d5734588964d9d8d7e99142ed72e7c8f60cc819f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 16 Mar 2015 17:37:54 +0100
Subject: [PATCH 3/3] Fix case sensitivity bug in default head/hair selection
 (Fixes #2453)

---
 apps/openmw/mwgui/race.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 97dbfbafc..f908a9dd0 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -142,13 +142,13 @@ namespace MWGui
 
         for (unsigned int i=0; i<mAvailableHeads.size(); ++i)
         {
-            if (mAvailableHeads[i] == proto.mHead)
+            if (Misc::StringUtils::ciEqual(mAvailableHeads[i], proto.mHead))
                 mFaceIndex = i;
         }
 
         for (unsigned int i=0; i<mAvailableHairs.size(); ++i)
         {
-            if (mAvailableHairs[i] == proto.mHair)
+            if (Misc::StringUtils::ciEqual(mAvailableHairs[i], proto.mHair))
                 mHairIndex = i;
         }