diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 10:42:41 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 16:24:46 +0100 |
| commit | 3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch) | |
| tree | e31dbd1b4605530e59c9864166f155b4edabc721 /src/plugins/texteditor | |
| parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/texteditor')
159 files changed, 525 insertions, 525 deletions
diff --git a/src/plugins/texteditor/autocompleter.cpp b/src/plugins/texteditor/autocompleter.cpp index 1430aa5a5d..221531a9b9 100644 --- a/src/plugins/texteditor/autocompleter.cpp +++ b/src/plugins/texteditor/autocompleter.cpp @@ -35,8 +35,8 @@ #include "texteditorsettings.h" #include "tabsettings.h" -#include <QtCore/QDebug> -#include <QtGui/QTextCursor> +#include <QDebug> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/autocompleter.h b/src/plugins/texteditor/autocompleter.h index e8af364fc1..d9631c808b 100644 --- a/src/plugins/texteditor/autocompleter.h +++ b/src/plugins/texteditor/autocompleter.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QChar> -#include <QtCore/QString> +#include <QChar> +#include <QString> QT_BEGIN_NAMESPACE class QTextCursor; diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 47422db53c..3a328c6183 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -48,19 +48,19 @@ #include <utils/fileutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QDirIterator> -#include <QtCore/QSettings> -#include <QtCore/QHash> -#include <QtCore/QPair> -#include <QtGui/QFileDialog> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QMainWindow> -#include <QtGui/QPushButton> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QDirIterator> +#include <QSettings> +#include <QHash> +#include <QPair> +#include <QFileDialog> +#include <QCheckBox> +#include <QComboBox> +#include <QHBoxLayout> +#include <QLabel> +#include <QMainWindow> +#include <QPushButton> +#include <QTextBlock> using namespace Utils; using namespace Find; diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index 0be41d278c..8c22311898 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -39,10 +39,10 @@ #include <find/searchresultwindow.h> #include <utils/filesearch.h> -#include <QtGui/QStringListModel> +#include <QStringListModel> -#include <QtCore/QFutureWatcher> -#include <QtCore/QPointer> +#include <QFutureWatcher> +#include <QPointer> QT_BEGIN_NAMESPACE class QLabel; diff --git a/src/plugins/texteditor/basefilefind_p.h b/src/plugins/texteditor/basefilefind_p.h index 7157bcd8f1..754378ceb0 100644 --- a/src/plugins/texteditor/basefilefind_p.h +++ b/src/plugins/texteditor/basefilefind_p.h @@ -35,8 +35,8 @@ #include <find/ifindfilter.h> -#include <QtCore/QVariant> -#include <QtGui/QLabel> +#include <QVariant> +#include <QLabel> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index e2f6badd46..ff9c8ada74 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -43,7 +43,7 @@ #include <coreplugin/id.h> #include <debugger/debuggerconstants.h> -#include <QtCore/QPoint> +#include <QPoint> using namespace TextEditor; using namespace Core; diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h index 0c73b81ed8..6676f30333 100644 --- a/src/plugins/texteditor/basehoverhandler.h +++ b/src/plugins/texteditor/basehoverhandler.h @@ -36,8 +36,8 @@ #include "texteditor_global.h" #include "helpitem.h" -#include <QtCore/QObject> -#include <QtCore/QString> +#include <QObject> +#include <QString> QT_BEGIN_NAMESPACE class QPoint; diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp index 4f6f4c1c7d..0336640289 100644 --- a/src/plugins/texteditor/basetextdocument.cpp +++ b/src/plugins/texteditor/basetextdocument.cpp @@ -41,16 +41,16 @@ #include "syntaxhighlighter.h" #include "texteditorconstants.h" -#include <QtCore/QStringList> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> -#include <QtCore/QFutureInterface> -#include <QtGui/QMainWindow> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QApplication> +#include <QStringList> +#include <QFile> +#include <QDir> +#include <QFileInfo> +#include <QTextStream> +#include <QTextCodec> +#include <QFutureInterface> +#include <QMainWindow> +#include <QSyntaxHighlighter> +#include <QApplication> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> diff --git a/src/plugins/texteditor/basetextdocumentlayout.h b/src/plugins/texteditor/basetextdocumentlayout.h index d4c78667dc..83e202b0c9 100644 --- a/src/plugins/texteditor/basetextdocumentlayout.h +++ b/src/plugins/texteditor/basetextdocumentlayout.h @@ -37,8 +37,8 @@ #include "itexteditor.h" -#include <QtGui/QTextBlockUserData> -#include <QtGui/QPlainTextDocumentLayout> +#include <QTextBlockUserData> +#include <QPlainTextDocumentLayout> namespace TextEditor { diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 1687164c7c..a466b0eeea 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -72,35 +72,35 @@ #include <utils/qtcassert.h> #include <utils/stylehelper.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QTextCodec> -#include <QtCore/QFile> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtCore/QTimeLine> -#include <QtCore/QTime> -#include <QtCore/QMimeData> -#include <QtGui/QAbstractTextDocumentLayout> -#include <QtGui/QApplication> -#include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QPainter> -#include <QtGui/QPrinter> -#include <QtGui/QPrintDialog> -#include <QtGui/QScrollBar> -#include <QtGui/QShortcut> -#include <QtGui/QStyle> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocumentFragment> -#include <QtGui/QTextBlock> -#include <QtGui/QTextLayout> -#include <QtGui/QToolBar> -#include <QtGui/QInputDialog> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QClipboard> +#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> //#define DO_FOO diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 708d82c867..bc2b9dfbea 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -39,7 +39,7 @@ #include <find/ifindsupport.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtGui/QPlainTextEdit> +#include <QPlainTextEdit> QT_BEGIN_NAMESPACE class QToolBar; diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h index 181a072277..3d9e00f931 100644 --- a/src/plugins/texteditor/basetexteditor_p.h +++ b/src/plugins/texteditor/basetexteditor_p.h @@ -41,10 +41,10 @@ #include <utils/changeset.h> -#include <QtCore/QBasicTimer> -#include <QtCore/QSharedData> -#include <QtCore/QPointer> -#include <QtCore/QScopedPointer> +#include <QBasicTimer> +#include <QSharedData> +#include <QPointer> +#include <QScopedPointer> namespace TextEditor { diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h index 0677afc929..28f600a8e5 100644 --- a/src/plugins/texteditor/basetextmark.h +++ b/src/plugins/texteditor/basetextmark.h @@ -38,8 +38,8 @@ #include <utils/fileutils.h> -#include <QtCore/QWeakPointer> -#include <QtCore/QHash> +#include <QWeakPointer> +#include <QHash> QT_BEGIN_NAMESPACE class QTextBlock; diff --git a/src/plugins/texteditor/behaviorsettings.cpp b/src/plugins/texteditor/behaviorsettings.cpp index 3078c56888..48d44a5c8d 100644 --- a/src/plugins/texteditor/behaviorsettings.cpp +++ b/src/plugins/texteditor/behaviorsettings.cpp @@ -34,8 +34,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QSettings> +#include <QString> static const char mouseNavigationKey[] = "MouseNavigation"; static const char scrollWheelZoomingKey[] = "ScrollWheelZooming"; diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h index 07683110f2..d7bf88ab2f 100644 --- a/src/plugins/texteditor/behaviorsettings.h +++ b/src/plugins/texteditor/behaviorsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index 85a0aefc82..1cf6b379b4 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -46,8 +46,8 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QSettings> -#include <QtCore/QTextCodec> +#include <QSettings> +#include <QTextCodec> using namespace TextEditor; diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp index ff4674e684..4d954544ed 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.cpp +++ b/src/plugins/texteditor/behaviorsettingswidget.cpp @@ -39,11 +39,11 @@ #include <texteditor/behaviorsettings.h> #include <texteditor/extraencodingsettings.h> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QTextCodec> -#include <QtCore/QTextStream> +#include <QList> +#include <QString> +#include <QByteArray> +#include <QTextCodec> +#include <QTextStream> #include <algorithm> #include <functional> diff --git a/src/plugins/texteditor/behaviorsettingswidget.h b/src/plugins/texteditor/behaviorsettingswidget.h index 26ce75f437..486a22b7c6 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.h +++ b/src/plugins/texteditor/behaviorsettingswidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QTextCodec; diff --git a/src/plugins/texteditor/circularclipboard.h b/src/plugins/texteditor/circularclipboard.h index dd8509f495..118c0854ba 100644 --- a/src/plugins/texteditor/circularclipboard.h +++ b/src/plugins/texteditor/circularclipboard.h @@ -33,8 +33,8 @@ #ifndef CIRCULARCLIPBOARD_H #define CIRCULARCLIPBOARD_H -#include <QtCore/QList> -#include <QtCore/QMimeData> +#include <QList> +#include <QMimeData> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/codeassist/basicproposalitem.cpp b/src/plugins/texteditor/codeassist/basicproposalitem.cpp index 36c3fc78ab..f2293d1429 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitem.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitem.cpp @@ -35,7 +35,7 @@ #include <texteditor/basetexteditor.h> #include <texteditor/quickfix.h> -#include <QtGui/QTextCursor> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/basicproposalitem.h b/src/plugins/texteditor/codeassist/basicproposalitem.h index d1f1aa5c36..0ff5efc1b6 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitem.h +++ b/src/plugins/texteditor/codeassist/basicproposalitem.h @@ -37,8 +37,8 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QVariant> -#include <QtGui/QIcon> +#include <QVariant> +#include <QIcon> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp index a2cdeadf50..041954419d 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.cpp @@ -35,10 +35,10 @@ #include "texteditorsettings.h" #include "completionsettings.h" -#include <QtCore/QDebug> -#include <QtCore/QRegExp> -#include <QtCore/QtAlgorithms> -#include <QtCore/QHash> +#include <QDebug> +#include <QRegExp> +#include <QtAlgorithms> +#include <QHash> #include <algorithm> diff --git a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h index 0ea79c2872..d3562d2d0e 100644 --- a/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h +++ b/src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h @@ -37,9 +37,9 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QList> -#include <QtCore/QHash> -#include <QtCore/QPair> +#include <QList> +#include <QHash> +#include <QPair> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp index d6b21593a0..4c0256b346 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.cpp +++ b/src/plugins/texteditor/codeassist/codeassistant.cpp @@ -45,11 +45,11 @@ #include <texteditor/completionsettings.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QTimer> -#include <QtCore/QDebug> -#include <QtGui/QKeyEvent> +#include <QObject> +#include <QList> +#include <QTimer> +#include <QDebug> +#include <QKeyEvent> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/codeassist/completionassistprovider.cpp b/src/plugins/texteditor/codeassist/completionassistprovider.cpp index 3a3bd7729d..aed63c3bff 100644 --- a/src/plugins/texteditor/codeassist/completionassistprovider.cpp +++ b/src/plugins/texteditor/codeassist/completionassistprovider.cpp @@ -32,7 +32,7 @@ #include "completionassistprovider.h" -#include <QtCore/QChar> +#include <QChar> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp index 8592e59ec9..2dc94176be 100644 --- a/src/plugins/texteditor/codeassist/defaultassistinterface.cpp +++ b/src/plugins/texteditor/codeassist/defaultassistinterface.cpp @@ -34,9 +34,9 @@ #include <texteditor/convenience.h> -#include <QtCore/QThread> -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QThread> +#include <QTextDocument> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp index 87628a0246..3493b97338 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp @@ -36,15 +36,15 @@ #include <utils/faketooltip.h> -#include <QtCore/QDebug> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDesktopWidget> -#include <QtGui/QKeyEvent> -#include <QtGui/QShortcutEvent> +#include <QDebug> +#include <QApplication> +#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 8b0951ee84..7e53d2dda9 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -42,20 +42,20 @@ #include <utils/faketooltip.h> -#include <QtCore/QRect> -#include <QtCore/QLatin1String> -#include <QtCore/QAbstractListModel> -#include <QtCore/QPointer> -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtGui/QApplication> -#include <QtGui/QVBoxLayout> -#include <QtGui/QListView> -#include <QtGui/QAbstractItemView> -#include <QtGui/QScrollBar> -#include <QtGui/QKeyEvent> -#include <QtGui/QDesktopWidget> -#include <QtGui/QLabel> +#include <QRect> +#include <QLatin1String> +#include <QAbstractListModel> +#include <QPointer> +#include <QDebug> +#include <QTimer> +#include <QApplication> +#include <QVBoxLayout> +#include <QListView> +#include <QAbstractItemView> +#include <QScrollBar> +#include <QKeyEvent> +#include <QDesktopWidget> +#include <QLabel> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistinterface.h b/src/plugins/texteditor/codeassist/iassistinterface.h index 04e0ae06d7..7c6b2d6d9e 100644 --- a/src/plugins/texteditor/codeassist/iassistinterface.h +++ b/src/plugins/texteditor/codeassist/iassistinterface.h @@ -37,7 +37,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/codeassist/iassistproposalitem.h b/src/plugins/texteditor/codeassist/iassistproposalitem.h index a924e08c45..b736163ce4 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalitem.h +++ b/src/plugins/texteditor/codeassist/iassistproposalitem.h @@ -35,7 +35,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistproposalmodel.h b/src/plugins/texteditor/codeassist/iassistproposalmodel.h index 5d65c0d818..c121af3272 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalmodel.h +++ b/src/plugins/texteditor/codeassist/iassistproposalmodel.h @@ -35,7 +35,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistproposalwidget.h b/src/plugins/texteditor/codeassist/iassistproposalwidget.h index 1db293babd..015f5b4c6a 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalwidget.h +++ b/src/plugins/texteditor/codeassist/iassistproposalwidget.h @@ -37,7 +37,7 @@ #include <texteditor/texteditor_global.h> -#include <QtGui/QFrame> +#include <QFrame> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/iassistprovider.h b/src/plugins/texteditor/codeassist/iassistprovider.h index 17b8eee043..9da5bcc7fc 100644 --- a/src/plugins/texteditor/codeassist/iassistprovider.h +++ b/src/plugins/texteditor/codeassist/iassistprovider.h @@ -36,7 +36,7 @@ #include <texteditor/texteditor_global.h> #include <coreplugin/id.h> -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/igenericproposalmodel.h b/src/plugins/texteditor/codeassist/igenericproposalmodel.h index 746b9242a9..31a6628e17 100644 --- a/src/plugins/texteditor/codeassist/igenericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/igenericproposalmodel.h @@ -38,7 +38,7 @@ #include <texteditor/texteditor_global.h> -#include <QtGui/QIcon> +#include <QIcon> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp index 0f48b5c7d4..1c20456b17 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp +++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp @@ -40,8 +40,8 @@ // @TODO: Move... #include <texteditor/quickfix.h> -#include <QtCore/QMap> -#include <QtCore/QDebug> +#include <QMap> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/codeassist/quickfixassistprovider.h b/src/plugins/texteditor/codeassist/quickfixassistprovider.h index 7da5388612..5d9d4c2efa 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprovider.h +++ b/src/plugins/texteditor/codeassist/quickfixassistprovider.h @@ -35,7 +35,7 @@ #include "iassistprovider.h" -#include <QtCore/QList> +#include <QList> namespace TextEditor { diff --git a/src/plugins/texteditor/codeassist/runner.h b/src/plugins/texteditor/codeassist/runner.h index d81710d1f3..2dc7ba75c6 100644 --- a/src/plugins/texteditor/codeassist/runner.h +++ b/src/plugins/texteditor/codeassist/runner.h @@ -35,7 +35,7 @@ #include "iassistproposalwidget.h" -#include <QtCore/QThread> +#include <QThread> namespace TextEditor { diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp index b72d63d3dd..b9a254461d 100644 --- a/src/plugins/texteditor/codecselector.cpp +++ b/src/plugins/texteditor/codecselector.cpp @@ -33,12 +33,12 @@ #include "codecselector.h" #include "basetextdocument.h" -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTextCodec> -#include <QtGui/QPushButton> -#include <QtGui/QScrollBar> -#include <QtGui/QVBoxLayout> +#include <QDebug> +#include <QFileInfo> +#include <QTextCodec> +#include <QPushButton> +#include <QScrollBar> +#include <QVBoxLayout> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h index 74a6679b84..c654a54c62 100644 --- a/src/plugins/texteditor/codecselector.h +++ b/src/plugins/texteditor/codecselector.h @@ -33,10 +33,10 @@ #ifndef CODECSELECTOR_H #define CODECSELECTOR_H -#include <QtGui/QDialog> -#include <QtGui/QLabel> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QListWidget> +#include <QDialog> +#include <QLabel> +#include <QDialogButtonBox> +#include <QListWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/codestyleeditor.cpp b/src/plugins/texteditor/codestyleeditor.cpp index 173e0f9f48..82a472c75a 100644 --- a/src/plugins/texteditor/codestyleeditor.cpp +++ b/src/plugins/texteditor/codestyleeditor.cpp @@ -41,9 +41,9 @@ #include "indenter.h" #include "snippets/snippeteditor.h" #include "snippets/isnippetprovider.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QTextBlock> -#include <QtGui/QLabel> +#include <QVBoxLayout> +#include <QTextBlock> +#include <QLabel> using namespace TextEditor; diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp index 8e557ec1e2..bc63d99732 100644 --- a/src/plugins/texteditor/codestylepool.cpp +++ b/src/plugins/texteditor/codestylepool.cpp @@ -37,9 +37,9 @@ #include <utils/persistentsettings.h> #include <coreplugin/icore.h> -#include <QtCore/QMap> -#include <QtCore/QDir> -#include <QtCore/QDebug> +#include <QMap> +#include <QDir> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index 9d0695251c..d17f5cd780 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/src/plugins/texteditor/codestyleselectorwidget.cpp @@ -37,19 +37,19 @@ #include "codestylepool.h" #include "tabsettings.h" -#include <QtGui/QComboBox> -#include <QtGui/QBoxLayout> -#include <QtGui/QCheckBox> -#include <QtGui/QPushButton> -#include <QtGui/QMenu> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QDialog> -#include <QtGui/QInputDialog> -#include <QtGui/QLabel> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> -#include <QtCore/QTextStream> -#include <QtCore/QSignalMapper> +#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/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h index e02551c4a6..f7a6576840 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.h +++ b/src/plugins/texteditor/codestyleselectorwidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> QT_BEGIN_NAMESPACE class QHBoxLayout; diff --git a/src/plugins/texteditor/colorscheme.cpp b/src/plugins/texteditor/colorscheme.cpp index e88551b4c9..67037bb2aa 100644 --- a/src/plugins/texteditor/colorscheme.cpp +++ b/src/plugins/texteditor/colorscheme.cpp @@ -36,9 +36,9 @@ #include <utils/fileutils.h> -#include <QtCore/QFile> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamWriter> +#include <QFile> +#include <QCoreApplication> +#include <QXmlStreamWriter> using namespace TextEditor; diff --git a/src/plugins/texteditor/colorscheme.h b/src/plugins/texteditor/colorscheme.h index ed3f19f98c..478da1da4a 100644 --- a/src/plugins/texteditor/colorscheme.h +++ b/src/plugins/texteditor/colorscheme.h @@ -35,9 +35,9 @@ #include "texteditor_global.h" -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtGui/QColor> +#include <QMap> +#include <QString> +#include <QColor> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/texteditor/colorschemeedit.cpp b/src/plugins/texteditor/colorschemeedit.cpp index 6ba583989d..695949fc64 100644 --- a/src/plugins/texteditor/colorschemeedit.cpp +++ b/src/plugins/texteditor/colorschemeedit.cpp @@ -35,8 +35,8 @@ #include "texteditorconstants.h" -#include <QtCore/QAbstractListModel> -#include <QtGui/QColorDialog> +#include <QAbstractListModel> +#include <QColorDialog> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/colorschemeedit.h b/src/plugins/texteditor/colorschemeedit.h index d0ec101a86..38e3958771 100644 --- a/src/plugins/texteditor/colorschemeedit.h +++ b/src/plugins/texteditor/colorschemeedit.h @@ -36,7 +36,7 @@ #include "colorscheme.h" #include "fontsettingspage.h" -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/plugins/texteditor/completionsettings.cpp b/src/plugins/texteditor/completionsettings.cpp index dbb1af7013..266cfc3a86 100644 --- a/src/plugins/texteditor/completionsettings.cpp +++ b/src/plugins/texteditor/completionsettings.cpp @@ -32,7 +32,7 @@ #include "completionsettings.h" -#include <QtCore/QSettings> +#include <QSettings> static const char groupPostfix[] = "Completion"; static const char caseSensitivityKey[] = "CaseSensitivity"; diff --git a/src/plugins/texteditor/convenience.cpp b/src/plugins/texteditor/convenience.cpp index 0e1d3ef211..3897c0823d 100644 --- a/src/plugins/texteditor/convenience.cpp +++ b/src/plugins/texteditor/convenience.cpp @@ -32,9 +32,9 @@ #include "convenience.h" -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> +#include <QTextDocument> +#include <QTextBlock> +#include <QTextCursor> namespace TextEditor { namespace Convenience { diff --git a/src/plugins/texteditor/convenience.h b/src/plugins/texteditor/convenience.h index 58cd158307..ad966118e6 100644 --- a/src/plugins/texteditor/convenience.h +++ b/src/plugins/texteditor/convenience.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp index a43ea4af4c..c1d817941f 100644 --- a/src/plugins/texteditor/displaysettings.cpp +++ b/src/plugins/texteditor/displaysettings.cpp @@ -32,8 +32,8 @@ #include "displaysettings.h" -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QSettings> +#include <QString> static const char displayLineNumbersKey[] = "DisplayLineNumbers"; static const char textWrappingKey[] = "TextWrapping"; diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index fb1b30a8c0..5d69ef5bd1 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -36,8 +36,8 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> +#include <QSettings> +#include <QTextStream> using namespace TextEditor; diff --git a/src/plugins/texteditor/extraencodingsettings.cpp b/src/plugins/texteditor/extraencodingsettings.cpp index 05fb00aebd..8fdc190223 100644 --- a/src/plugins/texteditor/extraencodingsettings.cpp +++ b/src/plugins/texteditor/extraencodingsettings.cpp @@ -34,8 +34,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QLatin1String> -#include <QtCore/QSettings> +#include <QLatin1String> +#include <QSettings> // Keep this for compatibility reasons. static const char kGroupPostfix[] = "EditorManager"; diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h index 8a8b6e9c06..677597e8bb 100644 --- a/src/plugins/texteditor/extraencodingsettings.h +++ b/src/plugins/texteditor/extraencodingsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 5b37796bd7..2350a1e988 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -36,7 +36,7 @@ #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QSettings> +#include <QSettings> using namespace Find; using namespace TextEditor; diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h index 670b408ddd..a4690073a6 100644 --- a/src/plugins/texteditor/findincurrentfile.h +++ b/src/plugins/texteditor/findincurrentfile.h @@ -38,7 +38,7 @@ #include <coreplugin/ifile.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QPointer> +#include <QPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 90950e2e45..2cbb05410d 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -34,14 +34,14 @@ #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QtDebug> -#include <QtCore/QSettings> -#include <QtCore/QDir> -#include <QtCore/QDirIterator> -#include <QtGui/QPushButton> -#include <QtGui/QFileDialog> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> +#include <QtDebug> +#include <QSettings> +#include <QDir> +#include <QDirIterator> +#include <QPushButton> +#include <QFileDialog> +#include <QHBoxLayout> +#include <QVBoxLayout> using namespace Find; using namespace TextEditor; diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h index 8b8bc16681..8e2471a682 100644 --- a/src/plugins/texteditor/findinfiles.h +++ b/src/plugins/texteditor/findinfiles.h @@ -37,10 +37,10 @@ #include <find/ifindfilter.h> -#include <QtCore/QPointer> -#include <QtGui/QLabel> -#include <QtGui/QComboBox> -#include <QtGui/QStringListModel> +#include <QPointer> +#include <QLabel> +#include <QComboBox> +#include <QStringListModel> namespace TextEditor { diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp index 3d746ad517..ab2250ed09 100644 --- a/src/plugins/texteditor/findinopenfiles.cpp +++ b/src/plugins/texteditor/findinopenfiles.cpp @@ -37,7 +37,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/openeditorsmodel.h> -#include <QtCore/QSettings> +#include <QSettings> using namespace Find; using namespace TextEditor; diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index 3a05dd233b..c94f6ba168 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -36,13 +36,13 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> -#include <QtGui/QTextCharFormat> -#include <QtGui/QFont> -#include <QtGui/QMainWindow> +#include <QFile> +#include <QFileInfo> +#include <QSettings> +#include <QCoreApplication> +#include <QTextCharFormat> +#include <QFont> +#include <QMainWindow> static const char fontFamilyKey[] = "FontFamily"; static const char fontSizeKey[] = "FontSize"; diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h index 41a12b7067..2e811480b9 100644 --- a/src/plugins/texteditor/fontsettings.h +++ b/src/plugins/texteditor/fontsettings.h @@ -37,9 +37,9 @@ #include "colorscheme.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QVector> +#include <QString> +#include <QList> +#include <QVector> QT_BEGIN_NAMESPACE class QTextCharFormat; diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index fe6f4066dc..ab018599f2 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -41,21 +41,21 @@ #include <utils/stringutils.h> #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QTimer> -#include <QtGui/QCheckBox> -#include <QtGui/QComboBox> -#include <QtGui/QFileDialog> -#include <QtGui/QFontDatabase> -#include <QtGui/QInputDialog> -#include <QtGui/QListWidget> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtGui/QPalette> -#include <QtGui/QTextCharFormat> -#include <QtGui/QTextEdit> -#include <QtGui/QToolButton> +#include <QDebug> +#include <QSettings> +#include <QTimer> +#include <QCheckBox> +#include <QComboBox> +#include <QFileDialog> +#include <QFontDatabase> +#include <QInputDialog> +#include <QListWidget> +#include <QMessageBox> +#include <QMainWindow> +#include <QPalette> +#include <QTextCharFormat> +#include <QTextEdit> +#include <QToolButton> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index bbba17bb18..e84710cf28 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -39,8 +39,8 @@ #include "texteditoroptionspage.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <QList> +#include <QString> QT_BEGIN_NAMESPACE class QWidget; diff --git a/src/plugins/texteditor/generichighlighter/context.h b/src/plugins/texteditor/generichighlighter/context.h index b0ddd4b130..3d5a082354 100644 --- a/src/plugins/texteditor/generichighlighter/context.h +++ b/src/plugins/texteditor/generichighlighter/context.h @@ -35,9 +35,9 @@ #include "includerulesinstruction.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QList> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp index f2ece94de1..e5b3bb8da2 100644 --- a/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp +++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.cpp @@ -34,12 +34,12 @@ #include <utils/fileutils.h> -#include <QtCore/QLatin1Char> -#include <QtCore/QEventLoop> -#include <QtCore/QFile> -#include <QtCore/QScopedPointer> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QLatin1Char> +#include <QEventLoop> +#include <QFile> +#include <QScopedPointer> +#include <QNetworkRequest> +#include <QNetworkReply> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.h b/src/plugins/texteditor/generichighlighter/definitiondownloader.h index 59056eee10..d387bfb113 100644 --- a/src/plugins/texteditor/generichighlighter/definitiondownloader.h +++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.h @@ -33,9 +33,9 @@ #ifndef DEFINITIONDOWNLOADER_H #define DEFINITIONDOWNLOADER_H -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QUrl> +#include <QObject> +#include <QString> +#include <QUrl> QT_BEGIN_NAMESPACE class QNetworkReply; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp index c8c01d8e52..043e2c0eed 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp @@ -37,7 +37,7 @@ #include "itemdata.h" #include "reuse.h" -#include <QtCore/QString> +#include <QString> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.h b/src/plugins/texteditor/generichighlighter/highlightdefinition.h index 9d671d8c1e..029eaa7e5b 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.h @@ -33,10 +33,10 @@ #ifndef HIGHLIGHTDEFINITION_H #define HIGHLIGHTDEFINITION_H -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QHash> +#include <QSet> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp index da38842a7a..cc123bcf20 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp @@ -40,7 +40,7 @@ #include "manager.h" #include "highlighterexception.h" -#include <QtCore/QLatin1String> +#include <QLatin1String> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h index 2369be3022..fa771cf0e6 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h @@ -33,12 +33,12 @@ #ifndef HIGHLIGHTDEFINITIONHANDLER_H #define HIGHLIGHTDEFINITIONHANDLER_H -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> -#include <QtCore/QStack> +#include <QString> +#include <QList> +#include <QSharedPointer> +#include <QStack> -#include <QtXml/QXmlDefaultHandler> +#include <QXmlDefaultHandler> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h index bde7a9e5dc..055dc6eb01 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h @@ -33,10 +33,10 @@ #ifndef HIGHLIGHTDEFINITIONMETADATA_H #define HIGHLIGHTDEFINITIONMETADATA_H -#include <QtCore/QString> -#include <QtCore/QLatin1String> -#include <QtCore/QStringList> -#include <QtCore/QUrl> +#include <QString> +#include <QLatin1String> +#include <QStringList> +#include <QUrl> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp index d8ad3ea29c..155948f183 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.cpp +++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp @@ -40,8 +40,8 @@ #include "reuse.h" #include "tabsettings.h" -#include <QtCore/QLatin1String> -#include <QtCore/QLatin1Char> +#include <QLatin1String> +#include <QLatin1Char> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h index 4d80f5d5b4..e4e3299e5f 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.h +++ b/src/plugins/texteditor/generichighlighter/highlighter.h @@ -36,14 +36,14 @@ #include "basetextdocumentlayout.h" #include "syntaxhighlighter.h" -#include <QtCore/QString> -#include <QtCore/QVector> -#include <QtCore/QStack> -#include <QtCore/QSharedPointer> -#include <QtCore/QStringList> - -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextCharFormat> +#include <QString> +#include <QVector> +#include <QStack> +#include <QSharedPointer> +#include <QStringList> + +#include <QSyntaxHighlighter> +#include <QTextCharFormat> namespace TextEditor { diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp index 7dc71e6676..d656ab424a 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp @@ -34,14 +34,14 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QLatin1String> -#include <QtCore/QLatin1Char> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QStringList> +#include <QSettings> +#include <QLatin1String> +#include <QLatin1Char> +#include <QDir> +#include <QFile> +#include <QStringList> #ifdef Q_OS_UNIX -#include <QtCore/QProcess> +#include <QProcess> #endif namespace TextEditor { diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.h b/src/plugins/texteditor/generichighlighter/highlightersettings.h index fef2de2a7b..9bc3c1229a 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettings.h +++ b/src/plugins/texteditor/generichighlighter/highlightersettings.h @@ -33,10 +33,10 @@ #ifndef HIGHLIGHTERSETTINGS_H #define HIGHLIGHTERSETTINGS_H -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QList> -#include <QtCore/QRegExp> +#include <QString> +#include <QStringList> +#include <QList> +#include <QRegExp> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp index 8f9baf8cb7..71f654da7f 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.cpp @@ -39,7 +39,7 @@ #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> -#include <QtGui/QMessageBox> +#include <QMessageBox> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/includerulesinstruction.h b/src/plugins/texteditor/generichighlighter/includerulesinstruction.h index 995e0e000c..e094b35974 100644 --- a/src/plugins/texteditor/generichighlighter/includerulesinstruction.h +++ b/src/plugins/texteditor/generichighlighter/includerulesinstruction.h @@ -33,7 +33,7 @@ #ifndef INCLUDERULESINSTRUCTION_H #define INCLUDERULESINSTRUCTION_H -#include <QtCore/QString> +#include <QString> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/itemdata.h b/src/plugins/texteditor/generichighlighter/itemdata.h index 6e8ada0836..a7f1beab16 100644 --- a/src/plugins/texteditor/generichighlighter/itemdata.h +++ b/src/plugins/texteditor/generichighlighter/itemdata.h @@ -33,8 +33,8 @@ #ifndef ITEMDATA_H #define ITEMDATA_H -#include <QtCore/QString> -#include <QtGui/QColor> +#include <QString> +#include <QColor> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/keywordlist.h b/src/plugins/texteditor/generichighlighter/keywordlist.h index f841debfbf..f7c146992f 100644 --- a/src/plugins/texteditor/generichighlighter/keywordlist.h +++ b/src/plugins/texteditor/generichighlighter/keywordlist.h @@ -33,8 +33,8 @@ #ifndef KEYWORDLIST_H #define KEYWORDLIST_H -#include <QtCore/QString> -#include <QtCore/QSet> +#include <QString> +#include <QSet> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp index 401ccffadc..87226c2036 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp @@ -33,18 +33,18 @@ #include "managedefinitionsdialog.h" #include "manager.h" -#include <QtCore/QUrl> -#include <QtCore/QIODevice> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QFuture> -#include <QtCore/QFutureWatcher> -#include <QtCore/QtConcurrentMap> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtGui/QMessageBox> - -#include <QtCore/QDebug> +#include <QUrl> +#include <QIODevice> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QFuture> +#include <QFutureWatcher> +#include <QtConcurrentMap> +#include <QFile> +#include <QFileInfo> +#include <QMessageBox> + +#include <QDebug> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h index f6710273e8..67f25d86b9 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h @@ -36,7 +36,7 @@ #include "ui_managedefinitionsdialog.h" #include "highlightdefinitionmetadata.h" -#include <QtCore/QList> +#include <QList> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp index 920461807d..fe6eed4b85 100644 --- a/src/plugins/texteditor/generichighlighter/manager.cpp +++ b/src/plugins/texteditor/generichighlighter/manager.cpp @@ -46,29 +46,29 @@ #include <coreplugin/progressmanager/progressmanager.h> #include <utils/QtConcurrentTools> -#include <QtCore/QtAlgorithms> -#include <QtCore/QtPlugin> -#include <QtCore/QString> -#include <QtCore/QLatin1Char> -#include <QtCore/QLatin1String> -#include <QtCore/QStringList> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QRegExp> -#include <QtCore/QFuture> -#include <QtCore/QtConcurrentRun> -#include <QtCore/QtConcurrentMap> -#include <QtCore/QUrl> -#include <QtCore/QSet> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtGui/QDesktopServices> -#include <QtGui/QMessageBox> -#include <QtXml/QXmlSimpleReader> -#include <QtXml/QXmlInputSource> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QtAlgorithms> +#include <QtPlugin> +#include <QString> +#include <QLatin1Char> +#include <QLatin1String> +#include <QStringList> +#include <QFile> +#include <QFileInfo> +#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> +#include <QNetworkRequest> +#include <QNetworkReply> #include <QtAlgorithms> using namespace TextEditor; diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h index 214a0e142e..b5a84de2e9 100644 --- a/src/plugins/texteditor/generichighlighter/manager.h +++ b/src/plugins/texteditor/generichighlighter/manager.h @@ -37,14 +37,14 @@ #include <coreplugin/mimedatabase.h> -#include <QtCore/QString> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QUrl> -#include <QtCore/QList> -#include <QtCore/QPair> -#include <QtCore/QSharedPointer> -#include <QtCore/QFutureWatcher> +#include <QString> +#include <QHash> +#include <QSet> +#include <QUrl> +#include <QList> +#include <QPair> +#include <QSharedPointer> +#include <QFutureWatcher> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/texteditor/generichighlighter/progressdata.cpp b/src/plugins/texteditor/generichighlighter/progressdata.cpp index db0bd46b9a..594678ff38 100644 --- a/src/plugins/texteditor/generichighlighter/progressdata.cpp +++ b/src/plugins/texteditor/generichighlighter/progressdata.cpp @@ -33,7 +33,7 @@ #include "progressdata.h" #include "rule.h" -#include <QtCore/QtGlobal> +#include <QtGlobal> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/progressdata.h b/src/plugins/texteditor/generichighlighter/progressdata.h index eae964b332..7ba53a6c6b 100644 --- a/src/plugins/texteditor/generichighlighter/progressdata.h +++ b/src/plugins/texteditor/generichighlighter/progressdata.h @@ -33,7 +33,7 @@ #ifndef PROGRESSDATA_H #define PROGRESSDATA_H -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/reuse.h b/src/plugins/texteditor/generichighlighter/reuse.h index 344831b950..21775ada5c 100644 --- a/src/plugins/texteditor/generichighlighter/reuse.h +++ b/src/plugins/texteditor/generichighlighter/reuse.h @@ -34,10 +34,10 @@ #define REUSE_H #include <Qt> -#include <QtCore/QString> -#include <QtCore/QLatin1String> -#include <QtCore/QChar> -#include <QtGui/QFont> +#include <QString> +#include <QLatin1String> +#include <QChar> +#include <QFont> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/rule.cpp b/src/plugins/texteditor/generichighlighter/rule.cpp index 505358a0f3..7fa1eb5caa 100644 --- a/src/plugins/texteditor/generichighlighter/rule.cpp +++ b/src/plugins/texteditor/generichighlighter/rule.cpp @@ -36,7 +36,7 @@ #include "highlightdefinition.h" #include "reuse.h" -#include <QtCore/QStringList> +#include <QStringList> #include <functional> diff --git a/src/plugins/texteditor/generichighlighter/rule.h b/src/plugins/texteditor/generichighlighter/rule.h index f8afd921e0..b5e7bc5e33 100644 --- a/src/plugins/texteditor/generichighlighter/rule.h +++ b/src/plugins/texteditor/generichighlighter/rule.h @@ -33,9 +33,9 @@ #ifndef RULE_H #define RULE_H -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QList> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp index 7cd53139ba..500dff2c0b 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.cpp +++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp @@ -36,7 +36,7 @@ #include "progressdata.h" #include "reuse.h" -#include <QtCore/QLatin1Char> +#include <QLatin1Char> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h index 582bdf1321..392f8ed9df 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.h +++ b/src/plugins/texteditor/generichighlighter/specificrules.h @@ -36,10 +36,10 @@ #include "rule.h" #include "dynamicrule.h" -#include <QtCore/QChar> -#include <QtCore/QStringList> -#include <QtCore/QRegExp> -#include <QtCore/QSharedPointer> +#include <QChar> +#include <QStringList> +#include <QRegExp> +#include <QSharedPointer> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/helpitem.cpp b/src/plugins/texteditor/helpitem.cpp index b68d888e01..65a724fe13 100644 --- a/src/plugins/texteditor/helpitem.cpp +++ b/src/plugins/texteditor/helpitem.cpp @@ -35,9 +35,9 @@ #include <coreplugin/helpmanager.h> #include <utils/htmldocextractor.h> -#include <QtCore/QUrl> -#include <QtCore/QByteArray> -#include <QtCore/QMap> +#include <QUrl> +#include <QByteArray> +#include <QMap> using namespace TextEditor; diff --git a/src/plugins/texteditor/helpitem.h b/src/plugins/texteditor/helpitem.h index 250b370718..bceed678a7 100644 --- a/src/plugins/texteditor/helpitem.h +++ b/src/plugins/texteditor/helpitem.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QString> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp index 998baa9a3a..8f0f444214 100644 --- a/src/plugins/texteditor/icodestylepreferences.cpp +++ b/src/plugins/texteditor/icodestylepreferences.cpp @@ -37,8 +37,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QSettings> -#include <QtCore/QStringList> +#include <QSettings> +#include <QStringList> using namespace TextEditor; diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index 8800644f09..560d02da05 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/src/plugins/texteditor/icodestylepreferences.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QObject> -#include <QtCore/QVariant> +#include <QObject> +#include <QVariant> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h index 22fd121d40..ade10ea734 100644 --- a/src/plugins/texteditor/icodestylepreferencesfactory.h +++ b/src/plugins/texteditor/icodestylepreferencesfactory.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/texteditor/indenter.cpp b/src/plugins/texteditor/indenter.cpp index be1fa6511d..eea6d1ac23 100644 --- a/src/plugins/texteditor/indenter.cpp +++ b/src/plugins/texteditor/indenter.cpp @@ -33,8 +33,8 @@ #include "indenter.h" #include "tabsettings.h" -#include <QtGui/QTextDocument> -#include <QtGui/QTextCursor> +#include <QTextDocument> +#include <QTextCursor> using namespace TextEditor; diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h index 17db4724f4..fbe64213ad 100644 --- a/src/plugins/texteditor/indenter.h +++ b/src/plugins/texteditor/indenter.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QtGlobal> +#include <QtGlobal> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/ioutlinewidget.h b/src/plugins/texteditor/ioutlinewidget.h index 2d07e9171a..61a3926e83 100644 --- a/src/plugins/texteditor/ioutlinewidget.h +++ b/src/plugins/texteditor/ioutlinewidget.h @@ -34,7 +34,7 @@ #define IOUTLINEWIDGET_H #include <texteditor/texteditor_global.h> -#include <QtGui/QWidget> +#include <QWidget> namespace Core { class IEditor; diff --git a/src/plugins/texteditor/itexteditor.cpp b/src/plugins/texteditor/itexteditor.cpp index 1ae99b00b7..7868ab7c44 100644 --- a/src/plugins/texteditor/itexteditor.cpp +++ b/src/plugins/texteditor/itexteditor.cpp @@ -34,7 +34,7 @@ #include <coreplugin/editormanager/editormanager.h> -#include <QtCore/QTextCodec> +#include <QTextCodec> using namespace TextEditor; diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h index c72c8f95ea..f53dde85b8 100644 --- a/src/plugins/texteditor/itexteditor.h +++ b/src/plugins/texteditor/itexteditor.h @@ -37,10 +37,10 @@ #include <coreplugin/editormanager/ieditor.h> -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QMap> -#include <QtGui/QIcon> +#include <QObject> +#include <QList> +#include <QMap> +#include <QIcon> QT_BEGIN_NAMESPACE class QIcon; diff --git a/src/plugins/texteditor/linenumberfilter.cpp b/src/plugins/texteditor/linenumberfilter.cpp index 4ec8eacd5b..24a760933b 100644 --- a/src/plugins/texteditor/linenumberfilter.cpp +++ b/src/plugins/texteditor/linenumberfilter.cpp @@ -37,7 +37,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/modemanager.h> -#include <QtCore/QVariant> +#include <QVariant> using namespace Core; using namespace Locator; diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index d448266477..0a20b6d01e 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -35,9 +35,9 @@ #include <locator/ilocatorfilter.h> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QFutureInterface> +#include <QString> +#include <QList> +#include <QFutureInterface> namespace TextEditor { diff --git a/src/plugins/texteditor/normalindenter.cpp b/src/plugins/texteditor/normalindenter.cpp index 981dd4ec43..7372017856 100644 --- a/src/plugins/texteditor/normalindenter.cpp +++ b/src/plugins/texteditor/normalindenter.cpp @@ -33,7 +33,7 @@ #include "normalindenter.h" #include "tabsettings.h" -#include <QtGui/QTextDocument> +#include <QTextDocument> using namespace TextEditor; diff --git a/src/plugins/texteditor/outlinefactory.cpp b/src/plugins/texteditor/outlinefactory.cpp index 1af5354e0c..3c9e2981e8 100644 --- a/src/plugins/texteditor/outlinefactory.cpp +++ b/src/plugins/texteditor/outlinefactory.cpp @@ -36,12 +36,12 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> -#include <QtGui/QVBoxLayout> -#include <QtGui/QToolButton> -#include <QtGui/QLabel> -#include <QtGui/QStackedWidget> +#include <QVBoxLayout> +#include <QToolButton> +#include <QLabel> +#include <QStackedWidget> -#include <QtCore/QDebug> +#include <QDebug> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h index c10608a23e..87ba4211fe 100644 --- a/src/plugins/texteditor/outlinefactory.h +++ b/src/plugins/texteditor/outlinefactory.h @@ -35,8 +35,8 @@ #include <texteditor/ioutlinewidget.h> #include <coreplugin/inavigationwidgetfactory.h> -#include <QtGui/QStackedWidget> -#include <QtGui/QMenu> +#include <QStackedWidget> +#include <QMenu> namespace Core { class IEditor; diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp index c0bb9f64c1..4f06f71561 100644 --- a/src/plugins/texteditor/plaintexteditor.cpp +++ b/src/plugins/texteditor/plaintexteditor.cpp @@ -49,10 +49,10 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> -#include <QtCore/QSharedPointer> -#include <QtCore/QFileInfo> +#include <QSharedPointer> +#include <QFileInfo> -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp index 18d7f0b68e..7d35c352d7 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.cpp +++ b/src/plugins/texteditor/plaintexteditorfactory.cpp @@ -44,7 +44,7 @@ #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/infobar.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h index 64aa516867..14ca8632ec 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.h +++ b/src/plugins/texteditor/plaintexteditorfactory.h @@ -35,7 +35,7 @@ #include <coreplugin/editormanager/ieditorfactory.h> -#include <QtCore/QStringList> +#include <QStringList> namespace TextEditor { class TextEditorActionHandler; diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h index 4e588c7fc5..bbc1269a63 100644 --- a/src/plugins/texteditor/quickfix.h +++ b/src/plugins/texteditor/quickfix.h @@ -35,9 +35,9 @@ #include "texteditor_global.h" -#include <QtCore/QString> -#include <QtCore/QMetaType> -#include <QtCore/QSharedPointer> +#include <QString> +#include <QMetaType> +#include <QSharedPointer> namespace TextEditor { diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 25433d8ae9..5d665fb4dc 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -39,13 +39,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QFile> -#include <QtCore/QSet> -#include <QtGui/QMainWindow> -#include <QtGui/QTextBlock> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> -#include <QtCore/QDebug> +#include <QFile> +#include <QSet> +#include <QMainWindow> +#include <QTextBlock> +#include <QTextCursor> +#include <QTextDocument> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h index c12ff7ae76..ecf4c2d875 100644 --- a/src/plugins/texteditor/refactoringchanges.h +++ b/src/plugins/texteditor/refactoringchanges.h @@ -37,10 +37,10 @@ #include <utils/textfileformat.h> #include <texteditor/texteditor_global.h> -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QSharedPointer> -#include <QtCore/QPair> +#include <QList> +#include <QString> +#include <QSharedPointer> +#include <QPair> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/refactoroverlay.cpp b/src/plugins/texteditor/refactoroverlay.cpp index 57a85f7541..bf21cd9f85 100644 --- a/src/plugins/texteditor/refactoroverlay.cpp +++ b/src/plugins/texteditor/refactoroverlay.cpp @@ -34,10 +34,10 @@ #include "basetextdocumentlayout.h" #include "basetexteditor.h" -#include <QtGui/QPainter> -#include <QtGui/QTextBlock> +#include <QPainter> +#include <QTextBlock> -#include <QtCore/QDebug> +#include <QDebug> namespace TextEditor { diff --git a/src/plugins/texteditor/refactoroverlay.h b/src/plugins/texteditor/refactoroverlay.h index 52cc17ec6c..ac72919427 100644 --- a/src/plugins/texteditor/refactoroverlay.h +++ b/src/plugins/texteditor/refactoroverlay.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtGui/QTextCursor> -#include <QtGui/QIcon> +#include <QTextCursor> +#include <QIcon> namespace TextEditor { class BaseTextEditorWidget; diff --git a/src/plugins/texteditor/semantichighlighter.cpp b/src/plugins/texteditor/semantichighlighter.cpp index 54497f8766..ddf0c002cb 100644 --- a/src/plugins/texteditor/semantichighlighter.cpp +++ b/src/plugins/texteditor/semantichighlighter.cpp @@ -36,8 +36,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QTextDocument> -#include <QtGui/QTextBlock> +#include <QTextDocument> +#include <QTextBlock> using namespace TextEditor; using namespace TextEditor::SemanticHighlighter; diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h index 987dc72902..62e80e27cc 100644 --- a/src/plugins/texteditor/semantichighlighter.h +++ b/src/plugins/texteditor/semantichighlighter.h @@ -35,11 +35,11 @@ #include "texteditor_global.h" -#include <QtCore/QHash> -#include <QtCore/QMap> -#include <QtCore/QVector> -#include <QtCore/QFuture> -#include <QtGui/QTextCharFormat> +#include <QHash> +#include <QMap> +#include <QVector> +#include <QFuture> +#include <QTextCharFormat> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp b/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp index bc726b4b11..80c99a60cb 100644 --- a/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp +++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.cpp @@ -35,7 +35,7 @@ #include "tabsettings.h" #include "tabsettingswidget.h" -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> namespace TextEditor { diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.h b/src/plugins/texteditor/simplecodestylepreferenceswidget.h index e650f41e7c..f562dfd653 100644 --- a/src/plugins/texteditor/simplecodestylepreferenceswidget.h +++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/isnippetprovider.h b/src/plugins/texteditor/snippets/isnippetprovider.h index 1e5921848c..e89a0cc386 100644 --- a/src/plugins/texteditor/snippets/isnippetprovider.h +++ b/src/plugins/texteditor/snippets/isnippetprovider.h @@ -35,7 +35,7 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QObject> +#include <QObject> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp b/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp index 5dfbd7d365..ced0540138 100644 --- a/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp +++ b/src/plugins/texteditor/snippets/plaintextsnippetprovider.cpp @@ -34,8 +34,8 @@ #include <texteditor/texteditorconstants.h> -#include <QtCore/QLatin1String> -#include <QtCore/QCoreApplication> +#include <QLatin1String> +#include <QCoreApplication> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/snippets/reuse.h b/src/plugins/texteditor/snippets/reuse.h index 17e7ec5288..7c1ee80812 100644 --- a/src/plugins/texteditor/snippets/reuse.h +++ b/src/plugins/texteditor/snippets/reuse.h @@ -33,8 +33,8 @@ #ifndef REUSE_H #define REUSE_H -#include <QtCore/QString> -#include <QtCore/QLatin1String> +#include <QString> +#include <QLatin1String> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp index fc35fd29f1..5be07d5e78 100644 --- a/src/plugins/texteditor/snippets/snippet.cpp +++ b/src/plugins/texteditor/snippets/snippet.cpp @@ -32,9 +32,9 @@ #include "snippet.h" -#include <QtCore/QLatin1Char> -#include <QtCore/QLatin1String> -#include <QtGui/QTextDocument> +#include <QLatin1Char> +#include <QLatin1String> +#include <QTextDocument> using namespace TextEditor; diff --git a/src/plugins/texteditor/snippets/snippet.h b/src/plugins/texteditor/snippets/snippet.h index fa41228fde..8485f5e8e7 100644 --- a/src/plugins/texteditor/snippets/snippet.h +++ b/src/plugins/texteditor/snippets/snippet.h @@ -35,8 +35,8 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QChar> -#include <QtCore/QString> +#include <QChar> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/snippetassistcollector.h b/src/plugins/texteditor/snippets/snippetassistcollector.h index d0f4a18f12..a1045d6a59 100644 --- a/src/plugins/texteditor/snippets/snippetassistcollector.h +++ b/src/plugins/texteditor/snippets/snippetassistcollector.h @@ -35,9 +35,9 @@ #include <texteditor/texteditor_global.h> -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtGui/QIcon> +#include <QString> +#include <QList> +#include <QIcon> namespace TextEditor { diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp index 3aa654939e..38c420c9e2 100644 --- a/src/plugins/texteditor/snippets/snippeteditor.cpp +++ b/src/plugins/texteditor/snippets/snippeteditor.cpp @@ -36,8 +36,8 @@ #include <texteditor/texteditorconstants.h> #include <texteditor/normalindenter.h> -#include <QtGui/QTextDocument> -#include <QtGui/QFocusEvent> +#include <QTextDocument> +#include <QFocusEvent> using namespace TextEditor; diff --git a/src/plugins/texteditor/snippets/snippetscollection.cpp b/src/plugins/texteditor/snippets/snippetscollection.cpp index c78682b76a..bd31c1ced8 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.cpp +++ b/src/plugins/texteditor/snippets/snippetscollection.cpp @@ -38,12 +38,12 @@ #include <extensionsystem/pluginmanager.h> #include <utils/fileutils.h> -#include <QtCore/QLatin1String> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QXmlStreamReader> +#include <QLatin1String> +#include <QFile> +#include <QFileInfo> +#include <QDir> +#include <QDebug> +#include <QXmlStreamReader> #include <QtAlgorithms> #include <iterator> diff --git a/src/plugins/texteditor/snippets/snippetscollection.h b/src/plugins/texteditor/snippets/snippetscollection.h index 1b5712b40e..cc89ab5126 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.h +++ b/src/plugins/texteditor/snippets/snippetscollection.h @@ -35,10 +35,10 @@ #include "snippet.h" -#include <QtCore/QVector> -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QXmlStreamWriter> +#include <QVector> +#include <QStringList> +#include <QHash> +#include <QXmlStreamWriter> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/snippets/snippetssettings.cpp b/src/plugins/texteditor/snippets/snippetssettings.cpp index f41ab686c8..2a998d3dfe 100644 --- a/src/plugins/texteditor/snippets/snippetssettings.cpp +++ b/src/plugins/texteditor/snippets/snippetssettings.cpp @@ -33,7 +33,7 @@ #include "snippetssettings.h" #include "reuse.h" -#include <QtCore/QSettings> +#include <QSettings> namespace { diff --git a/src/plugins/texteditor/snippets/snippetssettings.h b/src/plugins/texteditor/snippets/snippetssettings.h index 55dfefd580..32d8138781 100644 --- a/src/plugins/texteditor/snippets/snippetssettings.h +++ b/src/plugins/texteditor/snippets/snippetssettings.h @@ -33,7 +33,7 @@ #ifndef SNIPPETSSETTINGS_H #define SNIPPETSSETTINGS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index 9902733c06..6e719a4ea5 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -44,14 +44,14 @@ #include <texteditor/fontsettings.h> #include <extensionsystem/pluginmanager.h> -#include <QtCore/QModelIndex> -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QHash> -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> +#include <QModelIndex> +#include <QAbstractTableModel> +#include <QList> +#include <QSettings> +#include <QTextStream> +#include <QHash> +#include <QMessageBox> +#include <QMainWindow> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/storagesettings.cpp b/src/plugins/texteditor/storagesettings.cpp index a4be90cbc1..75e6165a6c 100644 --- a/src/plugins/texteditor/storagesettings.cpp +++ b/src/plugins/texteditor/storagesettings.cpp @@ -34,8 +34,8 @@ #include <utils/settingsutils.h> -#include <QtCore/QSettings> -#include <QtCore/QString> +#include <QSettings> +#include <QString> namespace TextEditor { diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h index c2e7fd2ef3..85a3e579d5 100644 --- a/src/plugins/texteditor/storagesettings.h +++ b/src/plugins/texteditor/storagesettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariantMap> +#include <QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h index 557c4f9417..3ab0860cbc 100644 --- a/src/plugins/texteditor/syntaxhighlighter.h +++ b/src/plugins/texteditor/syntaxhighlighter.h @@ -34,8 +34,8 @@ #include "texteditor_global.h" -#include <QtCore/QObject> -#include <QtGui/QTextLayout> +#include <QObject> +#include <QTextLayout> QT_BEGIN_NAMESPACE class QTextDocument; diff --git a/src/plugins/texteditor/tabsettings.cpp b/src/plugins/texteditor/tabsettings.cpp index 8a9efb06e8..e3f82bd5f0 100644 --- a/src/plugins/texteditor/tabsettings.cpp +++ b/src/plugins/texteditor/tabsettings.cpp @@ -34,11 +34,11 @@ #include <utils/settingsutils.h> -#include <QtCore/QDebug> -#include <QtCore/QSettings> -#include <QtCore/QString> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> +#include <QDebug> +#include <QSettings> +#include <QString> +#include <QTextCursor> +#include <QTextDocument> static const char spacesForTabsKey[] = "SpacesForTabs"; static const char autoSpacesForTabsKey[] = "AutoSpacesForTabs"; diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index a22c50bfa9..d12af6804e 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> -#include <QtGui/QTextBlock> +#include <QVariant> +#include <QTextBlock> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/tabsettingswidget.cpp b/src/plugins/texteditor/tabsettingswidget.cpp index 0033465062..c88e136818 100644 --- a/src/plugins/texteditor/tabsettingswidget.cpp +++ b/src/plugins/texteditor/tabsettingswidget.cpp @@ -34,7 +34,7 @@ #include "ui_tabsettingswidget.h" #include "tabsettings.h" -#include <QtCore/QTextStream> +#include <QTextStream> namespace TextEditor { diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h index 46fe8d4ba5..d2eaaecd45 100644 --- a/src/plugins/texteditor/tabsettingswidget.h +++ b/src/plugins/texteditor/tabsettingswidget.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtGui/QWidget> +#include <QWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/texteditor_global.h b/src/plugins/texteditor/texteditor_global.h index 607f71cccd..b7950b8b2b 100644 --- a/src/plugins/texteditor/texteditor_global.h +++ b/src/plugins/texteditor/texteditor_global.h @@ -33,7 +33,7 @@ #ifndef TEXTEDITOR_GLOBAL_H #define TEXTEDITOR_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(TEXTEDITOR_LIBRARY) # define TEXTEDITOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 17d180c2c0..0e20f1901f 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -48,10 +48,10 @@ #include <coreplugin/id.h> #include <utils/qtcassert.h> -#include <QtCore/QSet> -#include <QtCore/QtDebug> -#include <QtGui/QAction> -#include <QtGui/QTextCursor> +#include <QSet> +#include <QtDebug> +#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 70ff79237a..f94b384267 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/src/plugins/texteditor/texteditoractionhandler.h @@ -38,9 +38,9 @@ #include <coreplugin/icontext.h> #include <coreplugin/id.h> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QList> +#include <QObject> +#include <QPointer> +#include <QList> QT_FORWARD_DECLARE_CLASS(QAction) diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index 0f26a6f783..86108f84a5 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -33,7 +33,7 @@ #ifndef TEXTEDITORCONSTANTS_H #define TEXTEDITORCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace TextEditor { namespace Constants { diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index 7b39b36df4..cce4908b12 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -34,8 +34,8 @@ #include "texteditorconstants.h" -#include <QtCore/QCoreApplication> -#include <QtGui/QIcon> +#include <QCoreApplication> +#include <QIcon> using namespace TextEditor; diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index 0fd564f6bd..8833dd4b32 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -33,10 +33,10 @@ #include "texteditoroverlay.h" #include "basetexteditor.h" -#include <QtCore/QDebug> -#include <QtCore/QMap> -#include <QtGui/QPainter> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QMap> +#include <QPainter> +#include <QTextBlock> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/texteditoroverlay.h b/src/plugins/texteditor/texteditoroverlay.h index 7dd8c1ddc9..c4a4d9904b 100644 --- a/src/plugins/texteditor/texteditoroverlay.h +++ b/src/plugins/texteditor/texteditoroverlay.h @@ -33,11 +33,11 @@ #ifndef TEXTEDITOROVERLAY_H #define TEXTEDITOROVERLAY_H -#include <QtCore/QObject> -#include <QtCore/QList> -#include <QtCore/QVector> -#include <QtGui/QTextCursor> -#include <QtGui/QColor> +#include <QObject> +#include <QList> +#include <QVector> +#include <QTextCursor> +#include <QColor> QT_FORWARD_DECLARE_CLASS(QWidget) diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index fd915e80b0..d10a75d65f 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -62,9 +62,9 @@ #include <find/searchresultwindow.h> #include <utils/qtcassert.h> -#include <QtCore/QtPlugin> -#include <QtGui/QMainWindow> -#include <QtGui/QShortcut> +#include <QtPlugin> +#include <QMainWindow> +#include <QShortcut> using namespace TextEditor; using namespace TextEditor::Internal; diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index bc4d9cd475..717a3f267e 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -54,7 +54,7 @@ #include <coreplugin/icore.h> #include <utils/qtcassert.h> -#include <QtGui/QApplication> +#include <QApplication> using namespace TextEditor; using namespace TextEditor::Constants; diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h index e8915838d4..b0ba7be733 100644 --- a/src/plugins/texteditor/texteditorsettings.h +++ b/src/plugins/texteditor/texteditorsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QObject> +#include <QObject> QT_BEGIN_NAMESPACE template <class Key, class T> diff --git a/src/plugins/texteditor/textfilewizard.cpp b/src/plugins/texteditor/textfilewizard.cpp index 88d6aba2f9..12d7b91d1b 100644 --- a/src/plugins/texteditor/textfilewizard.cpp +++ b/src/plugins/texteditor/textfilewizard.cpp @@ -33,7 +33,7 @@ #include "textfilewizard.h" #include "basetexteditor.h" #include "texteditorconstants.h" -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; diff --git a/src/plugins/texteditor/tooltip/effects.h b/src/plugins/texteditor/tooltip/effects.h index f5083a646d..300aceb5e7 100644 --- a/src/plugins/texteditor/tooltip/effects.h +++ b/src/plugins/texteditor/tooltip/effects.h @@ -33,7 +33,7 @@ #ifndef EFFECTS_H #define EFFECTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> // This is a copy of a Qt private header. Please read comments in tooltip.h. diff --git a/src/plugins/texteditor/tooltip/reuse.h b/src/plugins/texteditor/tooltip/reuse.h index 7c590f2c50..b19a77f4ca 100644 --- a/src/plugins/texteditor/tooltip/reuse.h +++ b/src/plugins/texteditor/tooltip/reuse.h @@ -33,11 +33,11 @@ #ifndef TOOLTIPREUSE_H #define TOOLTIPREUSE_H -#include <QtCore/QPoint> -#include <QtCore/QRect> -#include <QtGui/QWidget> -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> +#include <QPoint> +#include <QRect> +#include <QWidget> +#include <QApplication> +#include <QDesktopWidget> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/tooltip/tipcontents.cpp b/src/plugins/texteditor/tooltip/tipcontents.cpp index aeaa7c7cb2..0b047a9b65 100644 --- a/src/plugins/texteditor/tooltip/tipcontents.cpp +++ b/src/plugins/texteditor/tooltip/tipcontents.cpp @@ -36,7 +36,7 @@ #include <utils/qtcassert.h> -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace TextEditor { diff --git a/src/plugins/texteditor/tooltip/tipcontents.h b/src/plugins/texteditor/tooltip/tipcontents.h index 19b3db96d2..3b9d69a330 100644 --- a/src/plugins/texteditor/tooltip/tipcontents.h +++ b/src/plugins/texteditor/tooltip/tipcontents.h @@ -35,8 +35,8 @@ #include "texteditor/texteditor_global.h" -#include <QtCore/QString> -#include <QtGui/QColor> +#include <QString> +#include <QColor> namespace TextEditor { diff --git a/src/plugins/texteditor/tooltip/tipfactory.cpp b/src/plugins/texteditor/tooltip/tipfactory.cpp index 74e3172b81..78f178a124 100644 --- a/src/plugins/texteditor/tooltip/tipfactory.cpp +++ b/src/plugins/texteditor/tooltip/tipfactory.cpp @@ -35,7 +35,7 @@ #include "tips.h" #include <utils/qtcassert.h> -#include <QtGui/QVBoxLayout> +#include <QVBoxLayout> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/tooltip/tipfactory.h b/src/plugins/texteditor/tooltip/tipfactory.h index 735fb7a3ae..0290dd8ed5 100644 --- a/src/plugins/texteditor/tooltip/tipfactory.h +++ b/src/plugins/texteditor/tooltip/tipfactory.h @@ -33,7 +33,7 @@ #ifndef TIPFACTORY_H #define TIPFACTORY_H -#include <QtGui/QWidget> +#include <QWidget> namespace TextEditor { diff --git a/src/plugins/texteditor/tooltip/tips.cpp b/src/plugins/texteditor/tooltip/tips.cpp index 98c5cb1bbe..cef73cd745 100644 --- a/src/plugins/texteditor/tooltip/tips.cpp +++ b/src/plugins/texteditor/tooltip/tips.cpp @@ -36,19 +36,19 @@ #include <utils/qtcassert.h> -#include <QtCore/QRect> -#include <QtGui/QColor> -#include <QtGui/QPainter> -#include <QtGui/QPen> -#include <QtGui/QPixmap> -#include <QtGui/QStyle> -#include <QtGui/QFontMetrics> -#include <QtGui/QTextDocument> -#include <QtGui/QStylePainter> -#include <QtGui/QStyleOptionFrame> -#include <QtGui/QResizeEvent> -#include <QtGui/QPaintEvent> -#include <QtGui/QVBoxLayout> +#include <QRect> +#include <QColor> +#include <QPainter> +#include <QPen> +#include <QPixmap> +#include <QStyle> +#include <QFontMetrics> +#include <QTextDocument> +#include <QStylePainter> +#include <QStyleOptionFrame> +#include <QResizeEvent> +#include <QPaintEvent> +#include <QVBoxLayout> namespace TextEditor { namespace Internal { diff --git a/src/plugins/texteditor/tooltip/tips.h b/src/plugins/texteditor/tooltip/tips.h index ed22135ae5..1afa669bd6 100644 --- a/src/plugins/texteditor/tooltip/tips.h +++ b/src/plugins/texteditor/tooltip/tips.h @@ -33,9 +33,9 @@ #ifndef TIPS_H #define TIPS_H -#include <QtCore/QSharedPointer> -#include <QtGui/QLabel> -#include <QtGui/QPixmap> +#include <QSharedPointer> +#include <QLabel> +#include <QPixmap> QT_FORWARD_DECLARE_CLASS(QVBoxLayout) diff --git a/src/plugins/texteditor/tooltip/tooltip.cpp b/src/plugins/texteditor/tooltip/tooltip.cpp index ad4ee2750c..bdb2707c9e 100644 --- a/src/plugins/texteditor/tooltip/tooltip.cpp +++ b/src/plugins/texteditor/tooltip/tooltip.cpp @@ -37,14 +37,14 @@ #include "effects.h" #include "reuse.h" -#include <QtCore/QString> -#include <QtGui/QColor> -#include <QtGui/QApplication> -#include <QtGui/QKeyEvent> -#include <QtGui/QMouseEvent> -#include <QtGui/QMenu> +#include <QString> +#include <QColor> +#include <QApplication> +#include <QKeyEvent> +#include <QMouseEvent> +#include <QMenu> -#include <QtCore/QDebug> +#include <QDebug> using namespace TextEditor; using namespace Internal; diff --git a/src/plugins/texteditor/tooltip/tooltip.h b/src/plugins/texteditor/tooltip/tooltip.h index abc7ef83f1..d9f1b3948d 100644 --- a/src/plugins/texteditor/tooltip/tooltip.h +++ b/src/plugins/texteditor/tooltip/tooltip.h @@ -35,11 +35,11 @@ #include "texteditor/texteditor_global.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QObject> -#include <QtCore/QTimer> -#include <QtCore/QRect> -#include <QtGui/QFont> +#include <QSharedPointer> +#include <QObject> +#include <QTimer> +#include <QRect> +#include <QFont> /* * In its current form QToolTip is not extensible. So this is an attempt to provide a more diff --git a/src/plugins/texteditor/typingsettings.cpp b/src/plugins/texteditor/typingsettings.cpp index d16a292d86..547e8360e3 100644 --- a/src/plugins/texteditor/typingsettings.cpp +++ b/src/plugins/texteditor/typingsettings.cpp @@ -33,8 +33,8 @@ #include "typingsettings.h" #include <utils/settingsutils.h> -#include <QtGui/QTextCursor> -#include <QtGui/QTextDocument> +#include <QTextCursor> +#include <QTextDocument> static const char autoIndentKey[] = "AutoIndent"; static const char tabKeyBehaviorKey[] = "TabKeyBehavior"; diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h index ca93380209..2280e4e459 100644 --- a/src/plugins/texteditor/typingsettings.h +++ b/src/plugins/texteditor/typingsettings.h @@ -35,8 +35,8 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> -#include <QtGui/QTextBlock> +#include <QVariant> +#include <QTextBlock> QT_BEGIN_NAMESPACE class QSettings; |