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

@@ -1,6 +1,6 @@
 add_qtc_plugin(VcsBase
   PLUGIN_DEPENDS Core DiffEditor ProjectExplorer TextEditor
-  PLUGIN_RECOMMENDS CodePaster CppTools
+  PLUGIN_RECOMMENDS CodePaster CppEditor
   SOURCES
     baseannotationhighlighter.cpp baseannotationhighlighter.h
     basevcseditorfactory.cpp basevcseditorfactory.h

src/plugins/vcsbase/vcsbase.qbs

@@ -15,7 +15,7 @@ QtcPlugin {
 
     pluginRecommends: [
         "CodePaster",
-        "CppTools"
+        "CppEditor"
     ]
 
     files: [

src/plugins/vcsbase/vcsbase_dependencies.pri

@@ -11,4 +11,4 @@ QTC_PLUGIN_DEPENDS += \
     diffeditor
 QTC_PLUGIN_RECOMMENDS += \
     cpaster \
-    cpptools
+    cppeditor