Commit e3938635 authored by Friedemann Kleint's avatar Friedemann Kleint

Header cleanup in share/qtcreator/qml, specify module name.

parent edb48935
#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
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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)
};
......
......@@ -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 {
......
......@@ -36,9 +36,9 @@
#include "abstractformeditortool.h"
#include <QColor>
#include <QtGui/QColor>
QT_FORWARD_DECLARE_CLASS(QPoint);
QT_FORWARD_DECLARE_CLASS(QPoint)
namespace QmlJSDebugger {
......
......@@ -34,8 +34,7 @@
#ifndef LAYERITEM_H
#define LAYERITEM_H
#include <QGraphicsObject>
#include <QWeakPointer>
#include <QtGui/QGraphicsObject>
namespace QmlJSDebugger {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -34,7 +34,9 @@
#include "rubberbandselectionmanipulator.h"
#include "../qdeclarativeviewobserver_p.h"
#include <QDebug>
#include <QtGui/QGraphicsItem>
#include <QtCore/QDebug>
namespace QmlJSDebugger {
......
......@@ -37,6 +37,10 @@
#include "selectionrectangle.h"
#include <QtCore/QPointF>
QT_FORWARD_DECLARE_CLASS(QGraphicsItem)
namespace QmlJSDebugger {
class QDeclarativeViewObserver;
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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);
......
......@@ -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 {
......
......@@ -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)
......
......@@ -34,7 +34,7 @@
#include "subcomponentmasklayeritem.h"
#include "qmlobserverconstants.h"
#include "qdeclarativeviewobserver.h"
#include <QPolygonF>
#include <QtGui/QPolygonF>
namespace QmlJSDebugger {
......
......@@ -34,7 +34,7 @@
#ifndef SUBCOMPONENTMASKLAYERITEM_H
#define SUBCOMPONENTMASKLAYERITEM_H
#include <QGraphicsPolygonItem>
#include <QtGui/QGraphicsPolygonItem>
namespace QmlJSDebugger {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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)
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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"
......
......@@ -42,7 +42,7 @@
#ifndef ORIENTATION_H
#define ORIENTATION_H
#include <QObject>
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
......
......@@ -42,8 +42,8 @@
#ifndef LOGGERWIDGET_H
#define LOGGERWIDGET_H
#include <QMainWindow>
#include <QMetaType>
#include <QtGui/QMainWindow>
#include <QtCore/QMetaType>
QT_BEGIN_NAMESPACE
......
......@@ -40,8 +40,8 @@
****************************************************************************/
#include <QIntValidator>
#include <QSettings>
#include <QtGui/QIntValidator>
#include <QtCore/QSettings>
#include "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
......
......@@ -40,14 +40,15 @@
****************************************************************************/