feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: handle case-insensitive file names in the WorkingCopy

Browse Source 
... by keying on Utils::FileName

Task-number: QTCREATORBUG-12390
Change-Id: Ia1a59d2e422b4f92300ac6a8e0e52dd7456a6e70
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Erik Verbruggen
2014-11-27 10:49:18 +01:00
committed by Nikolai Kosjar
parent e3977de08e
commit be4a030696
8 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -74,17 +74,17 @@ UnsavedFiles createUnsavedFiles(WorkingCopy workingCopy)
// TODO: change the modelmanager to hold one working copy, and amend it every time we ask for one.
// TODO: Reason: the UnsavedFile needs a QByteArray.
QSet<QString> modifiedFiles;
QSet<::Utils::FileName> modifiedFiles;
foreach (IDocument *doc, Core::DocumentManager::modifiedDocuments())
modifiedFiles.insert(doc->filePath());
modifiedFiles.insert(::Utils::FileName::fromString(doc->filePath()));
UnsavedFiles result;
QHashIterator<QString, QPair<QByteArray, unsigned> > wcIter = workingCopy.iterator();
QHashIterator<::Utils::FileName, QPair<QByteArray, unsigned> > wcIter = workingCopy.iterator();
while (wcIter.hasNext()) {
wcIter.next();
const QString &fileName = wcIter.key();
if (modifiedFiles.contains(fileName) && QFile(fileName).exists())
result.insert(fileName, wcIter.value().first);
const ::Utils::FileName &fileName = wcIter.key();
if (modifiedFiles.contains(fileName) && QFile(fileName.toString()).exists())
result.insert(fileName.toString(), wcIter.value().first);
}
return result;