C++: handle case-insensitive file names in the CPlusPlus::Snapshot

... by keying on Utils::FileName

Task-number: QTCREATORBUG-12390
Change-Id: Ia98afb5a9160a7fd9225a2f9e02539ff3c35ae86
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp
index 35bbd06b30..5a763d08e3 100644
--- a/src/plugins/cpptools/builtineditordocumentparser.cpp
+++ b/src/plugins/cpptools/builtineditordocumentparser.cpp
@@ -116,9 +116,9 @@ void BuiltinEditorDocumentParser::update(WorkingCopy workingCopy)
         m_snapshot = Snapshot();
     } else {
         // Remove changed files from the snapshot
-        QSet<QString> toRemove;
+        QSet<Utils::FileName> toRemove;
         foreach (const Document::Ptr &doc, m_snapshot) {
-            QString fileName = doc->fileName();
+            const Utils::FileName fileName = Utils::FileName::fromString(doc->fileName());
             if (workingCopy.contains(fileName)) {
                 if (workingCopy.get(fileName).second != doc->editorRevision())
                     addFileAndDependencies(&toRemove, fileName);
@@ -131,7 +131,7 @@ void BuiltinEditorDocumentParser::update(WorkingCopy workingCopy)
 
         if (!toRemove.isEmpty()) {
             invalidateSnapshot = true;
-            foreach (const QString &fileName, toRemove)
+            foreach (const Utils::FileName &fileName, toRemove)
                 m_snapshot.remove(fileName);
         }
     }
@@ -183,7 +183,7 @@ void BuiltinEditorDocumentParser::update(WorkingCopy workingCopy)
         m_snapshot = sourceProcessor.snapshot();
         Snapshot newSnapshot = m_snapshot.simplified(document());
         for (Snapshot::const_iterator i = m_snapshot.begin(), ei = m_snapshot.end(); i != ei; ++i) {
-            if (Client::isInjectedFile(i.key()))
+            if (Client::isInjectedFile(i.key().toString()))
                 newSnapshot.insert(i.value());
         }
         m_snapshot = newSnapshot;
@@ -231,12 +231,12 @@ BuiltinEditorDocumentParser *BuiltinEditorDocumentParser::get(const QString &fil
     return 0;
 }
 
-void BuiltinEditorDocumentParser::addFileAndDependencies(QSet<QString> *toRemove,
-                                                         const QString &fileName) const
+void BuiltinEditorDocumentParser::addFileAndDependencies(QSet<Utils::FileName> *toRemove,
+                                                         const Utils::FileName &fileName) const
 {
     toRemove->insert(fileName);
-    if (fileName != filePath()) {
-        QStringList deps = m_snapshot.filesDependingOn(fileName);
-        toRemove->unite(QSet<QString>::fromList(deps));
+    if (fileName != Utils::FileName::fromString(filePath())) {
+        Utils::FileNameList deps = m_snapshot.filesDependingOn(fileName);
+        toRemove->unite(QSet<Utils::FileName>::fromList(deps));
     }
 }