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, 6 insertions, 5 deletions

diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h
index 5f09996876..62c8ca9ec3 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.h
+++ b/src/plugins/cppeditor/cpptypehierarchy.h
@@ -52,9 +52,10 @@ class NavigationTreeView;
 class ProgressIndicator;
 }
 
-namespace CppTools { class CppClass; class CppElement; }
-
 namespace CppEditor {
+class CppClass;
+class CppElement;
+
 namespace Internal {
 
 class CppEditorWidget;
@@ -83,9 +84,9 @@ private slots:
     void displayHierarchy();
 
 private:
-    typedef QList<CppTools::CppClass> CppTools::CppClass::*HierarchyMember;
+    typedef QList<CppClass> CppClass::*HierarchyMember;
     void performFromExpression(const QString &expression, const QString &fileName);
-    QStandardItem *buildHierarchy(const CppTools::CppClass &cppClass, QStandardItem *parent,
+    QStandardItem *buildHierarchy(const CppClass &cppClass, QStandardItem *parent,
                                   bool isRoot, HierarchyMember member);
     void showNoTypeHierarchyLabel();
     void showTypeHierarchy();
@@ -103,7 +104,7 @@ private:
     Utils::AnnotatedItemDelegate *m_delegate = nullptr;
     TextEditor::TextEditorLinkLabel *m_inspectedClass = nullptr;
     QLabel *m_infoLabel = nullptr;
-    QFuture<QSharedPointer<CppTools::CppElement>> m_future;
+    QFuture<QSharedPointer<CppElement>> m_future;
     QFutureWatcher<void> m_futureWatcher;
     Utils::FutureSynchronizer m_synchronizer;
     Utils::ProgressIndicator *m_progressIndicator = nullptr;