krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Add missing case folding for dependency filenames (Fixes #1940)

Browse source
This commit is contained in:
scrawl 2014-09-26 20:45:45 +02:00
parent 7252cb63a6
commit 4b8ea25cf0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/contentselector/model/contentmodel.cpp
View file

@ -77,7 +77,7 @@ const ContentSelectorModel::EsmFile *ContentSelectorModel::ContentModel::item(co
foreach (const EsmFile *file, mFiles) foreach (const EsmFile *file, mFiles)
{ {
if (name == file->fileProperty (fp).toString()) if (name.compare(file->fileProperty (fp).toString(), Qt::CaseInsensitive) == 0)
return file; return file;
} }
return 0; return 0;
@ -120,7 +120,7 @@ Qt::ItemFlags ContentSelectorModel::ContentModel::flags(const QModelIndex &index
{ {
//compare filenames only. Multiple instances //compare filenames only. Multiple instances
//of the filename (with different paths) is not relevant here. //of the filename (with different paths) is not relevant here.
depFound = (dependency->fileName() == fileName); depFound = (dependency->fileName().compare(fileName, Qt::CaseInsensitive) == 0);
if (!depFound) if (!depFound)
continue; continue;
@ -299,7 +299,7 @@ bool ContentSelectorModel::ContentModel::setData(const QModelIndex &index, const
foreach (EsmFile *file, mFiles) foreach (EsmFile *file, mFiles)
{ {
if (file->gameFiles().contains(fileName)) if (file->gameFiles().contains(fileName, Qt::CaseInsensitive))
{ {
QModelIndex idx = indexFromItem(file); QModelIndex idx = indexFromItem(file);
emit dataChanged(idx, idx); emit dataChanged(idx, idx);
@ -500,7 +500,7 @@ void ContentSelectorModel::ContentModel::sortFiles()
//dependencies appear. //dependencies appear.
for (int j = i + 1; j < fileCount; j++) for (int j = i + 1; j < fileCount; j++)
{ {
if (gamefiles.contains(mFiles.at(j)->fileName())) if (gamefiles.contains(mFiles.at(j)->fileName(), Qt::CaseInsensitive))
{ {
mFiles.move(j, i); mFiles.move(j, i);
@ -589,7 +589,7 @@ bool ContentSelectorModel::ContentModel::setCheckState(const QString &filepath,
QFileInfo fileInfo(filepath); QFileInfo fileInfo(filepath);
QString filename = fileInfo.fileName(); QString filename = fileInfo.fileName();
if (downstreamFile->gameFiles().contains(filename)) if (downstreamFile->gameFiles().contains(filename, Qt::CaseInsensitive))
{ {
if (mCheckStates.contains(downstreamFile->filePath())) if (mCheckStates.contains(downstreamFile->filePath()))
mCheckStates[downstreamFile->filePath()] = Qt::Unchecked; mCheckStates[downstreamFile->filePath()] = Qt::Unchecked;