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, 9 insertions, 9 deletions

diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 0a49d777f7..a19a895c60 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -25,17 +25,18 @@
 
 #include "cppcodemodelinspectordialog.h"
 #include "ui_cppcodemodelinspectordialog.h"
+
+#include "baseeditordocumentprocessor.h"
+#include "cppcodemodelinspectordumper.h"
 #include "cppeditorwidget.h"
 #include "cppeditordocument.h"
+#include "cppmodelmanager.h"
+#include "cpptoolsbridge.h"
+#include "cpptoolsreuse.h"
+#include "cppworkingcopy.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
-#include <cpptools/baseeditordocumentprocessor.h>
-#include <cpptools/cppcodemodelinspectordumper.h>
-#include <cpptools/cppmodelmanager.h>
-#include <cpptools/cpptoolsbridge.h>
-#include <cpptools/cpptoolsreuse.h>
-#include <cpptools/cppworkingcopy.h>
 #include <projectexplorer/projectmacro.h>
 #include <projectexplorer/project.h>
 
@@ -55,8 +56,7 @@
 #include <numeric>
 
 using namespace CPlusPlus;
-using namespace CppTools;
-namespace CMI = CppCodeModelInspector;
+namespace CMI = CppEditor::CppCodeModelInspector;
 
 namespace {
 
@@ -1535,7 +1535,7 @@ void CppCodeModelInspectorDialog::refresh()
     dumper.dumpSnapshot(globalSnapshot, globalSnapshotTitle, /*isGlobalSnapshot=*/ true);
 
     TextEditor::BaseTextEditor *editor = currentEditor();
-    CppTools::CppEditorDocumentHandle *cppEditorDocument = nullptr;
+    CppEditorDocumentHandle *cppEditorDocument = nullptr;
     if (editor) {
         const QString editorFilePath = editor->document()->filePath().toString();
         cppEditorDocument = cmmi->cppEditorDocument(editorFilePath);