mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Remove redundant decoder in ContentModel

Browse Source
This commit is contained in:
scrawl 2015-02-05 15:39:53 +01:00
parent cff0127ce7
commit 4c6b9f8266
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,11 +442,6 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
filters << "*.esp" << "*.esm" << "*.omwgame" << "*.omwaddon";
dir.setNameFilters(filters);
QTextCodec *codec = QTextCodec::codecForName("UTF8");
// Create a decoder for non-latin characters in esx metadata
QTextDecoder *decoder = codec->makeDecoder();
foreach (const QString &path, dir.entryList())
{
QFileInfo info(dir.absoluteFilePath(path));
@ -466,11 +461,11 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
foreach (const ESM::Header::MasterData &item, fileReader.getGameFiles())
file->addGameFile(QString::fromStdString(item.name));
file->setAuthor (decoder->toUnicode(fileReader.getAuthor().c_str()));
file->setAuthor (QString::fromUtf8(fileReader.getAuthor().c_str()));
file->setDate (info.lastModified());
file->setFormat (fileReader.getFormat());
file->setFilePath (info.absoluteFilePath());
file->setDescription(decoder->toUnicode(fileReader.getDesc().c_str()));
file->setDescription(QString::fromUtf8(fileReader.getDesc().c_str()));
// Put the file in the table
addFile(file);
@ -483,8 +478,6 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
}
delete decoder;
sortFiles();
}