From 3a806d425270ddba1638877e132faae6f341c325 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 26 Mar 2013 15:56:33 +0100
Subject: [PATCH] Clean headers in TextEditor.
Change-Id: Ie679e7e9d0d20a0f71dcc1fcf0f7d8305eeeeced
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
---
.../projectexplorer/editorconfiguration.cpp | 1 +
src/plugins/texteditor/autocompleter.cpp | 1 -
src/plugins/texteditor/autocompleter.h | 1 -
src/plugins/texteditor/basefilefind.cpp | 11 -----------
src/plugins/texteditor/basehoverhandler.cpp | 5 -----
src/plugins/texteditor/basetextdocument.cpp | 6 ------
src/plugins/texteditor/basetexteditor.cpp | 14 --------------
src/plugins/texteditor/basetexteditor.h | 1 -
src/plugins/texteditor/behaviorsettingswidget.cpp | 1 -
src/plugins/texteditor/circularclipboardassist.cpp | 1 -
.../codeassist/defaultassistinterface.cpp | 1 -
.../codeassist/functionhintproposalwidget.cpp | 2 --
.../codeassist/genericproposalwidget.cpp | 2 --
.../texteditor/codeassist/igenericproposalmodel.h | 2 +-
.../codeassist/keywordscompletionassist.cpp | 3 ---
.../codeassist/keywordscompletionassist.h | 3 ---
.../codeassist/quickfixassistprocessor.cpp | 1 -
src/plugins/texteditor/codestyleselectorwidget.cpp | 6 ------
src/plugins/texteditor/displaysettingspage.cpp | 1 -
src/plugins/texteditor/findincurrentfile.cpp | 1 +
src/plugins/texteditor/findincurrentfile.h | 8 +++++---
src/plugins/texteditor/findinfiles.cpp | 2 --
src/plugins/texteditor/fontsettings.cpp | 2 --
src/plugins/texteditor/fontsettingspage.cpp | 8 --------
.../generichighlighter/definitiondownloader.cpp | 1 -
.../highlightdefinitionhandler.cpp | 2 --
.../highlightdefinitionhandler.h | 1 -
.../texteditor/generichighlighter/highlighter.h | 1 -
.../generichighlighter/highlightersettingspage.cpp | 1 -
.../generichighlighter/managedefinitionsdialog.cpp | 5 -----
.../texteditor/generichighlighter/manager.cpp | 4 ----
.../texteditor/generichighlighter/progressdata.cpp | 2 --
src/plugins/texteditor/generichighlighter/rule.cpp | 3 ---
src/plugins/texteditor/helpitem.cpp | 1 -
src/plugins/texteditor/icodestylepreferences.cpp | 3 ---
src/plugins/texteditor/indenter.h | 2 --
src/plugins/texteditor/itexteditor.h | 2 --
src/plugins/texteditor/itextmark.h | 1 -
src/plugins/texteditor/outlinefactory.cpp | 2 --
src/plugins/texteditor/plaintexteditor.cpp | 4 ----
src/plugins/texteditor/plaintexteditorfactory.cpp | 4 ----
src/plugins/texteditor/refactoringchanges.cpp | 5 -----
src/plugins/texteditor/refactoroverlay.cpp | 1 -
src/plugins/texteditor/semantichighlighter.h | 2 --
.../texteditor/simplecodestylepreferences.cpp | 1 -
.../texteditor/simplecodestylepreferences.h | 1 -
src/plugins/texteditor/snippets/snippeteditor.cpp | 2 --
.../texteditor/snippets/snippetssettingspage.cpp | 4 ----
src/plugins/texteditor/syntaxhighlighter.cpp | 7 -------
src/plugins/texteditor/tabsettings.h | 1 -
src/plugins/texteditor/texteditoractionhandler.cpp | 5 -----
src/plugins/texteditor/texteditoractionhandler.h | 1 -
src/plugins/texteditor/texteditorplugin.cpp | 9 ---------
src/plugins/texteditor/texteditorsettings.cpp | 2 --
src/plugins/texteditor/textfilewizard.cpp | 2 --
src/plugins/texteditor/typingsettings.h | 1 -
56 files changed, 8 insertions(+), 159 deletions(-)
diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp
index 0ed8e28e705..482d1b834c6 100644
--- a/src/plugins/projectexplorer/editorconfiguration.cpp
+++ b/src/plugins/projectexplorer/editorconfiguration.cpp
@@ -40,6 +40,7 @@
#include <texteditor/storagesettings.h>
#include <texteditor/behaviorsettings.h>
#include <texteditor/extraencodingsettings.h>
+#include <texteditor/tabsettings.h>
#include <texteditor/icodestylepreferencesfactory.h>
#include <QLatin1String>
diff --git a/src/plugins/texteditor/autocompleter.cpp b/src/plugins/texteditor/autocompleter.cpp
index 25aabaab4d3..37d251e536a 100644
--- a/src/plugins/texteditor/autocompleter.cpp
+++ b/src/plugins/texteditor/autocompleter.cpp
@@ -29,7 +29,6 @@
#include "autocompleter.h"
#include "basetextdocumentlayout.h"
-#include "texteditorsettings.h"
#include "tabsettings.h"
#include <QDebug>
diff --git a/src/plugins/texteditor/autocompleter.h b/src/plugins/texteditor/autocompleter.h
index c7923e86189..f18386adb22 100644
--- a/src/plugins/texteditor/autocompleter.h
+++ b/src/plugins/texteditor/autocompleter.h
@@ -32,7 +32,6 @@
#include "texteditor_global.h"
-#include <QChar>
#include <QString>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 34b26dd93ff..a29cc38626e 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -34,34 +34,23 @@
#include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/progressmanager/futureprogress.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/documentmanager.h>
-#include <find/textfindconstants.h>
-#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/refactoringchanges.h>
#include <utils/stylehelper.h>
-#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <utils/filesearch.h>
#include <QDebug>
-#include <QDirIterator>
#include <QSettings>
#include <QHash>
#include <QPair>
#include <QStringListModel>
#include <QFutureWatcher>
#include <QPointer>
-#include <QFileDialog>
-#include <QCheckBox>
#include <QComboBox>
#include <QLabel>
-#include <QHBoxLayout>
#include <QLabel>
-#include <QPushButton>
-#include <QTextBlock>
namespace TextEditor {
namespace Internal {
diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp
index b583e7cd554..e7a37ec0e4d 100644
--- a/src/plugins/texteditor/basehoverhandler.cpp
+++ b/src/plugins/texteditor/basehoverhandler.cpp
@@ -30,13 +30,8 @@
#include "basehoverhandler.h"
#include "itexteditor.h"
#include "basetexteditor.h"
-#include "displaysettings.h"
#include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/helpmanager.h>
-#include <coreplugin/id.h>
-#include <debugger/debuggerconstants.h>
#include <utils/tooltip/tooltip.h>
#include <utils/tooltip/tipcontents.h>
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 120bac06704..9959b9b9b0e 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -40,21 +40,15 @@
#include <QApplication>
#include <QDir>
-#include <QFile>
#include <QFileInfo>
#include <QFutureInterface>
#include <QScrollBar>
#include <QStringList>
-#include <QSyntaxHighlighter>
#include <QTextCodec>
-#include <QTextStream>
-#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <utils/qtcassert.h>
-#include <utils/fileutils.h>
-#include <utils/reloadpromptutils.h>
namespace TextEditor {
class BaseTextDocumentPrivate
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 24486e803b8..18523cec0c7 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -29,7 +29,6 @@
#include "basetexteditor.h"
#include "basetexteditor_p.h"
-#include "texteditor_global.h"
#include "basetextdocument.h"
#include "basetextdocumentlayout.h"
@@ -39,8 +38,6 @@
#include "tabsettings.h"
#include "typingsettings.h"
#include "icodestylepreferences.h"
-#include "texteditorconstants.h"
-#include "texteditorplugin.h"
#include "syntaxhighlighter.h"
#include "indenter.h"
#include "autocompleter.h"
@@ -56,14 +53,9 @@
#include <aggregation/aggregate.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/manhattanstyle.h>
-#include <coreplugin/id.h>
-#include <extensionsystem/pluginmanager.h>
#include <find/basetextfind.h>
#include <utils/linecolumnlabel.h>
#include <utils/hostosinfo.h>
@@ -75,30 +67,24 @@
#include <QCoreApplication>
#include <QTextCodec>
-#include <QFile>
#include <QDebug>
#include <QTimer>
#include <QTimeLine>
-#include <QTime>
#include <QMimeData>
#include <QAbstractTextDocumentLayout>
#include <QApplication>
#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
#include <QPainter>
#include <QPrinter>
#include <QPrintDialog>
#include <QScrollBar>
#include <QShortcut>
#include <QStyle>
-#include <QSyntaxHighlighter>
#include <QTextCursor>
#include <QTextDocumentFragment>
#include <QTextBlock>
#include <QTextLayout>
#include <QToolBar>
-#include <QInputDialog>
#include <QMenu>
#include <QMessageBox>
#include <QClipboard>
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 730eb7b2762..ce8c519cdbf 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -34,7 +34,6 @@
#include "codeassist/assistenums.h"
#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/id.h>
#include <find/ifindsupport.h>
#include <QPlainTextEdit>
diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp
index 69ee907c276..048eeace218 100644
--- a/src/plugins/texteditor/behaviorsettingswidget.cpp
+++ b/src/plugins/texteditor/behaviorsettingswidget.cpp
@@ -30,7 +30,6 @@
#include "behaviorsettingswidget.h"
#include "ui_behaviorsettingswidget.h"
-#include <texteditor/tabsettings.h>
#include <texteditor/typingsettings.h>
#include <texteditor/storagesettings.h>
#include <texteditor/behaviorsettings.h>
diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp
index 5d10d02be5f..e742ae01a88 100644
--- a/src/plugins/texteditor/circularclipboardassist.cpp
+++ b/src/plugins/texteditor/circularclipboardassist.cpp
@@ -28,7 +28,6 @@
****************************************************************************/
#include "circularclipboardassist.h"
-#include "codeassist/iassistprovider.h"
#include "codeassist/iassistinterface.h"
#include "codeassist/iassistprocessor.h"
#include "codeassist/iassistproposal.h"
diff --git a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp
index d8a376d709c..39bf978d27b 100644
--- a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp
+++ b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp
@@ -31,7 +31,6 @@
#include <texteditor/convenience.h>
-#include <QThread>
#include <QTextDocument>
#include <QTextCursor>
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
index c708b449476..84bcaa83574 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
@@ -39,10 +39,8 @@
#include <QLabel>
#include <QToolButton>
#include <QHBoxLayout>
-#include <QVBoxLayout>
#include <QDesktopWidget>
#include <QKeyEvent>
-#include <QShortcutEvent>
namespace TextEditor {
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
index 6f9571ec545..6422ffb10c0 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
@@ -28,10 +28,8 @@
****************************************************************************/
#include "genericproposalwidget.h"
-#include "iassistprovider.h"
#include "igenericproposalmodel.h"
#include "iassistproposalitem.h"
-#include "genericproposal.h"
#include "codeassistant.h"
#include <texteditor/texteditorsettings.h>
diff --git a/src/plugins/texteditor/codeassist/igenericproposalmodel.h b/src/plugins/texteditor/codeassist/igenericproposalmodel.h
index a2c5fd46525..9a4b60470cb 100644
--- a/src/plugins/texteditor/codeassist/igenericproposalmodel.h
+++ b/src/plugins/texteditor/codeassist/igenericproposalmodel.h
@@ -35,7 +35,7 @@
#include <texteditor/texteditor_global.h>
-#include <QIcon>
+QT_FORWARD_DECLARE_CLASS(QIcon)
namespace TextEditor {
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
index 03e0b1a925e..e4b0f4d827f 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
@@ -31,15 +31,12 @@
#include <texteditor/codeassist/iassistinterface.h>
#include <texteditor/codeassist/genericproposal.h>
-#include <texteditor/codeassist/ifunctionhintproposalmodel.h>
#include <texteditor/codeassist/functionhintproposal.h>
#include <texteditor/codeassist/basicproposalitemlistmodel.h>
#include "completionsettings.h"
#include "texteditorsettings.h"
#include "basetexteditor.h"
-#include <QtGui/QTextCursor>
-
using namespace TextEditor;
// --------------------------
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h
index 76c66c33a56..80aa1c8e04c 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h
@@ -34,9 +34,6 @@
#include "basicproposalitem.h"
#include "ifunctionhintproposalmodel.h"
-#include <QtGui/QIcon>
-#include <QtCore/QStringList>
-
namespace TextEditor {
class TEXTEDITOR_EXPORT Keywords
diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
index fa3e64017b0..db90f5d4d1b 100644
--- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
+++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp
@@ -37,7 +37,6 @@
// @TODO: Move...
#include <texteditor/quickfix.h>
-#include <QMap>
#include <QDebug>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index 41437c0c39a..537fdd07fe0 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -34,19 +34,13 @@
#include "codestylepool.h"
#include "tabsettings.h"
-#include <QComboBox>
-#include <QBoxLayout>
-#include <QCheckBox>
#include <QPushButton>
-#include <QMenu>
#include <QDialogButtonBox>
#include <QDialog>
#include <QInputDialog>
#include <QLabel>
#include <QMessageBox>
#include <QFileDialog>
-#include <QTextStream>
-#include <QSignalMapper>
#include <QDebug>
diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp
index dddd5e2535c..3820f4f913a 100644
--- a/src/plugins/texteditor/displaysettingspage.cpp
+++ b/src/plugins/texteditor/displaysettingspage.cpp
@@ -33,7 +33,6 @@
#include <coreplugin/icore.h>
-#include <QSettings>
#include <QTextStream>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index 0eb5377ad51..705fa3fcaed 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -32,6 +32,7 @@
#include <utils/filesearch.h>
#include <coreplugin/icore.h>
+#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QSettings>
diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h
index 7e369a7ff3c..5e1cee5c81c 100644
--- a/src/plugins/texteditor/findincurrentfile.h
+++ b/src/plugins/texteditor/findincurrentfile.h
@@ -32,11 +32,13 @@
#include "basefilefind.h"
-#include <coreplugin/idocument.h>
-#include <coreplugin/editormanager/ieditor.h>
-
#include <QPointer>
+namespace Core {
+class IEditor;
+class IDocument;
+} // namespace Core
+
namespace TextEditor {
namespace Internal {
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 4ca3a0bf547..f555b6fce30 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -35,13 +35,11 @@
#include <QDebug>
#include <QSettings>
#include <QDir>
-#include <QDirIterator>
#include <QPushButton>
#include <QFileDialog>
#include <QLabel>
#include <QComboBox>
#include <QHBoxLayout>
-#include <QVBoxLayout>
using namespace Find;
using namespace TextEditor;
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 521df21d9cc..6f9843c5c3e 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -29,10 +29,8 @@
#include "fontsettings.h"
#include "fontsettingspage.h"
-#include "texteditorconstants.h"
#include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
#include <coreplugin/icore.h>
#include <QCoreApplication>
diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index 090d6f72baa..80eb613577a 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -29,9 +29,7 @@
#include "fontsettingspage.h"
-#include "colorschemeedit.h"
#include "fontsettings.h"
-#include "texteditorconstants.h"
#include "ui_fontsettingspage.h"
#include <coreplugin/icore.h>
@@ -41,17 +39,11 @@
#include <QDebug>
#include <QSettings>
#include <QTimer>
-#include <QCheckBox>
-#include <QComboBox>
#include <QFileDialog>
#include <QFontDatabase>
#include <QInputDialog>
-#include <QListWidget>
#include <QMessageBox>
#include <QPalette>
-#include <QTextCharFormat>
-#include <QTextEdit>
-#include <QToolButton>
namespace TextEditor {
namespace Internal {
diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp
index a3281490185..484d52f4c8b 100644
--- a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp
+++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp
@@ -33,7 +33,6 @@
#include <QLatin1Char>
#include <QEventLoop>
-#include <QFile>
#include <QScopedPointer>
#include <QNetworkRequest>
#include <QNetworkReply>
diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
index b359240406d..aa311b540cc 100644
--- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
@@ -33,9 +33,7 @@
#include "itemdata.h"
#include "keywordlist.h"
#include "context.h"
-#include "reuse.h"
#include "manager.h"
-#include "highlighterexception.h"
#include <QLatin1String>
diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h
index 9f1c97eb5be..e9cfcd57951 100644
--- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h
+++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h
@@ -31,7 +31,6 @@
#define HIGHLIGHTDEFINITIONHANDLER_H
#include <QString>
-#include <QList>
#include <QSharedPointer>
#include <QStack>
diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h
index ad853c2315d..dc3445663a6 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.h
+++ b/src/plugins/texteditor/generichighlighter/highlighter.h
@@ -39,7 +39,6 @@
#include <QSharedPointer>
#include <QStringList>
-#include <QSyntaxHighlighter>
#include <QTextCharFormat>
namespace TextEditor {
diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
index 49b1f6046b9..c04a5d72e96 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp
@@ -34,7 +34,6 @@
#include "ui_highlightersettingspage.h"
#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
#include <QMessageBox>
diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
index 7de036c564e..2267f4e5484 100644
--- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
+++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
@@ -32,11 +32,6 @@
#include <QUrl>
#include <QIODevice>
-#include <QXmlStreamReader>
-#include <QXmlStreamAttributes>
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QtConcurrentMap>
#include <QFile>
#include <QFileInfo>
#include <QMessageBox>
diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp
index 8edb213d6d5..1aff2ed2870 100644
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -39,12 +39,10 @@
#include "texteditorsettings.h"
#include <coreplugin/icore.h>
-#include <utils/qtcassert.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <utils/QtConcurrentTools>
#include <QtAlgorithms>
-#include <QtPlugin>
#include <QString>
#include <QLatin1Char>
#include <QLatin1String>
@@ -54,13 +52,11 @@
#include <QDir>
#include <QRegExp>
#include <QFuture>
-#include <QtConcurrentRun>
#include <QtConcurrentMap>
#include <QUrl>
#include <QSet>
#include <QXmlStreamReader>
#include <QXmlStreamAttributes>
-#include <QDesktopServices>
#include <QMessageBox>
#include <QXmlSimpleReader>
#include <QXmlInputSource>
diff --git a/src/plugins/texteditor/generichighlighter/progressdata.cpp b/src/plugins/texteditor/generichighlighter/progressdata.cpp
index a57a8468fe8..246d8462216 100644
--- a/src/plugins/texteditor/generichighlighter/progressdata.cpp
+++ b/src/plugins/texteditor/generichighlighter/progressdata.cpp
@@ -30,8 +30,6 @@
#include "progressdata.h"
#include "rule.h"
-#include <QtGlobal>
-
using namespace TextEditor;
using namespace Internal;
diff --git a/src/plugins/texteditor/generichighlighter/rule.cpp b/src/plugins/texteditor/generichighlighter/rule.cpp
index 53cce34bc48..09955f93f4f 100644
--- a/src/plugins/texteditor/generichighlighter/rule.cpp
+++ b/src/plugins/texteditor/generichighlighter/rule.cpp
@@ -28,13 +28,10 @@
****************************************************************************/
#include "rule.h"
-#include "highlighterexception.h"
#include "progressdata.h"
#include "highlightdefinition.h"
#include "reuse.h"
-#include <QStringList>
-
#include <functional>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/helpitem.cpp b/src/plugins/texteditor/helpitem.cpp
index b0add0536a3..f247acdbab0 100644
--- a/src/plugins/texteditor/helpitem.cpp
+++ b/src/plugins/texteditor/helpitem.cpp
@@ -33,7 +33,6 @@
#include <utils/htmldocextractor.h>
#include <QUrl>
-#include <QByteArray>
#include <QMap>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp
index 490877f910a..5d7159bf78f 100644
--- a/src/plugins/texteditor/icodestylepreferences.cpp
+++ b/src/plugins/texteditor/icodestylepreferences.cpp
@@ -30,12 +30,9 @@
#include "icodestylepreferences.h"
#include "codestylepool.h"
#include "tabsettings.h"
-#include "texteditorconstants.h"
-
#include <utils/settingsutils.h>
#include <QSettings>
-#include <QStringList>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h
index ee0fd6c83c4..5f364b43d9d 100644
--- a/src/plugins/texteditor/indenter.h
+++ b/src/plugins/texteditor/indenter.h
@@ -32,8 +32,6 @@
#include "texteditor_global.h"
-#include <QtGlobal>
-
QT_BEGIN_NAMESPACE
class QTextDocument;
class QTextCursor;
diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h
index 9de25811aba..60b84efe7d5 100644
--- a/src/plugins/texteditor/itexteditor.h
+++ b/src/plugins/texteditor/itexteditor.h
@@ -36,8 +36,6 @@
#include <coreplugin/editormanager/ieditor.h>
-#include <QObject>
-#include <QList>
#include <QMap>
#include <QIcon>
diff --git a/src/plugins/texteditor/itextmark.h b/src/plugins/texteditor/itextmark.h
index eb5a8b81c09..61cf6c1ed62 100644
--- a/src/plugins/texteditor/itextmark.h
+++ b/src/plugins/texteditor/itextmark.h
@@ -34,7 +34,6 @@
#include <QObject>
#include <QList>
-#include <QMap>
#include <QIcon>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp
index f8322c5ec3d..c2eaad26757 100644
--- a/src/plugins/texteditor/outlinefactory.cpp
+++ b/src/plugins/texteditor/outlinefactory.cpp
@@ -31,9 +31,7 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <QVBoxLayout>
#include <QToolButton>
#include <QLabel>
#include <QStackedWidget>
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index 64770e81c05..c0a8982208c 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -29,13 +29,11 @@
#include "plaintexteditor.h"
#include "tabsettings.h"
-#include "texteditorconstants.h"
#include "texteditorplugin.h"
#include "texteditorsettings.h"
#include "basetextdocument.h"
#include "highlightdefinition.h"
#include "highlighter.h"
-#include "highlighterexception.h"
#include "highlightersettings.h"
#include "manager.h"
#include "context.h"
@@ -44,10 +42,8 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
#include <QSharedPointer>
-#include <QFileInfo>
#include <QDebug>
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index 7609756b3d9..d58827e3670 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -33,12 +33,8 @@
#include "texteditorconstants.h"
#include "texteditorplugin.h"
#include "texteditoractionhandler.h"
-#include "texteditorsettings.h"
-#include "manager.h"
-#include "highlightersettings.h"
#include <coreplugin/coreconstants.h>
-#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/infobar.h>
#include <QCoreApplication>
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index db870ee0e15..a79b31d660f 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -30,14 +30,9 @@
#include "refactoringchanges.h"
#include "basetexteditor.h"
-#include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <extensionsystem/pluginmanager.h>
-
#include <utils/qtcassert.h>
#include <QFile>
-#include <QSet>
#include <QTextBlock>
#include <QTextCursor>
#include <QTextDocument>
diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp
index e2d729cbf67..0c31724c14a 100644
--- a/src/plugins/texteditor/refactoroverlay.cpp
+++ b/src/plugins/texteditor/refactoroverlay.cpp
@@ -32,7 +32,6 @@
#include "basetexteditor.h"
#include <QPainter>
-#include <QTextBlock>
#include <QDebug>
diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h
index e068d3b351e..a57de4eedd4 100644
--- a/src/plugins/texteditor/semantichighlighter.h
+++ b/src/plugins/texteditor/semantichighlighter.h
@@ -33,8 +33,6 @@
#include "texteditor_global.h"
#include <QHash>
-#include <QMap>
-#include <QVector>
#include <QFuture>
#include <QTextCharFormat>
diff --git a/src/plugins/texteditor/simplecodestylepreferences.cpp b/src/plugins/texteditor/simplecodestylepreferences.cpp
index 73ab6341b4d..1e183c1123d 100644
--- a/src/plugins/texteditor/simplecodestylepreferences.cpp
+++ b/src/plugins/texteditor/simplecodestylepreferences.cpp
@@ -28,7 +28,6 @@
****************************************************************************/
#include "simplecodestylepreferences.h"
-#include "tabsettings.h"
using namespace TextEditor;
diff --git a/src/plugins/texteditor/simplecodestylepreferences.h b/src/plugins/texteditor/simplecodestylepreferences.h
index 298dad11371..30e9f0d5172 100644
--- a/src/plugins/texteditor/simplecodestylepreferences.h
+++ b/src/plugins/texteditor/simplecodestylepreferences.h
@@ -31,7 +31,6 @@
#define SIMPLECODESTYLEPREFERENCES_H
#include "icodestylepreferences.h"
-#include "tabsettings.h"
namespace TextEditor {
diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp
index f6093fb9b36..a179942783f 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.cpp
+++ b/src/plugins/texteditor/snippets/snippeteditor.cpp
@@ -31,9 +31,7 @@
#include <texteditor/basetextdocument.h>
#include <texteditor/texteditorconstants.h>
-#include <texteditor/normalindenter.h>
-#include <QTextDocument>
#include <QFocusEvent>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 724a6948e32..d9d2c72312a 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -33,20 +33,16 @@
#include "snippet.h"
#include "snippetscollection.h"
#include "snippetssettings.h"
-#include "reuse.h"
#include "ui_snippetssettingspage.h"
#include <coreplugin/icore.h>
#include <texteditor/texteditorsettings.h>
-#include <texteditor/fontsettings.h>
#include <extensionsystem/pluginmanager.h>
#include <QModelIndex>
#include <QAbstractTableModel>
#include <QList>
-#include <QSettings>
#include <QTextStream>
-#include <QHash>
#include <QMessageBox>
namespace TextEditor {
diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 1a2776dc76e..ed75207816f 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -31,13 +31,6 @@
#include "basetextdocument.h"
#include "basetextdocumentlayout.h"
-#include <qtextdocument.h>
-#include <qtextlayout.h>
-#include <qpointer.h>
-#include <qtextobject.h>
-#include <qtextcursor.h>
-#include <qdebug.h>
-#include <qtextedit.h>
#include <qtimer.h>
#include <math.h>
diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h
index 312c685ab6d..95071667df6 100644
--- a/src/plugins/texteditor/tabsettings.h
+++ b/src/plugins/texteditor/tabsettings.h
@@ -32,7 +32,6 @@
#include "texteditor_global.h"
-#include <QVariant>
#include <QTextBlock>
QT_BEGIN_NAMESPACE
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index ccfaf0fd7eb..ea8a42cb374 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -40,15 +40,10 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/id.h>
#include <utils/qtcassert.h>
-#include <QSet>
#include <QDebug>
#include <QAction>
-#include <QTextCursor>
using namespace TextEditor;
using namespace TextEditor::Internal;
diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h
index 0a8f510b430..964ee91a1f9 100644
--- a/src/plugins/texteditor/texteditoractionhandler.h
+++ b/src/plugins/texteditor/texteditoractionhandler.h
@@ -33,7 +33,6 @@
#include "texteditor_global.h"
#include <coreplugin/icontext.h>
-#include <coreplugin/id.h>
#include <QObject>
#include <QPointer>
diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp
index 0384ae2bc76..3ad315773e0 100644
--- a/src/plugins/texteditor/texteditorplugin.cpp
+++ b/src/plugins/texteditor/texteditorplugin.cpp
@@ -34,7 +34,6 @@
#include "findinopenfiles.h"
#include "fontsettings.h"
#include "linenumberfilter.h"
-#include "texteditorconstants.h"
#include "texteditorsettings.h"
#include "textfilewizard.h"
#include "plaintexteditorfactory.h"
@@ -42,22 +41,14 @@
#include "manager.h"
#include "outlinefactory.h"
#include "snippets/plaintextsnippetprovider.h"
-#include "codeassist/assistenums.h"
-#include "basetextmark.h"
#include "basetextmarkregistry.h"
#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/mimedatabase.h>
#include <coreplugin/variablemanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/id.h>
#include <coreplugin/externaltoolmanager.h>
#include <extensionsystem/pluginmanager.h>
#include <texteditor/texteditoractionhandler.h>
-#include <find/searchresultwindow.h>
#include <utils/qtcassert.h>
#include <QtPlugin>
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 877d337f998..6bbf02464f0 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -28,7 +28,6 @@
****************************************************************************/
#include "texteditorsettings.h"
-#include "texteditorconstants.h"
#include "basetexteditor.h"
#include "behaviorsettings.h"
@@ -41,7 +40,6 @@
#include "storagesettings.h"
#include "tabsettings.h"
#include "extraencodingsettings.h"
-#include "texteditorplugin.h"
#include "highlightersettingspage.h"
#include "snippetssettingspage.h"
#include "icodestylepreferences.h"
diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp
index 7de7f18c1d8..a2dbca480f2 100644
--- a/src/plugins/texteditor/textfilewizard.cpp
+++ b/src/plugins/texteditor/textfilewizard.cpp
@@ -28,8 +28,6 @@
****************************************************************************/
#include "textfilewizard.h"
-#include "basetexteditor.h"
-#include "texteditorconstants.h"
#include <QDebug>
using namespace TextEditor;
diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h
index d02118ff558..10c51781889 100644
--- a/src/plugins/texteditor/typingsettings.h
+++ b/src/plugins/texteditor/typingsettings.h
@@ -32,7 +32,6 @@
#include "texteditor_global.h"
-#include <QVariant>
#include <QTextBlock>
QT_BEGIN_NAMESPACE
--
GitLab