mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-03-18 12:07:40 +01:00
commit 47bac13749
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/view/doc/loader.cpp
View File

@ -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);

2
apps/opencs/view/doc/subview.cpp
View File

@ -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)

2
apps/opencs/view/doc/view.cpp
View File

@ -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)

2
apps/opencs/view/doc/viewmanager.cpp
View File

@ -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);

4
apps/openmw/mwgui/race.cpp
View File

@ -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;
}

2
components/contentselector/model/contentmodel.cpp
View File

@ -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);