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/tools | |
parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
download | qt-creator-3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8.tar.gz |
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/tools')
-rw-r--r-- | src/tools/examplesscanner/helpextractor.cpp | 2 | ||||
-rw-r--r-- | src/tools/qmlprofilertool/commandlistener.h | 2 | ||||
-rw-r--r-- | src/tools/qmlprofilertool/qmlprofilerapplication.cpp | 14 | ||||
-rw-r--r-- | src/tools/qmlprofilertool/qmlprofilerapplication.h | 6 | ||||
-rw-r--r-- | src/tools/qtcdebugger/main.cpp | 22 | ||||
-rw-r--r-- | src/tools/qtcreatorwidgets/customwidget.h | 8 | ||||
-rw-r--r-- | src/tools/qtcreatorwidgets/customwidgets.cpp | 8 | ||||
-rw-r--r-- | src/tools/qtcreatorwidgets/customwidgets.h | 10 | ||||
-rw-r--r-- | src/tools/screenshotcropper/cropimageview.cpp | 4 | ||||
-rw-r--r-- | src/tools/screenshotcropper/main.cpp | 2 | ||||
-rw-r--r-- | src/tools/screenshotcropper/screenshotcropperwindow.cpp | 4 |
11 files changed, 41 insertions, 41 deletions
diff --git a/src/tools/examplesscanner/helpextractor.cpp b/src/tools/examplesscanner/helpextractor.cpp index 904f59aa0a..39bcb1364d 100644 --- a/src/tools/examplesscanner/helpextractor.cpp +++ b/src/tools/examplesscanner/helpextractor.cpp @@ -32,7 +32,7 @@ #include "helpextractor.h" -#include <QtGui> +#include <QtWidgets> #include <QDebug> HelpExtractor::HelpExtractor() diff --git a/src/tools/qmlprofilertool/commandlistener.h b/src/tools/qmlprofilertool/commandlistener.h index 1902da8ae4..4b8df747ff 100644 --- a/src/tools/qmlprofilertool/commandlistener.h +++ b/src/tools/qmlprofilertool/commandlistener.h @@ -33,7 +33,7 @@ #ifndef COMMANDLISTENER_H #define COMMANDLISTENER_H -#include <QtCore/QThread> +#include <QThread> class CommandListener : public QThread { diff --git a/src/tools/qmlprofilertool/qmlprofilerapplication.cpp b/src/tools/qmlprofilertool/qmlprofilerapplication.cpp index fd286dddb4..c60592981b 100644 --- a/src/tools/qmlprofilertool/qmlprofilerapplication.cpp +++ b/src/tools/qmlprofilertool/qmlprofilerapplication.cpp @@ -33,13 +33,13 @@ #include "qmlprofilerapplication.h" #include "constants.h" #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> -#include <QtCore/QProcess> -#include <QtCore/QTimer> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QStringList> +#include <QTextStream> +#include <QProcess> +#include <QTimer> +#include <QDateTime> +#include <QFileInfo> +#include <QDebug> using namespace QmlJsDebugClient; diff --git a/src/tools/qmlprofilertool/qmlprofilerapplication.h b/src/tools/qmlprofilertool/qmlprofilerapplication.h index 9c06734cbb..9414895631 100644 --- a/src/tools/qmlprofilertool/qmlprofilerapplication.h +++ b/src/tools/qmlprofilertool/qmlprofilerapplication.h @@ -33,9 +33,9 @@ #ifndef QMLPROFILERAPPLICATION_H #define QMLPROFILERAPPLICATION_H -#include <QtCore/QCoreApplication> -#include <QtCore/QStringList> -#include <QtCore/QTimer> +#include <QCoreApplication> +#include <QStringList> +#include <QTimer> #include <qdeclarativedebugclient.h> #include <qmlprofilertraceclient.h> diff --git a/src/tools/qtcdebugger/main.cpp b/src/tools/qtcdebugger/main.cpp index 4090f8a044..7259721bab 100644 --- a/src/tools/qtcdebugger/main.cpp +++ b/src/tools/qtcdebugger/main.cpp @@ -36,17 +36,17 @@ * See usage() on how to install/use. * Installs itself in the bin directory of Qt Creator. */ -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QFileInfo> -#include <QtCore/QByteArray> -#include <QtCore/QString> -#include <QtCore/QDir> -#include <QtCore/QTime> -#include <QtCore/QProcess> -#include <QtGui/QPushButton> +#include <QApplication> +#include <QMessageBox> +#include <QDebug> +#include <QTextStream> +#include <QFileInfo> +#include <QByteArray> +#include <QString> +#include <QDir> +#include <QTime> +#include <QProcess> +#include <QPushButton> #include "registryaccess.h" diff --git a/src/tools/qtcreatorwidgets/customwidget.h b/src/tools/qtcreatorwidgets/customwidget.h index 58f3c28afd..4a6cd8a9a8 100644 --- a/src/tools/qtcreatorwidgets/customwidget.h +++ b/src/tools/qtcreatorwidgets/customwidget.h @@ -35,10 +35,10 @@ #include <QDesignerCustomWidgetInterface> -#include <QtCore/QString> -#include <QtCore/QSize> -#include <QtCore/QTextStream> -#include <QtGui/QIcon> +#include <QString> +#include <QSize> +#include <QTextStream> +#include <QIcon> // Parametrizable Template for custom widgets. diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp index d62fe9a3a5..2e8efe4c25 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.cpp +++ b/src/tools/qtcreatorwidgets/customwidgets.cpp @@ -32,10 +32,10 @@ #include "customwidgets.h" -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtDesigner/QExtensionManager> -#include <QtDesigner/QDesignerFormEditorInterface> +#include <QMenu> +#include <QAction> +#include <QExtensionManager> +#include <QDesignerFormEditorInterface> static const char groupC[] = "QtCreator"; diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index d0c497695b..9cca30074d 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -52,12 +52,12 @@ #include <utils/wizard.h> #include <utils/crumblepath.h> -#include <QtDesigner/QDesignerCustomWidgetCollectionInterface> -#include <QtDesigner/QDesignerContainerExtension> -#include <QtDesigner/QExtensionFactory> +#include <QDesignerCustomWidgetCollectionInterface> +#include <QDesignerContainerExtension> +#include <QExtensionFactory> -#include <QtCore/qplugin.h> -#include <QtCore/QList> +#include <qplugin.h> +#include <QList> QT_BEGIN_NAMESPACE class QExtensionManager; diff --git a/src/tools/screenshotcropper/cropimageview.cpp b/src/tools/screenshotcropper/cropimageview.cpp index 9473825d53..ac453a50db 100644 --- a/src/tools/screenshotcropper/cropimageview.cpp +++ b/src/tools/screenshotcropper/cropimageview.cpp @@ -1,6 +1,6 @@ #include "cropimageview.h" -#include <QtGui/QPainter> -#include <QtGui/QMouseEvent> +#include <QPainter> +#include <QMouseEvent> CropImageView::CropImageView(QWidget *parent) : QWidget(parent) diff --git a/src/tools/screenshotcropper/main.cpp b/src/tools/screenshotcropper/main.cpp index cf1a1dc743..1bfbb1bc7a 100644 --- a/src/tools/screenshotcropper/main.cpp +++ b/src/tools/screenshotcropper/main.cpp @@ -1,4 +1,4 @@ -#include <QtGui> +#include <QtWidgets> #include "screenshotcropperwindow.h" using namespace QtSupport::Internal; diff --git a/src/tools/screenshotcropper/screenshotcropperwindow.cpp b/src/tools/screenshotcropper/screenshotcropperwindow.cpp index 524b5f00dc..cd946e48c6 100644 --- a/src/tools/screenshotcropper/screenshotcropperwindow.cpp +++ b/src/tools/screenshotcropper/screenshotcropperwindow.cpp @@ -1,7 +1,7 @@ #include "screenshotcropperwindow.h" #include "ui_screenshotcropperwindow.h" -#include <QtGui/QListWidget> -#include <QtCore/QDebug> +#include <QListWidget> +#include <QDebug> using namespace QtSupport::Internal; |