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>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/clangtools/runsettingswidget.h b/src/plugins/clangtools/runsettingswidget.h
index 07f5090702..b8d25204f0 100644
--- a/src/plugins/clangtools/runsettingswidget.h
+++ b/src/plugins/clangtools/runsettingswidget.h
@@ -25,11 +25,11 @@
 
 #pragma once
 
-#include <cpptools/clangdiagnosticconfig.h>
+#include <cppeditor/clangdiagnosticconfig.h>
 
 #include <QWidget>
 
-namespace CppTools {
+namespace CppEditor {
 class ClangDiagnosticConfigsSelectionWidget;
 }
 
@@ -50,7 +50,7 @@ public:
     explicit RunSettingsWidget(QWidget *parent = nullptr);
     ~RunSettingsWidget();
 
-    CppTools::ClangDiagnosticConfigsSelectionWidget *diagnosticSelectionWidget();
+    CppEditor::ClangDiagnosticConfigsSelectionWidget *diagnosticSelectionWidget();
 
     void fromSettings(const RunSettings &s);
     RunSettings toSettings() const;