Commit 3a806d42 authored by Friedemann Kleint's avatar Friedemann Kleint

Clean headers in TextEditor.

Change-Id: Ie679e7e9d0d20a0f71dcc1fcf0f7d8305eeeeced
Reviewed-by: default avatarFawzi Mohamed <fawzi.mohamed@digia.com>
parent 5765bc90
......@@ -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>
......
......@@ -29,7 +29,6 @@
#include "autocompleter.h"
#include "basetextdocumentlayout.h"
#include "texteditorsettings.h"
#include "tabsettings.h"
#include <QDebug>
......
......@@ -32,7 +32,6 @@
#include "texteditor_global.h"
#include <QChar>
#include <QString>
QT_BEGIN_NAMESPACE
......
......@@ -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 {
......
......@@ -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>
......
......@@ -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
......
......@@ -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>
......
......@@ -34,7 +34,6 @@
#include "codeassist/assistenums.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/id.h>
#include <find/ifindsupport.h>
#include <QPlainTextEdit>
......
......@@ -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>
......
......@@ -28,7 +28,6 @@
****************************************************************************/
#include "circularclipboardassist.h"
#include "codeassist/iassistprovider.h"
#include "codeassist/iassistinterface.h"
#include "codeassist/iassistprocessor.h"
#include "codeassist/iassistproposal.h"
......
......@@ -31,7 +31,6 @@
#include <texteditor/convenience.h>
#include <QThread>
#include <QTextDocument>
#include <QTextCursor>
......
......@@ -39,10 +39,8 @@
#include <QLabel>
#include <QToolButton>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QDesktopWidget>
#include <QKeyEvent>
#include <QShortcutEvent>
namespace TextEditor {
......
......@@ -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>
......
......@@ -35,7 +35,7 @@
#include <texteditor/texteditor_global.h>
#include <QIcon>
QT_FORWARD_DECLARE_CLASS(QIcon)
namespace TextEditor {
......
......@@ -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;
// --------------------------
......
......@@ -34,9 +34,6 @@
#include "basicproposalitem.h"
#include "ifunctionhintproposalmodel.h"
#include <QtGui/QIcon>
#include <QtCore/QStringList>
namespace TextEditor {
class TEXTEDITOR_EXPORT Keywords
......
......@@ -37,7 +37,6 @@
// @TODO: Move...
#include <texteditor/quickfix.h>
#include <QMap>
#include <QDebug>
using namespace TextEditor;
......
......@@ -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>
......
......@@ -33,7 +33,6 @@
#include <coreplugin/icore.h>
#include <QSettings>
#include <QTextStream>
using namespace TextEditor;
......
......@@ -32,6 +32,7 @@
#include <utils/filesearch.h>
#include <coreplugin/icore.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QSettings>
......
......@@ -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 {
......
......@@ -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;
......
......@@ -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>
......
......@@ -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 {
......
......@@ -33,7 +33,6 @@
#include <QLatin1Char>
#include <QEventLoop>
#include <QFile>
#include <QScopedPointer>
#include <QNetworkRequest>
#include <QNetworkReply>
......
......@@ -33,9 +33,7 @@
#include "itemdata.h"
#include "keywordlist.h"
#include "context.h"
#include "reuse.h"
#include "manager.h"
#include "highlighterexception.h"
#include <QLatin1String>
......
......@@ -31,7 +31,6 @@
#define HIGHLIGHTDEFINITIONHANDLER_H
#include <QString>
#include <QList>
#include <QSharedPointer>
#include <QStack>
......
......@@ -39,7 +39,6 @@
#include <QSharedPointer>
#include <QStringList>
#include <QSyntaxHighlighter>
#include <QTextCharFormat>
namespace TextEditor {
......
......@@ -34,7 +34,6 @@
#include "ui_highlightersettingspage.h"
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <QMessageBox>
......
......@@ -32,11 +32,6 @@
#include <QUrl>
#include <QIODevice>
#include <QXmlStreamReader>
#include <QXmlStreamAttributes>
#include <QFuture>
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <QFile>
#include <QFileInfo>
#include <QMessageBox>
......
......@@ -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>
......
......@@ -30,8 +30,6 @@
#include "progressdata.h"
#include "rule.h"
#include <QtGlobal>
using namespace TextEditor;
using namespace Internal;
......
......@@ -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;
......
......@@ -33,7 +33,6 @@
#include <utils/htmldocextractor.h>
#include <QUrl>
#include <QByteArray>
#include <QMap>
using namespace TextEditor;
......
......@@ -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;
......
......@@ -32,8 +32,6 @@
#include "texteditor_global.h"
#include <QtGlobal>
QT_BEGIN_NAMESPACE
class QTextDocument;
class QTextCursor;
......
......@@ -36,8 +36,6 @@
#include <coreplugin/editormanager/ieditor.h>
#include <QObject>
#include <QList>
#include <QMap>
#include <QIcon>
......
......@@ -34,7 +34,6 @@
#include <QObject>
#include <QList>
#include <QMap>
#include <QIcon>
QT_BEGIN_NAMESPACE
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -32,7 +32,6 @@
#include "basetexteditor.h"
#include <QPainter>
#include <QTextBlock>
#include <QDebug>
......
......@@ -33,8 +33,6 @@
#include "texteditor_global.h"
#include <QHash>
#include <QMap>
#include <QVector>
#include <QFuture>
#include <QTextCharFormat>
......
......@@ -28,7 +28,6 @@
****************************************************************************/
#include "simplecodestylepreferences.h"
#include "tabsettings.h"
using namespace TextEditor;
......
......@@ -31,7 +31,6 @@
#define SIMPLECODESTYLEPREFERENCES_H
#include "icodestylepreferences.h"
#include "tabsettings.h"
namespace TextEditor {
......
......@@ -31,9 +31,7 @@
#include <texteditor/basetextdocument.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/normalindenter.h>