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/cppeditor/cppcodemodelinspectordialog.h b/src/plugins/cppeditor/cppcodemodelinspectordialog.h
index 310805aba8..230376aeba 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.h
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <cpptools/cppmodelmanager.h>
+#include "cppmodelmanager.h"
 
 #include <cplusplus/CppDocument.h>
 
@@ -88,12 +88,12 @@ private:
     void updateDocumentData(const CPlusPlus::Document::Ptr &document);
 
     void clearProjectPartData();
-    void updateProjectPartData(const CppTools::ProjectPart::ConstPtr &part);
+    void updateProjectPartData(const ProjectPart::ConstPtr &part);
 
     bool event(QEvent *e) override;
 
 private:
-    Ui::CppCodeModelInspectorDialog *m_ui;
+    QT_PREPEND_NAMESPACE(Ui)::CppCodeModelInspectorDialog *m_ui;
 
     // Snapshots and Documents
     QList<SnapshotInfo> *m_snapshotInfos;