Clean exported headers of the TextEditor plugin.

Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/analyzerbase/analyzerutils.cpp

@@ -34,6 +34,7 @@
 
 #include <cpptools/cppmodelmanager.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <utils/qtcassert.h>
 

src/plugins/android/androidmanifestdocument.h

@@ -31,7 +31,7 @@
 #ifndef ANDROIDMANIFESTDOCUMENT_H
 #define ANDROIDMANIFESTDOCUMENT_H
 
-#include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 namespace Android {
 namespace Internal {

src/plugins/android/androidmanifesteditor.h

@@ -39,6 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 class QToolBar;
+class QActionGroup;
 QT_END_NAMESPACE
 
 namespace Android {

src/plugins/android/javacompletionassistprovider.cpp

@@ -32,6 +32,7 @@
 #include "androidconstants.h"
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
+#include <coreplugin/id.h>
 
 using namespace Android;
 using namespace Android::Internal;

src/plugins/bookmarks/bookmarksplugin.cpp

@@ -42,6 +42,7 @@
 #include <coreplugin/id.h>
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/texteditorconstants.h>
 
 #include <QtPlugin>

src/plugins/clearcase/clearcaseplugin.cpp

@@ -54,6 +54,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/locator/commandlocator.h>
+#include <texteditor/textdocument.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/iprojectmanager.h>

src/plugins/cpaster/cpasterplugin.cpp

@@ -52,6 +52,7 @@
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <QtPlugin>
 #include <QDebug>

src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

@@ -36,6 +36,7 @@
 #include <cpptools/commentssettings.h>
 #include <cpptools/doxygengenerator.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <QDebug>
 #include <QTextBlock>

src/plugins/cppeditor/cppdoxygen_test.cpp

@@ -34,6 +34,9 @@
 
 #include <cpptools/cpptoolssettings.h>
 
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/documentmodel.h>
+
 #include <QCoreApplication>
 #include <QDebug>
 #include <QDir>

src/plugins/cppeditor/cppeditor.cpp

@@ -45,6 +45,8 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/documentmodel.h>
 
 #include <cpptools/cppchecksymbols.h>
 #include <cpptools/cppchecksymbols.h>

src/plugins/cppeditor/cppeditorplugin.cpp

@@ -44,6 +44,8 @@
 #include "cppsnippetprovider.h"
 #include "cpptypehierarchy.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #ifdef WITH_TESTS
 #  include "cppdoxygen_test.h"
 #endif

src/plugins/cppeditor/cppelementevaluator.cpp

@@ -33,6 +33,8 @@
 #include <cpptools/cpptoolsreuse.h>
 #include <cpptools/typehierarchybuilder.h>
 
+#include <texteditor/textdocument.h>
+
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/Icons.h>
 #include <cplusplus/TypeOfExpression.h>

src/plugins/cppeditor/cppincludehierarchy.cpp

@@ -37,6 +37,8 @@
 #include "cppincludehierarchymodel.h"
 #include "cppincludehierarchytreeview.h"
 
+#include <texteditor/textdocument.h>
+
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/find/itemviewfind.h>
 #include <cplusplus/CppDocument.h>

src/plugins/cppeditor/cpplocalrenaming.cpp

@@ -31,6 +31,7 @@
 #include "cpplocalrenaming.h"
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/fontsettings.h>
 
 #include <utils/qtcassert.h>

src/plugins/cppeditor/cppoutline.cpp

@@ -34,7 +34,10 @@
 
 #include <cplusplus/OverviewModel.h>
 
+#include <texteditor/textdocument.h>
+
 #include <coreplugin/find/itemviewfind.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
 
 #include <QDebug>

src/plugins/cppeditor/cppquickfixassistant.cpp

@@ -33,6 +33,8 @@
 #include "cppeditorconstants.h"
 #include "cppeditor.h"
 
+#include <texteditor/textdocument.h>
+
 #include <cplusplus/ASTPath.h>
 
 #include <extensionsystem/pluginmanager.h>

src/plugins/cppeditor/cppsnippetprovider.cpp

@@ -37,6 +37,7 @@
 #include <cpptools/cppqtstyleindenter.h>
 
 #include <texteditor/snippets/snippeteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <QLatin1String>
 #include <QCoreApplication>

src/plugins/cppeditor/cpptypehierarchy.cpp

@@ -36,6 +36,7 @@
 #include "cppeditorplugin.h"
 
 #include <coreplugin/find/itemviewfind.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
 #include <utils/annotateditemdelegate.h>
 #include <utils/navigationtreeview.h>

src/plugins/cppeditor/cppuseselectionsupdater.cpp

@@ -37,6 +37,7 @@
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/cpptoolsreuse.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/convenience.h>
 #include <texteditor/fontsettings.h>
 

src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp

@@ -32,6 +32,8 @@
 
 #include "cppeditorconstants.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+
 using namespace CppEditor::Internal;
 
 VirtualFunctionProposalItem::VirtualFunctionProposalItem(

src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp

@@ -41,6 +41,8 @@
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/codeassist/iassistproposal.h>
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <utils/fileutils.h>
 
 #include <QDebug>

src/plugins/cpptools/baseeditordocumentprocessor.h

@@ -36,11 +36,14 @@
 #include "cpptools_global.h"
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <cplusplus/CppDocument.h>
 
 #include <QTextEdit>
 
+namespace TextEditor { class TextDocument; }
+
 namespace CppTools {
 
 class CPPTOOLS_EXPORT BaseEditorDocumentProcessor : public QObject

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -40,6 +40,7 @@
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/codestyleeditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/displaysettings.h>
 #include <texteditor/snippets/isnippetprovider.h>
 #include <texteditor/texteditorsettings.h>

src/plugins/cpptools/cppcompletion_test.cpp

@@ -36,6 +36,8 @@
 #include <texteditor/codeassist/iassistproposal.h>
 #include <texteditor/convenience.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <utils/changeset.h>
 #include <utils/fileutils.h>

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -32,6 +32,8 @@
 
 #include "cppmodelmanager.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <QStringMatcher>
 
 using namespace CppTools::Internal;

src/plugins/cpptools/cppeditoroutline.cpp

@@ -34,10 +34,13 @@
 #include <cpptools/cpptoolsreuse.h>
 #include <cpptools/cpptoolssettings.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <cplusplus/OverviewModel.h>
 #include <utils/treeviewcombobox.h>
 
+#include <QAction>
 #include <QSortFilterProxyModel>
 #include <QTimer>
 

src/plugins/cpptools/cpplocatorfilter.cpp

@@ -31,6 +31,8 @@
 #include "cpplocatorfilter.h"
 #include "cppmodelmanager.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <QStringMatcher>
 
 using namespace CppTools;

src/plugins/cpptools/cppmodelmanager.cpp

@@ -46,6 +46,8 @@
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <texteditor/textdocument.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <extensionsystem/pluginmanager.h>

src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp

@@ -36,6 +36,7 @@
 #include <coreplugin/coreconstants.h>
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/plaintexteditorfactory.h>
 
 #include <utils/fileutils.h>

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -48,6 +48,7 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/icore.h>

src/plugins/cpptools/symbolsfindfilter.cpp

@@ -35,6 +35,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 

src/plugins/cvs/cvsplugin.cpp

@@ -43,6 +43,9 @@
 #include <vcsbase/basevcssubmiteditorfactory.h>
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcsbaseeditorparameterwidget.h>
+
+#include <texteditor/textdocument.h>
+
 #include <utils/synchronousprocess.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>

src/plugins/debugger/debuggerplugin.cpp

@@ -81,6 +81,8 @@
 #include <coreplugin/messagebox.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/modemanager.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/documentmodel.h>
 
 #include <cppeditor/cppeditorconstants.h>
 #include <cpptools/cppmodelmanager.h>
@@ -101,6 +103,7 @@
 #include <projectexplorer/target.h>
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditorsettings.h>
 
@@ -128,6 +131,7 @@
 #include <QtPlugin>
 #include <QTreeWidget>
 #include <QVBoxLayout>
+#include <QMenu>
 
 #ifdef WITH_TESTS
 #include <QTest>

src/plugins/debugger/debuggertooltipmanager.cpp

@@ -41,7 +41,9 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/documentmodel.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <utils/tooltip/tooltip.h>
 #include <utils/treemodel.h>

src/plugins/debugger/disassembleragent.cpp

@@ -41,6 +41,8 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/documentmodel.h>
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditor.h>

src/plugins/debugger/qml/qmlcppengine.cpp

@@ -39,6 +39,7 @@
 
 #include <utils/qtcassert.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <qmljs/consolemanagerinterface.h>

src/plugins/debugger/qml/qmlinspectoradapter.cpp

@@ -40,6 +40,9 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/documentmodel.h>
 #include <qmldebug/declarativeenginedebugclient.h>
 #include <qmldebug/declarativeenginedebugclientv2.h>
 #include <qmldebug/declarativetoolsclient.h>

src/plugins/debugger/qml/qmllivetextpreview.cpp

@@ -34,6 +34,7 @@
 #include "qmlinspectoragent.h"
 
 #include <coreplugin/infobar.h>
+#include <texteditor/textdocument.h>
 #include <qmldebug/basetoolsclient.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljs/parser/qmljsast_p.h>

src/plugins/debugger/qml/qmlv8debuggerclient.cpp

@@ -42,6 +42,8 @@
 #include <utils/qtcassert.h>
 #include <texteditor/texteditor.h>
 
+#include <coreplugin/editormanager/documentmodel.h>
+
 #include <qmljs/consolemanagerinterface.h>
 
 #include <QTextBlock>

src/plugins/debugger/sourceagent.cpp

@@ -35,7 +35,11 @@
 #include "debuggercore.h"
 #include "stackhandler.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/idocument.h>
+
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/textmark.h>
 
 #include <cppeditor/cppeditorconstants.h>

src/plugins/debugger/sourceutils.cpp

@@ -34,6 +34,7 @@
 #include "watchutils.h"
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <cpptools/abstracteditorsupport.h>
 #include <cpptools/cppprojectfile.h>
 #include <cpptools/cppmodelmanager.h>

src/plugins/designer/formeditorw.cpp

@@ -47,6 +47,7 @@
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/outputpane.h>

src/plugins/designer/qtcreatorintegration.cpp

@@ -42,7 +42,9 @@
 #include <cpptools/symbolfinder.h>
 #include <cplusplus/Overview.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <utils/mimetypes/mimedatabase.h>

src/plugins/diffeditor/diffeditor.cpp

@@ -55,6 +55,7 @@
 #include <QHBoxLayout>
 #include <QToolBar>
 #include <QComboBox>
+#include <QAction>
 #include <QDir>
 #include <QTextCodec>
 #include <QTextBlock>

src/plugins/diffeditor/diffview.cpp

@@ -35,6 +35,8 @@
 
 #include <utils/qtcassert.h>
 
+#include <QCoreApplication>
+
 namespace DiffEditor {
 namespace Internal {
 

src/plugins/diffeditor/sidebysidediffeditorwidget.cpp

@@ -34,6 +34,8 @@
 #include "diffutils.h"
 #include "diffeditorconstants.h"
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <QPlainTextEdit>
 #include <QVBoxLayout>
 #include <QPlainTextDocumentLayout>
@@ -44,6 +46,7 @@
 #include <QToolButton>
 #include <QTextCodec>
 #include <QMessageBox>
+#include <QMenu>
 
 #include <texteditor/texteditor.h>
 #include <texteditor/textdocumentlayout.h>

src/plugins/diffeditor/unifieddiffeditorwidget.cpp

@@ -35,6 +35,7 @@
 
 #include <QPlainTextEdit>
 #include <QVBoxLayout>
+#include <QMenu>
 #include <QPlainTextDocumentLayout>
 #include <QTextBlock>
 #include <QScrollBar>
@@ -45,6 +46,7 @@
 #include <QMessageBox>
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/textdocumentlayout.h>
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/textdocument.h>
@@ -56,6 +58,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/patchtool.h>
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <extensionsystem/pluginmanager.h>
 

src/plugins/emacskeys/emacskeysplugin.cpp

@@ -41,6 +41,7 @@
 #include <utils/qtcassert.h>
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 
 #include <QAction>
 #include <QPlainTextEdit>

src/plugins/genericprojectmanager/genericprojectfileseditor.cpp

@@ -34,6 +34,7 @@
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditoractionhandler.h>
+#include <texteditor/textdocument.h>
 
 #include <QCoreApplication>
 

src/plugins/git/giteditor.cpp

@@ -43,6 +43,8 @@
 #include <vcsbase/vcsoutputwindow.h>
 #include <texteditor/textdocument.h>
 
+#include <QMenu>
+
 #include <QFileInfo>
 #include <QRegExp>
 #include <QSet>

src/plugins/glsleditor/glsleditor.cpp

@@ -54,6 +54,7 @@
 #include <extensionsystem/pluginspec.h>
 
 #include <texteditor/refactoroverlay.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/syntaxhighlighter.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>

src/plugins/perforce/perforceplugin.cpp

@@ -49,6 +49,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/locator/commandlocator.h>
+#include <texteditor/textdocument.h>
 #include <utils/fileutils.h>
 #include <utils/mimetypes/mimedatabase.h>
 #include <utils/parameteraction.h>

src/plugins/projectexplorer/allprojectsfind.cpp

@@ -36,6 +36,8 @@
 #include "editorconfiguration.h"
 
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <utils/filesearch.h>
 #include <utils/algorithm.h>
 

src/plugins/projectexplorer/editorconfiguration.cpp

@@ -39,6 +39,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/simplecodestylepreferences.h>
 #include <texteditor/typingsettings.h>

src/plugins/qmakeprojectmanager/profilecompletionassist.cpp

@@ -33,6 +33,8 @@
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
 
+#include <coreplugin/id.h>
+
 using namespace QmakeProjectManager::Internal;
 using namespace TextEditor;
 

src/plugins/qmakeprojectmanager/profileeditor.cpp

@@ -41,6 +41,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <texteditor/texteditoractionhandler.h>
+#include <texteditor/textdocument.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
 

src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp

@@ -41,6 +41,7 @@
 #include "wizards/qtquickapp.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/buildmanager.h>

src/plugins/qmldesigner/components/componentcore/crumblebar.cpp

@@ -35,6 +35,8 @@
 #include <nodeabstractproperty.h>
 
 #include <coreplugin/documentmanager.h>
+#include <coreplugin/imode.h>
+#include <coreplugin/editormanager/editormanager.h>
 
 #include <QVariant>
 #include <QtDebug>

src/plugins/qmldesigner/components/integration/designdocument.cpp

@@ -49,6 +49,7 @@
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
+#include <coreplugin/idocument.h>
 
 #include <QFileInfo>
 #include <QUrl>

src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp

@@ -33,6 +33,8 @@
 
 #include <qmldesignerplugin.h>
 
+#include <coreplugin/editormanager/editormanager.h>
+
 #include <QPushButton>
 
 namespace QmlDesigner {

src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

@@ -79,6 +79,7 @@
 #include <coreplugin/icore.h>
 #include <utils/hostosinfo.h>
 #include <coreplugin/messagebox.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/kit.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/baseqtversion.h>

src/plugins/qmldesigner/designmodewidget.cpp

@@ -44,6 +44,7 @@
 #include <coreplugin/minisplitter.h>
 #include <coreplugin/sidebar.h>
 #include <coreplugin/editortoolbar.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/inavigationwidgetfactory.h>
 #include <extensionsystem/pluginmanager.h>
 

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -43,7 +43,9 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <coreplugin/modemanager.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <extensionsystem/pluginspec.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <projectexplorer/projectexplorerconstants.h>

src/plugins/qmldesigner/qmldesignerplugin.h

@@ -54,6 +54,7 @@ namespace Core {
     class IEditor;
     class DesignMode;
     class EditorManager;
+    class IMode;
 }
 
 namespace QmlDesigner {

src/plugins/qmldesigner/shortcutmanager.cpp

@@ -34,6 +34,7 @@
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/documentmodel.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <utils/hostosinfo.h>
 

src/plugins/qmljseditor/quicktoolbar.cpp

@@ -45,6 +45,7 @@
 #include <qmljs/qmljsevaluate.h>
 #include <qmljs/qmljsutils.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/tabsettings.h>
 #include <coreplugin/icore.h>
 

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -34,6 +34,7 @@
 #include "qmljsbundleprovider.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <cpptools/cppmodelmanager.h>

src/plugins/qnx/bardescriptoreditor.cpp

@@ -41,6 +41,7 @@
 #include <projectexplorer/taskhub.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditor.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/tabsettings.h>
 #include <utils/linecolumnlabel.h>
 #include <utils/qtcassert.h>

src/plugins/subversion/subversionplugin.cpp

@@ -47,6 +47,8 @@
 #include <vcsbase/vcsoutputwindow.h>
 #include <vcsbase/vcsbaseeditorparameterwidget.h>
 
+#include <texteditor/textdocument.h>
+
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>

src/plugins/texteditor/basefilefind.cpp

@@ -30,6 +30,7 @@
 
 #include "basefilefind.h"
 #include "basefilefind_p.h"
+#include "textdocument.h"
 
 #include <aggregation/aggregate.h>
 #include <coreplugin/icore.h>
@@ -37,6 +38,7 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/dialogs/readonlyfilesdialog.h>
 #include <coreplugin/documentmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/find/ifindsupport.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/refactoringchanges.h>

src/plugins/texteditor/basehoverhandler.h

@@ -33,7 +33,8 @@
 
 #include "texteditor_global.h"
 #include "helpitem.h"
-#include <texteditor/codeassist/keywordscompletionassist.h>
+
+#include <QObject>
 
 namespace Core { class IEditor; }
 

src/plugins/texteditor/codeassist/codeassistant.cpp

@@ -32,6 +32,7 @@
 #include "completionassistprovider.h"
 #include "quickfixassistprovider.h"
 #include "iassistprocessor.h"
+#include "textdocument.h"
 #include "iassistproposal.h"
 #include "iassistproposalwidget.h"
 #include "assistinterface.h"

src/plugins/texteditor/codeassist/genericproposalmodel.h

@@ -38,9 +38,9 @@
 
 
 #include <QHash>
-#include <QIcon>
 #include <QList>
-#include <QPair>
+
+QT_FORWARD_DECLARE_CLASS(QIcon)
 
 namespace TextEditor {
 

src/plugins/texteditor/codeassist/iassistprocessor.h

@@ -31,8 +31,6 @@
 #ifndef IASSISTPROCESSOR_H
 #define IASSISTPROCESSOR_H
 
-#include "iassistproposalwidget.h"
-
 #include <texteditor/texteditor_global.h>
 
 namespace TextEditor {

src/plugins/texteditor/codeassist/iassistproposalmodel.h

@@ -33,7 +33,7 @@
 
 #include <texteditor/texteditor_global.h>
 
-#include <QString>
+QT_FORWARD_DECLARE_CLASS(QString)
 
 namespace TextEditor {
 

src/plugins/texteditor/codeassist/iassistprovider.h

@@ -32,10 +32,10 @@
 #define IASSISTPROVIDER_H
 
 #include <texteditor/texteditor_global.h>
-#include <coreplugin/id.h>
 
 #include <QObject>
 
+namespace Core { class Id; }
 namespace TextEditor {
 
 class IAssistProcessor;

src/plugins/texteditor/codestyleeditor.cpp

@@ -30,6 +30,7 @@
 
 #include "codestyleeditor.h"
 
+#include "textdocument.h"
 #include "icodestylepreferencesfactory.h"
 #include "icodestylepreferences.h"
 #include "codestyleselectorwidget.h"

src/plugins/texteditor/codestylepool.h

@@ -33,10 +33,9 @@
 
 #include "texteditor_global.h"
 
-#include <utils/fileutils.h>
-
 #include <QObject>
 
+namespace Utils { class FileName; }
 namespace TextEditor {
 
 class ICodeStylePreferences;

src/plugins/texteditor/codestyleselectorwidget.cpp

@@ -35,6 +35,8 @@
 #include "codestylepool.h"
 #include "tabsettings.h"
 
+#include <utils/fileutils.h>
+
 #include <QPushButton>
 #include <QDialogButtonBox>
 #include <QDialog>

src/plugins/texteditor/findincurrentfile.cpp

@@ -30,6 +30,7 @@
 
 #include "findincurrentfile.h"
 #include "texteditor.h"
+#include "textdocument.h"
 
 #include <utils/filesearch.h>
 #include <utils/fileutils.h>

src/plugins/texteditor/fontsettingspage.h

@@ -33,7 +33,8 @@
 
 #include "texteditor_global.h"
 
-#include "fontsettings.h"
+#include "texteditorconstants.h"
+#include "colorscheme.h"
 
 #include "texteditoroptionspage.h"
 
@@ -47,6 +48,8 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
+class Format;
+class FontSettings;
 namespace Internal { class FontSettingsPagePrivate; }
 
 // GUI description of a format consisting of id (settings key)

src/plugins/texteditor/icodestylepreferences.h

@@ -34,9 +34,9 @@
 #include "texteditor_global.h"
 
 #include <QObject>
-#include <QVariant>
 
 QT_BEGIN_NAMESPACE
+class QVariant;
 class QSettings;
 QT_END_NAMESPACE
 

src/plugins/texteditor/icodestylepreferencesfactory.h

@@ -33,10 +33,9 @@
 
 #include "texteditor_global.h"
 
-#include <coreplugin/id.h>
-
 #include <QObject>
 
+namespace Core { class Id; }
 namespace TextEditor {
 
 class ICodeStylePreferences;

src/plugins/texteditor/refactoringchanges.cpp

@@ -30,9 +30,11 @@
 
 #include "refactoringchanges.h"
 #include "texteditor.h"
+#include "textdocument.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/dialogs/readonlyfilesdialog.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
 

src/plugins/texteditor/simplecodestylepreferences.cpp

@@ -30,6 +30,8 @@
 
 #include "simplecodestylepreferences.h"
 
+#include <QVariant>
+
 using namespace TextEditor;
 
 static const char settingsSuffixKey[] = "TabPreferences";

src/plugins/texteditor/snippets/snippetssettingspage.cpp

@@ -34,6 +34,7 @@
 #include "snippet.h"
 #include "snippetscollection.h"
 #include "snippetssettings.h"
+#include "textdocument.h"
 #include "ui_snippetssettingspage.h"
 
 #include <coreplugin/icore.h>

src/plugins/texteditor/syntaxhighlighter.cpp

@@ -37,6 +37,8 @@
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
+#include <QTextDocument>
+#include <QPointer>
 #include <qtimer.h>
 
 #include <math.h>

src/plugins/texteditor/textdocument.cpp

@@ -42,6 +42,8 @@
 #include "texteditorconstants.h"
 #include "typingsettings.h"
 #include <texteditor/generichighlighter/highlighter.h>
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/documentmodel.h>
 
 #include <QApplication>
 #include <QDir>

src/plugins/texteditor/textdocument.h

@@ -35,8 +35,6 @@
 
 #include <coreplugin/id.h>
 #include <coreplugin/textdocument.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
 
 #include <QList>
 #include <QMap>

src/plugins/texteditor/textdocumentlayout.cpp

@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "textdocumentlayout.h"
+#include "textdocument.h"
 #include <utils/qtcassert.h>
 #include <QDebug>
 

src/plugins/texteditor/textdocumentlayout.h

@@ -33,8 +33,8 @@
 
 #include "texteditor_global.h"
 
-#include "texteditor.h"
 #include "textmark.h"
+#include "textdocument.h"
 
 #include <QTextBlockUserData>
 #include <QPlainTextDocumentLayout>

src/plugins/texteditor/texteditor.cpp

@@ -30,6 +30,10 @@
 
 #include "texteditor.h"
 #include "texteditor_p.h"
+#include "displaysettings.h"
+#include "marginsettings.h"
+#include "fontsettings.h"
+#include "texteditoractionhandler.h"
 
 #include "autocompleter.h"
 #include "basehoverhandler.h"
@@ -48,6 +52,7 @@
 #include "textdocument.h"
 #include "textdocumentlayout.h"
 #include "texteditoroverlay.h"
+#include "refactoroverlay.h"
 #include "texteditorsettings.h"
 #include "typingsettings.h"
 #include "extraencodingsettings.h"

src/plugins/texteditor/texteditor.h

@@ -31,22 +31,17 @@
 #ifndef TEXTEDITOR_H
 #define TEXTEDITOR_H
 
-#include "textdocument.h"
-#include "codeassist/assistenums.h"
 #include "texteditor_global.h"
+#include "codeassist/assistenums.h"
 
-#include <texteditor/texteditoractionhandler.h>
-
-#include <coreplugin/textdocument.h>
-#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
-#include <coreplugin/find/ifindsupport.h>
 
 #include <utils/uncommentselection.h>
 
 #include <QLabel>
 #include <QPlainTextEdit>
+#include <QSharedPointer>
 #include <functional>
 
 QT_BEGIN_NAMESPACE
@@ -60,11 +55,12 @@ class QTextBlock;
 QT_END_NAMESPACE
 
 namespace TextEditor {
-
+class TextDocument;
 class BaseHoverHandler;
 class TabSettings;
 class RefactorOverlay;
 struct RefactorMarker;
+class SyntaxHighlighter;
 class IAssistMonitorInterface;
 class AssistInterface;
 class IAssistProvider;
@@ -211,9 +207,9 @@ public:
     TextEditorWidget(QWidget *parent = 0);
     ~TextEditorWidget();
 
-    void setTextDocument(const TextDocumentPtr &doc);
+    void setTextDocument(const QSharedPointer<TextDocument> &doc);
     TextDocument *textDocument() const;
-    TextDocumentPtr textDocumentPtr() const;
+    QSharedPointer<TextDocument> textDocumentPtr() const;
 
     // IEditor
     virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName);

src/plugins/texteditor/texteditor_p.h

@@ -31,22 +31,10 @@
 #ifndef TEXTEDITOR_P_H
 #define TEXTEDITOR_P_H
 
-#include "texteditor.h"
-#include "behaviorsettings.h"
-#include "displaysettings.h"
-#include "marginsettings.h"
-#include "fontsettings.h"
-#include "refactoroverlay.h"
 
-#include <coreplugin/id.h>
-#include <utils/changeset.h>
+#include "texteditor_global.h"
 
-#include <QBasicTimer>
-#include <QSharedPointer>
-#include <QPointer>
-#include <QScopedPointer>
-#include <QTextBlock>
-#include <QTimer>
+#include <QList>
 
 namespace TextEditor {
 

src/plugins/texteditor/texteditor_test.cpp

@@ -40,6 +40,7 @@
 
 #include "texteditor.h"
 #include "texteditorplugin.h"
+#include "textdocument.h"
 
 using namespace TextEditor;
 

src/plugins/texteditor/texteditoractionhandler.cpp

@@ -38,6 +38,7 @@
 
 #include <coreplugin/locator/locatormanager.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>

src/plugins/texteditor/texteditoractionhandler.h

@@ -33,11 +33,12 @@
 
 #include "texteditor_global.h"
 
-#include <coreplugin/id.h>
-
 #include <QObject>
 
-namespace Core { class IEditor; }
+namespace Core {
+class Id;
+class IEditor;
+}
 
 namespace TextEditor {
 class TextEditorWidget;

src/plugins/texteditor/texteditorsettings.cpp

@@ -30,6 +30,7 @@
 
 #include "texteditorsettings.h"
 
+#include "fontsettings.h"
 #include "texteditor.h"
 #include "behaviorsettings.h"
 #include "behaviorsettingspage.h"

src/plugins/texteditor/textmark.h

@@ -33,7 +33,6 @@
 
 #include "texteditor_global.h"
 
-#include <QObject>
 #include <QIcon>
 
 QT_BEGIN_NAMESPACE

src/plugins/texteditor/typingsettings.h

@@ -33,10 +33,12 @@
 
 #include "texteditor_global.h"
 
-#include <QTextBlock>
+#include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
+class QTextDocument;
+class QTextCursor;
 QT_END_NAMESPACE
 
 namespace TextEditor {