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/clangtools/clangtool.h

@@ -33,7 +33,7 @@
 #include <debugger/debuggermainwindow.h>
 
 #include <projectexplorer/runconfiguration.h>
-#include <cpptools/projectinfo.h>
+#include <cppeditor/projectinfo.h>
 
 #include <utils/variant.h>
 
@@ -42,7 +42,7 @@ class QFrame;
 class QToolButton;
 QT_END_NAMESPACE
 
-namespace CppTools {
+namespace CppEditor {
 class ClangDiagnosticConfig;
 }
 namespace Debugger {
@@ -92,7 +92,7 @@ public:
     void startTool(FileSelection fileSelection);
     void startTool(FileSelection fileSelection,
                    const RunSettings &runSettings,
-                   const CppTools::ClangDiagnosticConfig &diagnosticConfig);
+                   const CppEditor::ClangDiagnosticConfig &diagnosticConfig);
 
     Diagnostics read(OutputFileFormat outputFileFormat,
                      const QString &logFilePath,