diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-01-24 12:30:21 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-01-24 12:30:21 +0100 |
commit | e39386352ac02bf0615ba47d0bdea5427e13767a (patch) | |
tree | ebc5b64416714dc29d7260b5aa1c46d5c8a82e65 | |
parent | edb48935475afa5753226593b5883a0d4c62d05c (diff) |
Header cleanup in share/qtcreator/qml, specify module name.
37 files changed, 224 insertions, 195 deletions
diff --git a/share/qtcreator/qml/qmldump/main.cpp b/share/qtcreator/qml/qmldump/main.cpp index cf92d1dfce..1a7a3c439f 100644 --- a/share/qtcreator/qml/qmldump/main.cpp +++ b/share/qtcreator/qml/qmldump/main.cpp @@ -1,19 +1,22 @@ -#include <QApplication> -#include <QSet> -#include <QXmlStreamWriter> -#include <QXmlStreamReader> - -#include <QMetaObject> -#include <QMetaProperty> -#include <QPushButton> -#include <QDebug> -#include <iostream> -#include <QtDeclarative> -#include <QtCore/private/qobject_p.h> -#include <QtCore/private/qmetaobject_p.h> +#include <QtDeclarative/QtDeclarative> #include <QtDeclarative/private/qdeclarativemetatype_p.h> #include <QtDeclarative/private/qdeclarativeopenmetaobject_p.h> #include <QtDeclarative/QDeclarativeView> + +#include <QtGui/QApplication> +#include <QtGui/QPushButton> + +#include <QtCore/QSet> +#include <QtCore/QXmlStreamWriter> +#include <QtCore/QXmlStreamReader> +#include <QtCore/QMetaObject> +#include <QtCore/QMetaProperty> +#include <QtCore/QDebug> +#include <QtCore/private/qobject_p.h> +#include <QtCore/private/qmetaobject_p.h> + +#include <iostream> + #ifdef QT_SIMULATOR #include <QtGui/private/qsimulatorconnection_p.h> #endif diff --git a/share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.h b/share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.h index 85e36de122..38651f2de4 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/abstractformeditortool.h @@ -34,9 +34,8 @@ #ifndef ABSTRACTFORMEDITORTOOL_H #define ABSTRACTFORMEDITORTOOL_H -#include <qglobal.h> -#include <QList> -#include <QObject> +#include <QtCore/QList> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE class QMouseEvent; diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp index 1c62c84f61..3961957421 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.cpp @@ -35,11 +35,11 @@ #include "qdeclarativeviewobserver.h" #include "qmlobserverconstants.h" -#include <QGraphicsPolygonItem> -#include <QTimer> -#include <QObject> +#include <QtGui/QGraphicsPolygonItem> -#include <QDebug> +#include <QtCore/QTimer> +#include <QtCore/QObject> +#include <QtCore/QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h index 958567dc49..8ce7a6d8e3 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/boundingrecthighlighter.h @@ -34,16 +34,16 @@ #ifndef BOUNDINGRECTHIGHLIGHTER_H #define BOUNDINGRECTHIGHLIGHTER_H -#include <QObject> -#include <QWeakPointer> - #include "layeritem.h" -QT_FORWARD_DECLARE_CLASS(QGraphicsItem); -QT_FORWARD_DECLARE_CLASS(QPainter); -QT_FORWARD_DECLARE_CLASS(QWidget); -QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem); -QT_FORWARD_DECLARE_CLASS(QTimer); +#include <QtCore/QObject> +#include <QtCore/QWeakPointer> + +QT_FORWARD_DECLARE_CLASS(QGraphicsItem) +QT_FORWARD_DECLARE_CLASS(QPainter) +QT_FORWARD_DECLARE_CLASS(QWidget) +QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem) +QT_FORWARD_DECLARE_CLASS(QTimer) namespace QmlJSDebugger { @@ -73,7 +73,7 @@ private: void freeBoundingBox(BoundingBox *box); private: - Q_DISABLE_COPY(BoundingRectHighlighter); + Q_DISABLE_COPY(BoundingRectHighlighter) QDeclarativeViewObserver *m_view; QList<BoundingBox* > m_boxes; @@ -96,7 +96,7 @@ public: QGraphicsPolygonItem *highlightPolygonEdge; private: - Q_DISABLE_COPY(BoundingBox); + Q_DISABLE_COPY(BoundingBox) }; diff --git a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp index 6d14b02379..2218762694 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.cpp @@ -34,13 +34,13 @@ #include "colorpickertool.h" #include "qdeclarativeviewobserver.h" -#include <QMouseEvent> -#include <QKeyEvent> -#include <QRectF> -#include <QRgb> -#include <QImage> -#include <QApplication> -#include <QPalette> +#include <QtGui/QMouseEvent> +#include <QtGui/QKeyEvent> +#include <QtCore/QRectF> +#include <QtGui/QRgb> +#include <QtGui/QImage> +#include <QtGui/QApplication> +#include <QtGui/QPalette> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h index 7941f56c33..8ef2e027c4 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/colorpickertool.h @@ -36,9 +36,9 @@ #include "abstractformeditortool.h" -#include <QColor> +#include <QtGui/QColor> -QT_FORWARD_DECLARE_CLASS(QPoint); +QT_FORWARD_DECLARE_CLASS(QPoint) namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/layeritem.h b/share/qtcreator/qml/qmljsdebugger/editor/layeritem.h index 779473b5ff..4b4bf0b60f 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/layeritem.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/layeritem.h @@ -34,8 +34,7 @@ #ifndef LAYERITEM_H #define LAYERITEM_H -#include <QGraphicsObject> -#include <QWeakPointer> +#include <QtGui/QGraphicsObject> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp index 7747f956e0..09f8029dad 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp @@ -31,15 +31,15 @@ ** **************************************************************************/ -#include <QLabel> -#include <QIcon> -#include <QAction> -#include <QMenu> - #include "qmltoolbar.h" #include "toolbarcolorbox.h" -#include <QDebug> +#include <QtGui/QLabel> +#include <QtGui/QIcon> +#include <QtGui/QAction> +#include <QtGui/QMenu> + +#include <QtCore/QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h index 6a1838cd94..b06a812779 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h @@ -34,8 +34,9 @@ #ifndef QMLTOOLBAR_H #define QMLTOOLBAR_H -#include <QToolBar> -#include <QIcon> +#include <QtGui/QToolBar> +#include <QtGui/QIcon> + #include "qmlobserverconstants.h" namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp index 3e7eae7bff..9ca11e008a 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp @@ -34,7 +34,9 @@ #include "rubberbandselectionmanipulator.h" #include "../qdeclarativeviewobserver_p.h" -#include <QDebug> +#include <QtGui/QGraphicsItem> + +#include <QtCore/QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.h index 88e0da2a6a..025c22712b 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/rubberbandselectionmanipulator.h @@ -37,6 +37,10 @@ #include "selectionrectangle.h" +#include <QtCore/QPointF> + +QT_FORWARD_DECLARE_CLASS(QGraphicsItem) + namespace QmlJSDebugger { class QDeclarativeViewObserver; diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp index 0bef762966..6b77ad7d81 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.cpp @@ -35,10 +35,14 @@ #include "../qdeclarativeviewobserver_p.h" #include "qmlobserverconstants.h" -#include <QPen> +#include <QtCore/QDebug> + +#include <QtGui/QGraphicsPolygonItem> +#include <QtGui/QGraphicsObject> +#include <QtGui/QGraphicsScene> +#include <QtGui/QPen> + #include <cmath> -#include <QGraphicsScene> -#include <QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.h b/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.h index e9264c8b18..94316b6e7f 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/selectionindicator.h @@ -34,9 +34,15 @@ #ifndef SELECTIONINDICATOR_H #define SELECTIONINDICATOR_H -#include <QWeakPointer> -#include <QGraphicsPolygonItem> -#include <QGraphicsObject> +#include <QtCore/QWeakPointer> +#include <QtCore/QHash> + +QT_BEGIN_NAMESPACE +class QGraphicsObject; +class QGraphicsPolygonItem; +class QGraphicsItem; +class QPolygonF; +QT_END_NAMESPACE namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp index 73f9e08a8c..b5972bd392 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.cpp @@ -34,11 +34,14 @@ #include "selectionrectangle.h" #include "qmlobserverconstants.h" -#include <QPen> -#include <QGraphicsScene> -#include <QtDebug> +#include <QtGui/QPen> +#include <QtGui/QGraphicsRectItem> +#include <QtGui/QGraphicsObject> +#include <QtGui/QGraphicsScene> + +#include <QtCore/QtDebug> + #include <cmath> -#include <QGraphicsScene> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.h b/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.h index 3d7bc95e92..43b1dc5427 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/selectionrectangle.h @@ -34,9 +34,12 @@ #ifndef SELECTIONRECTANGLE_H #define SELECTIONRECTANGLE_H -#include <QWeakPointer> -#include <QGraphicsRectItem> -#include <QGraphicsObject> +#include <QtCore/QWeakPointer> + +QT_FORWARD_DECLARE_CLASS(QGraphicsObject) +QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem) +QT_FORWARD_DECLARE_CLASS(QPointF) +QT_FORWARD_DECLARE_CLASS(QRectF) namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.cpp index a57d256bc1..78af954b18 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.cpp @@ -34,21 +34,20 @@ #include "selectiontool.h" #include "layeritem.h" -//#include "resizehandleitem.h" #include "../qdeclarativeviewobserver_p.h" -#include <QDeclarativeEngine> +#include <QtGui/QApplication> +#include <QtGui/QWheelEvent> +#include <QtGui/QMouseEvent> +#include <QtGui/QClipboard> +#include <QtGui/QMenu> +#include <QtGui/QAction> +#include <QtGui/QGraphicsObject> -#include <QApplication> -#include <QWheelEvent> -#include <QMouseEvent> -#include <QClipboard> -#include <QMenu> -#include <QAction> -#include <QDeclarativeItem> -#include <QGraphicsObject> +#include <QtDeclarative/QDeclarativeItem> +#include <QtDeclarative/QDeclarativeEngine> -#include <QDebug> +#include <QtCore/QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.h b/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.h index 9bccd2ed03..6f5a5a418a 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/selectiontool.h @@ -40,14 +40,13 @@ #include "singleselectionmanipulator.h" #include "selectionindicator.h" -#include <QHash> -#include <QList> -#include <QTime> -#include <QAction> - -QT_FORWARD_DECLARE_CLASS(QGraphicsItem); -QT_FORWARD_DECLARE_CLASS(QMouseEvent); -QT_FORWARD_DECLARE_CLASS(QKeyEvent); +#include <QtCore/QList> +#include <QtCore/QTime> + +QT_FORWARD_DECLARE_CLASS(QGraphicsItem) +QT_FORWARD_DECLARE_CLASS(QMouseEvent) +QT_FORWARD_DECLARE_CLASS(QKeyEvent) +QT_FORWARD_DECLARE_CLASS(QAction) namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.h b/share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.h index 53b7917f87..46ae285dbe 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/singleselectionmanipulator.h @@ -34,8 +34,8 @@ #ifndef SINGLESELECTIONMANIPULATOR_H #define SINGLESELECTIONMANIPULATOR_H -#include <QPointF> -#include <QList> +#include <QtCore/QPointF> +#include <QtCore/QList> QT_FORWARD_DECLARE_CLASS(QGraphicsItem); diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp index f225c32145..4413f2b498 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.cpp @@ -36,14 +36,13 @@ #include "subcomponentmasklayeritem.h" #include "layeritem.h" -#include <QGraphicsItem> -#include <QGraphicsObject> -#include <QTimer> -#include <QMouseEvent> -#include <QKeyEvent> - -#include <QDebug> +#include <QtGui/QGraphicsItem> +#include <QtGui/QGraphicsObject> +#include <QtGui/QMouseEvent> +#include <QtGui/QKeyEvent> +#include <QtCore/QTimer> +#include <QtCore/QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h index 2a11b97894..8e662aec26 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponenteditortool.h @@ -35,8 +35,8 @@ #define SUBCOMPONENTEDITORTOOL_H #include "abstractformeditortool.h" -#include <QStack> -#include <QStringList> +#include <QtCore/QStack> +#include <QtCore/QStringList> QT_FORWARD_DECLARE_CLASS(QGraphicsObject) QT_FORWARD_DECLARE_CLASS(QPoint) diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp index 4d6cef4e6f..f4cf40fe08 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.cpp @@ -34,7 +34,7 @@ #include "subcomponentmasklayeritem.h" #include "qmlobserverconstants.h" #include "qdeclarativeviewobserver.h" -#include <QPolygonF> +#include <QtGui/QPolygonF> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h index f30d8b085f..e6e8ce0e9a 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/subcomponentmasklayeritem.h @@ -34,7 +34,7 @@ #ifndef SUBCOMPONENTMASKLAYERITEM_H #define SUBCOMPONENTMASKLAYERITEM_H -#include <QGraphicsPolygonItem> +#include <QtGui/QGraphicsPolygonItem> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp index 5f1463f20f..d5ada6cee1 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp @@ -34,18 +34,18 @@ #include "toolbarcolorbox.h" #include "qmlobserverconstants.h" -#include <QPixmap> -#include <QPainter> -#include <QMenu> -#include <QAction> -#include <QContextMenuEvent> -#include <QClipboard> -#include <QApplication> -#include <QColorDialog> -#include <QDrag> -#include <QMimeData> - -#include <QDebug> +#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> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h index e109467bed..ffb6edab7c 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h @@ -34,12 +34,12 @@ #ifndef ToolBarColorBox_H #define ToolBarColorBox_H -#include <QLabel> -#include <QColor> -#include <QPoint> +#include <QtGui/QLabel> +#include <QtGui/QColor> +#include <QtCore/QPoint> -QT_FORWARD_DECLARE_CLASS(QContextMenuEvent); -QT_FORWARD_DECLARE_CLASS(QAction); +QT_FORWARD_DECLARE_CLASS(QContextMenuEvent) +QT_FORWARD_DECLARE_CLASS(QAction) namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp index 5378faf7c7..d5189187f6 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/zoomtool.cpp @@ -34,14 +34,14 @@ #include "zoomtool.h" #include "../qdeclarativeviewobserver_p.h" -#include <QMouseEvent> -#include <QWheelEvent> -#include <QKeyEvent> -#include <QRectF> -#include <QMenu> -#include <QAction> - -#include <QDebug> +#include <QtGui/QMouseEvent> +#include <QtGui/QWheelEvent> +#include <QtGui/QKeyEvent> +#include <QtGui/QMenu> +#include <QtGui/QAction> + +#include <QtCore/QRectF> +#include <QtCore/QDebug> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h index c7b11e675d..5cee7cd23e 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h @@ -46,7 +46,7 @@ #include "qmlobserverconstants.h" #include "qmljsdebugger_global.h" -#include <QHash> +#include <QtCore/QHash> QT_FORWARD_DECLARE_CLASS(QColor) QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h index 7d8bc1032d..ec47235cfd 100644 --- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h +++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h @@ -36,12 +36,14 @@ #include "qmljsdebugger_global.h" #include "qmlobserverconstants.h" -#include <qdeclarativeview.h> -#include <QWeakPointer> -QT_FORWARD_DECLARE_CLASS(QDeclarativeItem); -QT_FORWARD_DECLARE_CLASS(QMouseEvent); -QT_FORWARD_DECLARE_CLASS(QToolBar); +#include <QtDeclarative/QDeclarativeView> + +#include <QtCore/QScopedPointer> + +QT_FORWARD_DECLARE_CLASS(QDeclarativeItem) +QT_FORWARD_DECLARE_CLASS(QMouseEvent) +QT_FORWARD_DECLARE_CLASS(QToolBar) namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp index 849d43cb27..3eb33f5d7d 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp @@ -44,15 +44,15 @@ #include "qt_private/qdeclarativedebughelper_p.h" -#include <QDeclarativeItem> -#include <QDeclarativeEngine> -#include <QDeclarativeContext> -#include <QDeclarativeExpression> -#include <QWidget> -#include <QMouseEvent> -#include <QGraphicsObject> -#include <QApplication> -#include <QAbstractAnimation> +#include <QtDeclarative/QDeclarativeItem> +#include <QtDeclarative/QDeclarativeEngine> +#include <QtDeclarative/QDeclarativeContext> +#include <QtDeclarative/QDeclarativeExpression> +#include <QtGui/QWidget> +#include <QtGui/QMouseEvent> +#include <QtGui/QGraphicsObject> +#include <QtGui/QApplication> +#include <QtCore/QAbstractAnimation> namespace QmlJSDebugger { diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h index 046095eeb8..0cdfecb45e 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h @@ -34,9 +34,8 @@ #ifndef QDECLARATIVEVIEWOBSERVER_P_H #define QDECLARATIVEVIEWOBSERVER_P_H -#include <QWeakPointer> -#include <QPointF> -#include <QTimer> +#include <QtCore/QWeakPointer> +#include <QtCore/QPointF> #include "qdeclarativeviewobserver.h" #include "qdeclarativeobserverservice.h" diff --git a/share/qtcreator/qml/qmlobserver/deviceorientation.h b/share/qtcreator/qml/qmlobserver/deviceorientation.h index a4f9f671dd..1399886497 100644 --- a/share/qtcreator/qml/qmlobserver/deviceorientation.h +++ b/share/qtcreator/qml/qmlobserver/deviceorientation.h @@ -42,7 +42,7 @@ #ifndef ORIENTATION_H #define ORIENTATION_H -#include <QObject> +#include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/share/qtcreator/qml/qmlobserver/loggerwidget.h b/share/qtcreator/qml/qmlobserver/loggerwidget.h index c677d11418..808ff795e4 100644 --- a/share/qtcreator/qml/qmlobserver/loggerwidget.h +++ b/share/qtcreator/qml/qmlobserver/loggerwidget.h @@ -42,8 +42,8 @@ #ifndef LOGGERWIDGET_H #define LOGGERWIDGET_H -#include <QMainWindow> -#include <QMetaType> +#include <QtGui/QMainWindow> +#include <QtCore/QMetaType> QT_BEGIN_NAMESPACE diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.cpp b/share/qtcreator/qml/qmlobserver/proxysettings.cpp index c4dc087263..fb64c42c7f 100644 --- a/share/qtcreator/qml/qmlobserver/proxysettings.cpp +++ b/share/qtcreator/qml/qmlobserver/proxysettings.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ -#include <QIntValidator> -#include <QSettings> +#include <QtGui/QIntValidator> +#include <QtCore/QSettings> #include "proxysettings.h" diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.h b/share/qtcreator/qml/qmlobserver/proxysettings.h index 5f5bb00e43..4a2fcb9afb 100644 --- a/share/qtcreator/qml/qmlobserver/proxysettings.h +++ b/share/qtcreator/qml/qmlobserver/proxysettings.h @@ -42,8 +42,8 @@ #ifndef PROXYSETTINGS_H #define PROXYSETTINGS_H -#include <QDialog> -#include <QNetworkProxy> +#include <QtGui/QDialog> +#include <QtNetwork/QNetworkProxy> #ifdef Q_WS_MAEMO_5 #include "ui_proxysettings_maemo5.h" #else diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp index e515b649f8..fe3ff4b465 100644 --- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp +++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.cpp @@ -40,14 +40,15 @@ ****************************************************************************/ #include <qdeclarativetester.h> -#include <QDebug> -#include <QApplication> -#include <qdeclarativeview.h> -#include <QFile> -#include <QDeclarativeComponent> -#include <QDir> -#include <QCryptographicHash> -#include <QGraphicsObject> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/QDeclarativeComponent> +#include <QtGui/QGraphicsObject> +#include <QtGui/QApplication> +#include <QtCore/QDebug> +#include <QtCore/QFile> +#include <QtCore/QDir> +#include <QtCore/QCryptographicHash> + #ifndef NO_PRIVATE_HEADERS #include <private/qabstractanimation_p.h> #include <private/qdeclarativeitem_p.h> diff --git a/share/qtcreator/qml/qmlobserver/qdeclarativetester.h b/share/qtcreator/qml/qmlobserver/qdeclarativetester.h index c7173ab507..6bf202f4c8 100644 --- a/share/qtcreator/qml/qmlobserver/qdeclarativetester.h +++ b/share/qtcreator/qml/qmlobserver/qdeclarativetester.h @@ -42,15 +42,17 @@ #ifndef QDECLARATIVETESTER_H #define QDECLARATIVETESTER_H -#include <QEvent> -#include <QMouseEvent> -#include <QKeyEvent> -#include <QImage> -#include <QUrl> #include <qmlruntime.h> -#include <qdeclarativelist.h> -#include <qdeclarative.h> -#include <QAbstractAnimation> + +#include <QtDeclarative/qdeclarativelist.h> +#include <QtDeclarative/qdeclarative.h> + +#include <QtGui/QMouseEvent> +#include <QtGui/QKeyEvent> +#include <QtGui/QImage> +#include <QtCore/QUrl> +#include <QtCore/QEvent> +#include <QtCore/QAbstractAnimation> QT_BEGIN_NAMESPACE diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp index 29515f281b..45e07ba9b3 100644 --- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp +++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp @@ -67,36 +67,40 @@ #include <qdeclarativeviewobserver.h> #include <qdeclarativeobserverservice.h> -#include <QSettings> -#include <QXmlStreamReader> -#include <QBuffer> -#include <QNetworkReply> -#include <QNetworkCookieJar> -#include <QNetworkDiskCache> -#include <QNetworkAccessManager> -#include <QSignalMapper> -#include <QDeclarativeComponent> -#include <QWidget> -#include <QApplication> -#include <QTranslator> -#include <QDir> -#include <QTextBrowser> -#include <QFile> -#include <QFileInfo> -#include <QVBoxLayout> -#include <QProgressDialog> -#include <QProcess> -#include <QMenuBar> -#include <QMenu> -#include <QAction> -#include <QFileDialog> -#include <QInputDialog> -#include <QTimer> -#include <QGraphicsObject> -#include <QNetworkProxyFactory> -#include <QKeyEvent> -#include <QMutex> -#include <QMutexLocker> +#include <QtNetwork/QNetworkReply> +#include <QtNetwork/QNetworkCookieJar> +#include <QtNetwork/QNetworkDiskCache> +#include <QtNetwork/QNetworkAccessManager> +#include <QtNetwork/QNetworkProxyFactory> + +#include <QtDeclarative/QDeclarativeComponent> + +#include <QtGui/QWidget> +#include <QtGui/QApplication> +#include <QtGui/QTextBrowser> +#include <QtGui/QVBoxLayout> +#include <QtGui/QProgressDialog> +#include <QtGui/QMenuBar> +#include <QtGui/QMenu> +#include <QtGui/QAction> +#include <QtGui/QFileDialog> +#include <QtGui/QInputDialog> +#include <QtGui/QGraphicsObject> +#include <QtGui/QKeyEvent> + +#include <QtCore/QSignalMapper> +#include <QtCore/QSettings> +#include <QtCore/QXmlStreamReader> +#include <QtCore/QBuffer> +#include <QtCore/QTranslator> +#include <QtCore/QDir> +#include <QtCore/QFile> +#include <QtCore/QFileInfo> +#include <QtCore/QProcess> +#include <QtCore/QTimer> +#include <QtCore/QMutex> +#include <QtCore/QMutexLocker> + #include "proxysettings.h" #include "deviceorientation.h" diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.h b/share/qtcreator/qml/qmlobserver/qmlruntime.h index ee117018dc..858f5b9a36 100644 --- a/share/qtcreator/qml/qmlobserver/qmlruntime.h +++ b/share/qtcreator/qml/qmlobserver/qmlruntime.h @@ -42,10 +42,10 @@ #ifndef QDECLARATIVEVIEWER_H #define QDECLARATIVEVIEWER_H -#include <QMainWindow> -#include <QTimer> -#include <QTime> -#include <QList> +#include <QtGui/QMainWindow> +#include <QtCore/QTimer> +#include <QtCore/QTime> +#include <QtCore/QList> #include "loggerwidget.h" |