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/generichighlighter | |
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/generichighlighter')
27 files changed, 113 insertions, 113 deletions
diff --git a/src/plugins/texteditor/generichighlighter/context.h b/src/plugins/texteditor/generichighlighter/context.h index b0ddd4b130d..3d5a082354c 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 f2ece94de14..e5b3bb8da21 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 59056eee10a..d387bfb1135 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 c8c01d8e521..043e2c0eed2 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 9d671d8c1ee..029eaa7e5b0 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 da38842a7a8..cc123bcf209 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 2369be3022d..fa771cf0e6a 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 bde7a9e5dca..055dc6eb019 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 d8ad3ea29c9..155948f1839 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 4d80f5d5b49..e4e3299e5fc 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 7dc71e66761..d656ab424aa 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 fef2de2a7bb..9bc3c1229a6 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 8f9baf8cb7e..71f654da7f4 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 995e0e000c7..e094b359747 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 6e8ada08361..a7f1beab162 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 f841debfbfd..f7c146992fc 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 401ccffadc6..87226c2036b 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 f6710273e86..67f25d86b92 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 920461807d0..fe6eed4b85c 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 214a0e142e9..b5a84de2e99 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 db0bd46b9ad..594678ff384 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 eae964b3323..7ba53a6c6bf 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 344831b9505..21775ada5ce 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 505358a0f3a..7fa1eb5caa9 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 f8afd921e0f..b5e7bc5e331 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 7cd53139ba4..500dff2c0bd 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 582bdf13217..392f8ed9df8 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 { |