Commit b26a17f3 authored by hjk's avatar hjk Committed by Nikolai Kosjar

CppTools: Change CppModelManager implementation pattern

Replace the CppModelManagerInterface/derived CppModelManager
combo by a more common CppModelManager/CppModelManagerPrivate
pimpl pattern.

Change-Id: Ia4582845ed94d5ef60b8571bab9b2260c6290287
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent e5e86931
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
#include "analyzerconstants.h" #include "analyzerconstants.h"
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <QTextCursor> #include <QTextCursor>
...@@ -72,7 +72,7 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor() ...@@ -72,7 +72,7 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor()
const int pos = tc.position(); const int pos = tc.position();
editor->convertPosition(pos, &line, &column); editor->convertPosition(pos, &line, &column);
const CPlusPlus::Snapshot &snapshot = CppTools::CppModelManagerInterface::instance()->snapshot(); const CPlusPlus::Snapshot &snapshot = CppTools::CppModelManager::instance()->snapshot();
CPlusPlus::Document::Ptr doc = snapshot.document(editor->document()->filePath()); CPlusPlus::Document::Ptr doc = snapshot.document(editor->document()->filePath());
QTC_ASSERT(doc, return 0); QTC_ASSERT(doc, return 0);
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/headerpath.h> #include <projectexplorer/headerpath.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -400,8 +400,8 @@ QList<Node *> AutotoolsProject::nodes(FolderNode *parent) const ...@@ -400,8 +400,8 @@ QList<Node *> AutotoolsProject::nodes(FolderNode *parent) const
void AutotoolsProject::updateCppCodeModel() void AutotoolsProject::updateCppCodeModel()
{ {
CppTools::CppModelManagerInterface *modelManager = CppTools::CppModelManager *modelManager =
CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager::instance();
if (!modelManager) if (!modelManager)
return; return;
......
...@@ -67,18 +67,18 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err ...@@ -67,18 +67,18 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
#ifdef CLANG_INDEXING #ifdef CLANG_INDEXING
m_indexer.reset(new ClangIndexer); m_indexer.reset(new ClangIndexer);
CppTools::CppModelManagerInterface::instance()->setIndexingSupport(m_indexer->indexingSupport()); CppTools::CppModelManager::instance()->setIndexingSupport(m_indexer->indexingSupport());
#endif // CLANG_INDEXING #endif // CLANG_INDEXING
// wire up the pch manager // wire up the pch manager
QObject *session = ProjectExplorer::SessionManager::instance(); QObject *session = ProjectExplorer::SessionManager::instance();
connect(session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)), connect(session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)),
pchManager, SLOT(onAboutToRemoveProject(ProjectExplorer::Project*))); pchManager, SLOT(onAboutToRemoveProject(ProjectExplorer::Project*)));
connect(CppTools::CppModelManagerInterface::instance(), SIGNAL(projectPartsUpdated(ProjectExplorer::Project*)), connect(CppTools::CppModelManager::instance(), SIGNAL(projectPartsUpdated(ProjectExplorer::Project*)),
pchManager, SLOT(onProjectPartsUpdated(ProjectExplorer::Project*))); pchManager, SLOT(onProjectPartsUpdated(ProjectExplorer::Project*)));
m_modelManagerSupport.reset(new ModelManagerSupport); m_modelManagerSupport.reset(new ModelManagerSupport);
CppTools::CppModelManagerInterface::instance()->addModelManagerSupport( CppTools::CppModelManager::instance()->addModelManagerSupport(
m_modelManagerSupport.data()); m_modelManagerSupport.data());
return true; return true;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include <cppeditor/cppeditorconstants.h> #include <cppeditor/cppeditorconstants.h>
#include <cpptools/cppdoxygen.h> #include <cpptools/cppdoxygen.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cppworkingcopy.h> #include <cpptools/cppworkingcopy.h>
#include <texteditor/basetexteditor.h> #include <texteditor/basetexteditor.h>
...@@ -208,7 +208,7 @@ AssistInterface *ClangCompletionAssistProvider::createAssistInterface( ...@@ -208,7 +208,7 @@ AssistInterface *ClangCompletionAssistProvider::createAssistInterface(
{ {
Q_UNUSED(isObjCEnabled); Q_UNUSED(isObjCEnabled);
CppModelManagerInterface *modelManager = CppModelManagerInterface::instance(); CppModelManager *modelManager = CppModelManager::instance();
QList<ProjectPart::Ptr> parts = modelManager->projectPart(filePath); QList<ProjectPart::Ptr> parts = modelManager->projectPart(filePath);
if (parts.isEmpty()) if (parts.isEmpty())
parts += modelManager->fallbackProjectPart(); parts += modelManager->fallbackProjectPart();
...@@ -558,7 +558,7 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::P ...@@ -558,7 +558,7 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::P
{ {
Q_ASSERT(!clangWrapper.isNull()); Q_ASSERT(!clangWrapper.isNull());
CppModelManagerInterface *mmi = CppModelManagerInterface::instance(); CppModelManager *mmi = CppModelManager::instance();
Q_ASSERT(mmi); Q_ASSERT(mmi);
m_unsavedFiles = Utils::createUnsavedFiles(mmi->workingCopy()); m_unsavedFiles = Utils::createUnsavedFiles(mmi->workingCopy());
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <cplusplus/Icons.h> #include <cplusplus/Icons.h>
#include <cpptools/cppcompletionassistprovider.h> #include <cpptools/cppcompletionassistprovider.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <texteditor/codeassist/assistproposalitem.h> #include <texteditor/codeassist/assistproposalitem.h>
#include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/completionassistprovider.h>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "pchinfo.h" #include "pchinfo.h"
#include "pchmanager.h" #include "pchmanager.h"
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cppprojects.h> #include <cpptools/cppprojects.h>
#include <cpptools/cppworkingcopy.h> #include <cpptools/cppworkingcopy.h>
......
...@@ -126,7 +126,7 @@ void ClangEditorDocumentProcessor::run() ...@@ -126,7 +126,7 @@ void ClangEditorDocumentProcessor::run()
{ {
// Run clang parser // Run clang parser
const CppTools::WorkingCopy workingCopy const CppTools::WorkingCopy workingCopy
= CppTools::CppModelManagerInterface::instance()->workingCopy(); = CppTools::CppModelManager::instance()->workingCopy();
disconnect(&m_parserWatcher, &QFutureWatcher<void>::finished, disconnect(&m_parserWatcher, &QFutureWatcher<void>::finished,
this, &ClangEditorDocumentProcessor::onParserFinished); this, &ClangEditorDocumentProcessor::onParserFinished);
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <QDir> #include <QDir>
...@@ -94,7 +94,7 @@ CppTools::CppIndexingSupport *ClangIndexer::indexingSupport() ...@@ -94,7 +94,7 @@ CppTools::CppIndexingSupport *ClangIndexer::indexingSupport()
QFuture<void> ClangIndexer::refreshSourceFiles(const QStringList &sourceFiles) QFuture<void> ClangIndexer::refreshSourceFiles(const QStringList &sourceFiles)
{ {
typedef CppTools::ProjectPart ProjectPart; typedef CppTools::ProjectPart ProjectPart;
CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *mmi = CppTools::CppModelManager::instance();
LiveUnitsManager *lum = LiveUnitsManager::instance(); LiveUnitsManager *lum = LiveUnitsManager::instance();
if (m_clangIndexer->isBusy()) if (m_clangIndexer->isBusy())
...@@ -149,7 +149,7 @@ void ClangIndexer::indexNow(Unit::Ptr unit) ...@@ -149,7 +149,7 @@ void ClangIndexer::indexNow(Unit::Ptr unit)
typedef CppTools::ProjectPart ProjectPart; typedef CppTools::ProjectPart ProjectPart;
QString file = unit->fileName(); QString file = unit->fileName();
CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *mmi = CppTools::CppModelManager::instance();
const QList<ProjectPart::Ptr> &parts = mmi->projectPart(file); const QList<ProjectPart::Ptr> &parts = mmi->projectPart(file);
ProjectPart::Ptr part; ProjectPart::Ptr part;
if (!parts.isEmpty()) if (!parts.isEmpty())
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "utils.h" #include "utils.h"
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Utils { namespace Utils {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "symbol.h" #include "symbol.h"
#include "unit.h" #include "unit.h"
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QString> #include <QtCore/QString>
......
...@@ -142,7 +142,7 @@ void PchManager::onProjectPartsUpdated(ProjectExplorer::Project *project) ...@@ -142,7 +142,7 @@ void PchManager::onProjectPartsUpdated(ProjectExplorer::Project *project)
ClangProjectSettings *cps = settingsForProject(project); ClangProjectSettings *cps = settingsForProject(project);
Q_ASSERT(cps); Q_ASSERT(cps);
CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *mmi = CppTools::CppModelManager::instance();
const QList<ProjectPart::Ptr> projectParts = mmi->projectInfo( const QList<ProjectPart::Ptr> projectParts = mmi->projectInfo(
cps->project()).projectParts(); cps->project()).projectParts();
updatePchInfo(cps, projectParts); updatePchInfo(cps, projectParts);
...@@ -435,7 +435,7 @@ void PchManager::updateActivePchFiles() ...@@ -435,7 +435,7 @@ void PchManager::updateActivePchFiles()
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
QSet<ProjectPart::Ptr> activeParts; QSet<ProjectPart::Ptr> activeParts;
CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *mmi = CppTools::CppModelManager::instance();
foreach (const CppTools::ProjectInfo &pi, mmi->projectInfos()) foreach (const CppTools::ProjectInfo &pi, mmi->projectInfos())
activeParts.unite(QSet<ProjectPart::Ptr>::fromList(pi.projectParts())); activeParts.unite(QSet<ProjectPart::Ptr>::fromList(pi.projectParts()));
QList<ProjectPart::Ptr> partsWithPCHFiles = m_activePchFiles.keys(); QList<ProjectPart::Ptr> partsWithPCHFiles = m_activePchFiles.keys();
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "clangprojectsettings.h" #include "clangprojectsettings.h"
#include "pchinfo.h" #include "pchinfo.h"
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
...@@ -269,8 +269,8 @@ void Manager::initialize() ...@@ -269,8 +269,8 @@ void Manager::initialize()
&d->parser, SLOT(setFlatMode(bool)), Qt::QueuedConnection); &d->parser, SLOT(setFlatMode(bool)), Qt::QueuedConnection);
// connect to the cpp model manager for signals about document updates // connect to the cpp model manager for signals about document updates
CppTools::CppModelManagerInterface *codeModelManager CppTools::CppModelManager *codeModelManager
= CppTools::CppModelManagerInterface::instance(); = CppTools::CppModelManager::instance();
// when code manager signals that document is updated - handle it by ourselves // when code manager signals that document is updated - handle it by ourselves
connect(codeModelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)), connect(codeModelManager, SIGNAL(documentUpdated(CPlusPlus::Document::Ptr)),
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <cplusplus/Name.h> #include <cplusplus/Name.h>
// other // other
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cplusplus/Overview.h> #include <cplusplus/Overview.h>
#include <cplusplus/Icons.h> #include <cplusplus/Icons.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
...@@ -666,7 +666,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot) ...@@ -666,7 +666,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot)
void Parser::resetDataToCurrentState() void Parser::resetDataToCurrentState()
{ {
// get latest data // get latest data
CppTools::CppModelManagerInterface *codeModel = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *codeModel = CppTools::CppModelManager::instance();
if (codeModel) if (codeModel)
resetData(codeModel->snapshot()); resetData(codeModel->snapshot());
} }
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/uicodemodelsupport.h> #include <qtsupport/uicodemodelsupport.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -326,8 +326,8 @@ bool CMakeProject::parseCMakeLists() ...@@ -326,8 +326,8 @@ bool CMakeProject::parseCMakeLists()
return true; return true;
} }
CppTools::CppModelManagerInterface *modelmanager = CppTools::CppModelManager *modelmanager =
CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager::instance();
if (modelmanager) { if (modelmanager) {
CppTools::ProjectInfo pinfo = modelmanager->projectInfo(this); CppTools::ProjectInfo pinfo = modelmanager->projectInfo(this);
pinfo.clearProjectParts(); pinfo.clearProjectParts();
......
...@@ -1339,7 +1339,7 @@ void CppCodeModelInspectorDialog::onWorkingCopyDocumentSelected(const QModelInde ...@@ -1339,7 +1339,7 @@ void CppCodeModelInspectorDialog::onWorkingCopyDocumentSelected(const QModelInde
void CppCodeModelInspectorDialog::refresh() void CppCodeModelInspectorDialog::refresh()
{ {
CppTools::CppModelManagerInterface *cmmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *cmmi = CppTools::CppModelManager::instance();
const int oldSnapshotIndex = m_ui->snapshotSelector->currentIndex(); const int oldSnapshotIndex = m_ui->snapshotSelector->currentIndex();
const bool selectEditorRelevant const bool selectEditorRelevant
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#ifndef CPPCODEMODELINSPECTORDIALOG_H #ifndef CPPCODEMODELINSPECTORDIALOG_H
#define CPPCODEMODELINSPECTORDIALOG_H #define CPPCODEMODELINSPECTORDIALOG_H
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "cppeditortestcase.h" #include "cppeditortestcase.h"
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include <cpptools/cppchecksymbols.h> #include <cpptools/cppchecksymbols.h>
#include <cpptools/cppcodeformatter.h> #include <cpptools/cppcodeformatter.h>
#include <cpptools/cppcompletionassistprovider.h> #include <cpptools/cppcompletionassistprovider.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cppsemanticinfo.h> #include <cpptools/cppsemanticinfo.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <cpptools/cpptoolsplugin.h> #include <cpptools/cpptoolsplugin.h>
...@@ -102,7 +102,7 @@ public: ...@@ -102,7 +102,7 @@ public:
CppEditorWidgetPrivate(CppEditorWidget *q); CppEditorWidgetPrivate(CppEditorWidget *q);
public: public:
QPointer<CppTools::CppModelManagerInterface> m_modelManager; QPointer<CppTools::CppModelManager> m_modelManager;
CppEditorDocument *m_cppEditorDocument; CppEditorDocument *m_cppEditorDocument;
CppEditorOutline *m_cppEditorOutline; CppEditorOutline *m_cppEditorOutline;
...@@ -126,7 +126,7 @@ public: ...@@ -126,7 +126,7 @@ public:
}; };
CppEditorWidgetPrivate::CppEditorWidgetPrivate(CppEditorWidget *q) CppEditorWidgetPrivate::CppEditorWidgetPrivate(CppEditorWidget *q)
: m_modelManager(CppModelManagerInterface::instance()) : m_modelManager(CppModelManager::instance())
, m_cppEditorDocument(qobject_cast<CppEditorDocument *>(q->textDocument())) , m_cppEditorDocument(qobject_cast<CppEditorDocument *>(q->textDocument()))
, m_cppEditorOutline(new CppEditorOutline(q)) , m_cppEditorOutline(new CppEditorOutline(q))
, m_cppDocumentationCommentHelper(q) , m_cppDocumentationCommentHelper(q)
...@@ -302,7 +302,7 @@ void CppEditorWidget::findUsages() ...@@ -302,7 +302,7 @@ void CppEditorWidget::findUsages()
return; return;
SemanticInfo info = d->m_lastSemanticInfo; SemanticInfo info = d->m_lastSemanticInfo;
info.snapshot = CppModelManagerInterface::instance()->snapshot(); info.snapshot = CppModelManager::instance()->snapshot();
info.snapshot.insert(info.doc); info.snapshot.insert(info.doc);
if (const Macro *macro = CppTools::findCanonicalMacro(textCursor(), info.doc)) { if (const Macro *macro = CppTools::findCanonicalMacro(textCursor(), info.doc)) {
...@@ -321,7 +321,7 @@ void CppEditorWidget::renameUsages(const QString &replacement) ...@@ -321,7 +321,7 @@ void CppEditorWidget::renameUsages(const QString &replacement)
return; return;
SemanticInfo info = d->m_lastSemanticInfo; SemanticInfo info = d->m_lastSemanticInfo;
info.snapshot = CppModelManagerInterface::instance()->snapshot(); info.snapshot = CppModelManager::instance()->snapshot();
info.snapshot.insert(info.doc); info.snapshot.insert(info.doc);
if (const Macro *macro = CppTools::findCanonicalMacro(textCursor(), info.doc)) { if (const Macro *macro = CppTools::findCanonicalMacro(textCursor(), info.doc)) {
...@@ -694,7 +694,7 @@ void CppEditorWidget::updateFunctionDeclDefLinkNow() ...@@ -694,7 +694,7 @@ void CppEditorWidget::updateFunctionDeclDefLinkNow()
if (!isSemanticInfoValidExceptLocalUses()) if (!isSemanticInfoValidExceptLocalUses())
return; return;
Snapshot snapshot = CppModelManagerInterface::instance()->snapshot(); Snapshot snapshot = CppModelManager::instance()->snapshot();
snapshot.insert(semanticDoc); snapshot.insert(semanticDoc);
d->m_declDefLinkFinder->startFindLinkAt(textCursor(), semanticDoc, snapshot); d->m_declDefLinkFinder->startFindLinkAt(textCursor(), semanticDoc, snapshot);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <cpptools/builtineditordocumentprocessor.h> #include <cpptools/builtineditordocumentprocessor.h>
#include <cpptools/cppcodeformatter.h> #include <cpptools/cppcodeformatter.h>
#include <cpptools/cppcodemodelsettings.h> #include <cpptools/cppcodemodelsettings.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cppqtstyleindenter.h> #include <cpptools/cppqtstyleindenter.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <cpptools/cpptoolsplugin.h> #include <cpptools/cpptoolsplugin.h>
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
namespace { namespace {
CppTools::CppModelManagerInterface *mm() CppTools::CppModelManager *mm()
{ {
return CppTools::CppModelManagerInterface::instance(); return CppTools::CppModelManager::instance();
} }
} // anonymous namespace } // anonymous namespace
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <cpptools/baseeditordocumentprocessor.h> #include <cpptools/baseeditordocumentprocessor.h>
#include <cpptools/cppcompletionassistprovider.h> #include <cpptools/cppcompletionassistprovider.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cpptools/cppsemanticinfo.h> #include <cpptools/cppsemanticinfo.h>
#include <cpptools/editordocumenthandle.h> #include <cpptools/editordocumenthandle.h>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "cppeditor.h" #include "cppeditor.h"
#include "cppeditorplugin.h" #include "cppeditorplugin.h"
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanager.h>
#include <cplusplus/OverviewModel.h> #include <cplusplus/OverviewModel.h>
#include <utils/treeviewcombobox.h> #include <utils/treeviewcombobox.h>
...@@ -189,7 +189,7 @@ QWidget *CppEditorOutline::widget() const ...@@ -189,7 +189,7 @@ QWidget *CppEditorOutline::widget() const
void CppEditorOutline::updateNow() void CppEditorOutline::updateNow()
{ {
CppTools::CppModelManagerInterface *cmmi = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *cmmi = CppTools::CppModelManager::instance();
if (!cmmi) if (!cmmi)
return; return;
......
...@@ -288,7 +288,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err ...@@ -288,7 +288,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
cppToolsMenu->addSeparator(globalContext); cppToolsMenu->addSeparator(globalContext);
m_reparseExternallyChangedFiles = new QAction(tr("Reparse Externally Changed Files"), this); m_reparseExternallyChangedFiles = new QAction(tr("Reparse Externally Changed Files"), this);
cmd = ActionManager::registerAction(m_reparseExternallyChangedFiles, Constants::UPDATE_CODEMODEL, globalContext); cmd = ActionManager::registerAction(m_reparseExternallyChangedFiles, Constants::UPDATE_CODEMODEL, globalContext);
CppTools::CppModelManagerInterface *cppModelManager = CppTools::CppModelManagerInterface::instance(); CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance();