diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-26 13:22:35 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-26 13:15:29 +0000 |
commit | fe2addf5156ac3838a182b4af3de07c64e96ab7a (patch) | |
tree | 34f7afb81cafe442f9929e4d36d77db4b21825d6 /src/plugins | |
parent | 93bb48893fa2eaaeae8347ab0b19ea337bc889ce (diff) |
Clean exported headers of the TextEditor plugin.
Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins')
104 files changed, 177 insertions, 48 deletions
diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp index ed6e9b0c28..508b0422ef 100644 --- a/src/plugins/analyzerbase/analyzerutils.cpp +++ b/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> diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h index 3c80e57f1b..c49bdaf235 100644 --- a/src/plugins/android/androidmanifestdocument.h +++ b/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 { diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h index f5b6f0236a..848a092c62 100644 --- a/src/plugins/android/androidmanifesteditor.h +++ b/src/plugins/android/androidmanifesteditor.h @@ -39,6 +39,7 @@ QT_BEGIN_NAMESPACE class QToolBar; +class QActionGroup; QT_END_NAMESPACE namespace Android { diff --git a/src/plugins/android/javacompletionassistprovider.cpp b/src/plugins/android/javacompletionassistprovider.cpp index 66c55a65d5..0a5165869f 100644 --- a/src/plugins/android/javacompletionassistprovider.cpp +++ b/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; diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index 4b991f72c4..2eed45ab75 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/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> diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 28df2e2d14..c9aef6eb3e 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/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> diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index f3904750c6..571e8de60a 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp index 844c33afbc..63ddc929ed 100644 --- a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppdoxygen_test.cpp b/src/plugins/cppeditor/cppdoxygen_test.cpp index 830c67ba97..6a258f2dfc 100644 --- a/src/plugins/cppeditor/cppdoxygen_test.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 1114939848..f3be75c32a 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index b4d99499c9..377d585703 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/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 diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp index d2e3544cbc..050a85561d 100644 --- a/src/plugins/cppeditor/cppelementevaluator.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp index f8dda2004c..07c77ffd5a 100644 --- a/src/plugins/cppeditor/cppincludehierarchy.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cpplocalrenaming.cpp b/src/plugins/cppeditor/cpplocalrenaming.cpp index e411926b4d..ab267df0b8 100644 --- a/src/plugins/cppeditor/cpplocalrenaming.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index b088b816ba..5ba2c72c15 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp index 12661e0ec3..eb02f751fa 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppsnippetprovider.cpp b/src/plugins/cppeditor/cppsnippetprovider.cpp index cc70ffaf51..30a4753d28 100644 --- a/src/plugins/cppeditor/cppsnippetprovider.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 2d2304cf3e..0b27e1360e 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.cpp b/src/plugins/cppeditor/cppuseselectionsupdater.cpp index 49ee7303e1..61ee051d0c 100644 --- a/src/plugins/cppeditor/cppuseselectionsupdater.cpp +++ b/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> diff --git a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp index ab296f3378..6de2d3dddf 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp +++ b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.cpp @@ -32,6 +32,8 @@ #include "cppeditorconstants.h" +#include <coreplugin/editormanager/editormanager.h> + using namespace CppEditor::Internal; VirtualFunctionProposalItem::VirtualFunctionProposalItem( diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index dfae9a2150..2de53e8e62 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/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> diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h index 0ac944947a..e3c8dcc679 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.h +++ b/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 diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp index 7ed6805ee1..e1b5807a20 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.cpp +++ b/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> diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 49294eb146..083cbd5813 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/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> diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index 045398189d..a068820e1c 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -32,6 +32,8 @@ #include "cppmodelmanager.h" +#include <coreplugin/editormanager/editormanager.h> + #include <QStringMatcher> using namespace CppTools::Internal; diff --git a/src/plugins/cpptools/cppeditoroutline.cpp b/src/plugins/cpptools/cppeditoroutline.cpp index 8102cd8d40..182e3f6af3 100644 --- a/src/plugins/cpptools/cppeditoroutline.cpp +++ b/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> diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 9436736cc9..e1163b413d 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/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; diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index c7a8065696..ea7c038d7f 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/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> diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp b/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp index 90aca43ce9..b41d66455f 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter_test.cpp +++ b/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> diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 628a0e122b..2a352a6b7d 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/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> diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index ecb77142c2..da407a4baa 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/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> diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index fd5d777f81..1c3b2024f1 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/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> diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 46da006cbf..de5dc649db 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/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> diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index 8c6106817d..6bfdc72ce6 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/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> diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp index 30c884a1fe..7c270a6530 100644 --- a/src/plugins/debugger/disassembleragent.cpp +++ b/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> diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 1d01a19020..bf2fc5bb2b 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/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> diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp index 08edb3588b..0eb3c88c91 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp +++ b/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> diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp index 80ef6220c7..fb6cf9540c 100644 --- a/src/plugins/debugger/qml/qmllivetextpreview.cpp +++ b/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> diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 67f1a59aed..26b54be1b1 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/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> diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp index 937836c229..3cf6ccea5b 100644 --- a/src/plugins/debugger/sourceagent.cpp +++ b/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> diff --git a/src/plugins/debugger/sourceutils.cpp b/src/plugins/debugger/sourceutils.cpp index 9e1d80bf9b..459f9a23ee 100644 --- a/src/plugins/debugger/sourceutils.cpp +++ b/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> diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 42d1e3c308..5231896b32 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/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> diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 1376648fd6..79d2a6e800 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/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> diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 69a3055421..6058e119f9 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -55,6 +55,7 @@ #include <QHBoxLayout> #include <QToolBar> #include <QComboBox> +#include <QAction> #include <QDir> #include <QTextCodec> #include <QTextBlock> diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp index 6be3133ac5..cc2478f9c1 100644 --- a/src/plugins/diffeditor/diffview.cpp +++ b/src/plugins/diffeditor/diffview.cpp @@ -35,6 +35,8 @@ #include <utils/qtcassert.h> +#include <QCoreApplication> + namespace DiffEditor { namespace Internal { diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index b91c4b81e5..b1a3b4d0bf 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/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> diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 17c1bd8c43..31bd0961f8 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/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> diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp index 69fe6d919b..ab86614985 100644 --- a/src/plugins/emacskeys/emacskeysplugin.cpp +++ b/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> diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp index ccbc63e148..209d864768 100644 --- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp +++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp @@ -34,6 +34,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <texteditor/texteditoractionhandler.h> +#include <texteditor/textdocument.h> #include <QCoreApplication> diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index e3658150f1..794f59d799 100644 --- a/src/plugins/git/giteditor.cpp +++ b/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> diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index 73901b3db5..aa14a53fcf 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/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> diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index fb2bba4041..f9582b03cf 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index 7401b76cf0..5a01c34f02 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/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> diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 82d8ab93e6..d67adce146 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/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> diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp index 1466291c57..2ad37aee7f 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp +++ b/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; diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index f83994aeaa..66d92e1791 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/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> diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp index f9cc7e8d5a..d7f762e10b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp index 1e346a2a47..d4fcfedb99 100644 --- a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index 73e0942e23..9b02dd94ed 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp index 4753850296..654f9e075b 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.cpp @@ -33,6 +33,8 @@ #include <qmldesignerplugin.h> +#include <coreplugin/editormanager/editormanager.h> + #include <QPushButton> namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index b93f898ee8..88d96cd40f 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index ef73428d7c..3efb840e71 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index e005475c0a..85c355fc03 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/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> diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h index ab8cfb79e3..23f159c14d 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.h +++ b/src/plugins/qmldesigner/qmldesignerplugin.h @@ -54,6 +54,7 @@ namespace Core { class IEditor; class DesignMode; class EditorManager; + class IMode; } namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/shortcutmanager.cpp b/src/plugins/qmldesigner/shortcutmanager.cpp index baf5252c4e..5f8ccfcf8f 100644 --- a/src/plugins/qmldesigner/shortcutmanager.cpp +++ b/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> diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 00af014ef1..36c6d8bdd8 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/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> diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index fb8721fe21..821b65519f 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/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> diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp index 863b529b2b..5274774d30 100644 --- a/src/plugins/qnx/bardescriptoreditor.cpp +++ b/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> diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index da2862c204..5a7ed50758 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/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> diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 7c13415e46..9e00297faf 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/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> diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h index d2a6541e8a..00accf05b7 100644 --- a/src/plugins/texteditor/basehoverhandler.h +++ b/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; } diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index 51b0ab7f88..1dd33bd87a 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.cpp +++ b/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" diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h index 43cd6494fd..a147991a52 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.h +++ b/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 { diff --git a/src/plugins/texteditor/codeassist/iassistprocessor.h b/src/plugins/texteditor/codeassist/iassistprocessor.h index 7d7a7dd7e9..b956149066 100644 --- a/src/plugins/texteditor/codeassist/iassistprocessor.h +++ b/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 { diff --git a/src/plugins/texteditor/codeassist/iassistproposalmodel.h b/src/plugins/texteditor/codeassist/iassistproposalmodel.h index 4eacabe853..b881b40cb6 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalmodel.h +++ b/src/plugins/texteditor/codeassist/iassistproposalmodel.h @@ -33,7 +33,7 @@ #include <texteditor/texteditor_global.h> -#include <QString> +QT_FORWARD_DECLARE_CLASS(QString) namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistprovider.h b/src/plugins/texteditor/codeassist/iassistprovider.h index a967a87be4..9ca728789b 100644 --- a/src/plugins/texteditor/codeassist/iassistprovider.h +++ b/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; diff --git a/src/plugins/texteditor/codestyleeditor.cpp b/src/plugins/texteditor/codestyleeditor.cpp index 08baf759ec..f4f567c7bf 100644 --- a/src/plugins/texteditor/codestyleeditor.cpp +++ b/src/plugins/texteditor/codestyleeditor.cpp @@ -30,6 +30,7 @@ #include "codestyleeditor.h" +#include "textdocument.h" #include "icodestylepreferencesfactory.h" #include "icodestylepreferences.h" #include "codestyleselectorwidget.h" diff --git a/src/plugins/texteditor/codestylepool.h b/src/plugins/texteditor/codestylepool.h index 9405877024..9a20d1d00e 100644 --- a/src/plugins/texteditor/codestylepool.h +++ b/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; diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index 673bb507b6..6cf09a5ad0 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/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> diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 6416a8fb2e..c68b459c0c 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/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> diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index a281436f1d..ee7b7bd790 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/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) diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index 2388fda845..6e5d6964a7 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/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 diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h index f3abb38318..b2e6bfd7b8 100644 --- a/src/plugins/texteditor/icodestylepreferencesfactory.h +++ b/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; diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 5685e75c88..346b40834c 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/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> diff --git a/src/plugins/texteditor/simplecodestylepreferences.cpp b/src/plugins/texteditor/simplecodestylepreferences.cpp index fa56c4b305..b19c3c878a 100644 --- a/src/plugins/texteditor/simplecodestylepreferences.cpp +++ b/src/plugins/texteditor/simplecodestylepreferences.cpp @@ -30,6 +30,8 @@ #include "simplecodestylepreferences.h" +#include <QVariant> + using namespace TextEditor; static const char settingsSuffixKey[] = "TabPreferences"; diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index 45a7afc187..44bbc6353a 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/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> diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp index f5a3dd437d..debb4fedde 100644 --- a/src/plugins/texteditor/syntaxhighlighter.cpp +++ b/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> diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp index af37bf3d1d..75e4ad4f08 100644 --- a/src/plugins/texteditor/textdocument.cpp +++ b/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> diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h index 7378807372..818059e80a 100644 --- a/src/plugins/texteditor/textdocument.h +++ b/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> diff --git a/src/plugins/texteditor/textdocumentlayout.cpp b/src/plugins/texteditor/textdocumentlayout.cpp index 112d5de7bc..4187ef31e0 100644 --- a/src/plugins/texteditor/textdocumentlayout.cpp +++ b/src/plugins/texteditor/textdocumentlayout.cpp @@ -29,6 +29,7 @@ ****************************************************************************/ #include "textdocumentlayout.h" +#include "textdocument.h" #include <utils/qtcassert.h> #include <QDebug> diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h index d09a8caac8..eaf018d82a 100644 --- a/src/plugins/texteditor/textdocumentlayout.h +++ b/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> diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index bafc47481b..ee5ad4f5a2 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/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" diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 1ba72e2b36..9ddaa159d5 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/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); diff --git a/src/plugins/texteditor/texteditor_p.h b/src/plugins/texteditor/texteditor_p.h index 15a0419f26..b71600e022 100644 --- a/src/plugins/texteditor/texteditor_p.h +++ b/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 <QBasicTimer> -#include <QSharedPointer> -#include <QPointer> -#include <QScopedPointer> -#include <QTextBlock> -#include <QTimer> + +#include "texteditor_global.h" + +#include <QList> namespace TextEditor { diff --git a/src/plugins/texteditor/texteditor_test.cpp b/src/plugins/texteditor/texteditor_test.cpp index fe7295f384..eabbbb69bf 100644 --- a/src/plugins/texteditor/texteditor_test.cpp +++ b/src/plugins/texteditor/texteditor_test.cpp @@ -40,6 +40,7 @@ #include "texteditor.h" #include "texteditorplugin.h" +#include "textdocument.h" using namespace TextEditor; diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 586e64ef08..06fa947cec 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/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> diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h index 11c5b7a2eb..5ef2c993bc 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/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; diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index 8e09907fb3..fd3bf12b1c 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -30,6 +30,7 @@ #include "texteditorsettings.h" +#include "fontsettings.h" #include "texteditor.h" #include "behaviorsettings.h" #include "behaviorsettingspage.h" diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h index ddbe872d28..85726d521c 100644 --- a/src/plugins/texteditor/textmark.h +++ b/src/plugins/texteditor/textmark.h @@ -33,7 +33,6 @@ #include "texteditor_global.h" -#include <QObject> #include <QIcon> QT_BEGIN_NAMESPACE diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h index 5d42db28a3..6c49feb343 100644 --- a/src/plugins/texteditor/typingsettings.h +++ b/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 { diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 27771bafc5..c658815aaa 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -54,6 +54,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> +#include <coreplugin/editormanager/editormanager.h> #include <cplusplus/LookupContext.h> #include <cplusplus/Overview.h> @@ -62,6 +63,7 @@ #include <extensionsystem/iplugin.h> #include <texteditor/texteditor.h> +#include <texteditor/textdocument.h> #include <utils/qtcassert.h> #include <utils/fancymainwindow.h> diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index d4c9316fb9..2f14a2f33e 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -32,6 +32,7 @@ #include "vcsbaseeditor.h" #include <texteditor/texteditoractionhandler.h> +#include <texteditor/textdocument.h> #include <diffeditor/diffeditorconstants.h> #include <extensionsystem/pluginmanager.h> diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index e38abbd3e1..31509def76 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -35,6 +35,9 @@ #include <coreplugin/icore.h> #include <coreplugin/vcsmanager.h> +#include <coreplugin/editormanager/documentmodel.h> +#include <coreplugin/editormanager/editormanager.h> +#include <coreplugin/idocument.h> #include <utils/qtcassert.h> #include <utils/synchronousprocess.h> diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 9b40522e35..f3fc5e62f1 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -39,6 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/vcsmanager.h> #include <coreplugin/patchtool.h> +#include <coreplugin/editormanager/editormanager.h> #include <extensionsystem/pluginmanager.h> #include <projectexplorer/editorconfiguration.h> #include <projectexplorer/projectexplorer.h> |