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/genericprojectmanager/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_qtc_plugin(GenericProjectManager
   PLUGIN_DEPENDS Core ProjectExplorer QtSupport TextEditor
   PLUGIN_TEST_DEPENDS CppEditor
-  PLUGIN_RECOMMENDS CppTools
+  PLUGIN_RECOMMENDS CppEditor
   SOURCES ${TEST_SOURCES}
     filesselectionwizardpage.cpp filesselectionwizardpage.h
     genericbuildconfiguration.cpp genericbuildconfiguration.h

src/plugins/genericprojectmanager/genericproject.cpp

@@ -34,7 +34,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 
-#include <cpptools/cppprojectupdaterinterface.h>
+#include <cppeditor/cppprojectupdaterinterface.h>
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -171,7 +171,7 @@ private:
     QStringList m_cxxflags;
     QStringList m_cflags;
 
-    CppTools::CppProjectUpdaterInterface *m_cppCodeModelUpdater = nullptr;
+    CppEditor::CppProjectUpdaterInterface *m_cppCodeModelUpdater = nullptr;
 
     Utils::FileSystemWatcher m_deployFileWatcher;
 };
@@ -208,7 +208,7 @@ GenericBuildSystem::GenericBuildSystem(Target *target)
         const bool successFullyCreatedProjectUpdater
             = QMetaObject::invokeMethod(projectUpdaterFactory,
                                         "create",
-                                        Q_RETURN_ARG(CppTools::CppProjectUpdaterInterface *,
+                                        Q_RETURN_ARG(CppEditor::CppProjectUpdaterInterface *,
                                                      m_cppCodeModelUpdater));
         QTC_CHECK(successFullyCreatedProjectUpdater);
     }

src/plugins/genericprojectmanager/genericprojectmanager.qbs

@@ -14,7 +14,7 @@ QtcPlugin {
     Depends { name: "app_version_header" }
 
     pluginRecommends: [
-        "CppTools"
+        "CppEditor"
     ]
 
     pluginTestDepends: [

src/plugins/genericprojectmanager/genericprojectmanager_dependencies.pri

@@ -8,6 +8,6 @@ QTC_PLUGIN_DEPENDS += \
     texteditor \
     qtsupport
 QTC_PLUGIN_RECOMMENDS += \
-    cpptools
+    cppeditor
 QTC_TEST_DEPENDS += \
     cppeditor