Merge CppTools into CppEditor

There was no proper separation of responsibilities between these
plugins. In particular, CppTools had lots of editor-related
functionality, so it's not clear why it was separated out in the first
place.
In fact, for a lot of code, it seemed quite arbitrary where it was put
(just one example: switchHeaderSource() was in CppTools, wheras
switchDeclarationDefinition() was in CppEditor).
Merging the plugins will enable us to get rid of various convoluted
pseudo-abstractions that were only introduced to keep up the artificial
separation.

Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/qmljstools/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_qtc_plugin(QmlJSTools
   DEPENDS LanguageUtils
   PUBLIC_DEPENDS QmlJS
-  PLUGIN_DEPENDS Core CppTools ProjectExplorer QtSupport TextEditor
+  PLUGIN_DEPENDS Core CppEditor ProjectExplorer QtSupport TextEditor
   SOURCES
     qmljsbundleprovider.cpp qmljsbundleprovider.h
     qmljscodestylepreferencesfactory.cpp qmljscodestylepreferencesfactory.h

src/plugins/qmljstools/qmljscodestylesettingspage.h

@@ -81,4 +81,4 @@ private:
 };
 
 } // namespace Internal
-} // namespace CppTools
+} // namespace QmlJSTools

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -34,7 +34,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 
-#include <cpptools/cppmodelmanager.h>
+#include <cppeditor/cppmodelmanager.h>
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildsystem.h>
@@ -207,10 +207,10 @@ ModelManager::~ModelManager() = default;
 
 void ModelManager::delayedInitialization()
 {
-    CppTools::CppModelManager *cppModelManager = CppTools::CppModelManager::instance();
+    CppEditor::CppModelManager *cppModelManager = CppEditor::CppModelManager::instance();
     // It's important to have a direct connection here so we can prevent
     // the source and AST of the cpp document being cleaned away.
-    connect(cppModelManager, &CppTools::CppModelManager::documentUpdated,
+    connect(cppModelManager, &CppEditor::CppModelManager::documentUpdated,
             this, &ModelManagerInterface::maybeQueueCppQmlTypeUpdate, Qt::DirectConnection);
 
     connect(SessionManager::instance(), &SessionManager::projectRemoved,

src/plugins/qmljstools/qmljstools.qbs

@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "Utils" }
 
     Depends { name: "Core" }
-    Depends { name: "CppTools" }
+    Depends { name: "CppEditor" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "QtSupport" }
@@ -54,7 +54,7 @@ QtcPlugin {
     }
 
     Export {
-        Depends { name: "CppTools" }
+        Depends { name: "CppEditor" }
         Depends { name: "QmlDebug" }
     }
 }

src/plugins/qmljstools/qmljstools_dependencies.pri

@@ -11,4 +11,4 @@ QTC_PLUGIN_DEPENDS += \
     projectexplorer \
     qtsupport \
     texteditor \
-    cpptools
+    cppeditor

src/plugins/qmljstools/qmljstoolsplugin.h

@@ -51,4 +51,4 @@ private slots:
 };
 
 } // namespace Internal
-} // namespace CppTools
+} // namespace QmlJSTools