From b168eec2a13da85f2e82f17730a599a77ef93180 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 15 Dec 2009 15:16:46 +0100
Subject: [PATCH] Replaced the hardcoded QHash<QString, QString> with
 CppModelManagerInterface::WorkingCopy.

---
 src/plugins/cpptools/cppfindreferences.cpp      | 4 ++--
 src/plugins/cpptools/cppmodelmanager.cpp        | 8 ++++----
 src/plugins/cpptools/cppmodelmanager.h          | 4 ++--
 src/plugins/cpptools/cppmodelmanagerinterface.h | 4 +++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index b21dd56e1c..d580c89c0e 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -243,13 +243,13 @@ void CppFindReferences::findAll_helper(Symbol *symbol)
     _resultWindow->popup(true);
 
     const Snapshot snapshot = _modelManager->snapshot();
-    const QHash<QString, QString> wl = _modelManager->workingCopy();
+    const CppTools::CppModelManagerInterface::WorkingCopy workingCopy = _modelManager->workingCopy();
 
     Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
 
     QFuture<Usage> result;
 
-    result = QtConcurrent::run(&find_helper, wl, snapshot, symbol);
+    result = QtConcurrent::run(&find_helper, workingCopy, snapshot, symbol);
     m_watcher.setFuture(result);
 
     Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching..."),
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 1ed3ba1d2f..4c60a5d312 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -788,9 +788,9 @@ void CppModelManager::renameUsages(CPlusPlus::Symbol *symbol)
         m_findReferences->renameUsages(symbol);
 }
 
-QHash<QString, QString> CppModelManager::buildWorkingCopyList()
+CppModelManager::WorkingCopy CppModelManager::buildWorkingCopyList()
 {
-    QHash<QString, QString> workingCopy;
+    WorkingCopy workingCopy;
     QMapIterator<TextEditor::ITextEditor *, CppEditorSupport *> it(m_editorSupport);
     while (it.hasNext()) {
         it.next();
@@ -814,7 +814,7 @@ QHash<QString, QString> CppModelManager::buildWorkingCopyList()
     return workingCopy;
 }
 
-QHash<QString, QString> CppModelManager::workingCopy() const
+CppModelManager::WorkingCopy CppModelManager::workingCopy() const
 {
     return const_cast<CppModelManager *>(this)->buildWorkingCopyList();
 }
@@ -869,7 +869,7 @@ QStringList CppModelManager::includesInPath(const QString &path) const
 QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles)
 {
     if (! sourceFiles.isEmpty() && m_indexerEnabled) {
-        const QHash<QString, QString> workingCopy = buildWorkingCopyList();
+        const WorkingCopy workingCopy = buildWorkingCopyList();
 
         CppPreprocessor *preproc = new CppPreprocessor(this);
         preproc->setRevision(++m_revision);
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 6b474a0561..f5f445d605 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -73,7 +73,7 @@ public:
     virtual ~CppModelManager();
 
     virtual void updateSourceFiles(const QStringList &sourceFiles);
-    virtual QHash<QString, QString> workingCopy() const;
+    virtual WorkingCopy workingCopy() const;
 
     virtual QList<ProjectInfo> projectInfos() const;
     virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const;
@@ -131,7 +131,7 @@ private Q_SLOTS:
     void updateEditorSelections();
 
 private:
-    QHash<QString, QString> buildWorkingCopyList();
+    WorkingCopy buildWorkingCopyList();
 
     QStringList projectFiles()
     {
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index b8c3f7308a..f0327fb631 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -78,13 +78,15 @@ public:
         QStringList frameworkPaths;
     };
 
+    typedef QHash<QString, QString> WorkingCopy;
+
 public:
     CppModelManagerInterface(QObject *parent = 0) : QObject(parent) {}
     virtual ~CppModelManagerInterface() {}
 
     static CppModelManagerInterface *instance();
 
-    virtual QHash<QString, QString> workingCopy() const = 0;
+    virtual WorkingCopy workingCopy() const = 0;
     virtual CPlusPlus::Snapshot snapshot() const = 0;
 
     virtual QList<ProjectInfo> projectInfos() const = 0;
-- 
GitLab