Commit b168eec2 authored by Roberto Raggi's avatar Roberto Raggi

Replaced the hardcoded QHash<QString, QString> with CppModelManagerInterface::WorkingCopy.

parent 730fd82a
...@@ -243,13 +243,13 @@ void CppFindReferences::findAll_helper(Symbol *symbol) ...@@ -243,13 +243,13 @@ void CppFindReferences::findAll_helper(Symbol *symbol)
_resultWindow->popup(true); _resultWindow->popup(true);
const Snapshot snapshot = _modelManager->snapshot(); 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(); Core::ProgressManager *progressManager = Core::ICore::instance()->progressManager();
QFuture<Usage> result; QFuture<Usage> result;
result = QtConcurrent::run(&find_helper, wl, snapshot, symbol); result = QtConcurrent::run(&find_helper, workingCopy, snapshot, symbol);
m_watcher.setFuture(result); m_watcher.setFuture(result);
Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching..."), Core::FutureProgress *progress = progressManager->addTask(result, tr("Searching..."),
......
...@@ -788,9 +788,9 @@ void CppModelManager::renameUsages(CPlusPlus::Symbol *symbol) ...@@ -788,9 +788,9 @@ void CppModelManager::renameUsages(CPlusPlus::Symbol *symbol)
m_findReferences->renameUsages(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); QMapIterator<TextEditor::ITextEditor *, CppEditorSupport *> it(m_editorSupport);
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();
...@@ -814,7 +814,7 @@ QHash<QString, QString> CppModelManager::buildWorkingCopyList() ...@@ -814,7 +814,7 @@ QHash<QString, QString> CppModelManager::buildWorkingCopyList()
return workingCopy; return workingCopy;
} }
QHash<QString, QString> CppModelManager::workingCopy() const CppModelManager::WorkingCopy CppModelManager::workingCopy() const
{ {
return const_cast<CppModelManager *>(this)->buildWorkingCopyList(); return const_cast<CppModelManager *>(this)->buildWorkingCopyList();
} }
...@@ -869,7 +869,7 @@ QStringList CppModelManager::includesInPath(const QString &path) const ...@@ -869,7 +869,7 @@ QStringList CppModelManager::includesInPath(const QString &path) const
QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles) QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles)
{ {
if (! sourceFiles.isEmpty() && m_indexerEnabled) { if (! sourceFiles.isEmpty() && m_indexerEnabled) {
const QHash<QString, QString> workingCopy = buildWorkingCopyList(); const WorkingCopy workingCopy = buildWorkingCopyList();
CppPreprocessor *preproc = new CppPreprocessor(this); CppPreprocessor *preproc = new CppPreprocessor(this);
preproc->setRevision(++m_revision); preproc->setRevision(++m_revision);
......
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
virtual ~CppModelManager(); virtual ~CppModelManager();
virtual void updateSourceFiles(const QStringList &sourceFiles); virtual void updateSourceFiles(const QStringList &sourceFiles);
virtual QHash<QString, QString> workingCopy() const; virtual WorkingCopy workingCopy() const;
virtual QList<ProjectInfo> projectInfos() const; virtual QList<ProjectInfo> projectInfos() const;
virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const; virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const;
...@@ -131,7 +131,7 @@ private Q_SLOTS: ...@@ -131,7 +131,7 @@ private Q_SLOTS:
void updateEditorSelections(); void updateEditorSelections();
private: private:
QHash<QString, QString> buildWorkingCopyList(); WorkingCopy buildWorkingCopyList();
QStringList projectFiles() QStringList projectFiles()
{ {
......
...@@ -78,13 +78,15 @@ public: ...@@ -78,13 +78,15 @@ public:
QStringList frameworkPaths; QStringList frameworkPaths;
}; };
typedef QHash<QString, QString> WorkingCopy;
public: public:
CppModelManagerInterface(QObject *parent = 0) : QObject(parent) {} CppModelManagerInterface(QObject *parent = 0) : QObject(parent) {}
virtual ~CppModelManagerInterface() {} virtual ~CppModelManagerInterface() {}
static CppModelManagerInterface *instance(); static CppModelManagerInterface *instance();
virtual QHash<QString, QString> workingCopy() const = 0; virtual WorkingCopy workingCopy() const = 0;
virtual CPlusPlus::Snapshot snapshot() const = 0; virtual CPlusPlus::Snapshot snapshot() const = 0;
virtual QList<ProjectInfo> projectInfos() const = 0; virtual QList<ProjectInfo> projectInfos() const = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment