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/cppoutline.h b/src/plugins/cppeditor/cppoutline.h
index a4d988fc9f..9c6e3e14d7 100644
--- a/src/plugins/cppeditor/cppoutline.h
+++ b/src/plugins/cppeditor/cppoutline.h
@@ -25,11 +25,11 @@
 
 #pragma once
 
+#include "abstractoverviewmodel.h"
 #include "cppeditorwidget.h"
 
 #include <texteditor/ioutlinewidget.h>
 
-#include <cpptools/abstractoverviewmodel.h>
 #include <utils/navigationtreeview.h>
 
 #include <QSortFilterProxyModel>
@@ -50,13 +50,13 @@ class CppOutlineFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    CppOutlineFilterModel(CppTools::AbstractOverviewModel &sourceModel, QObject *parent);
+    CppOutlineFilterModel(AbstractOverviewModel &sourceModel, QObject *parent);
     // QSortFilterProxyModel
     bool filterAcceptsRow(int sourceRow,
                           const QModelIndex &sourceParent) const override;
     Qt::DropActions supportedDragActions() const override;
 private:
-    CppTools::AbstractOverviewModel &m_sourceModel;
+    AbstractOverviewModel &m_sourceModel;
 };
 
 class CppOutlineWidget : public TextEditor::IOutlineWidget