C++: Move the ModelManagerInterface from CppTools to CPlusPlus.

9 files changed, 22 insertions, 18 deletions

diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
index 0d0ed1ebc8..ef415e98e8 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/plugingenerator.cpp
@@ -36,7 +36,7 @@
 
 #include <coreplugin/basefilewizard.h>
 
-#include <cpptools/cppmodelmanagerinterface.h>
+#include <cpptools/abstracteditorsupport.h>
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 52d0335d1d..e404998d6d 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -51,7 +51,7 @@
 #include <coreplugin/iversioncontrol.h>
 #include <coreplugin/vcsmanager.h>
 
-#include <cpptools/cppmodelmanagerinterface.h>
+#include <cplusplus/ModelManagerInterface.h>
 #include <cplusplus/CppDocument.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/projectexplorer.h>
@@ -1328,8 +1328,8 @@ Qt4ProFileNode::Qt4ProFileNode(Qt4Project *project,
 
 Qt4ProFileNode::~Qt4ProFileNode()
 {
-    CppTools::CppModelManagerInterface *modelManager
-            = ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>();
+    CPlusPlus::CppModelManagerInterface *modelManager
+            = ExtensionSystem::PluginManager::instance()->getObject<CPlusPlus::CppModelManagerInterface>();
     QMap<QString, Qt4UiCodeModelSupport *>::const_iterator it, end;
     end = m_uiCodeModelSupport.constEnd();
     for (it = m_uiCodeModelSupport.constBegin(); it != end; ++it) {
@@ -1890,8 +1890,8 @@ QStringList Qt4ProFileNode::updateUiFiles()
         removeFileNodes(toRemove, this);
     }
 
-    CppTools::CppModelManagerInterface *modelManager =
-        ExtensionSystem::PluginManager::instance()->getObject<CppTools::CppModelManagerInterface>();
+    CPlusPlus::CppModelManagerInterface *modelManager =
+        ExtensionSystem::PluginManager::instance()->getObject<CPlusPlus::CppModelManagerInterface>();
 
     if (!toAdd.isEmpty()) {
         foreach (FileNode *file, toAdd) {
@@ -2192,8 +2192,8 @@ QString Qt4ProFileNode::uiHeaderFile(const QString &uiDir, const QString &formFi
 void Qt4ProFileNode::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, Qt4UiCodeModelSupport *> oldCodeModelSupport;
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 4fc67eb505..26987b6ef2 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -51,7 +51,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <extensionsystem/pluginmanager.h>
-#include <cpptools/cppmodelmanagerinterface.h>
+#include <cplusplus/ModelManagerInterface.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/buildenvironmentwidget.h>
@@ -421,9 +421,9 @@ void Qt4Project::updateCppCodeModel()
 {
     Qt4BuildConfiguration *activeBC = activeTarget()->activeBuildConfiguration();
 
-    CppTools::CppModelManagerInterface *modelmanager =
+    CPlusPlus::CppModelManagerInterface *modelmanager =
         ExtensionSystem::PluginManager::instance()
-            ->getObject<CppTools::CppModelManagerInterface>();
+            ->getObject<CPlusPlus::CppModelManagerInterface>();
 
     if (!modelmanager)
         return;
@@ -544,7 +544,7 @@ void Qt4Project::updateCppCodeModel()
     files += m_projectFiles->files[SourceType];
     files += m_projectFiles->generatedFiles[SourceType];
 
-    CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
+    CPlusPlus::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
 
     //qDebug()<<"Using precompiled header"<<allPrecompileHeaders;
 
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
index ba33fb7cad..230e843b87 100644
--- a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
@@ -40,7 +40,7 @@
 using namespace Qt4ProjectManager;
 using namespace Internal;
 
-Qt4UiCodeModelSupport::Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
+Qt4UiCodeModelSupport::Qt4UiCodeModelSupport(CPlusPlus::CppModelManagerInterface *modelmanager,
                                              Qt4Project *project,
                                              const QString &source,
                                              const QString &uiHeaderFile)
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.h b/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
index 8216990df8..d9eb01a7c7 100644
--- a/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.h
@@ -36,6 +36,10 @@
 
 #include <cpptools/uicodecompletionsupport.h>
 
+namespace CPlusPlus {
+class CppModelManagerInterface;
+}
+
 namespace Qt4ProjectManager {
 class Qt4Project;
 namespace Internal {
@@ -43,7 +47,7 @@ namespace Internal {
 class Qt4UiCodeModelSupport : public CppTools::UiCodeModelSupport
 {
 public:
-    Qt4UiCodeModelSupport(CppTools::CppModelManagerInterface *modelmanager,
+    Qt4UiCodeModelSupport(CPlusPlus::CppModelManagerInterface *modelmanager,
                           Qt4Project *project,
                           const QString &sourceFile,
                           const QString &uiHeaderFile);
diff --git a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
index 134293f318..3b0fb961e8 100644
--- a/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/consoleappwizard.cpp
@@ -36,7 +36,7 @@
 #include "consoleappwizarddialog.h"
 #include "qt4projectmanagerconstants.h"
 
-#include <cpptools/cppmodelmanagerinterface.h>
+#include <cpptools/abstracteditorsupport.h>
 
 #include <QtGui/QIcon>
 
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 83b0321a03..67b193cf94 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -36,7 +36,7 @@
 #include "guiappwizarddialog.h"
 #include "qt4projectmanagerconstants.h"
 
-#include <cpptools/cppmodelmanagerinterface.h>
+#include <cpptools/abstracteditorsupport.h>
 #include <designer/cpp/formclasswizardparameters.h>
 #include <coreplugin/icore.h>
 
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index 4b75b02ab1..e886713b93 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -38,7 +38,7 @@
 #include "mobilelibraryparameters.h"
 
 #include <utils/codegeneration.h>
-#include <cpptools/cppmodelmanagerinterface.h>
+#include <cpptools/abstracteditorsupport.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QtCore/QDir>
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.cpp b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
index 38e1870c47..96040a25d1 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.cpp
@@ -34,7 +34,7 @@
 #include "testwizard.h"
 #include "testwizarddialog.h"
 
-#include <cpptools/cppmodelmanager.h>
+#include <cpptools/abstracteditorsupport.h>
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <utils/qtcassert.h>