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/cpaster | |
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/cpaster')
26 files changed, 95 insertions, 95 deletions
diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp index 91b6489411..2d720e872f 100644 --- a/src/plugins/cpaster/codepasterprotocol.cpp +++ b/src/plugins/cpaster/codepasterprotocol.cpp @@ -42,9 +42,9 @@ #include <utils/qtcassert.h> -#include <QtGui/QListWidget> -#include <QtNetwork/QNetworkReply> -#include <QtCore/QDebug> +#include <QListWidget> +#include <QNetworkReply> +#include <QDebug> enum { debug = 0 }; diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp index 2dce06eca8..2ae6d1fbc1 100644 --- a/src/plugins/cpaster/codepastersettings.cpp +++ b/src/plugins/cpaster/codepastersettings.cpp @@ -35,17 +35,17 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> -#include <QtGui/QLineEdit> -#include <QtGui/QFileDialog> -#include <QtGui/QGroupBox> -#include <QtGui/QFormLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QIcon> -#include <QtCore/QDebug> -#include <QtCore/QVariant> +#include <QSettings> +#include <QCoreApplication> +#include <QLineEdit> +#include <QFileDialog> +#include <QGroupBox> +#include <QFormLayout> +#include <QVBoxLayout> +#include <QLabel> +#include <QIcon> +#include <QDebug> +#include <QVariant> static const char settingsGroupC[] = "CodePasterSettings"; static const char serverKeyC[] = "Server"; diff --git a/src/plugins/cpaster/columnindicatortextedit.cpp b/src/plugins/cpaster/columnindicatortextedit.cpp index d5ac629ca1..9af09b002d 100644 --- a/src/plugins/cpaster/columnindicatortextedit.cpp +++ b/src/plugins/cpaster/columnindicatortextedit.cpp @@ -32,8 +32,8 @@ #include "columnindicatortextedit.h" -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> +#include <QPainter> +#include <QScrollBar> namespace CodePaster { diff --git a/src/plugins/cpaster/columnindicatortextedit.h b/src/plugins/cpaster/columnindicatortextedit.h index f89c728d8d..9024bd2379 100644 --- a/src/plugins/cpaster/columnindicatortextedit.h +++ b/src/plugins/cpaster/columnindicatortextedit.h @@ -33,7 +33,7 @@ #ifndef COLUMNINDICATORTEXTEDIT_H #define COLUMNINDICATORTEXTEDIT_H -#include <QtGui/QTextEdit> +#include <QTextEdit> namespace CodePaster { diff --git a/src/plugins/cpaster/cpasterconstants.h b/src/plugins/cpaster/cpasterconstants.h index b8890480d6..798ff73154 100644 --- a/src/plugins/cpaster/cpasterconstants.h +++ b/src/plugins/cpaster/cpasterconstants.h @@ -33,7 +33,7 @@ #ifndef CPASTERCONSTANTS_H #define CPASTERCONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace CodePaster { namespace Constants { diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 8c527d7a7b..360b3574e8 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -56,16 +56,16 @@ #include <utils/fileutils.h> #include <texteditor/basetexteditor.h> -#include <QtCore/QtPlugin> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTemporaryFile> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QClipboard> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> +#include <QtPlugin> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTemporaryFile> +#include <QAction> +#include <QApplication> +#include <QClipboard> +#include <QMenu> +#include <QMainWindow> using namespace Core; using namespace TextEditor; diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h index 065960a1e4..4b50faa91c 100644 --- a/src/plugins/cpaster/cpasterplugin.h +++ b/src/plugins/cpaster/cpasterplugin.h @@ -35,8 +35,8 @@ #include <extensionsystem/iplugin.h> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> +#include <QStringList> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/cpaster/fileshareprotocol.cpp b/src/plugins/cpaster/fileshareprotocol.cpp index 92985ac6f0..376559041f 100644 --- a/src/plugins/cpaster/fileshareprotocol.cpp +++ b/src/plugins/cpaster/fileshareprotocol.cpp @@ -40,12 +40,12 @@ #include <utils/qtcassert.h> #include <utils/fileutils.h> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttribute> -#include <QtCore/QTemporaryFile> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QXmlStreamReader> +#include <QXmlStreamAttribute> +#include <QTemporaryFile> +#include <QDir> +#include <QFileInfo> +#include <QDebug> enum { debug = 0 }; diff --git a/src/plugins/cpaster/fileshareprotocol.h b/src/plugins/cpaster/fileshareprotocol.h index 82a99832f0..3fb32973fa 100644 --- a/src/plugins/cpaster/fileshareprotocol.h +++ b/src/plugins/cpaster/fileshareprotocol.h @@ -35,7 +35,7 @@ #include "protocol.h" -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace CodePaster { diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp index 68e752979c..028ef9387f 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp @@ -35,9 +35,9 @@ #include <coreplugin/icore.h> -#include <QtCore/QDir> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> +#include <QDir> +#include <QSettings> +#include <QCoreApplication> static const char settingsGroupC[] = "FileSharePasterSettings"; static const char pathKeyC[] = "Path"; diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.h b/src/plugins/cpaster/fileshareprotocolsettingspage.h index 35ba8fd0f1..cccd85acb6 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.h +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.h @@ -36,9 +36,9 @@ #include <coreplugin/dialogs/ioptionspage.h> #include "ui_fileshareprotocolsettingswidget.h" -#include <QtCore/QSharedPointer> -#include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QSharedPointer> +#include <QPointer> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpaster/kdepasteprotocol.cpp b/src/plugins/cpaster/kdepasteprotocol.cpp index b24efe3b55..00ac696025 100644 --- a/src/plugins/cpaster/kdepasteprotocol.cpp +++ b/src/plugins/cpaster/kdepasteprotocol.cpp @@ -34,13 +34,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QByteArray> -#include <QtCore/QStringList> +#include <QDebug> +#include <QTextStream> +#include <QXmlStreamReader> +#include <QByteArray> +#include <QStringList> -#include <QtNetwork/QNetworkReply> +#include <QNetworkReply> enum { debug = 0 }; diff --git a/src/plugins/cpaster/pastebindotcaprotocol.cpp b/src/plugins/cpaster/pastebindotcaprotocol.cpp index af8da970e8..650aed03e1 100644 --- a/src/plugins/cpaster/pastebindotcaprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcaprotocol.cpp @@ -34,10 +34,10 @@ #include <utils/qtcassert.h> -#include <QtNetwork/QNetworkReply> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QStringList> +#include <QNetworkReply> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QStringList> static const char urlC[] = "http://pastebin.ca/"; diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index 1df4ca28e0..6edaa7c69b 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -37,13 +37,13 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamAttributes> -#include <QtCore/QByteArray> +#include <QDebug> +#include <QTextStream> +#include <QXmlStreamReader> +#include <QXmlStreamAttributes> +#include <QByteArray> -#include <QtNetwork/QNetworkReply> +#include <QNetworkReply> enum { debug = 0 }; diff --git a/src/plugins/cpaster/pastebindotcomsettings.cpp b/src/plugins/cpaster/pastebindotcomsettings.cpp index d2205059a5..f3d47bb782 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.cpp +++ b/src/plugins/cpaster/pastebindotcomsettings.cpp @@ -35,8 +35,8 @@ #include "ui_pastebindotcomsettings.h" #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QCoreApplication> +#include <QSettings> +#include <QCoreApplication> static const char groupC[] = "PasteBinDotComSettings"; static const char prefixKeyC[] = "Prefix"; diff --git a/src/plugins/cpaster/pastebindotcomsettings.h b/src/plugins/cpaster/pastebindotcomsettings.h index 04059f5f62..c66574f4ed 100644 --- a/src/plugins/cpaster/pastebindotcomsettings.h +++ b/src/plugins/cpaster/pastebindotcomsettings.h @@ -35,9 +35,9 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QStringList> -#include <QtCore/QUrl> -#include <QtGui/QWidget> +#include <QStringList> +#include <QUrl> +#include <QWidget> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpaster/pasteselectdialog.cpp b/src/plugins/cpaster/pasteselectdialog.cpp index 0a5a7a67dd..07df5dd911 100644 --- a/src/plugins/cpaster/pasteselectdialog.cpp +++ b/src/plugins/cpaster/pasteselectdialog.cpp @@ -35,8 +35,8 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QPushButton> namespace CodePaster { diff --git a/src/plugins/cpaster/pasteselectdialog.h b/src/plugins/cpaster/pasteselectdialog.h index f3ba197f74..5492d7b2be 100644 --- a/src/plugins/cpaster/pasteselectdialog.h +++ b/src/plugins/cpaster/pasteselectdialog.h @@ -35,7 +35,7 @@ #include "ui_pasteselect.h" -#include <QtCore/QList> +#include <QList> QT_FORWARD_DECLARE_CLASS(QPushButton) diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp index d05aa34320..524b3d7f8a 100644 --- a/src/plugins/cpaster/pasteview.cpp +++ b/src/plugins/cpaster/pasteview.cpp @@ -35,12 +35,12 @@ #include <coreplugin/icore.h> -#include <QtGui/QFontMetrics> -#include <QtGui/QPainter> -#include <QtGui/QScrollBar> -#include <QtGui/QPushButton> -#include <QtCore/QSettings> -#include <QtCore/QByteArray> +#include <QFontMetrics> +#include <QPainter> +#include <QScrollBar> +#include <QPushButton> +#include <QSettings> +#include <QByteArray> static const char groupC[] = "CPaster"; static const char heightKeyC[] = "PasteViewHeight"; diff --git a/src/plugins/cpaster/pasteview.h b/src/plugins/cpaster/pasteview.h index 1f4b971496..d2ced6e1ad 100644 --- a/src/plugins/cpaster/pasteview.h +++ b/src/plugins/cpaster/pasteview.h @@ -36,7 +36,7 @@ #include "ui_pasteview.h" #include "splitter.h" -#include <QtGui/QDialog> +#include <QDialog> namespace CodePaster { class Protocol; diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp index eabe6c5354..462cf4c8ce 100644 --- a/src/plugins/cpaster/protocol.cpp +++ b/src/plugins/cpaster/protocol.cpp @@ -38,17 +38,17 @@ #include <coreplugin/icore.h> #include <coreplugin/dialogs/ioptionspage.h> -#include <QtNetwork/QNetworkRequest> -#include <QtNetwork/QNetworkReply> +#include <QNetworkRequest> +#include <QNetworkReply> -#include <QtCore/QUrl> -#include <QtCore/QDebug> -#include <QtCore/QVariant> +#include <QUrl> +#include <QDebug> +#include <QVariant> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> -#include <QtGui/QMainWindow> -#include <QtGui/QPushButton> +#include <QMessageBox> +#include <QApplication> +#include <QMainWindow> +#include <QPushButton> namespace CodePaster { diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h index c0a491224f..b01776fbe6 100644 --- a/src/plugins/cpaster/protocol.h +++ b/src/plugins/cpaster/protocol.h @@ -33,9 +33,9 @@ #ifndef PROTOCOL_H #define PROTOCOL_H -#include <QtCore/QObject> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> +#include <QObject> +#include <QScopedPointer> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QNetworkAccessManager; diff --git a/src/plugins/cpaster/settings.cpp b/src/plugins/cpaster/settings.cpp index 9573279022..3830ccf38a 100644 --- a/src/plugins/cpaster/settings.cpp +++ b/src/plugins/cpaster/settings.cpp @@ -33,8 +33,8 @@ #include "settings.h" #include "pastebindotcomprotocol.h" -#include <QtCore/QVariant> -#include <QtCore/QSettings> +#include <QVariant> +#include <QSettings> static const char groupC[] = "CodePaster"; static const char userNameKeyC[] = "UserName"; diff --git a/src/plugins/cpaster/settings.h b/src/plugins/cpaster/settings.h index 0e9de809cb..151d89e0bd 100644 --- a/src/plugins/cpaster/settings.h +++ b/src/plugins/cpaster/settings.h @@ -33,7 +33,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index 9409e3bcf1..d20ad35a79 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -37,9 +37,9 @@ #include <utils/qtcassert.h> #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtCore/QTextStream> -#include <QtCore/QCoreApplication> +#include <QSettings> +#include <QTextStream> +#include <QCoreApplication> namespace CodePaster { diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index a42bd3703a..7746056f7b 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -37,9 +37,9 @@ #include <coreplugin/dialogs/ioptionspage.h> -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QPointer> +#include <QStringList> +#include <QSharedPointer> +#include <QPointer> namespace CodePaster { |