diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp index 4292367131..1b502c9d6c 100644 --- a/apps/opencs/view/doc/filedialog.cpp +++ b/apps/opencs/view/doc/filedialog.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include @@ -32,7 +33,7 @@ void CSVDoc::FileDialog::addFiles(const std::vector& data { for (auto iter = dataDirs.rbegin(); iter != dataDirs.rend(); ++iter) { - QString path = QString::fromUtf8(iter->string().c_str()); + QString path = Files::pathToQString(*iter); mSelector->addFiles(path); } mSelector->sortFiles(); diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp index d6d3ece470..3c3d6b8c65 100644 --- a/components/contentselector/model/contentmodel.cpp +++ b/components/contentselector/model/contentmodel.cpp @@ -8,6 +8,7 @@ #include #include +#include ContentSelectorModel::ContentModel::ContentModel(QObject* parent, QIcon warningIcon, bool showOMWScripts) : QAbstractTableModel(parent) @@ -468,7 +469,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString& path, bool newf ESM::ESMReader fileReader; ToUTF8::Utf8Encoder encoder(ToUTF8::calculateEncoding(mEncoding.toStdString())); fileReader.setEncoder(&encoder); - fileReader.open(std::string(dir.absoluteFilePath(path2).toUtf8().constData())); + fileReader.open(Files::pathFromQString(dir.absoluteFilePath(path2))); EsmFile* file = new EsmFile(path2);