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/qmljsinspector | |
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/plugins/qmljsinspector')
20 files changed, 81 insertions, 81 deletions
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp index 7995a2256a..418de0119f 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp +++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp @@ -43,8 +43,8 @@ #include <utils/qtcassert.h> #include <projectexplorer/project.h> -#include <QtCore/QUrl> -#include <QtNetwork/QAbstractSocket> +#include <QUrl> +#include <QAbstractSocket> using namespace QmlJSInspector::Internal; diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h index ab5f841909..2824e3cc2d 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.h +++ b/src/plugins/qmljsinspector/qmljsclientproxy.h @@ -34,7 +34,7 @@ #include "qmljsinspectorplugin.h" #include "qmljsprivateapi.h" -#include <QtCore/QObject> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QUrl) diff --git a/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp b/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp index 2f946cdda5..d12e1682e2 100644 --- a/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp +++ b/src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "qmljscontextcrumblepath.h" -#include <QtGui/QMouseEvent> -#include <QtCore/QDebug> +#include <QMouseEvent> +#include <QDebug> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljscontextcrumblepath.h b/src/plugins/qmljsinspector/qmljscontextcrumblepath.h index 4f98165b36..321425c5e8 100644 --- a/src/plugins/qmljsinspector/qmljscontextcrumblepath.h +++ b/src/plugins/qmljsinspector/qmljscontextcrumblepath.h @@ -33,7 +33,7 @@ #define QMLJSCONTEXTCRUMBLEPATH_H #include <utils/crumblepath.h> -#include <QtCore/QStringList> +#include <QStringList> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index ebe3cb2076..8a9912c494 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -86,26 +86,26 @@ #include <extensionsystem/pluginmanager.h> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QTimer> -#include <QtCore/QtPlugin> -#include <QtCore/QDateTime> - -#include <QtGui/QLabel> -#include <QtGui/QDockWidget> -#include <QtGui/QVBoxLayout> -#include <QtGui/QAction> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> -#include <QtGui/QPainter> -#include <QtGui/QSpinBox> -#include <QtGui/QMessageBox> -#include <QtGui/QTextBlock> - -#include <QtGui/QToolTip> -#include <QtGui/QCursor> -#include <QtNetwork/QHostAddress> +#include <QDebug> +#include <QStringList> +#include <QTimer> +#include <QtPlugin> +#include <QDateTime> + +#include <QLabel> +#include <QDockWidget> +#include <QVBoxLayout> +#include <QAction> +#include <QLineEdit> +#include <QLabel> +#include <QPainter> +#include <QSpinBox> +#include <QMessageBox> +#include <QTextBlock> + +#include <QToolTip> +#include <QCursor> +#include <QHostAddress> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h index 477d331065..6a9544f55a 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.h +++ b/src/plugins/qmljsinspector/qmljsinspector.h @@ -41,8 +41,8 @@ #include <qmljs/qmljsdocument.h> #include <qmljs/parser/qmljsastfwd_p.h> -#include <QtGui/QAction> -#include <QtCore/QObject> +#include <QAction> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QLineEdit) diff --git a/src/plugins/qmljsinspector/qmljsinspector_global.h b/src/plugins/qmljsinspector/qmljsinspector_global.h index 630e2c35a3..897c08f7fd 100644 --- a/src/plugins/qmljsinspector/qmljsinspector_global.h +++ b/src/plugins/qmljsinspector/qmljsinspector_global.h @@ -32,7 +32,7 @@ #ifndef QMLINSPECTOR_GLOBAL_H #define QMLINSPECTOR_GLOBAL_H -#include <QtCore/QtGlobal> +#include <QtGlobal> #if defined(QMLJSINSPECTOR_LIBRARY) # define QMLINSPECTOR_EXPORT Q_DECL_EXPORT diff --git a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp b/src/plugins/qmljsinspector/qmljsinspectorclient.cpp index bba7ffe607..d4bf615c8c 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorclient.cpp @@ -33,7 +33,7 @@ #include "qmljsclientproxy.h" #include "qmljsinspectorconstants.h" -#include <QtGui/QColor> +#include <QColor> using namespace QmlJSDebugger; diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp index 386e66109f..8378c1b300 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.cpp @@ -49,14 +49,14 @@ #include <qmlprojectmanager/qmlproject.h> #include <utils/qtcassert.h> -#include <QtCore/QStringList> -#include <QtCore/QtPlugin> -#include <QtCore/QTimer> +#include <QStringList> +#include <QtPlugin> +#include <QTimer> -#include <QtGui/QHBoxLayout> -#include <QtGui/QToolButton> +#include <QHBoxLayout> +#include <QToolButton> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJSInspector::Internal; using namespace QmlJSInspector::Constants; diff --git a/src/plugins/qmljsinspector/qmljsinspectorplugin.h b/src/plugins/qmljsinspector/qmljsinspectorplugin.h index 3b1c875215..34bedf6d65 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorplugin.h +++ b/src/plugins/qmljsinspector/qmljsinspectorplugin.h @@ -35,9 +35,9 @@ #include <extensionsystem/iplugin.h> #include <qmljs/qmljsmodelmanagerinterface.h> -#include <QtCore/QObject> -#include <QtCore/QPointer> -#include <QtCore/QTimer> +#include <QObject> +#include <QPointer> +#include <QTimer> namespace Core { class IMode; diff --git a/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp b/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp index a10d456eb2..ac9a8bf90b 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorsettings.cpp @@ -32,7 +32,7 @@ #include "qmljsinspectorsettings.h" #include "qmljsinspectorconstants.h" -#include <QtCore/QSettings> +#include <QSettings> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspectorsettings.h b/src/plugins/qmljsinspector/qmljsinspectorsettings.h index fcfb09e4af..1eb5ffdec2 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorsettings.h +++ b/src/plugins/qmljsinspector/qmljsinspectorsettings.h @@ -33,7 +33,7 @@ #ifndef INSPECTORSETTINGS_H #define INSPECTORSETTINGS_H -#include <QtCore/QObject> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QSettings) diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp index ec64ca80fa..88a015adf2 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp @@ -47,12 +47,12 @@ #include <utils/styledbar.h> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMenu> -#include <QtGui/QToolButton> -#include <QtGui/QLineEdit> +#include <QAction> +#include <QActionGroup> +#include <QHBoxLayout> +#include <QMenu> +#include <QToolButton> +#include <QLineEdit> namespace QmlJSInspector { namespace Internal { diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.h b/src/plugins/qmljsinspector/qmljsinspectortoolbar.h index f2cee71794..b533c38de6 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.h +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.h @@ -35,8 +35,8 @@ #include <debugger/debuggerconstants.h> -#include <QtCore/QObject> -#include <QtGui/QIcon> +#include <QObject> +#include <QIcon> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp index 6c33fadcb7..dee2e8a435 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.cpp +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.cpp @@ -54,7 +54,7 @@ #include <debugger/debuggerconstants.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace QmlJS; using namespace QmlJS::AST; diff --git a/src/plugins/qmljsinspector/qmljslivetextpreview.h b/src/plugins/qmljsinspector/qmljslivetextpreview.h index fe2d1b1cd7..661b2d0e77 100644 --- a/src/plugins/qmljsinspector/qmljslivetextpreview.h +++ b/src/plugins/qmljsinspector/qmljslivetextpreview.h @@ -33,8 +33,8 @@ #ifndef SCRIPTBINDINGREWRITER_H #define SCRIPTBINDINGREWRITER_H -#include <QtCore/QObject> -#include <QtCore/QWeakPointer> +#include <QObject> +#include <QWeakPointer> #include <qmljs/parser/qmljsastfwd_p.h> #include <qmljs/qmljsdocument.h> diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.cpp b/src/plugins/qmljsinspector/qmljspropertyinspector.cpp index 58c9d0fca5..4ee78abf2a 100644 --- a/src/plugins/qmljsinspector/qmljspropertyinspector.cpp +++ b/src/plugins/qmljsinspector/qmljspropertyinspector.cpp @@ -31,19 +31,19 @@ **************************************************************************/ #include "qmljspropertyinspector.h" -#include <QtGui/QHeaderView> -#include <QtGui/QItemDelegate> -#include <QtGui/QLineEdit> -#include <QtGui/QDoubleValidator> -#include <QtGui/QPainter> +#include <QHeaderView> +#include <QItemDelegate> +#include <QLineEdit> +#include <QDoubleValidator> +#include <QPainter> // expression editor -#include <QtGui/QContextMenuEvent> -#include <QtGui/QVBoxLayout> +#include <QContextMenuEvent> +#include <QVBoxLayout> // context menu -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QAction> +#include <QMenu> #include <utils/qtcassert.h> diff --git a/src/plugins/qmljsinspector/qmljspropertyinspector.h b/src/plugins/qmljsinspector/qmljspropertyinspector.h index 4cd98b4e2f..31fe1d61b6 100644 --- a/src/plugins/qmljsinspector/qmljspropertyinspector.h +++ b/src/plugins/qmljsinspector/qmljspropertyinspector.h @@ -33,12 +33,12 @@ #define PROPERTYINSPECTOR_H #include <qmljsprivateapi.h> -#include <QtGui/QTreeView> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> +#include <QTreeView> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> -#include <QtGui/QDialog> -#include <QtGui/QDialogButtonBox> +#include <QDialog> +#include <QDialogButtonBox> #include "customcolordialog.h" diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp index 5e7a78b279..b16fa40771 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp @@ -31,18 +31,18 @@ **************************************************************************/ #include "qmljstoolbarcolorbox.h" -#include <QtGui/QPixmap> -#include <QtGui/QPainter> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QColorDialog> -#include <QtGui/QDrag> - -#include <QtCore/QMimeData> -#include <QtCore/QDebug> +#include <QPixmap> +#include <QPainter> +#include <QMenu> +#include <QAction> +#include <QContextMenuEvent> +#include <QClipboard> +#include <QApplication> +#include <QColorDialog> +#include <QDrag> + +#include <QMimeData> +#include <QDebug> namespace QmlJSInspector { diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h index bdc30b65a7..449804d139 100644 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h +++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h @@ -32,9 +32,9 @@ #ifndef TOOLBARCOLORBOX_H #define TOOLBARCOLORBOX_H -#include <QtGui/QLabel> -#include <QtGui/QColor> -#include <QtCore/QPoint> +#include <QLabel> +#include <QColor> +#include <QPoint> QT_FORWARD_DECLARE_CLASS(QContextMenuEvent) QT_FORWARD_DECLARE_CLASS(QAction) |