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/runsettingswidget.cpp

@@ -32,7 +32,7 @@
 #include "executableinfo.h"
 #include "settingswidget.h"
 
-#include <cpptools/clangdiagnosticconfigswidget.h>
+#include <cppeditor/clangdiagnosticconfigswidget.h>
 
 #include <QThread>
 
@@ -53,13 +53,13 @@ RunSettingsWidget::~RunSettingsWidget()
     delete m_ui;
 }
 
-CppTools::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSelectionWidget()
+CppEditor::ClangDiagnosticConfigsSelectionWidget *RunSettingsWidget::diagnosticSelectionWidget()
 {
     return m_ui->diagnosticWidget;
 }
 
-static CppTools::ClangDiagnosticConfigsWidget *createEditWidget(
-    const CppTools::ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect)
+static CppEditor::ClangDiagnosticConfigsWidget *createEditWidget(
+    const CppEditor::ClangDiagnosticConfigs &configs, const Utils::Id &configToSelect)
 {
     // Determine executable paths
     FilePath clangTidyPath;
@@ -92,7 +92,7 @@ void RunSettingsWidget::fromSettings(const RunSettings &s)
                                     s.diagnosticConfigId(),
                                     createEditWidget);
     connect(m_ui->diagnosticWidget,
-            &CppTools::ClangDiagnosticConfigsSelectionWidget::changed,
+            &CppEditor::ClangDiagnosticConfigsSelectionWidget::changed,
             this,
             &RunSettingsWidget::changed);