diff options
| author | Christian Kamm <[email protected]> | 2010-12-03 13:49:35 +0100 |
|---|---|---|
| committer | Christian Kamm <[email protected]> | 2011-01-04 15:58:21 +0100 |
| commit | 5f50a6ae343574bc247eb631c0a2314273f50add (patch) | |
| tree | c8e15fe94e5e692a7e101e67511c451db5718c09 /src/plugins/cmakeprojectmanager/cmakeproject.cpp | |
| parent | 5de7be5f91efcaddccffde464d1556d7a8b05a59 (diff) | |
C++: Move the ModelManagerInterface from CppTools to CPlusPlus.
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 3b3d947cf1b..78d0d8b01fb 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -47,7 +47,7 @@ #include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildmanager.h> #include <projectexplorer/toolchain.h> -#include <cpptools/cppmodelmanagerinterface.h> +#include <cplusplus/ModelManagerInterface.h> #include <extensionsystem/pluginmanager.h> #include <designer/formwindoweditor.h> #include <utils/qtcassert.h> @@ -95,8 +95,8 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName) CMakeProject::~CMakeProject() { // Remove CodeModel support - CppTools::CppModelManagerInterface *modelManager - = ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>(); + CPlusPlus::CppModelManagerInterface *modelManager + = ExtensionSystem::PluginManager::instance()->getObject<CPlusPlus::CppModelManagerInterface>(); QMap<QString, CMakeUiCodeModelSupport *>::const_iterator it, end; it = m_uiCodeModelSupport.constBegin(); end = m_uiCodeModelSupport.constEnd(); @@ -282,10 +282,10 @@ bool CMakeProject::parseCMakeLists() allIncludePaths.append(projectDirectory()); allIncludePaths.append(cbpparser.includeFiles()); - CppTools::CppModelManagerInterface *modelmanager = - ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>(); + CPlusPlus::CppModelManagerInterface *modelmanager = + ExtensionSystem::PluginManager::instance()->getObject<CPlusPlus::CppModelManagerInterface>(); if (modelmanager) { - CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this); + CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this); if (pinfo.includePaths != allIncludePaths || pinfo.sourceFiles != m_files || pinfo.defines != activeBC->toolChain()->predefinedMacros() @@ -608,8 +608,8 @@ QString CMakeProject::uiHeaderFile(const QString &uiFile) void CMakeProject::createUiCodeModelSupport() { // qDebug()<<"creatUiCodeModelSupport()"; - CppTools::CppModelManagerInterface *modelManager - = ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>(); + CPlusPlus::CppModelManagerInterface *modelManager + = ExtensionSystem::PluginManager::instance()->getObject<CPlusPlus::CppModelManagerInterface>(); // First move all to QMap<QString, CMakeUiCodeModelSupport *> oldCodeModelSupport; |