CppEditor: Pimpl CppEditorWidget

...to cut some build depedencies.

Change-Id: I11b7e5f3c12b6821d0825a94ad74a7e4b69c4b12
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

src/plugins/cppeditor/cppeditor.h

@@ -31,35 +31,33 @@
 #define CPPEDITOR_H
 
 #include "cppeditordocument.h"
-#include "cppfollowsymbolundercursor.h"
+
 #include "cppfunctiondecldeflink.h"
 
 #include <cpptools/commentssettings.h>
-#include <cpptools/cppsemanticinfo.h>
 #include <texteditor/basetexteditor.h>
+#include <texteditor/semantichighlighter.h>
 
 #include <utils/qtcoverride.h>
 #include <utils/uncommentselection.h>
 
-#include <QFutureWatcher>
+#include <QScopedPointer>
-#include <QModelIndex>
-
-QT_BEGIN_NAMESPACE
-class QSortFilterProxyModel;
-class QToolButton;
-QT_END_NAMESPACE
 
 namespace CPlusPlus {
 class OverviewModel;
 class Symbol;
 }
 
-namespace Utils { class TreeViewComboBox; }
+namespace CppTools {
+class SemanticInfo;
+}
 
 namespace CppEditor {
 namespace Internal {
 
 class CPPEditorWidget;
+class CPPEditorWidgetPrivate;
+class FollowSymbolUnderCursor;
 
 class CPPEditor : public TextEditor::BaseTextEditor
 {
@@ -204,44 +202,8 @@ private:
     bool handleDocumentationComment(QKeyEvent *e);
     bool isStartOfDoxygenComment(const QTextCursor &cursor) const;
 
-    QPointer<CppTools::CppModelManagerInterface> m_modelManager;
+private:
-
+    QScopedPointer<CPPEditorWidgetPrivate> d;
-    CPPEditorDocument *m_cppEditorDocument;
-    Utils::TreeViewComboBox *m_outlineCombo;
-    CPlusPlus::OverviewModel *m_outlineModel;
-    QModelIndex m_outlineModelIndex;
-    QSortFilterProxyModel *m_proxyModel;
-    QAction *m_sortAction;
-    QTimer *m_updateOutlineTimer;
-    QTimer *m_updateOutlineIndexTimer;
-    QTimer *m_updateUsesTimer;
-    QTimer *m_updateFunctionDeclDefLinkTimer;
-    QHash<int, QTextCharFormat> m_semanticHighlightFormatMap;
-
-    QList<QTextEdit::ExtraSelection> m_renameSelections;
-    int m_currentRenameSelection;
-    static const int NoCurrentRenameSelection = -1;
-    bool m_inRename, m_inRenameChanged, m_firstRenameChange;
-    QTextCursor m_currentRenameSelectionBegin;
-    QTextCursor m_currentRenameSelectionEnd;
-
-    CppTools::SemanticInfo m_lastSemanticInfo;
-    QList<TextEditor::QuickFixOperation::Ptr> m_quickFixes;
-
-    QScopedPointer<QFutureWatcher<TextEditor::HighlightingResult> > m_highlightWatcher;
-    unsigned m_highlightRevision; // the editor revision that requested the highlight
-
-    QScopedPointer<QFutureWatcher<QList<int> > > m_referencesWatcher;
-    unsigned m_referencesRevision;
-    int m_referencesCursorPosition;
-
-    FunctionDeclDefLinkFinder *m_declDefLinkFinder;
-    QSharedPointer<FunctionDeclDefLink> m_declDefLink;
-
-    CppTools::CommentsSettings m_commentsSettings;
-
-    QScopedPointer<FollowSymbolUnderCursor> m_followSymbolUnderCursor;
-    QToolButton *m_preprocessorButton;
 };
 
 } // namespace Internal

src/plugins/cppeditor/cppeditortestcase.cpp

@@ -33,6 +33,7 @@
 #include "cppeditor.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <cpptools/cppsemanticinfo.h>
 #include <cplusplus/CppDocument.h>
 
 #include <QDir>

src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp

@@ -31,6 +31,7 @@
 #include "cppeditorplugin.h"
 #include "cppeditortestcase.h"
 #include "cppelementevaluator.h"
+#include "cppfollowsymbolundercursor.h"
 #include "cppvirtualfunctionassistprovider.h"
 #include "cppvirtualfunctionproposalitem.h"