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

@@ -1,6 +1,6 @@
 add_qtc_plugin(MesonProjectManager
   DEPENDS QmlJS
-  PLUGIN_DEPENDS Core CppTools ProjectExplorer TextEditor QtSupport
+  PLUGIN_DEPENDS Core CppEditor ProjectExplorer TextEditor QtSupport
   PLUGIN_RECOMMENDS Designer
   SOURCES
   mesonprojectplugin.cpp

src/plugins/mesonprojectmanager/mesonprojectmanager.qbs

@@ -12,7 +12,7 @@ Project {
         Depends { name: "Utils" }
 
         Depends { name: "Core" }
-        Depends { name: "CppTools" }
+        Depends { name: "CppEditor" }
         Depends { name: "ProjectExplorer" }
         Depends { name: "QtSupport" }
         Depends { name: "app_version_header" }

src/plugins/mesonprojectmanager/mesonprojectmanager_dependencies.pri

@@ -5,7 +5,7 @@ QTC_LIB_DEPENDS += \
 QTC_PLUGIN_DEPENDS += \
     coreplugin \
     projectexplorer \
-    cpptools \
+    cppeditor \
     qtsupport
 QTC_PLUGIN_RECOMMENDS += \
     designer

src/plugins/mesonprojectmanager/project/mesonbuildsystem.h

@@ -29,7 +29,7 @@
 #include "exewrappers/mesonwrapper.h"
 #include "kithelper/kitdata.h"
 
-#include <cpptools/cppprojectupdater.h>
+#include <cppeditor/cppprojectupdater.h>
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/target.h>
@@ -72,7 +72,7 @@ private:
     QStringList configArgs(bool isSetup);
     ProjectExplorer::BuildSystem::ParseGuard m_parseGuard;
     MesonProjectParser m_parser;
-    CppTools::CppProjectUpdater m_cppCodeModelUpdater;
+    CppEditor::CppProjectUpdater m_cppCodeModelUpdater;
     QStringList m_pendingConfigArgs;
     Utils::FileSystemWatcher m_IntroWatcher;
     KitData m_kitData;