diff options
247 files changed, 1176 insertions, 842 deletions
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp index 244c34a..cfd4cff 100644 --- a/src/declarative/3rdparty/qlistmodelinterface.cpp +++ b/src/declarative/3rdparty/qlistmodelinterface.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qlistmodelinterface_p.h> +#include "qlistmodelinterface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/3rdparty/qlistmodelinterface_p.h b/src/declarative/3rdparty/qlistmodelinterface_p.h index 738378e..f7c956a 100644 --- a/src/declarative/3rdparty/qlistmodelinterface_p.h +++ b/src/declarative/3rdparty/qlistmodelinterface_p.h @@ -45,7 +45,6 @@ #include <QtCore/QHash> #include <QtCore/QVariant> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp index 6c6037e..dc779ac 100644 --- a/src/declarative/debugger/qmldebug.cpp +++ b/src/declarative/debugger/qmldebug.cpp @@ -38,10 +38,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <private/qmldebug_p.h> -#include <private/qmldebugclient_p.h> + +#include "qmldebug_p.h" + +#include "qmldebugclient_p.h" + +#include <qmlenginedebug_p.h> + #include <private/qobject_p.h> -#include <private/qmlenginedebug_p.h> class QmlEngineDebugClient : public QmlDebugClient { diff --git a/src/declarative/debugger/qmldebugclient.cpp b/src/declarative/debugger/qmldebugclient.cpp index f1473c2..68e14c2 100644 --- a/src/declarative/debugger/qmldebugclient.cpp +++ b/src/declarative/debugger/qmldebugclient.cpp @@ -39,12 +39,15 @@ ** ****************************************************************************/ -#include <private/qmldebugclient_p.h> -#include <private/qobject_p.h> -#include <private/qpacketprotocol_p.h> +#include "qmldebugclient_p.h" + +#include "qpacketprotocol_p.h" + #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlDebugConnectionPrivate : public QObject @@ -201,4 +204,4 @@ void QmlDebugClient::messageReceived(const QByteArray &) QT_END_NAMESPACE -#include "qmldebugclient.moc" +#include <qmldebugclient.moc> diff --git a/src/declarative/debugger/qmldebuggerstatus.cpp b/src/declarative/debugger/qmldebuggerstatus.cpp index 208c7a1..dc1cfb0 100644 --- a/src/declarative/debugger/qmldebuggerstatus.cpp +++ b/src/declarative/debugger/qmldebuggerstatus.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qmldebuggerstatus_p.h> +#include "qmldebuggerstatus_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qmldebugservice.cpp b/src/declarative/debugger/qmldebugservice.cpp index adf592f..810fbed 100644 --- a/src/declarative/debugger/qmldebugservice.cpp +++ b/src/declarative/debugger/qmldebugservice.cpp @@ -39,14 +39,17 @@ ** ****************************************************************************/ -#include <private/qmldebugservice_p.h> +#include "qmldebugservice_p.h" + +#include "qpacketprotocol_p.h" + #include <QtCore/qdebug.h> #include <QtNetwork/qtcpserver.h> #include <QtNetwork/qtcpsocket.h> -#include <private/qobject_p.h> -#include <private/qpacketprotocol_p.h> #include <QtCore/qstringlist.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlDebugServerPrivate; @@ -387,4 +390,4 @@ void QmlDebugService::messageReceived(const QByteArray &) QT_END_NAMESPACE -#include "qmldebugservice.moc" +#include <qmldebugservice.moc> diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 60b8303..b76c461 100644 --- a/src/declarative/debugger/qpacketprotocol.cpp +++ b/src/declarative/debugger/qpacketprotocol.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qpacketprotocol_p.h> +#include "qpacketprotocol_p.h" + #include <QBuffer> QT_BEGIN_NAMESPACE @@ -494,5 +495,4 @@ QPacketAutoSend::~QPacketAutoSend() QT_END_NAMESPACE -#include "qpacketprotocol.moc" - +#include <qpacketprotocol.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp index eabd344..c838d7d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp @@ -39,12 +39,15 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsanchors_p_p.h> +#include "qmlgraphicsanchors_p_p.h" + #include "qmlgraphicsitem.h" -#include <private/qmlgraphicsitem_p.h> -#include <QDebug> +#include "qmlgraphicsitem_p.h" + #include <qmlinfo.h> +#include <QDebug> + QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,Anchors,QmlGraphicsAnchors) @@ -1006,7 +1009,7 @@ bool QmlGraphicsAnchorsPrivate::checkVAnchorValid(QmlGraphicsAnchorLine anchor) return true; } -#include "moc_qmlgraphicsanchors_p.cpp" +#include <moc_qmlgraphicsanchors_p.cpp> QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h index 507b4d8..2f2ca74 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p.h @@ -42,9 +42,11 @@ #ifndef QMLGRAPHICSANCHORS_H #define QMLGRAPHICSANCHORS_H -#include <QtCore/QObject> +#include "qmlgraphicsitem.h" + #include <qml.h> -#include <qmlgraphicsitem.h> + +#include <QtCore/QObject> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h index 5b6d6cf..be3b6dc 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanchors_p_p.h @@ -53,8 +53,9 @@ // We mean it. // -#include <private/qmlgraphicsanchors_p.h> -#include "private/qobject_p.h" +#include "qmlgraphicsanchors_p.h" + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp index 8cb597d..670b38b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp @@ -39,10 +39,12 @@ ** ****************************************************************************/ -#include <QMovie> +#include "qmlgraphicsanimatedimage_p.h" +#include "qmlgraphicsanimatedimage_p_p.h" + #include <qmlengine.h> -#include <private/qmlgraphicsanimatedimage_p.h> -#include <private/qmlgraphicsanimatedimage_p_p.h> + +#include <QMovie> #include <QNetworkRequest> #include <QNetworkReply> diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h index 79daa0f..a837702 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSANIMATEDIMAGE_H #define QMLGRAPHICSANIMATEDIMAGE_H -#include <private/qmlgraphicsimage_p.h> +#include "qmlgraphicsimage_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h index c24afa0..0d1c749 100644 --- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qmlgraphicsimage_p_p.h> +#include "qmlgraphicsimage_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp index 71233c6..1964ee4 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsborderimage_p.h> -#include <private/qmlgraphicsborderimage_p_p.h> +#include "qmlgraphicsborderimage_p.h" +#include "qmlgraphicsborderimage_p_p.h" + +#include <qmlengine.h> + #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> -#include <qmlengine.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h index 8c10a87..cf3c518 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h @@ -42,8 +42,9 @@ #ifndef QMLGRAPHICSBORDERIMAGE_H #define QMLGRAPHICSBORDERIMAGE_H +#include "qmlgraphicsimagebase_p.h" + #include <QtNetwork/qnetworkreply.h> -#include <private/qmlgraphicsimagebase_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h index 50d81cd..51ebb02 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <private/qmlgraphicsimagebase_p_p.h> -#include <private/qmlgraphicsscalegrid_p_p.h> +#include "qmlgraphicsimagebase_p_p.h" +#include "qmlgraphicsscalegrid_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicseffects.cpp b/src/declarative/graphicsitems/qmlgraphicseffects.cpp index 0523fd5..e1f5687 100644 --- a/src/declarative/graphicsitems/qmlgraphicseffects.cpp +++ b/src/declarative/graphicsitems/qmlgraphicseffects.cpp @@ -38,7 +38,9 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include <qml.h> + #include <QtGui/qgraphicseffect.h> QML_DECLARE_TYPE(QGraphicsEffect) diff --git a/src/declarative/graphicsitems/qmlgraphicsevents.cpp b/src/declarative/graphicsitems/qmlgraphicsevents.cpp index 24214ea..9958dea 100644 --- a/src/declarative/graphicsitems/qmlgraphicsevents.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsevents.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsevents_p_p.h> +#include "qmlgraphicsevents_p_p.h" QT_BEGIN_NAMESPACE /*! diff --git a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h index 567a509..b07fd88 100644 --- a/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsevents_p_p.h @@ -54,6 +54,7 @@ // #include <qml.h> + #include <QtCore/qobject.h> #include <QtGui/qevent.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp index 806b72f..89c7657 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsflickable_p.h> -#include <private/qmlgraphicsflickable_p_p.h> +#include "qmlgraphicsflickable_p.h" +#include "qmlgraphicsflickable_p_p.h" #include <QGraphicsSceneMouseEvent> #include <QPointer> @@ -1287,4 +1287,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QmlGraphicsFlickableVisibleArea) QML_DEFINE_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea) -#include "qmlgraphicsflickable.moc" +#include <qmlgraphicsflickable.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h index 9610ac1..aa29f3e 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSFLICKABLE_H #define QMLGRAPHICSFLICKABLE_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h index 4953aa0..b19a08c 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h @@ -53,12 +53,15 @@ // We mean it. // -#include "qdatetime.h" -#include <private/qmlgraphicsflickable_p.h> -#include <private/qmlgraphicsitem_p.h> -#include "qml.h" -#include <private/qmltimeline_p_p.h> -#include <private/qmlanimation_p_p.h> +#include "qmlgraphicsflickable_p.h" + +#include "qmlgraphicsitem_p.h" + +#include <qml.h> +#include <qmltimeline_p_p.h> +#include <qmlanimation_p_p.h> + +#include <qdatetime.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp index cbb5581..ff8995b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp @@ -39,11 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsflipable_p.h> -#include <private/qmlgraphicsitem_p.h> -#include "QtGui/qgraphicstransform.h" +#include "qmlgraphicsflipable_p.h" + +#include "qmlgraphicsitem_p.h" + #include <qmlinfo.h> +#include <QtGui/qgraphicstransform.h> + QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,Flipable,QmlGraphicsFlipable) diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h index 8f075ac..c189786 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflipable_p.h @@ -42,9 +42,10 @@ #ifndef QMLGRAPHICSFLIPABLE_H #define QMLGRAPHICSFLIPABLE_H +#include "qmlgraphicsitem.h" + #include <QtCore/QObject> #include <QtGui/QTransform> -#include <qmlgraphicsitem.h> #include <QtGui/qvector3d.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp index 8cd59f4..333b689 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsfocuspanel_p.h> +#include "qmlgraphicsfocuspanel_p.h" + #include <QtGui/qgraphicsscene.h> #include <QEvent> diff --git a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h index d1824e7..4c5cc14 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsfocuspanel_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSFOCUSPANEL_H #define QMLGRAPHICSFOCUSPANEL_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp index f1ddac0..828756c 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope.cpp @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsfocusscope_p.h> - +#include "qmlgraphicsfocusscope_p.h" QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,FocusScope,QmlGraphicsFocusScope) diff --git a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h index 3744240..0ea9da5 100644 --- a/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsfocusscope_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSFOCUSSCOPE_H #define QMLGRAPHICSFOCUSSCOPE_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp index 2ae18f9..275d38d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp @@ -39,11 +39,13 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsgraphicsobjectcontainer_p.h> +#include "qmlgraphicsgraphicsobjectcontainer_p.h" + +#include "qmlgraphicsitem_p.h" + #include <QGraphicsObject> #include <QGraphicsWidget> #include <QGraphicsSceneResizeEvent> -#include <private/qmlgraphicsitem_p.h> QT_BEGIN_NAMESPACE @@ -225,6 +227,6 @@ void QmlGraphicsGraphicsObjectContainerPrivate::_q_updateSize() }*/ } -#include "moc_qmlgraphicsgraphicsobjectcontainer_p.cpp" +#include <moc_qmlgraphicsgraphicsobjectcontainer_p.cpp> QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h index 7d16685..1091145 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H #define QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp index f31e586..f4d94aa 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsgridview_p.h> -#include <private/qmlgraphicsvisualitemmodel_p.h> -#include <private/qlistmodelinterface_p.h> -#include <private/qmleasefollow_p.h> -#include <private/qmlgraphicsflickable_p_p.h> +#include "qmlgraphicsgridview_p.h" +#include "qmlgraphicsvisualitemmodel_p.h" +#include "qmlgraphicsflickable_p_p.h" + +#include <qmleasefollow_p.h> + +#include <qlistmodelinterface_p.h> #include <QKeyEvent> QT_BEGIN_NAMESPACE @@ -1681,4 +1683,4 @@ QML_DEFINE_TYPE(Qt, 4,6, GridView, QmlGraphicsGridView) QT_END_NAMESPACE -#include "qmlgraphicsgridview.moc" +#include <qmlgraphicsgridview.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h index 99515a3..1615469 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsgridview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRIDVIEW_H #define QMLGRAPHICSGRIDVIEW_H -#include <private/qmlgraphicsflickable_p.h> +#include "qmlgraphicsflickable_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsimage.cpp b/src/declarative/graphicsitems/qmlgraphicsimage.cpp index c75b9ce..38df0c7 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsimage_p.h> -#include <private/qmlgraphicsimage_p_p.h> +#include "qmlgraphicsimage_p.h" +#include "qmlgraphicsimage_p_p.h" #include <QKeyEvent> #include <QPainter> diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p.h index 5d1228d..2547b78 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimage_p.h @@ -42,8 +42,9 @@ #ifndef QMLGRAPHICSIMAGE_H #define QMLGRAPHICSIMAGE_H +#include "qmlgraphicsimagebase_p.h" + #include <QtNetwork/qnetworkreply.h> -#include <private/qmlgraphicsimagebase_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h index 93bccb6..f6b4e51 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimage_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> -#include <private/qmlgraphicsimagebase_p_p.h> +#include "qmlgraphicsitem_p.h" +#include "qmlgraphicsimagebase_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp index e11e6c1..b7ed7b6 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp @@ -39,13 +39,15 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsimagebase_p.h> -#include <private/qmlgraphicsimagebase_p_p.h> +#include "qmlgraphicsimagebase_p.h" +#include "qmlgraphicsimagebase_p_p.h" + +#include <qmlengine.h> +#include <qmlpixmapcache_p.h> + #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> -#include <qmlengine.h> -#include <private/qmlpixmapcache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h index 4936794..61ea975 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSIMAGEBASE_H #define QMLGRAPHICSIMAGEBASE_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h index 7ce413c..44b2332 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p_p.h @@ -53,7 +53,8 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsitem_p.h" + #include <QtCore/QPointer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index 1bf1089..1b2861d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -39,6 +39,19 @@ ** ****************************************************************************/ +#include "qmlgraphicsitem_p.h" +#include "qmlgraphicsitem.h" + +#include "qmlgraphicsevents_p_p.h" + +#include <qfxperf_p_p.h> +#include <qmlengine.h> +#include <qmlopenmetaobject_p.h> +#include <qmlstate_p.h> +#include <qmlview.h> +#include <qmlstategroup_p.h> +#include <qmlcomponent.h> + #include <QDebug> #include <QPen> #include <QFile> @@ -47,22 +60,9 @@ #include <QNetworkRequest> #include <QGraphicsSceneMouseEvent> #include <QtScript/qscriptengine.h> -#include <private/qfxperf_p_p.h> #include <QtGui/qgraphicstransform.h> #include <QtGui/qgraphicseffect.h> - -#include <qmlengine.h> -#include <private/qmlopenmetaobject_p.h> -#include <private/qmlstate_p.h> -#include <private/qlistmodelinterface_p.h> - -#include "qmlview.h" -#include <private/qmlstategroup_p.h> - -#include <private/qmlgraphicsitem_p.h> -#include "qmlgraphicsitem.h" -#include <private/qmlgraphicsevents_p_p.h> -#include <qmlcomponent.h> +#include <qlistmodelinterface_p.h> QT_BEGIN_NAMESPACE @@ -3033,8 +3033,8 @@ int QmlGraphicsItemPrivate::restart(QTime &t) return n; } -#include "qmlgraphicsitem.moc" -#include "moc_qmlgraphicsitem.cpp" +#include <qmlgraphicsitem.moc> +#include <moc_qmlgraphicsitem.cpp> QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h index d092896..df8c634 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem.h @@ -42,10 +42,11 @@ #ifndef QMLGRAPHICSITEM_H #define QMLGRAPHICSITEM_H -#include <QtCore/QObject> -#include <QtCore/QList> #include <qml.h> #include <qmlcomponent.h> + +#include <QtCore/QObject> +#include <QtCore/QList> #include <QtGui/qgraphicsitem.h> #include <QtGui/qgraphicstransform.h> #include <QtGui/qfont.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h index a76a7f7..82950c2 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h @@ -53,17 +53,21 @@ // We mean it. // -#include <qmlgraphicsitem.h> -#include <private/qmlstate_p.h> -#include <private/qmlgraphicsanchors_p.h> -#include <private/qmlnullablevalue_p_p.h> -#include <private/qmlgraphicsanchors_p_p.h> +#include "qmlgraphicsitem.h" + +#include "qmlgraphicsanchors_p.h" +#include "qmlgraphicsanchors_p_p.h" + +#include <qmlstate_p.h> +#include <qmlnullablevalue_p_p.h> #include <qml.h> #include <qmlcontext.h> + #include <QtCore/qlist.h> -#include <private/qgraphicsitem_p.h> #include <QtCore/qdebug.h> +#include <private/qgraphicsitem_p.h> + QT_BEGIN_NAMESPACE class QNetworkReply; diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp index fa761a2..7227eb0 100644 --- a/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem.cpp @@ -39,8 +39,10 @@ ** ****************************************************************************/ -#include <private/qmlgraphicslayoutitem_p.h> +#include "qmlgraphicslayoutitem_p.h" + #include <QDebug> + #include <limits.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h index 1acb5c1..3278b63 100644 --- a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h @@ -41,8 +41,9 @@ #ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H #define QMLGRAPHICSGRAPHICSLAYOUTITEM_H +#include "qmlgraphicsitem.h" + #include <QGraphicsLayoutItem> -#include <qmlgraphicsitem.h> #include <QSizeF> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index 7a4e02c..658cfaa 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -39,13 +39,15 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsflickable_p_p.h> -#include <private/qmleasefollow_p.h> -#include <private/qlistmodelinterface_p.h> -#include <private/qmlgraphicsvisualitemmodel_p.h> -#include <private/qmlgraphicslistview_p.h> +#include "qmlgraphicslistview_p.h" + +#include "qmlgraphicsflickable_p_p.h" +#include "qmlgraphicsvisualitemmodel_p.h" + +#include <qmleasefollow_p.h> #include <qmlexpression.h> +#include <qlistmodelinterface_p.h> #include <QKeyEvent> QT_BEGIN_NAMESPACE @@ -2497,4 +2499,4 @@ QML_DEFINE_TYPE(Qt,4,6,ListView,QmlGraphicsListView) QT_END_NAMESPACE -#include "qmlgraphicslistview.moc" +#include <qmlgraphicslistview.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h index 241fb05..6dc131c 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSLISTVIEW_H #define QMLGRAPHICSLISTVIEW_H -#include <private/qmlgraphicsflickable_p.h> +#include "qmlgraphicsflickable_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp index 7c3a8f1..86239cf 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsloader_p_p.h> -#include <private/qmlengine_p.h> +#include "qmlgraphicsloader_p_p.h" + +#include <qmlengine_p.h> QT_BEGIN_NAMESPACE @@ -396,6 +397,6 @@ QmlGraphicsItem *QmlGraphicsLoader::item() const return d->item; } -#include "moc_qmlgraphicsloader_p.cpp" +#include <moc_qmlgraphicsloader_p.cpp> QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p.h index bca65fa..88cc70d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsloader_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSLOADER_H #define QMLGRAPHICSLOADER_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h index 7c1d9bc..569e1a5 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsloader_p_p.h @@ -53,8 +53,9 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> -#include <private/qmlgraphicsloader_p.h> +#include "qmlgraphicsloader_p.h" + +#include "qmlgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp index 2aa9397..159fc29 100644 --- a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp @@ -39,11 +39,12 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsmouseregion_p.h> -#include <private/qmlgraphicsmouseregion_p_p.h> -#include <private/qmlgraphicsevents_p_p.h> -#include <QGraphicsSceneMouseEvent> +#include "qmlgraphicsmouseregion_p.h" +#include "qmlgraphicsmouseregion_p_p.h" + +#include "qmlgraphicsevents_p_p.h" +#include <QGraphicsSceneMouseEvent> QT_BEGIN_NAMESPACE static const qreal DragThreshold = 5; diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h index 998183d..0ddad1b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSMOUSEREGION_H #define QMLGRAPHICSMOUSEREGION_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h index dc43ad5..0f1b0d4 100644 --- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p_p.h @@ -53,10 +53,11 @@ // We mean it. // -#include "qdatetime.h" -#include "qbasictimer.h" -#include "qgraphicssceneevent.h" -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsitem_p.h" + +#include <qdatetime.h> +#include <qbasictimer.h> +#include <qgraphicssceneevent.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp index a31f08f..146b1e4 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlgraphicspainteditem_p.h> -#include <private/qmlgraphicspainteditem_p_p.h> +#include "qmlgraphicspainteditem_p.h" +#include "qmlgraphicspainteditem_p_p.h" #include <QDebug> #include <QPen> diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h index d59f6d1..ab21f36 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h @@ -42,8 +42,7 @@ #ifndef QMLGRAPHICSIMAGEITEM_H #define QMLGRAPHICSIMAGEITEM_H -#include <qmlgraphicsitem.h> - +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h index 2eace4c..6bcc51a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp index 6286dd3..63c7658 100644 --- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp @@ -39,10 +39,22 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsparticles_p.h" + +#include "qmlgraphicsitem_p.h" + +#include <qmlpixmapcache_p.h> +#include <qfxperf_p_p.h> +#include <qmlanimation_p_p.h> + +#include <QNetworkReply> +#include <QPainter> +#include <QtGui/qdrawutil.h> +#include <QVarLengthArray> #include <stdlib.h> #include <math.h> + #ifndef M_PI #define M_PI 3.14159265358979323846 #define M_PI_2 (M_PI / 2.) @@ -50,15 +62,6 @@ #ifndef INT_MAX #define INT_MAX 2147483647 #endif -#include <private/qmlpixmapcache_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qmlanimation_p_p.h> -#include <QNetworkReply> - -#include <private/qmlgraphicsparticles_p.h> -#include <QPainter> -#include <QtGui/qdrawutil.h> -#include <QVarLengthArray> QT_BEGIN_NAMESPACE #define PI_SQR 9.8696044 diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h index 3cb3ff6..c34d55b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSPARTICLES_H #define QMLGRAPHICSPARTICLES_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp index 2fa965a..18f27af 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlgraphicspath_p.h> -#include <private/qmlgraphicspath_p_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qbezier_p.h> +#include "qmlgraphicspath_p.h" +#include "qmlgraphicspath_p_p.h" + +#include <qfxperf_p_p.h> + #include <QSet> +#include <private/qbezier_p.h> QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,Path,QmlGraphicsPath) diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h index 30a377e..2b4b0fd 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h @@ -42,11 +42,12 @@ #ifndef QMLGRAPHICSPATH_H #define QMLGRAPHICSPATH_H -#include <QtCore/QObject> -#include <QtGui/QPainterPath> +#include "qmlgraphicsitem.h" + #include <qml.h> -#include <qmlgraphicsitem.h> +#include <QtCore/QObject> +#include <QtGui/QPainterPath> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h index 1374ede..04342a8 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspath_p_p.h @@ -53,10 +53,11 @@ // We mean it. // -#include "private/qobject_p.h" -#include <private/qmlgraphicspath_p.h> -#include "qml.h" +#include "qmlgraphicspath_p.h" +#include <qml.h> + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE class QmlGraphicsPathPrivate : public QObjectPrivate diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp index 92751a0..705462a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp @@ -39,17 +39,19 @@ ** ****************************************************************************/ -#include <math.h> +#include "qmlgraphicspathview_p.h" +#include "qmlgraphicspathview_p_p.h" + +#include <qmlstate_p.h> +#include <qmlopenmetaobject_p.h> + #include <QDebug> #include <QEvent> -#include <private/qmlstate_p.h> -#include <private/qlistmodelinterface_p.h> -#include <private/qmlopenmetaobject_p.h> - -#include <private/qmlgraphicspathview_p.h> -#include <private/qmlgraphicspathview_p_p.h> +#include <qlistmodelinterface_p.h> #include <QGraphicsSceneEvent> +#include <math.h> + static const int FlickThreshold = 5; QT_BEGIN_NAMESPACE @@ -892,4 +894,4 @@ QObject *QmlGraphicsPathView::qmlAttachedProperties(QObject *obj) QT_END_NAMESPACE -#include "qmlgraphicspathview.moc" +#include <qmlgraphicspathview.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h index 38f1cd8..17106a2 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h @@ -42,8 +42,8 @@ #ifndef QMLGRAPHICSPATHVIEW_H #define QMLGRAPHICSPATHVIEW_H -#include <qmlgraphicsitem.h> -#include <private/qmlgraphicspath_p.h> +#include "qmlgraphicsitem.h" +#include "qmlgraphicspath_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h index 4987b9c..7ffe6ac 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h @@ -53,12 +53,15 @@ // We mean it. // -#include "qdatetime.h" -#include <private/qmlgraphicspathview_p.h> -#include <private/qmlgraphicsitem_p.h> -#include <private/qmlgraphicsvisualitemmodel_p.h> -#include "qml.h" -#include <private/qmlanimation_p_p.h> +#include "qmlgraphicspathview_p.h" + +#include "qmlgraphicsitem_p.h" +#include "qmlgraphicsvisualitemmodel_p.h" + +#include <qml.h> +#include <qmlanimation_p_p.h> + +#include <qdatetime.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp index 07bbf1f..db0cc7c 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp @@ -39,15 +39,17 @@ ** ****************************************************************************/ +#include "qmlgraphicspositioners_p.h" +#include "qmlgraphicspositioners_p_p.h" + +#include <qml.h> +#include <qmlstate_p.h> +#include <qmlstategroup_p.h> +#include <qmlstateoperations_p.h> +#include <qfxperf_p_p.h> + #include <QDebug> #include <QCoreApplication> -#include "qml.h" -#include <private/qmlstate_p.h> -#include <private/qmlstategroup_p.h> -#include <private/qmlstateoperations_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qmlgraphicspositioners_p.h> -#include <private/qmlgraphicspositioners_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h index a0665ae..03e0f41 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h @@ -42,11 +42,12 @@ #ifndef QMLGRAPHICSLAYOUTS_H #define QMLGRAPHICSLAYOUTS_H +#include "qmlgraphicsitem.h" + +#include <qmlstate_p.h> + #include <QtCore/QObject> #include <QtCore/QString> -#include <qmlgraphicsitem.h> -#include <private/qmlstate_p.h> - QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h index 676f94c..b079f6a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h @@ -53,13 +53,16 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicspositioners_p.h" + +#include "qmlgraphicsitem_p.h" + +#include <qmlstate_p.h> +#include <qmltransitionmanager_p_p.h> +#include <qmlstateoperations_p.h> + #include <QtCore/QObject> #include <QtCore/QString> -#include <private/qmlgraphicspositioners_p.h> -#include <private/qmlstate_p.h> -#include <private/qmltransitionmanager_p_p.h> -#include <private/qmlstateoperations_p.h> #include <QtCore/QTimer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp index 9c11bc4..cc09436 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsrectangle_p.h> -#include <private/qmlgraphicsrectangle_p_p.h> +#include "qmlgraphicsrectangle_p.h" +#include "qmlgraphicsrectangle_p_p.h" #include <QPainter> #include <QtCore/qmath.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h index fe8c403..4f4c1cf 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h @@ -42,9 +42,9 @@ #ifndef QMLGRAPHICSRECT_H #define QMLGRAPHICSRECT_H -#include <qmlgraphicsitem.h> -#include <QtGui/qbrush.h> +#include "qmlgraphicsitem.h" +#include <QtGui/qbrush.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h index d15b2da..c4bbbe4 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp index 4e6fce2..a650999 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlgraphicsrepeater_p.h> -#include <private/qmlgraphicsrepeater_p_p.h> -#include <private/qmllistaccessor_p.h> -#include <private/qmlgraphicsvisualitemmodel_p.h> -#include <private/qlistmodelinterface_p.h> +#include "qmlgraphicsrepeater_p.h" +#include "qmlgraphicsrepeater_p_p.h" +#include "qmlgraphicsvisualitemmodel_p.h" + +#include <qmllistaccessor_p.h> + +#include <qlistmodelinterface_p.h> QT_BEGIN_NAMESPACE QmlGraphicsRepeaterPrivate::QmlGraphicsRepeaterPrivate() diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h index c5d0166..61f82d7 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSREPEATER_H #define QMLGRAPHICSREPEATER_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h index c2a8606..e6d7bfd 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p_p.h @@ -53,10 +53,11 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> -#include <private/qmlgraphicsrepeater_p.h> -#include <QPointer> +#include "qmlgraphicsrepeater_p.h" + +#include "qmlgraphicsitem_p.h" +#include <QPointer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp index 142384b..3fd14bb 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid.cpp @@ -39,11 +39,12 @@ ** ****************************************************************************/ -#include <QBuffer> +#include "qmlgraphicsscalegrid_p_p.h" + #include <qml.h> -#include <QDebug> -#include <private/qmlgraphicsscalegrid_p_p.h> +#include <QBuffer> +#include <QDebug> QT_BEGIN_NAMESPACE /*! diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h index 6a2b773..c7d067d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h @@ -42,12 +42,13 @@ #ifndef QMLGRAPHICSSCALEGRID_H #define QMLGRAPHICSSCALEGRID_H -#include <QtCore/QString> -#include <QtCore/QObject> -#include <private/qmlpixmapcache_p.h> +#include "qmlgraphicsborderimage_p.h" + +#include <qmlpixmapcache_p.h> #include <qml.h> -#include <private/qmlgraphicsborderimage_p.h> +#include <QtCore/QString> +#include <QtCore/QObject> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp index 650d844..854d503 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include <private/qmlgraphicstext_p.h> -#include <private/qmlgraphicstext_p_p.h> +#include "qmlgraphicstext_p.h" +#include "qmlgraphicstext_p_p.h" + +#include <qfxperf_p_p.h> -#include <private/qtextcontrol_p.h> -#include <private/qfxperf_p_p.h> #include <QTextLayout> #include <QTextLine> #include <QTextDocument> @@ -52,6 +52,8 @@ #include <QPainter> #include <qmath.h> +#include <private/qtextcontrol_p.h> + QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,Text,QmlGraphicsText) diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h index b6a5932..6ca460b 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstext_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSTEXT_H #define QMLGRAPHICSTEXT_H -#include <qmlgraphicsitem.h> +#include "qmlgraphicsitem.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h index 8a4c057..0ddae57 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstext_p_p.h @@ -54,8 +54,10 @@ // #include "qmlgraphicsitem.h" -#include <private/qmlgraphicsitem_p.h> -#include "qml.h" +#include "qmlgraphicsitem_p.h" + +#include <qml.h> + #include <QtGui/qtextlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp index 042c43c..747e2fb 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp @@ -39,19 +39,22 @@ ** ****************************************************************************/ -#include <private/qmlgraphicstextedit_p.h> -#include <private/qmlgraphicstextedit_p_p.h> -#include <private/qtextcontrol_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qmlgraphicsevents_p_p.h> +#include "qmlgraphicstextedit_p.h" +#include "qmlgraphicstextedit_p_p.h" + +#include "qmlgraphicsevents_p_p.h" + +#include <qfxperf_p_p.h> + #include <QTextLayout> #include <QTextLine> #include <QTextDocument> #include <QGraphicsSceneMouseEvent> - #include <QDebug> #include <QPainter> +#include <private/qtextcontrol_p.h> + QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,TextEdit,QmlGraphicsTextEdit) diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h index 1ddfa6b..0fe09f3 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h @@ -42,15 +42,14 @@ #ifndef QMLGRAPHICSTEXTEDIT_H #define QMLGRAPHICSTEXTEDIT_H -#include <private/qmlgraphicstext_p.h> -#include <private/qmlgraphicspainteditem_p.h> +#include "qmlgraphicstext_p.h" +#include "qmlgraphicspainteditem_p.h" #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> #include <QtGui/qtextcursor.h> #include <QtGui/qtextformat.h> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h index 84965e4..8914bfd 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p_p.h @@ -54,9 +54,9 @@ // #include "qmlgraphicsitem.h" -#include <private/qmlgraphicspainteditem_p_p.h> -#include "qml.h" +#include "qmlgraphicspainteditem_p_p.h" +#include <qml.h> QT_BEGIN_NAMESPACE class QTextLayout; diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp index d3e8ad6..ff6c32c 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp @@ -39,9 +39,11 @@ ** ****************************************************************************/ -#include <private/qmlgraphicstextinput_p.h> -#include <private/qmlgraphicstextinput_p_p.h> -#include "qmlinfo.h" +#include "qmlgraphicstextinput_p.h" +#include "qmlgraphicstextinput_p_p.h" + +#include <qmlinfo.h> + #include <QValidator> #include <QApplication> #include <QFontMetrics> diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h index a31ced2..c22c637 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h @@ -42,8 +42,9 @@ #ifndef QMLGRAPHICSTEXTINPUT_H #define QMLGRAPHICSTEXTINPUT_H -#include <private/qmlgraphicstext_p.h> -#include <private/qmlgraphicspainteditem_p.h> +#include "qmlgraphicstext_p.h" +#include "qmlgraphicspainteditem_p.h" + #include <QGraphicsSceneMouseEvent> #include <QIntValidator> diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h index efb05fe..9eb6e07 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p_p.h @@ -42,11 +42,16 @@ #ifndef QMLGRAPHICSTEXTINPUT_P_H #define QMLGRAPHICSTEXTINPUT_P_H -#include <private/qmlgraphicstextinput_p.h> -#include "qml.h" -#include <private/qmlgraphicspainteditem_p_p.h> -#include "private/qlinecontrol_p.h" +#include "qmlgraphicstextinput_p.h" + +#include "qmlgraphicspainteditem_p_p.h" + +#include <qml.h> + #include <QPointer> + +#include <private/qlinecontrol_p.h> + // // W A R N I N G // ------------- diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp index eaf25d1..b973d6c 100644 --- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp @@ -39,22 +39,26 @@ ** ****************************************************************************/ -#include <private/qlistmodelinterface_p.h> +#include "qmlgraphicsvisualitemmodel_p.h" + #include "qmlgraphicsitem.h" + #include <qmlcontext.h> #include <qmlexpression.h> -#include <private/qmlpackage_p.h> -#include "qhash.h" -#include "qlist.h" -#include "private/qobject_p.h" -#include <private/qmetaobjectbuilder_p.h> -#include <private/qmlopenmetaobject_p.h> -#include <private/qmllistaccessor_p.h> -#include "qmlinfo.h" -#include <private/qmlgraphicsvisualitemmodel_p.h> -#include "private/qguard_p.h" +#include <qmlpackage_p.h> +#include <qmlopenmetaobject_p.h> +#include <qmllistaccessor_p.h> +#include <qmlinfo.h> + +#include <qlistmodelinterface_p.h> +#include <qhash.h> +#include <qlist.h> +#include <qmetaobjectbuilder_p.h> #include <QtCore/qdebug.h> +#include <private/qobject_p.h> +#include <private/qguard_p.h> + QML_DECLARE_TYPE(QListModelInterface) QT_BEGIN_NAMESPACE @@ -1055,4 +1059,4 @@ QML_DEFINE_TYPE(Qt,4,6,VisualDataModel,QmlGraphicsVisualDataModel) QT_END_NAMESPACE -#include "qmlgraphicsvisualitemmodel.moc" +#include <qmlgraphicsvisualitemmodel.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h index 9855867..4e76aee 100644 --- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel_p.h @@ -42,10 +42,10 @@ #ifndef QMLGRAPHICSVISUALDATAMODEL_H #define QMLGRAPHICSVISUALDATAMODEL_H -#include <QtCore/qobject.h> -#include <QtCore/qabstractitemmodel.h> #include <qml.h> +#include <QtCore/qobject.h> +#include <QtCore/qabstractitemmodel.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index ffbbdf9..d2b8289 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -39,6 +39,15 @@ ** ****************************************************************************/ +#include "qmlgraphicswebview_p.h" +#include "qmlgraphicswebview_p_p.h" + +#include "qmlgraphicspainteditem_p_p.h" + +#include <qml.h> +#include <qmlengine.h> +#include <qmlstate_p.h> + #include <QDebug> #include <QPen> #include <QFile> @@ -52,15 +61,7 @@ #include <QtWebKit/QWebFrame> #include <QtWebKit/QWebElement> #include <QtWebKit/QWebSettings> - -#include "qml.h" -#include "qmlengine.h" -#include <private/qmlstate_p.h> -#include <private/qlistmodelinterface_p.h> - -#include <private/qmlgraphicswebview_p.h> -#include <private/qmlgraphicswebview_p_p.h> -#include <private/qmlgraphicspainteditem_p_p.h> +#include <qlistmodelinterface_p.h> QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,WebView,QmlGraphicsWebView) @@ -1321,4 +1322,4 @@ QWebPage *QmlGraphicsWebPage::createWindow(WebWindowType type) QT_END_NAMESPACE -#include "qmlgraphicswebview.moc" +#include <qmlgraphicswebview.moc> diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index a1c0d57..0b2ba07 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -42,9 +42,10 @@ #ifndef QMLGRAPHICSWEBVIEW_H #define QMLGRAPHICSWEBVIEW_H +#include "qmlgraphicspainteditem_p.h" + #include <QtGui/QAction> #include <QtCore/QUrl> -#include <private/qmlgraphicspainteditem_p.h> #include <QtNetwork/qnetworkaccessmanager.h> #include <QtWebKit/QWebPage> diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h index 5063669..5659059 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p_p.h @@ -43,6 +43,7 @@ #define QMLGRAPHICSWEBVIEW_P_H #include <qml.h> + #include <QtWebKit/QWebPage> QT_BEGIN_HEADER diff --git a/src/declarative/qml/parser/qmljsast.cpp b/src/declarative/qml/parser/qmljsast.cpp index 81b0649..2a39aae 100644 --- a/src/declarative/qml/parser/qmljsast.cpp +++ b/src/declarative/qml/parser/qmljsast.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmljsast_p.h> -#include <private/qmljsastvisitor_p.h> +#include "qmljsast_p.h" + +#include "qmljsastvisitor_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsast_p.h b/src/declarative/qml/parser/qmljsast_p.h index c8f540c..032fbb1 100644 --- a/src/declarative/qml/parser/qmljsast_p.h +++ b/src/declarative/qml/parser/qmljsast_p.h @@ -53,8 +53,9 @@ // We mean it. // -#include <private/qmljsastvisitor_p.h> -#include <private/qmljsglobal_p.h> +#include "qmljsastvisitor_p.h" +#include "qmljsglobal_p.h" + #include <QtCore/QString> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsastfwd_p.h b/src/declarative/qml/parser/qmljsastfwd_p.h index b485138..f571a2e 100644 --- a/src/declarative/qml/parser/qmljsastfwd_p.h +++ b/src/declarative/qml/parser/qmljsastfwd_p.h @@ -42,8 +42,9 @@ #ifndef QMLJSAST_FWD_P_H #define QMLJSAST_FWD_P_H +#include "qmljsglobal_p.h" + #include <QtCore/qglobal.h> -#include <private/qmljsglobal_p.h> // // W A R N I N G diff --git a/src/declarative/qml/parser/qmljsastvisitor.cpp b/src/declarative/qml/parser/qmljsastvisitor.cpp index 089fe76..1290c89 100644 --- a/src/declarative/qml/parser/qmljsastvisitor.cpp +++ b/src/declarative/qml/parser/qmljsastvisitor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qmljsastvisitor_p.h> +#include "qmljsastvisitor_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsastvisitor_p.h b/src/declarative/qml/parser/qmljsastvisitor_p.h index b49a151..1b50bcc 100644 --- a/src/declarative/qml/parser/qmljsastvisitor_p.h +++ b/src/declarative/qml/parser/qmljsastvisitor_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <private/qmljsastfwd_p.h> -#include <private/qmljsglobal_p.h> +#include "qmljsastfwd_p.h" +#include "qmljsglobal_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsengine_p.cpp b/src/declarative/qml/parser/qmljsengine_p.cpp index ab317aa..b8ecd18 100644 --- a/src/declarative/qml/parser/qmljsengine_p.cpp +++ b/src/declarative/qml/parser/qmljsengine_p.cpp @@ -39,9 +39,11 @@ ** ****************************************************************************/ -#include <private/qmljsglobal_p.h> -#include <private/qmljsengine_p.h> -#include <private/qmljsnodepool_p.h> +#include "qmljsengine_p.h" + +#include "qmljsglobal_p.h" +#include "qmljsnodepool_p.h" + #include <qnumeric.h> #include <QHash> diff --git a/src/declarative/qml/parser/qmljsengine_p.h b/src/declarative/qml/parser/qmljsengine_p.h index 6ae470c..2c15af3 100644 --- a/src/declarative/qml/parser/qmljsengine_p.h +++ b/src/declarative/qml/parser/qmljsengine_p.h @@ -53,12 +53,12 @@ // We mean it. // +#include "qmljsglobal_p.h" +#include "qmljsastfwd_p.h" + #include <QString> #include <QSet> -#include <private/qmljsglobal_p.h> -#include <private/qmljsastfwd_p.h> - QT_QML_BEGIN_NAMESPACE namespace QmlJS { diff --git a/src/declarative/qml/parser/qmljsgrammar.cpp b/src/declarative/qml/parser/qmljsgrammar.cpp index 9ad61e6..b8c6560 100644 --- a/src/declarative/qml/parser/qmljsgrammar.cpp +++ b/src/declarative/qml/parser/qmljsgrammar.cpp @@ -40,7 +40,7 @@ ** ****************************************************************************/ -#include <private/qmljsgrammar_p.h> +#include "qmljsgrammar_p.h" const char *const QmlJSGrammar::spell [] = { "end of file", "&", "&&", "&=", "break", "case", "catch", ":", ";", "continue", diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp index 2edd553..e9ea604 100644 --- a/src/declarative/qml/parser/qmljslexer.cpp +++ b/src/declarative/qml/parser/qmljslexer.cpp @@ -40,13 +40,14 @@ ****************************************************************************/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif -#include <private/qmljsglobal_p.h> -#include <private/qmljsengine_p.h> -#include <private/qmljslexer_p.h> -#include <private/qmljsgrammar_p.h> +#include "qmljslexer_p.h" + +#include "qmljsglobal_p.h" +#include "qmljsengine_p.h" +#include "qmljsgrammar_p.h" #include <QtGui/qapplication.h> diff --git a/src/declarative/qml/parser/qmljslexer_p.h b/src/declarative/qml/parser/qmljslexer_p.h index b483316..b830071 100644 --- a/src/declarative/qml/parser/qmljslexer_p.h +++ b/src/declarative/qml/parser/qmljslexer_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include <QtCore/QString> +#include "qmljsglobal_p.h" -#include <private/qmljsglobal_p.h> +#include <QtCore/QString> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsmemorypool_p.h b/src/declarative/qml/parser/qmljsmemorypool_p.h index e5d3e27..3da2678 100644 --- a/src/declarative/qml/parser/qmljsmemorypool_p.h +++ b/src/declarative/qml/parser/qmljsmemorypool_p.h @@ -53,11 +53,12 @@ // We mean it. // +#include "qmljsglobal_p.h" + #include <QtCore/qglobal.h> #include <QtCore/qshareddata.h> -#include <string.h> -#include <private/qmljsglobal_p.h> +#include <string.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qmljsnodepool_p.h b/src/declarative/qml/parser/qmljsnodepool_p.h index ffd1287..abe4cc8 100644 --- a/src/declarative/qml/parser/qmljsnodepool_p.h +++ b/src/declarative/qml/parser/qmljsnodepool_p.h @@ -53,12 +53,12 @@ // We mean it. // +#include "qmljsglobal_p.h" +#include "qmljsmemorypool_p.h" + #include <QtCore/QHash> #include <QtCore/QString> -#include <private/qmljsglobal_p.h> -#include <private/qmljsmemorypool_p.h> - QT_QML_BEGIN_NAMESPACE namespace QmlJS { diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index 472f67e..7a81557 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -41,21 +41,19 @@ ** ****************************************************************************/ +#include "qmljsparser_p.h" + +#include "qmljsengine_p.h" +#include "qmljslexer_p.h" +#include "qmljsast_p.h" +#include "qmljsnodepool_p.h" + #include <QtCore/QtDebug> #include <QtGui/QApplication> +#include <QVarLengthArray> #include <string.h> -#include <private/qmljsengine_p.h> -#include <private/qmljslexer_p.h> -#include <private/qmljsast_p.h> -#include <private/qmljsnodepool_p.h> - - - -#include <private/qmljsparser_p.h> -#include <QVarLengthArray> - // // This file is automatically generated from qmljs.g. // Changes will be lost. diff --git a/src/declarative/qml/parser/qmljsparser_p.h b/src/declarative/qml/parser/qmljsparser_p.h index 1f0c1a7..2cefb5c 100644 --- a/src/declarative/qml/parser/qmljsparser_p.h +++ b/src/declarative/qml/parser/qmljsparser_p.h @@ -60,10 +60,10 @@ #ifndef QMLJSPARSER_P_H #define QMLJSPARSER_P_H -#include <private/qmljsglobal_p.h> -#include <private/qmljsgrammar_p.h> -#include <private/qmljsast_p.h> -#include <private/qmljsengine_p.h> +#include "qmljsglobal_p.h" +#include "qmljsgrammar_p.h" +#include "qmljsast_p.h" +#include "qmljsengine_p.h" #include <QtCore/QList> #include <QtCore/QString> diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index 3187e41..11b9f80 100644 --- a/src/declarative/qml/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qmetaobjectbuilder_p.h> +#include "qmetaobjectbuilder_p.h" + #ifndef Q_OS_WIN #include <stdint.h> #endif diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 323525b..c009093 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -42,15 +42,16 @@ #ifndef QML_H #define QML_H +#include "qmlmetatype.h" +#include "qmlmetaproperty.h" +#include "qmlparserstatus.h" +#include "qmlpropertyvaluesource.h" +#include "qmllist.h" + #include <QtCore/qbytearray.h> #include <QtCore/qstringlist.h> #include <QtCore/qurl.h> #include <QtCore/qmetaobject.h> -#include <qmlmetatype.h> -#include <qmlmetaproperty.h> -#include <qmlparserstatus.h> -#include <qmlpropertyvaluesource.h> -#include <qmllist.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp index 01cb97f..6a32df7 100644 --- a/src/declarative/qml/qmlbasicscript.cpp +++ b/src/declarative/qml/qmlbasicscript.cpp @@ -39,17 +39,20 @@ ** ****************************************************************************/ -#include <private/qmlbasicscript_p.h> +#include "qmlbasicscript_p.h" + +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlrefcount_p.h" +#include "qmlglobal_p.h" + +#include <qfxperf_p_p.h> +#include <qmljsast_p.h> +#include <qmljsengine_p.h> + #include <QColor> #include <QDebug> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> #include <QStack> -#include <private/qfxperf_p_p.h> -#include <private/qmlrefcount_p.h> -#include <private/qmljsast_p.h> -#include <private/qmljsengine_p.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h index 57d4fa7..830d2bd 100644 --- a/src/declarative/qml/qmlbasicscript_p.h +++ b/src/declarative/qml/qmlbasicscript_p.h @@ -53,10 +53,11 @@ // We mean it. // +#include "qmlparser_p.h" + #include <QtCore/QList> #include <QtCore/QByteArray> #include <QtCore/QVariant> -#include <private/qmlparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index f9fc2d2..56d5807 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -39,17 +39,20 @@ ** ****************************************************************************/ -#include <qml.h> #include "qmlbinding.h" -#include <private/qmlbinding_p.h> -#include <qmlcontext.h> -#include <qmlinfo.h> +#include "qmlbinding_p.h" + +#include "qml.h" +#include "qmlcontext.h" +#include "qmlinfo.h" +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmlstringconverters_p.h" + +#include <qfxperf_p_p.h> + #include <QVariant> -#include <private/qfxperf_p_p.h> #include <QtCore/qdebug.h> -#include <private/qmlcontext_p.h> -#include <private/qmldeclarativedata_p.h> -#include <private/qmlstringconverters_p.h> Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h index ce768a6..6f2d4f1 100644 --- a/src/declarative/qml/qmlbinding.h +++ b/src/declarative/qml/qmlbinding.h @@ -42,10 +42,11 @@ #ifndef QMLBINDING_H #define QMLBINDING_H +#include "qml.h" +#include "qmlpropertyvaluesource.h" +#include "qmlexpression.h" + #include <QtCore/QObject> -#include <qml.h> -#include <qmlpropertyvaluesource.h> -#include <qmlexpression.h> #include <QtCore/QMetaProperty> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlbinding_p.h b/src/declarative/qml/qmlbinding_p.h index 85d9ad6..945b659 100644 --- a/src/declarative/qml/qmlbinding_p.h +++ b/src/declarative/qml/qmlbinding_p.h @@ -53,9 +53,10 @@ // We mean it. // -#include <qmlbinding.h> -#include <qmlmetaproperty.h> -#include <private/qmlexpression_p.h> +#include "qmlbinding.h" + +#include "qmlmetaproperty.h" +#include "qmlexpression_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp index 136bf23..0f2e199 100644 --- a/src/declarative/qml/qmlbindingoptimizations.cpp +++ b/src/declarative/qml/qmlbindingoptimizations.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmlbindingoptimizations_p.h> -#include <private/qmlcontext_p.h> +#include "qmlbindingoptimizations_p.h" + +#include "qmlcontext_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h index 2cdc07d..4ce145d 100644 --- a/src/declarative/qml/qmlbindingoptimizations_p.h +++ b/src/declarative/qml/qmlbindingoptimizations_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include <private/qmlexpression_p.h> -#include <qmlbinding.h> +#include "qmlexpression_p.h" +#include "qmlbinding.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index 1f41472..110a56c 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -39,16 +39,18 @@ ** ****************************************************************************/ -#include <private/qmlboundsignal_p.h> -#include <private/qmetaobjectbuilder_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlexpression_p.h> -#include <private/qmlcontext_p.h> -#include <qmlmetatype.h> -#include <qml.h> -#include <qmlcontext.h> +#include "qmlboundsignal_p.h" + +#include "qmetaobjectbuilder_p.h" +#include "qmlengine_p.h" +#include "qmlexpression_p.h" +#include "qmlcontext_p.h" +#include "qmlmetatype.h" +#include "qml.h" +#include "qmlcontext.h" +#include "qmlglobal_p.h" + #include <QtCore/qdebug.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE @@ -259,4 +261,4 @@ int QmlBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a) QT_END_NAMESPACE -#include "qmlboundsignal.moc" +#include <qmlboundsignal.moc> diff --git a/src/declarative/qml/qmlboundsignal_p.h b/src/declarative/qml/qmlboundsignal_p.h index 53a5a6b..971fc89 100644 --- a/src/declarative/qml/qmlboundsignal_p.h +++ b/src/declarative/qml/qmlboundsignal_p.h @@ -53,10 +53,12 @@ // We mean it. // -#include <qmlexpression.h> -#include <private/qobject_p.h> +#include "qmlexpression.h" + #include <QtCore/qmetaobject.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlAbstractBoundSignal : public QObject diff --git a/src/declarative/qml/qmlclassfactory.cpp b/src/declarative/qml/qmlclassfactory.cpp index bad0890..3c19c2f 100644 --- a/src/declarative/qml/qmlclassfactory.cpp +++ b/src/declarative/qml/qmlclassfactory.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qmlclassfactory_p.h> +#include "qmlclassfactory_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp index 0a0175c..0da6452 100644 --- a/src/declarative/qml/qmlcleanup.cpp +++ b/src/declarative/qml/qmlcleanup.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmlcleanup_p.h> -#include <private/qmlengine_p.h> +#include "qmlcleanup_p.h" + +#include "qmlengine_p.h" /*! \internal diff --git a/src/declarative/qml/qmlcompileddata.cpp b/src/declarative/qml/qmlcompileddata.cpp index c41ee3f..8b165c6 100644 --- a/src/declarative/qml/qmlcompileddata.cpp +++ b/src/declarative/qml/qmlcompileddata.cpp @@ -39,15 +39,17 @@ ** ****************************************************************************/ -#include <private/qmlcompiler_p.h> +#include "qmlcompiler_p.h" #include "qmlengine.h" #include "qmlcomponent.h" -#include <private/qmlcomponent_p.h> +#include "qmlcomponent_p.h" #include "qmlcontext.h" -#include <private/qmlcontext_p.h> -#include <private/qobject_p.h> +#include "qmlcontext_p.h" + #include <QtCore/qdebug.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE int QmlCompiledData::pack(const char *data, size_t size) diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 578aa91..2404702 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -39,40 +39,42 @@ ** ****************************************************************************/ -#include <private/qmlcompiler_p.h> -#include <private/qmlcompositetypedata_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qmlparser_p.h> -#include <private/qmlscriptparser_p.h> -#include <qmlpropertyvaluesource.h> -#include <qmlcomponent.h> -#include <private/qmetaobjectbuilder_p.h> -#include <private/qmlbasicscript_p.h> +#include "qmlcompiler_p.h" + +#include "qmlcompositetypedata_p.h" +#include "qmlparser_p.h" +#include "qmlscriptparser_p.h" +#include "qmlpropertyvaluesource.h" +#include "qmlcomponent.h" +#include "qmetaobjectbuilder_p.h" +#include "qmlbasicscript_p.h" +#include "qmlstringconverters_p.h" +#include "qmlengine_p.h" +#include "qmlengine.h" +#include "qmlcontext.h" +#include "qmlmetatype.h" +#include "qmlcustomparser_p_p.h" +#include "qmlcontext_p.h" +#include "qmlcomponent_p.h" +#include "parser/qmljsast_p.h" +#include "qmlvmemetaobject_p.h" +#include "qmlexpression_p.h" +#include "qmlmetaproperty_p.h" +#include "qmlrewrite_p.h" +#include "qmlscriptstring.h" +#include "qmlglobal_p.h" +#include "qmlscriptparser_p.h" + +#include <qfxperf_p_p.h> + #include <QColor> #include <QDebug> #include <QPointF> #include <QSizeF> #include <QRectF> #include <QAtomicInt> -#include <private/qmlstringconverters_p.h> -#include <private/qmlengine_p.h> -#include <qmlengine.h> -#include <qmlcontext.h> -#include <qmlmetatype.h> #include <QtCore/qdebug.h> #include <QtGui/qapplication.h> -#include <private/qmlcustomparser_p_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlcomponent_p.h> -#include "parser/qmljsast_p.h" -#include <private/qmlvmemetaobject_p.h> -#include <private/qmlexpression_p.h> -#include <private/qmlmetaproperty_p.h> -#include <private/qmlrewrite_p.h> -#include <qmlscriptstring.h> -#include <private/qmlglobal_p.h> - -#include <private/qmlscriptparser_p.h> QT_BEGIN_NAMESPACE @@ -2305,7 +2307,8 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode) return true; } -#include <private/qmljsparser_p.h> +#include <qmljsparser_p.h> + static QStringList astNodeToStringList(QmlJS::AST::Node *node) { if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) { diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index 8c48c63..809cc72 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -53,18 +53,19 @@ // We mean it. // +#include "qml.h" +#include "qmlerror.h" +#include "qmlinstruction_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qmlparser_p.h" +#include "qmlengine_p.h" +#include "qbitfield_p.h" +#include "qmlpropertycache_p.h" +#include "qmlintegercache_p.h" +#include "qmltypenamecache_p.h" + #include <QtCore/qbytearray.h> #include <QtCore/qset.h> -#include <qml.h> -#include <qmlerror.h> -#include <private/qmlinstruction_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qmlparser_p.h> -#include <private/qmlengine_p.h> -#include <private/qbitfield_p.h> -#include <private/qmlpropertycache_p.h> -#include <private/qmlintegercache_p.h> -#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 1e922b0..b66e026 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -40,25 +40,27 @@ ****************************************************************************/ #include "qmlcomponent.h" -#include <private/qmlcomponent_p.h> -#include <private/qmlcompiler_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlcompositetypedata_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlvme_p.h> +#include "qmlcomponent_p.h" + +#include "qmlcompiler_p.h" +#include "qmlcontext_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlengine_p.h" +#include "qmlvme_p.h" #include "qml.h" +#include "qmlengine.h" +#include "qmlbinding.h" +#include "qmlbinding_p.h" +#include "qmlglobal_p.h" +#include "qmlscriptparser_p.h" + +#include <qfxperf_p_p.h> + #include <QStack> -#include <private/qfxperf_p_p.h> #include <QStringList> -#include <qmlengine.h> #include <QFileInfo> -#include "qmlbinding.h" #include <QtCore/qdebug.h> #include <QApplication> -#include <private/qmlbinding_p.h> -#include <private/qmlglobal_p.h> - -#include <private/qmlscriptparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index 0abb58f..1cc5937 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -42,11 +42,12 @@ #ifndef QMLCOMPONENT_H #define QMLCOMPONENT_H +#include "qml.h" +#include "qmlerror.h" + #include <QtCore/qobject.h> #include <QtCore/qstring.h> #include <QtScript/qscriptvalue.h> -#include <qml.h> -#include <qmlerror.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index 61a8a10..1372d98 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -53,16 +53,19 @@ // We mean it. // +#include "qmlcomponent.h" + +#include "qmlengine_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qbitfield_p.h" +#include "qmlerror.h" +#include "qml.h" + #include <QtCore/QString> #include <QtCore/QStringList> #include <QtCore/QList> + #include <private/qobject_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qbitfield_p.h> -#include <qmlerror.h> -#include <qmlcomponent.h> -#include <qml.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h index 0d2843d..c8b9f25 100644 --- a/src/declarative/qml/qmlcompositetypedata_p.h +++ b/src/declarative/qml/qmlcompositetypedata_p.h @@ -53,8 +53,9 @@ // We mean it. // +#include "qmlengine_p.h" + #include <QtCore/qglobal.h> -#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index 2566e63..9590718 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -39,17 +39,19 @@ ** ****************************************************************************/ -#include <private/qmlcompositetypedata_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qmlscriptparser_p.h> -#include <qmlengine.h> +#include "qmlcompositetypemanager_p.h" + +#include "qmlcompositetypedata_p.h" +#include "qmlscriptparser_p.h" +#include "qmlengine.h" +#include "qmlengine_p.h" +#include "qmlcomponent.h" +#include "qmlcomponent_p.h" +#include "qmlcompiler_p.h" + #include <QtNetwork/qnetworkreply.h> -#include <private/qmlengine_p.h> #include <QtCore/qdebug.h> #include <QtCore/qfile.h> -#include <qmlcomponent.h> -#include <private/qmlcomponent_p.h> -#include <private/qmlcompiler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h index 0abbfb5..0169bff 100644 --- a/src/declarative/qml/qmlcompositetypemanager_p.h +++ b/src/declarative/qml/qmlcompositetypemanager_p.h @@ -53,11 +53,12 @@ // We mean it. // +#include "qmlscriptparser_p.h" +#include "qmlrefcount_p.h" +#include "qmlerror.h" +#include "qmlengine.h" + #include <QtCore/qglobal.h> -#include <private/qmlscriptparser_p.h> -#include <private/qmlrefcount_p.h> -#include <qmlerror.h> -#include <qmlengine.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 1afe945..c3971ae 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -39,17 +39,20 @@ ** ****************************************************************************/ -#include <qmlcontext.h> -#include <private/qmlcontext_p.h> -#include <private/qmlexpression_p.h> -#include <private/qmlengine_p.h> -#include <qmlengine.h> +#include "qmlcontext.h" +#include "qmlcontext_p.h" + +#include "qmlexpression_p.h" +#include "qmlengine_p.h" +#include "qmlengine.h" +#include "qmlbindingoptimizations_p.h" +#include "qmlinfo.h" + #include <qscriptengine.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qdebug.h> -#include <private/qmlbindingoptimizations_p.h> + #include <private/qscriptdeclarativeclass_p.h> -#include <qmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h index a70d5db..0229056 100644 --- a/src/declarative/qml/qmlcontext_p.h +++ b/src/declarative/qml/qmlcontext_p.h @@ -53,16 +53,19 @@ // We mean it. // -#include <qmlcontext.h> -#include <private/qobject_p.h> -#include <private/qmldeclarativedata_p.h> +#include "qmlcontext.h" + +#include "qmldeclarativedata_p.h" +#include "qmlengine_p.h" +#include "qmlintegercache_p.h" +#include "qmltypenamecache_p.h" + #include <QtCore/qhash.h> #include <QtScript/qscriptvalue.h> #include <QtCore/qset.h> + +#include <private/qobject_p.h> #include <private/qguard_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlintegercache_p.h> -#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp index d567da1..5635ceb 100644 --- a/src/declarative/qml/qmlcontextscriptclass.cpp +++ b/src/declarative/qml/qmlcontextscriptclass.cpp @@ -39,10 +39,11 @@ ** ****************************************************************************/ -#include <private/qmlcontextscriptclass_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmltypenamescriptclass_p.h> +#include "qmlcontextscriptclass_p.h" + +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmltypenamescriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h index 10b848a..a577d52 100644 --- a/src/declarative/qml/qmlcontextscriptclass_p.h +++ b/src/declarative/qml/qmlcontextscriptclass_p.h @@ -53,9 +53,11 @@ // We mean it. // +#include "qmltypenamecache_p.h" + #include <QtScript/qscriptclass.h> + #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcustomparser.cpp b/src/declarative/qml/qmlcustomparser.cpp index 9174fe6..9085440 100644 --- a/src/declarative/qml/qmlcustomparser.cpp +++ b/src/declarative/qml/qmlcustomparser.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <private/qmlcustomparser_p.h> -#include <private/qmlcustomparser_p_p.h> -#include <private/qmlparser_p.h> +#include "qmlcustomparser_p.h" +#include "qmlcustomparser_p_p.h" + +#include "qmlparser_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 88a264f..9502b08 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -53,11 +53,12 @@ // We mean it. // +#include "qmlmetatype.h" +#include "qmlerror.h" +#include "qmlparser_p.h" + #include <QtCore/qbytearray.h> #include <QtCore/qxmlstream.h> -#include <qmlmetatype.h> -#include <qmlerror.h> -#include <private/qmlparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlcustomparser_p_p.h b/src/declarative/qml/qmlcustomparser_p_p.h index e8673c9..c27a5bc 100644 --- a/src/declarative/qml/qmlcustomparser_p_p.h +++ b/src/declarative/qml/qmlcustomparser_p_p.h @@ -53,9 +53,11 @@ // We mean it. // +#include "qmlcustomparser_p.h" + +#include "qmlparser_p.h" + #include <QtCore/qglobal.h> -#include <private/qmlcustomparser_p.h> -#include <private/qmlparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmldeclarativedata_p.h b/src/declarative/qml/qmldeclarativedata_p.h index a6020d7..bdbb5c8 100644 --- a/src/declarative/qml/qmldeclarativedata_p.h +++ b/src/declarative/qml/qmldeclarativedata_p.h @@ -53,9 +53,10 @@ // We mean it. // -#include <private/qobject_p.h> #include <QtScript/qscriptvalue.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlCompiledData; diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index 1b02199..8812c31 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -40,15 +40,17 @@ ****************************************************************************/ #include "qmldom.h" -#include <private/qmldom_p.h> -#include <private/qmlcompositetypedata_p.h> -#include <private/qmlcompiler_p.h> -#include <private/qmlengine_p.h> +#include "qmldom_p.h" + +#include "qmlcompositetypedata_p.h" +#include "qmlcompiler_p.h" +#include "qmlengine_p.h" +#include "qmlscriptparser_p.h" +#include "qmlglobal_p.h" + #include <QtCore/QByteArray> #include <QtCore/QDebug> #include <QtCore/QString> -#include <private/qmlscriptparser_p.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmldom.h b/src/declarative/qml/qmldom.h index ad28d0d..24710f1 100644 --- a/src/declarative/qml/qmldom.h +++ b/src/declarative/qml/qmldom.h @@ -42,9 +42,10 @@ #ifndef QMLDOM_H #define QMLDOM_H +#include "qmlerror.h" + #include <QtCore/qlist.h> #include <QtCore/qshareddata.h> -#include <qmlerror.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmldom_p.h b/src/declarative/qml/qmldom_p.h index 10bf312..df6a980 100644 --- a/src/declarative/qml/qmldom_p.h +++ b/src/declarative/qml/qmldom_p.h @@ -53,8 +53,9 @@ // We mean it. // +#include "qmlparser_p.h" + #include <QtCore/QtGlobal> -#include <private/qmlparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 88a8c45..ce5b4a4 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -39,14 +39,33 @@ ** ****************************************************************************/ -#include <QtCore/qmetaobject.h> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> -#include <private/qobject_p.h> -#include <private/qmlcompiler_p.h> -#include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlglobalscriptclass_p.h> +#include "qmlengine_p.h" +#include "qmlengine.h" +#include "qmlcontext_p.h" +#include "qmlcompiler_p.h" +#include "qmlglobalscriptclass_p.h" +#include "qml.h" +#include "qmlbasicscript_p.h" +#include "qmlcontext.h" +#include "qmlexpression.h" +#include "qmlcomponent.h" +#include "qmlmetaproperty_p.h" +#include "qmlbinding_p.h" +#include "qmlvme_p.h" +#include "qmlenginedebug_p.h" +#include "qmlstringconverters_p.h" +#include "qmlxmlhttprequest_p.h" +#include "qmlsqldatabase_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" +#include "qmlscriptstring.h" +#include "qmlglobal_p.h" +#include "qmlworkerscript_p.h" + +#include <qfxperf_p_p.h> + +#include <QtCore/qmetaobject.h> #include <QScriptClass> #include <QNetworkReply> #include <QNetworkRequest> @@ -57,13 +76,7 @@ #include <QPair> #include <QDebug> #include <QMetaObject> -#include "qml.h" -#include <private/qfxperf_p_p.h> #include <QStack> -#include <private/qmlbasicscript_p.h> -#include "qmlengine.h" -#include "qmlcontext.h" -#include "qmlexpression.h" #include <QtCore/qthreadstorage.h> #include <QtCore/qthread.h> #include <QtCore/qcoreapplication.h> @@ -72,24 +85,15 @@ #include <QtGui/qvector3d.h> #include <QtGui/qsound.h> #include <QGraphicsObject> -#include <qmlcomponent.h> -#include <private/qmlmetaproperty_p.h> -#include <private/qmlbinding_p.h> -#include <private/qmlvme_p.h> -#include <private/qmlenginedebug_p.h> -#include <private/qmlstringconverters_p.h> -#include <private/qmlxmlhttprequest_p.h> -#include <private/qmlsqldatabase_p.h> -#include <private/qmltypenamescriptclass_p.h> -#include <private/qmllistscriptclass_p.h> -#include <qmlscriptstring.h> -#include <private/qmlglobal_p.h> #include <QtCore/qcryptographichash.h> -#include <private/qmlworkerscript_p.h> + +#include <private/qobject_p.h> +#include <private/qscriptdeclarativeclass_p.h> #ifdef Q_OS_WIN // for %APPDATA% -#include "qt_windows.h" -#include "qlibrary.h" +#include <qt_windows.h> +#include <qlibrary.h> + #define CSIDL_APPDATA 0x001a // <username>\Application Data #endif @@ -1215,8 +1219,9 @@ QmlEnginePrivate::Imports::~Imports() delete d; } -#include <qmlmetatype.h> -#include <private/qmltypenamecache_p.h> +#include "qmlmetatype.h" +#include "qmltypenamecache_p.h" + static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache) { if (!cache) diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 4eb9843..68dcb2d 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -53,6 +53,22 @@ // We mean it. // +#include "qmlengine.h" + +#include "qmlclassfactory_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qpodvector_p.h" +#include "qml.h" +#include "qmlbasicscript_p.h" +#include "qmlvaluetype_p.h" +#include "qmlcontext.h" +#include "qmlexpression.h" +#include "qmlmetaproperty_p.h" +#include "qmlpropertycache_p.h" +#include "qmlobjectscriptclass_p.h" +#include "qmlcontextscriptclass_p.h" +#include "qmlvaluetypescriptclass_p.h" + #include <QtScript/QScriptClass> #include <QtScript/QScriptValue> #include <QtScript/QScriptString> @@ -60,22 +76,9 @@ #include <QtCore/qlist.h> #include <QtCore/qpair.h> #include <QtCore/qstack.h> -#include <private/qobject_p.h> -#include <private/qmlclassfactory_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qpodvector_p.h> -#include <qml.h> -#include <private/qmlbasicscript_p.h> -#include <private/qmlvaluetype_p.h> -#include <qmlcontext.h> -#include <qmlengine.h> -#include <qmlexpression.h> #include <QtScript/qscriptengine.h> -#include <private/qmlmetaproperty_p.h> -#include <private/qmlpropertycache_p.h> -#include <private/qmlobjectscriptclass_p.h> -#include <private/qmlcontextscriptclass_p.h> -#include <private/qmlvaluetypescriptclass_p.h> + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp index 68c0607..034e4f5 100644 --- a/src/declarative/qml/qmlenginedebug.cpp +++ b/src/declarative/qml/qmlenginedebug.cpp @@ -39,16 +39,18 @@ ** ****************************************************************************/ -#include <private/qmlenginedebug_p.h> -#include <private/qmlboundsignal_p.h> +#include "qmlenginedebug_p.h" + +#include "qmlboundsignal_p.h" +#include "qmlengine.h" +#include "qmlmetatype.h" +#include "qmlmetaproperty.h" +#include "qmlbinding.h" +#include "qmlcontext_p.h" +#include "qmlwatcher_p.h" + #include <QtCore/qdebug.h> #include <QtCore/qmetaobject.h> -#include <qmlengine.h> -#include <qmlmetatype.h> -#include <qmlmetaproperty.h> -#include <qmlbinding.h> -#include <private/qmlcontext_p.h> -#include <private/qmlwatcher_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h index 8ba3d38..c173fdc 100644 --- a/src/declarative/qml/qmlenginedebug_p.h +++ b/src/declarative/qml/qmlenginedebug_p.h @@ -53,7 +53,8 @@ // We mean it. // -#include <private/qmldebugservice_p.h> +#include <qmldebugservice_p.h> + #include <QtCore/qurl.h> #include <QtCore/qvariant.h> diff --git a/src/declarative/qml/qmlerror.cpp b/src/declarative/qml/qmlerror.cpp index 3532cf5..7cb68cf 100644 --- a/src/declarative/qml/qmlerror.cpp +++ b/src/declarative/qml/qmlerror.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qmlerror.h" + #include <QtCore/qdebug.h> #include <QtCore/qfile.h> #include <QtCore/qstringlist.h> diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 276b118..ab9f9ea 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -40,13 +40,16 @@ ****************************************************************************/ #include "qmlexpression.h" -#include <private/qmlexpression_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlrewrite_p.h> -#include "QtCore/qdebug.h" -#include <private/qmlcompiler_p.h> +#include "qmlexpression_p.h" + +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlrewrite_p.h" +#include "qmlcompiler_p.h" + +#include <QtCore/qdebug.h> #include <QtScript/qscriptprogram.h> + #include <private/qscriptdeclarativeclass_p.h> Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h index 34783b2..c019f21 100644 --- a/src/declarative/qml/qmlexpression.h +++ b/src/declarative/qml/qmlexpression.h @@ -42,9 +42,10 @@ #ifndef QMLEXPRESSION_H #define QMLEXPRESSION_H +#include "qmlerror.h" + #include <QtCore/qobject.h> #include <QtCore/qvariant.h> -#include <qmlerror.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h index 6beeaec..57a3ce2 100644 --- a/src/declarative/qml/qmlexpression_p.h +++ b/src/declarative/qml/qmlexpression_p.h @@ -53,12 +53,15 @@ // We mean it. // -#include <private/qmlbasicscript_p.h> #include "qmlexpression.h" -#include <private/qmlengine_p.h> -#include <private/qguard_p.h> + +#include "qmlbasicscript_p.h" +#include "qmlengine_p.h" + #include <QtScript/qscriptvalue.h> +#include <private/qguard_p.h> + QT_BEGIN_NAMESPACE class QmlAbstractExpression diff --git a/src/declarative/qml/qmlglobalscriptclass.cpp b/src/declarative/qml/qmlglobalscriptclass.cpp index bb81d37..478a874 100644 --- a/src/declarative/qml/qmlglobalscriptclass.cpp +++ b/src/declarative/qml/qmlglobalscriptclass.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlglobalscriptclass_p.h> +#include "qmlglobalscriptclass_p.h" + #include <QtScript/qscriptstring.h> #include <QtScript/qscriptengine.h> #include <QtScript/qscriptvalueiterator.h> diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp index bbd6022..2dbc968 100644 --- a/src/declarative/qml/qmlinfo.cpp +++ b/src/declarative/qml/qmlinfo.cpp @@ -40,8 +40,10 @@ ****************************************************************************/ #include "qmlinfo.h" -#include <private/qmldeclarativedata_p.h> -#include <qmlcontext.h> + +#include "qmldeclarativedata_p.h" +#include "qmlcontext.h" + #include <QtGui/qapplication.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp index 322ae9c..010010d 100644 --- a/src/declarative/qml/qmlinstruction.cpp +++ b/src/declarative/qml/qmlinstruction.cpp @@ -39,8 +39,10 @@ ** ****************************************************************************/ -#include <private/qmlinstruction_p.h> -#include <private/qmlcompiler_p.h> +#include "qmlinstruction_p.h" + +#include "qmlcompiler_p.h" + #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp index 673d683..1968873 100644 --- a/src/declarative/qml/qmlintegercache.cpp +++ b/src/declarative/qml/qmlintegercache.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <private/qmlintegercache_p.h> -#include <private/qmlengine_p.h> -#include <qmlmetatype.h> +#include "qmlintegercache_p.h" + +#include "qmlengine_p.h" +#include "qmlmetatype.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h index 2b10dcc..d9df52a 100644 --- a/src/declarative/qml/qmlintegercache_p.h +++ b/src/declarative/qml/qmlintegercache_p.h @@ -53,11 +53,13 @@ // We mean it. // -#include <private/qmlrefcount_p.h> -#include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlcleanup_p.h> +#include "qmlrefcount_p.h" +#include "qmlcleanup_p.h" + #include <QtCore/qhash.h> +#include <private/qscriptdeclarativeclass_p.h> + QT_BEGIN_NAMESPACE class QmlType; diff --git a/src/declarative/qml/qmllist.h b/src/declarative/qml/qmllist.h index e51b078..ad2d874 100644 --- a/src/declarative/qml/qmllist.h +++ b/src/declarative/qml/qmllist.h @@ -42,7 +42,7 @@ #ifndef QMLLIST_H #define QMLLIST_H -#include <qmlprivate.h> +#include "qmlprivate.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp index 6e67864..d93498d 100644 --- a/src/declarative/qml/qmllistscriptclass.cpp +++ b/src/declarative/qml/qmllistscriptclass.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmllistscriptclass_p.h> -#include <private/qmlengine_p.h> +#include "qmllistscriptclass_p.h" + +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 44fa3d6..2b3b385 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -40,19 +40,23 @@ ****************************************************************************/ #include "qmlmetaproperty.h" -#include <private/qmlmetaproperty_p.h> -#include <private/qmlcompositetypedata_p.h> -#include <qml.h> -#include <private/qfxperf_p_p.h> -#include <QStringList> +#include "qmlmetaproperty_p.h" + +#include "qmlcompositetypedata_p.h" +#include "qml.h" #include "qmlbinding.h" -#include <qmlcontext.h> -#include <private/qmlboundsignal_p.h> -#include <math.h> +#include "qmlcontext.h" +#include "qmlboundsignal_p.h" +#include "qmlengine.h" +#include "qmlengine_p.h" +#include "qmldeclarativedata_p.h" + +#include <qfxperf_p_p.h> + +#include <QStringList> #include <QtCore/qdebug.h> -#include <qmlengine.h> -#include <private/qmlengine_p.h> -#include <private/qmldeclarativedata_p.h> + +#include <math.h> Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index 4315c71..b4d72bb 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -54,8 +54,10 @@ // #include "qmlmetaproperty.h" + +#include "qmlpropertycache_p.h" + #include <private/qobject_p.h> -#include <private/qmlpropertycache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 46d967b..edf8974 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -40,13 +40,15 @@ ****************************************************************************/ #include "qmlmetatype.h" + +#include "qmlproxymetaobject_p.h" +#include "qmlcustomparser_p.h" + #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> #include <QtCore/qmetaobject.h> #include <QtCore/qbitarray.h> #include <QtCore/qreadwritelock.h> -#include <private/qmlproxymetaobject_p.h> - #include <qmetatype.h> #include <qobjectdefs.h> #include <qdatetime.h> @@ -56,10 +58,10 @@ #include <qstringlist.h> #include <qvector.h> #include <qlocale.h> -#include <ctype.h> #include <QtCore/qcryptographichash.h> #include <QtScript/qscriptvalue.h> -#include <private/qmlcustomparser_p.h> + +#include <ctype.h> #ifdef QT_BOOTSTRAPPED # ifndef QT_NO_GEOM_VARIANT @@ -921,6 +923,7 @@ QList<QmlType*> QmlMetaType::qmlTypes() #include <QtGui/qsizepolicy.h> #include <QtGui/qkeysequence.h> #include <QtGui/qpen.h> + //#include <QtGui/qtextlength.h> #include <QtGui/qtextformat.h> #include <QtGui/qmatrix.h> @@ -930,6 +933,7 @@ QList<QmlType*> QmlMetaType::qmlTypes() #include <QtGui/qvector3d.h> #include <QtGui/qvector4d.h> #include <QtGui/qquaternion.h> + Q_DECLARE_METATYPE(QScriptValue); /*! diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h index 99d6743..d17b44f 100644 --- a/src/declarative/qml/qmlmetatype.h +++ b/src/declarative/qml/qmlmetatype.h @@ -42,13 +42,14 @@ #ifndef QMLMETATYPE_H #define QMLMETATYPE_H +#include "qmlprivate.h" +#include "qmlparserstatus.h" +#include "qmlpropertyvaluesource.h" +#include "qmlpropertyvalueinterceptor.h" + #include <QtCore/qglobal.h> #include <QtCore/qvariant.h> #include <QtCore/qbitarray.h> -#include <qmlprivate.h> -#include <qmlparserstatus.h> -#include <qmlpropertyvaluesource.h> -#include <qmlpropertyvalueinterceptor.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index fb3dd07..86ee29c 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -39,16 +39,19 @@ ** ****************************************************************************/ -#include <private/qmlobjectscriptclass_p.h> -#include <private/qmlengine_p.h> -#include <private/qguard_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmldeclarativedata_p.h> -#include <private/qmltypenamescriptclass_p.h> -#include <private/qmllistscriptclass_p.h> -#include <qmlbinding.h> +#include "qmlobjectscriptclass_p.h" + +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" +#include "qmlbinding.h" + #include <QtCore/qtimer.h> +#include <private/qguard_p.h> + QT_BEGIN_NAMESPACE struct ObjectData : public QScriptDeclarativeClass::Object { diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h index 6169812..d8ef1d2 100644 --- a/src/declarative/qml/qmlobjectscriptclass_p.h +++ b/src/declarative/qml/qmlobjectscriptclass_p.h @@ -53,10 +53,12 @@ // We mean it. // +#include "qmlpropertycache_p.h" +#include "qmltypenamecache_p.h" + #include <QtScript/qscriptclass.h> + #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlpropertycache_p.h> -#include <private/qmltypenamecache_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index d92529b..02a9e70 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -39,23 +39,26 @@ ** ****************************************************************************/ -#include <private/qmlparser_p.h> +#include "qmlparser_p.h" + +#include "qmlpropertyvaluesource.h" +#include "qmlvme_p.h" +#include "qml.h" +#include "qmlcomponent_p.h" +#include "qmlcomponent.h" +#include "qmetaobjectbuilder_p.h" +#include "qmlvmemetaobject_p.h" +#include "qmlcompiler_p.h" +#include "parser/qmljsast_p.h" +#include "parser/qmljsengine_p.h" + +#include <qfxperf_p_p.h> + #include <QStack> -#include <qmlpropertyvaluesource.h> #include <QColor> #include <QPointF> #include <QSizeF> #include <QRectF> -#include <private/qmlvme_p.h> -#include <private/qfxperf_p_p.h> -#include <qml.h> -#include <private/qmlcomponent_p.h> -#include <qmlcomponent.h> -#include <private/qmetaobjectbuilder_p.h> -#include <private/qmlvmemetaobject_p.h> -#include <private/qmlcompiler_p.h> -#include "parser/qmljsast_p.h" -#include "parser/qmljsengine_p.h" #include <QtDebug> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index 73bb498..aa7a762 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -53,11 +53,13 @@ // We mean it. // +#include "qml.h" +#include "qmlrefcount_p.h" + #include <QtCore/QByteArray> #include <QtCore/QList> #include <QtCore/qstring.h> -#include <qml.h> -#include <private/qmlrefcount_p.h> + #include <private/qobject_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h index 0eec43c..dd98110 100644 --- a/src/declarative/qml/qmlprivate.h +++ b/src/declarative/qml/qmlprivate.h @@ -43,6 +43,7 @@ #define QMLPRIVATE_H #include <QtCore/qglobal.h> + #ifndef Q_OS_WIN #include <stdint.h> #endif diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp index 7efeb82..7e3a1c4 100644 --- a/src/declarative/qml/qmlpropertycache.cpp +++ b/src/declarative/qml/qmlpropertycache.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <private/qmlpropertycache_p.h> -#include <private/qmlengine_p.h> -#include <qmlbinding.h> +#include "qmlpropertycache_p.h" + +#include "qmlengine_p.h" +#include "qmlbinding.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h index e4efc04..7cee606 100644 --- a/src/declarative/qml/qmlpropertycache_p.h +++ b/src/declarative/qml/qmlpropertycache_p.h @@ -53,11 +53,13 @@ // We mean it. // -#include <private/qmlrefcount_p.h> -#include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlcleanup_p.h> +#include "qmlrefcount_p.h" +#include "qmlcleanup_p.h" + #include <QtCore/qvector.h> +#include <private/qscriptdeclarativeclass_p.h> + QT_BEGIN_NAMESPACE class QmlEngine; diff --git a/src/declarative/qml/qmlpropertyvalueinterceptor.cpp b/src/declarative/qml/qmlpropertyvalueinterceptor.cpp index c8a3f74..9d0d7f6 100644 --- a/src/declarative/qml/qmlpropertyvalueinterceptor.cpp +++ b/src/declarative/qml/qmlpropertyvalueinterceptor.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qmlpropertyvalueinterceptor.h" + #include "qml.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlpropertyvaluesource.cpp b/src/declarative/qml/qmlpropertyvaluesource.cpp index 7c42e2f..50f2f8c 100644 --- a/src/declarative/qml/qmlpropertyvaluesource.cpp +++ b/src/declarative/qml/qmlpropertyvaluesource.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qmlpropertyvaluesource.h" + #include "qml.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlproxymetaobject.cpp b/src/declarative/qml/qmlproxymetaobject.cpp index 72e8504..983c350 100644 --- a/src/declarative/qml/qmlproxymetaobject.cpp +++ b/src/declarative/qml/qmlproxymetaobject.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qmlproxymetaobject_p.h> +#include "qmlproxymetaobject_p.h" #include <QDebug> diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h index 7f9163c..f983030 100644 --- a/src/declarative/qml/qmlproxymetaobject_p.h +++ b/src/declarative/qml/qmlproxymetaobject_p.h @@ -53,11 +53,13 @@ // We mean it. // +#include "qmetaobjectbuilder_p.h" +#include "qml.h" + #include <QtCore/QMetaObject> #include <QtCore/QObject> -#include <private/qmetaobjectbuilder_p.h> + #include <private/qobject_p.h> -#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlrefcount.cpp b/src/declarative/qml/qmlrefcount.cpp index dbe84ad..9422625 100644 --- a/src/declarative/qml/qmlrefcount.cpp +++ b/src/declarative/qml/qmlrefcount.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp index 6674095..34bd198 100644 --- a/src/declarative/qml/qmlrewrite.cpp +++ b/src/declarative/qml/qmlrewrite.cpp @@ -39,9 +39,11 @@ ** ****************************************************************************/ -#include <private/qmlrewrite_p.h> +#include "qmlrewrite_p.h" + +#include "qmlglobal_p.h" + #include <QtCore/qdebug.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 89336f3..35234ec 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -39,24 +39,23 @@ ** ****************************************************************************/ -#include <private/qmlscriptparser_p.h> -#include <private/qmlparser_p.h> +#include "qmlscriptparser_p.h" +#include "qmlparser_p.h" #include "parser/qmljsengine_p.h" #include "parser/qmljsparser_p.h" #include "parser/qmljslexer_p.h" #include "parser/qmljsnodepool_p.h" #include "parser/qmljsastvisitor_p.h" #include "parser/qmljsast_p.h" +#include "qmlrewrite_p.h" -#include <private/qmlrewrite_p.h> +#include <qfxperf_p_p.h> #include <QStack> #include <QCoreApplication> #include <QtDebug> -#include <private/qfxperf_p_p.h> - QT_BEGIN_NAMESPACE using namespace QmlJS; diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h index d6f57c3..16888aa 100644 --- a/src/declarative/qml/qmlscriptparser_p.h +++ b/src/declarative/qml/qmlscriptparser_p.h @@ -52,10 +52,11 @@ // We mean it. // +#include "qmlerror.h" +#include "qmlparser_p.h" + #include <QtCore/QList> #include <QtCore/QUrl> -#include <qmlerror.h> -#include <private/qmlparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index 8c4c7bf..be6ef16 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -39,9 +39,14 @@ ** ****************************************************************************/ +#include "qmlsqldatabase_p.h" + +#include "qmlengine.h" +#include "qmlengine_p.h" +#include "qmlrefcount_p.h" +#include "qmlengine_p.h" + #include <QtCore/qobject.h> -#include <qmlengine.h> -#include <private/qmlengine_p.h> #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptvalueiterator.h> #include <QtScript/qscriptcontext.h> @@ -51,11 +56,8 @@ #include <QtSql/qsqlquery.h> #include <QtSql/qsqlerror.h> #include <QtSql/qsqlrecord.h> -#include <private/qmlrefcount_p.h> -#include <private/qmlengine_p.h> #include <QtCore/qstack.h> #include <QtCore/qcryptographichash.h> -#include <private/qmlsqldatabase_p.h> #include <QtCore/qsettings.h> #include <QtCore/qdir.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qmlstringconverters.cpp b/src/declarative/qml/qmlstringconverters.cpp index 872feba..c68654f 100644 --- a/src/declarative/qml/qmlstringconverters.cpp +++ b/src/declarative/qml/qmlstringconverters.cpp @@ -39,13 +39,14 @@ ** ****************************************************************************/ +#include "qmlstringconverters_p.h" + #include <QtGui/qcolor.h> #include <QtGui/qvector3d.h> #include <QtCore/qpoint.h> #include <QtCore/qrect.h> #include <QtCore/qsize.h> #include <QtCore/qvariant.h> -#include <private/qmlstringconverters_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlstringconverters_p.h b/src/declarative/qml/qmlstringconverters_p.h index a31f06a..380a904 100644 --- a/src/declarative/qml/qmlstringconverters_p.h +++ b/src/declarative/qml/qmlstringconverters_p.h @@ -54,6 +54,8 @@ // #include <QtCore/qglobal.h> +#include <QtCore/qvariant.h> + class QColor; class QPointF; class QSizeF; diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp index 1a38aa5..7e68492 100644 --- a/src/declarative/qml/qmltypenamecache.cpp +++ b/src/declarative/qml/qmltypenamecache.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmltypenamecache_p.h> -#include <private/qmlengine_p.h> +#include "qmltypenamecache_p.h" + +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h index 6ff403d..754399f 100644 --- a/src/declarative/qml/qmltypenamecache_p.h +++ b/src/declarative/qml/qmltypenamecache_p.h @@ -53,9 +53,10 @@ // We mean it. // -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" +#include "qmlcleanup_p.h" + #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlcleanup_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp index 1f13f20..72106ae 100644 --- a/src/declarative/qml/qmltypenamescriptclass.cpp +++ b/src/declarative/qml/qmltypenamescriptclass.cpp @@ -39,9 +39,10 @@ ** ****************************************************************************/ -#include <private/qmltypenamescriptclass_p.h> -#include <private/qmlengine_p.h> -#include <private/qmltypenamecache_p.h> +#include "qmltypenamescriptclass_p.h" + +#include "qmlengine_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h index f630854..e72c05c 100644 --- a/src/declarative/qml/qmltypenamescriptclass_p.h +++ b/src/declarative/qml/qmltypenamescriptclass_p.h @@ -52,9 +52,11 @@ // // We mean it. // +#include "qmlengine_p.h" + #include <QtScript/qscriptclass.h> + #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp index 8a05312..6d08cd1 100644 --- a/src/declarative/qml/qmlvaluetype.cpp +++ b/src/declarative/qml/qmlvaluetype.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qmlvaluetype_p.h> +#include "qmlvaluetype_p.h" + #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h index 770650a..800edee 100644 --- a/src/declarative/qml/qmlvaluetype_p.h +++ b/src/declarative/qml/qmlvaluetype_p.h @@ -53,12 +53,13 @@ // We mean it. // +#include "qmlmetaproperty.h" + #include <QtCore/qobject.h> #include <QtCore/qrect.h> #include <QtCore/qvariant.h> #include <QtGui/qvector3d.h> #include <QtGui/qfont.h> -#include <qmlmetaproperty.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp index b3b09be..57f999f 100644 --- a/src/declarative/qml/qmlvaluetypescriptclass.cpp +++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmlvaluetypescriptclass_p.h> -#include <private/qmlengine_p.h> +#include "qmlvaluetypescriptclass_p.h" + +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetypescriptclass_p.h b/src/declarative/qml/qmlvaluetypescriptclass_p.h index 19020b2..98d0251 100644 --- a/src/declarative/qml/qmlvaluetypescriptclass_p.h +++ b/src/declarative/qml/qmlvaluetypescriptclass_p.h @@ -53,6 +53,7 @@ // We mean it. // #include <QtScript/qscriptclass.h> + #include <private/qscriptdeclarativeclass_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index d080268..116163a 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -39,36 +39,39 @@ ** ****************************************************************************/ -#include <private/qmlvme_p.h> -#include <private/qmlcompiler_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qmlboundsignal_p.h> -#include <private/qmlstringconverters_p.h> -#include <private/qmetaobjectbuilder_p.h> -#include <private/qmldeclarativedata_p.h> -#include <qml.h> -#include <private/qmlcustomparser_p.h> +#include "qmlvme_p.h" + +#include "qmlcompiler_p.h" +#include "qmlboundsignal_p.h" +#include "qmlstringconverters_p.h" +#include "qmetaobjectbuilder_p.h" +#include "qmldeclarativedata_p.h" +#include "qml.h" +#include "qmlcustomparser_p.h" +#include "qmlengine.h" +#include "qmlcontext.h" +#include "qmlcomponent.h" +#include "qmlbinding.h" +#include "qmlengine_p.h" +#include "qmlcomponent_p.h" +#include "qmlvmemetaobject_p.h" +#include "qmlbinding_p.h" +#include "qmlcontext_p.h" +#include "qmlbindingoptimizations_p.h" +#include "qmlglobal_p.h" +#include "qmlscriptstring.h" + +#include <qfxperf_p_p.h> + #include <QStack> #include <QWidget> #include <QColor> #include <QPointF> #include <QSizeF> #include <QRectF> -#include <qmlengine.h> -#include <qmlcontext.h> -#include <qmlcomponent.h> -#include <qmlbinding.h> -#include <private/qmlengine_p.h> -#include <private/qmlcomponent_p.h> -#include <private/qmlvmemetaobject_p.h> #include <QtCore/qdebug.h> #include <QtCore/qvarlengtharray.h> #include <QtGui/qapplication.h> -#include <private/qmlbinding_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlbindingoptimizations_p.h> -#include <private/qmlglobal_p.h> -#include <qmlscriptstring.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h index f4f54ee..9c45dc1 100644 --- a/src/declarative/qml/qmlvme_p.h +++ b/src/declarative/qml/qmlvme_p.h @@ -53,10 +53,11 @@ // We mean it. // +#include "qmlerror.h" +#include "qbitfield_p.h" + #include <QtCore/QString> #include <QtCore/QStack> -#include <qmlerror.h> -#include <private/qbitfield_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 5e19347..8588eff 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -39,15 +39,17 @@ ** ****************************************************************************/ -#include <private/qmlvmemetaobject_p.h> -#include <qml.h> -#include <private/qmlrefcount_p.h> +#include "qmlvmemetaobject_p.h" + +#include "qml.h" +#include "qmlrefcount_p.h" +#include "qmlexpression.h" +#include "qmlcontext_p.h" + #include <QColor> #include <QDate> #include <QtCore/qlist.h> #include <QtCore/qdebug.h> -#include <qmlexpression.h> -#include <private/qmlcontext_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvmemetaobject_p.h b/src/declarative/qml/qmlvmemetaobject_p.h index f78cfaa..e737721 100644 --- a/src/declarative/qml/qmlvmemetaobject_p.h +++ b/src/declarative/qml/qmlvmemetaobject_p.h @@ -53,10 +53,12 @@ // We mean it. // -#include <qml.h> +#include "qml.h" + #include <QtCore/QMetaObject> #include <QtCore/QBitArray> #include <QtCore/QPair> + #include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp index 2ecb1d9..507c11d 100644 --- a/src/declarative/qml/qmlwatcher.cpp +++ b/src/declarative/qml/qmlwatcher.cpp @@ -39,14 +39,16 @@ ** ****************************************************************************/ +#include "qmlwatcher_p.h" + +#include "qmlexpression.h" +#include "qmlcontext.h" +#include "qml.h" + +#include <qmldebugservice_p.h> + #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> -#include <qmlexpression.h> -#include <private/qmldebugservice_p.h> -#include <qmlcontext.h> -#include <qml.h> - -#include <private/qmlwatcher_p.h> QT_BEGIN_NAMESPACE @@ -180,4 +182,4 @@ void QmlWatcher::addPropertyWatch(int id, QObject *object, quint32 debugId, cons QT_END_NAMESPACE -#include "qmlwatcher.moc" +#include <qmlwatcher.moc> diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp index 0437bd6..2a3dbce 100644 --- a/src/declarative/qml/qmlworkerscript.cpp +++ b/src/declarative/qml/qmlworkerscript.cpp @@ -39,12 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlworkerscript_p.h> +#include "qmlworkerscript_p.h" + +#include "qmlengine_p.h" + #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> #include <QtScript/qscriptengine.h> -#include <private/qmlengine_p.h> #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> #include <QtScript/qscriptvalueiterator.h> diff --git a/src/declarative/qml/qmlworkerscript_p.h b/src/declarative/qml/qmlworkerscript_p.h index 96394ae..51efc4b 100644 --- a/src/declarative/qml/qmlworkerscript_p.h +++ b/src/declarative/qml/qmlworkerscript_p.h @@ -53,9 +53,10 @@ // We mean it. // +#include "qml.h" +#include "qmlparserstatus.h" + #include <QtCore/qthread.h> -#include <qml.h> -#include <qmlparserstatus.h> #include <QtScript/qscriptvalue.h> #include <QtCore/qurl.h> diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp index 18d3c55..d1705a1 100644 --- a/src/declarative/qml/qmlxmlhttprequest.cpp +++ b/src/declarative/qml/qmlxmlhttprequest.cpp @@ -39,19 +39,20 @@ ** ****************************************************************************/ +#include "qmlxmlhttprequest_p.h" + +#include "qmlengine.h" +#include "qmlengine_p.h" +#include "qmlrefcount_p.h" +#include "qmlengine_p.h" + #include <QtCore/qobject.h> -#include <qmlengine.h> -#include <private/qmlengine_p.h> #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptcontext.h> #include <QtScript/qscriptengine.h> #include <QtNetwork/qnetworkreply.h> #include <QtCore/qxmlstream.h> -#include <private/qmlrefcount_p.h> -#include <private/qmlengine_p.h> #include <QtCore/qstack.h> -#include <private/qmlxmlhttprequest_p.h> - #include <QtCore/qdebug.h> // From DOM-Level-3-Core spec @@ -1590,4 +1591,4 @@ void qt_add_qmlxmlhttprequest(QScriptEngine *engine) engine->globalObject().setProperty(QLatin1String("DOMException"), domExceptionPrototype); } -#include "qmlxmlhttprequest.moc" +#include <qmlxmlhttprequest.moc> diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp index 1f66393..237d33f 100644 --- a/src/declarative/qml/rewriter/rewriter.cpp +++ b/src/declarative/qml/rewriter/rewriter.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/rewriter_p.h> -#include <private/qmljsast_p.h> +#include "rewriter_p.h" + +#include <qmljsast_p.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h index 731621d..57e7ea2 100644 --- a/src/declarative/qml/rewriter/rewriter_p.h +++ b/src/declarative/qml/rewriter/rewriter_p.h @@ -42,12 +42,13 @@ #ifndef REWRITER_H #define REWRITER_H +#include "textwriter_p.h" + +#include <qmljsastvisitor_p.h> + #include <QtCore/QList> #include <QtCore/QString> -#include <private/textwriter_p.h> -#include <private/qmljsastvisitor_p.h> - QT_BEGIN_HEADER QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp index 876db4d..8f89f12 100644 --- a/src/declarative/qml/rewriter/textwriter.cpp +++ b/src/declarative/qml/rewriter/textwriter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/textwriter_p.h> +#include "textwriter_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/rewriter/textwriter_p.h b/src/declarative/qml/rewriter/textwriter_p.h index f7b8b26..a19fa5e 100644 --- a/src/declarative/qml/rewriter/textwriter_p.h +++ b/src/declarative/qml/rewriter/textwriter_p.h @@ -42,12 +42,12 @@ #ifndef TEXTWRITER_H #define TEXTWRITER_H +#include <qmljsglobal_p.h> + #include <QtCore/QString> #include <QtCore/QList> #include <QtGui/QTextCursor> -#include <private/qmljsglobal_p.h> - QT_BEGIN_HEADER QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp index 9ffe9a9..f62f810 100644 --- a/src/declarative/util/qfxperf.cpp +++ b/src/declarative/util/qfxperf.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qfxperf_p_p.h b/src/declarative/util/qfxperf_p_p.h index 0e12912..e3f820c 100644 --- a/src/declarative/util/qfxperf_p_p.h +++ b/src/declarative/util/qfxperf_p_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include <private/qperformancelog_p_p.h> +#include "qperformancelog_p_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index c6e8a18..0f5a0f0 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -39,26 +39,30 @@ ** ****************************************************************************/ -#include <private/qmlanimation_p.h> -#include "qvariant.h" -#include "qcolor.h" -#include "qfile.h" -#include "qmlpropertyvaluesource.h" -#include "qml.h" -#include "qmlinfo.h" -#include <private/qmlanimation_p_p.h> -#include <private/qmlbehavior_p.h> +#include "qmlanimation_p.h" +#include "qmlanimation_p_p.h" + +#include "qmlbehavior_p.h" +#include "qmlstateoperations_p.h" + +#include <qmlpropertyvaluesource.h> +#include <qml.h> +#include <qmlinfo.h> +#include <qmlexpression.h> +#include <qmlstringconverters_p.h> +#include <qmlglobal_p.h> + +#include <qvariant.h> +#include <qcolor.h> +#include <qfile.h> #include <QParallelAnimationGroup> #include <QSequentialAnimationGroup> #include <QtCore/qset.h> #include <QtCore/qrect.h> #include <QtCore/qpoint.h> #include <QtCore/qsize.h> -#include <qmlexpression.h> -#include <private/qmlstateoperations_p.h> -#include <private/qmlstringconverters_p.h> + #include <private/qvariantanimation_p.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index 87b6703..707ed33 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -42,15 +42,17 @@ #ifndef QMLANIMATION_H #define QMLANIMATION_H -#include <QtCore/qvariant.h> -#include <QtCore/QAbstractAnimation> -#include <QtGui/qcolor.h> -#include <private/qmltransition_p.h> +#include "qmltransition_p.h" +#include "qmlstate_p.h" + #include <qmlpropertyvaluesource.h> -#include <private/qmlstate_p.h> #include <qml.h> #include <qmlscriptstring.h> +#include <QtCore/qvariant.h> +#include <QtCore/QAbstractAnimation> +#include <QtGui/qcolor.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index 326e1c6..5dac59a 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -53,19 +53,23 @@ // We mean it. // -#include <private/qobject_p.h> -#include <private/qmlnullablevalue_p_p.h> -#include <private/qvariantanimation_p.h> +#include "qmlanimation_p.h" + +#include "qmlnullablevalue_p_p.h" +#include "qmltimeline_p_p.h" + +#include <qml.h> +#include <qmlcontext.h> + #include <QtCore/QPauseAnimation> #include <QtCore/QVariantAnimation> #include <QtCore/QAnimationGroup> #include <QtGui/QColor> -#include <private/qmlanimation_p.h> -#include <qml.h> -#include <qmlcontext.h> -#include <private/qmltimeline_p_p.h> #include <QDebug> +#include <private/qobject_p.h> +#include <private/qvariantanimation_p.h> + QT_BEGIN_NAMESPACE //interface for classes that provide animation actions for QActionAnimation diff --git a/src/declarative/util/qmlbehavior.cpp b/src/declarative/util/qmlbehavior.cpp index ca2cca5..9757fa2 100644 --- a/src/declarative/util/qmlbehavior.cpp +++ b/src/declarative/util/qmlbehavior.cpp @@ -39,14 +39,18 @@ ** ****************************************************************************/ -#include <private/qobject_p.h> -#include <private/qmlanimation_p.h> -#include <private/qmltransition_p.h> -#include <private/qmlbehavior_p.h> +#include "qmlbehavior_p.h" + +#include "qmlanimation_p.h" +#include "qmltransition_p.h" + #include <qmlcontext.h> #include <qmlinfo.h> + #include <QtCore/qparallelanimationgroup.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,Behavior,QmlBehavior) diff --git a/src/declarative/util/qmlbehavior_p.h b/src/declarative/util/qmlbehavior_p.h index 581a0a8..da3b40f 100644 --- a/src/declarative/util/qmlbehavior_p.h +++ b/src/declarative/util/qmlbehavior_p.h @@ -42,10 +42,11 @@ #ifndef QMLBEHAVIOR_H #define QMLBEHAVIOR_H +#include "qmlstate_p.h" + #include <qmlpropertyvaluesource.h> #include <qmlpropertyvalueinterceptor.h> #include <qml.h> -#include <private/qmlstate_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index fb2e9ee..c68cef2 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -39,16 +39,20 @@ ** ****************************************************************************/ +#include "qmlbind_p.h" + +#include "qmlnullablevalue_p_p.h" + #include <qmlengine.h> #include <qmlcontext.h> -#include <private/qobject_p.h> + #include <QtCore/qfile.h> #include <QtCore/qdebug.h> #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptcontext.h> #include <QtScript/qscriptengine.h> -#include <private/qmlnullablevalue_p_p.h> -#include <private/qmlbind_p.h> + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlbind_p.h b/src/declarative/util/qmlbind_p.h index 4d85698..4d7cd1f 100644 --- a/src/declarative/util/qmlbind_p.h +++ b/src/declarative/util/qmlbind_p.h @@ -42,9 +42,10 @@ #ifndef QMLBIND_H #define QMLBIND_H -#include <QtCore/qobject.h> #include <qml.h> +#include <QtCore/qobject.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index f01b7a9..f5fbd3f 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -39,13 +39,16 @@ ** ****************************************************************************/ -#include <private/qmlconnection_p.h> +#include "qmlconnection_p.h" + #include <qmlexpression.h> -#include <private/qmlboundsignal_p.h> -#include "private/qobject_p.h" +#include <qmlboundsignal_p.h> #include <qmlcontext.h> + #include <QtCore/qdebug.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlConnectionPrivate : public QObjectPrivate diff --git a/src/declarative/util/qmlconnection_p.h b/src/declarative/util/qmlconnection_p.h index 1bc81fe..52bc247 100644 --- a/src/declarative/util/qmlconnection_p.h +++ b/src/declarative/util/qmlconnection_p.h @@ -42,11 +42,12 @@ #ifndef QMLCONNECTION_H #define QMLCONNECTION_H -#include <QtCore/qobject.h> -#include <QtCore/qstring.h> #include <qml.h> #include <qmlscriptstring.h> +#include <QtCore/qobject.h> +#include <QtCore/qstring.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmldatetimeformatter.cpp b/src/declarative/util/qmldatetimeformatter.cpp index 4486912..9d216cf 100644 --- a/src/declarative/util/qmldatetimeformatter.cpp +++ b/src/declarative/util/qmldatetimeformatter.cpp @@ -39,10 +39,12 @@ ** ****************************************************************************/ -#include <private/qmldatetimeformatter_p.h> -#include "private/qobject_p.h" +#include "qmldatetimeformatter_p.h" + #include <QtCore/qlocale.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE //TODO: may need optimisation as the QDateTime member may not be needed? diff --git a/src/declarative/util/qmldatetimeformatter_p.h b/src/declarative/util/qmldatetimeformatter_p.h index cd5f75f..c90ee8c 100644 --- a/src/declarative/util/qmldatetimeformatter_p.h +++ b/src/declarative/util/qmldatetimeformatter_p.h @@ -42,9 +42,10 @@ #ifndef QMLDATETIMEFORMATTER_H #define QMLDATETIMEFORMATTER_H -#include <QtCore/qdatetime.h> #include <qml.h> +#include <QtCore/qdatetime.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmleasefollow.cpp b/src/declarative/util/qmleasefollow.cpp index 0b844f9..e3153b1 100644 --- a/src/declarative/util/qmleasefollow.cpp +++ b/src/declarative/util/qmleasefollow.cpp @@ -39,11 +39,15 @@ ** ****************************************************************************/ -#include <private/qmleasefollow_p.h> +#include "qmleasefollow_p.h" + +#include "qmlanimation_p_p.h" + #include <qmlmetaproperty.h> -#include <math.h> + #include <QtCore/qdebug.h> -#include <private/qmlanimation_p_p.h> + +#include <math.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmleasefollow_p.h b/src/declarative/util/qmleasefollow_p.h index 8ea2b8f..ef095a3 100644 --- a/src/declarative/util/qmleasefollow_p.h +++ b/src/declarative/util/qmleasefollow_p.h @@ -42,10 +42,11 @@ #ifndef QMLEASEFOLLOW_H #define QMLEASEFOLLOW_H -#include <QtCore/qobject.h> #include <qml.h> #include <qmlpropertyvaluesource.h> +#include <QtCore/qobject.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp index 4874f50..8230b1a 100644 --- a/src/declarative/util/qmlfontloader.cpp +++ b/src/declarative/util/qmlfontloader.cpp @@ -39,17 +39,20 @@ ** ****************************************************************************/ -#include "private/qobject_p.h" -#include <private/qmlfontloader_p.h> +#include "qmlfontloader_p.h" + +#include <qmlcontext.h> +#include <qmlengine.h> + #include <QUrl> #include <QDebug> #include <QNetworkRequest> #include <QNetworkReply> #include <QFile> -#include <qmlcontext.h> -#include <qmlengine.h> #include <QFontDatabase> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlFontLoaderPrivate : public QObjectPrivate diff --git a/src/declarative/util/qmlfontloader_p.h b/src/declarative/util/qmlfontloader_p.h index 0202f3c..aac8a71 100644 --- a/src/declarative/util/qmlfontloader_p.h +++ b/src/declarative/util/qmlfontloader_p.h @@ -42,9 +42,10 @@ #ifndef QMLFONTLOADER_H #define QMLFONTLOADER_H -#include <QtCore/qobject.h> #include <qml.h> +#include <QtCore/qobject.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp index 140f0f9..1e051b7 100644 --- a/src/declarative/util/qmllistaccessor.cpp +++ b/src/declarative/util/qmllistaccessor.cpp @@ -39,13 +39,15 @@ ** ****************************************************************************/ -#include <private/qmllistaccessor_p.h> -#include <QStringList> +#include "qmllistaccessor_p.h" + #include <qmlmetatype.h> + +#include <QStringList> #include <QtCore/qdebug.h> // ### Remove me -#include <private/qmlengine_p.h> +#include <qmlengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index d4cce0c..2678de7 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -39,17 +39,20 @@ ** ****************************************************************************/ +#include "qmllistmodel_p.h" + +#include "qmlopenmetaobject_p.h" + +#include <qmlcustomparser_p.h> +#include <qmlparser_p.h> +#include <qmlengine_p.h> +#include <qmlcontext.h> +#include <qmlinfo.h> + #include <QtCore/qdebug.h> #include <QtCore/qstack.h> #include <QXmlStreamReader> -#include <private/qmlcustomparser_p.h> -#include <private/qmlparser_p.h> -#include <private/qmlopenmetaobject_p.h> -#include <private/qmlengine_p.h> -#include <qmlcontext.h> -#include <private/qmllistmodel_p.h> #include <QtScript/qscriptvalueiterator.h> -#include "qmlinfo.h" Q_DECLARE_METATYPE(QListModelInterface *) @@ -923,4 +926,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QmlListElement) -#include "qmllistmodel.moc" +#include <qmllistmodel.moc> diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h index d626060..734d44c 100644 --- a/src/declarative/util/qmllistmodel_p.h +++ b/src/declarative/util/qmllistmodel_p.h @@ -42,16 +42,16 @@ #ifndef QMLLISTMODEL_H #define QMLLISTMODEL_H +#include <qml.h> + #include <QtCore/QObject> #include <QtCore/QStringList> #include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QVariant> -#include <qml.h> -#include <private/qlistmodelinterface_p.h> +#include <qlistmodelinterface_p.h> #include <QtScript/qscriptvalue.h> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlnumberformatter.cpp b/src/declarative/util/qmlnumberformatter.cpp index ccc07ef..073dc68 100644 --- a/src/declarative/util/qmlnumberformatter.cpp +++ b/src/declarative/util/qmlnumberformatter.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmlnumberformatter_p.h> -#include "private/qobject_p.h" +#include "qmlnumberformatter_p.h" + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlnumberformatter_p.h b/src/declarative/util/qmlnumberformatter_p.h index 346c2f0..71fceb2 100644 --- a/src/declarative/util/qmlnumberformatter_p.h +++ b/src/declarative/util/qmlnumberformatter_p.h @@ -42,8 +42,9 @@ #ifndef QMLNUMBERFORMATTER_H #define QMLNUMBERFORMATTER_H +#include "qnumberformat_p.h" + #include <qml.h> -#include <private/qnumberformat_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp index 6fb624c..04cd8a5 100644 --- a/src/declarative/util/qmlopenmetaobject.cpp +++ b/src/declarative/util/qmlopenmetaobject.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include <private/qmlopenmetaobject_p.h> -#include <private/qmetaobjectbuilder_p.h> +#include "qmlopenmetaobject_p.h" + +#include <qmetaobjectbuilder_p.h> #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlopenmetaobject_p.h b/src/declarative/util/qmlopenmetaobject_p.h index 7a5b4ce..6045678 100644 --- a/src/declarative/util/qmlopenmetaobject_p.h +++ b/src/declarative/util/qmlopenmetaobject_p.h @@ -43,9 +43,10 @@ #define QMLOPENMETAOBJECT_H #include <QtCore/QMetaObject> -#include <private/qobject_p.h> #include <QtCore/QObject> +#include <private/qobject_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index 447a5d8..f9238ca 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -39,8 +39,9 @@ ** ****************************************************************************/ -#include "private/qobject_p.h" -#include <private/qmlpackage_p.h> +#include "qmlpackage_p.h" + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE @@ -151,4 +152,4 @@ QML_DEFINE_TYPE(Qt,4,6,Package,QmlPackage) QT_END_NAMESPACE -#include "qmlpackage.moc" +#include <qmlpackage.moc> diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index d4143e8..29720d8 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -39,13 +39,16 @@ ** ****************************************************************************/ -#include <private/qmlpixmapcache_p.h> +#include "qmlpixmapcache_p.h" + +#include "qfxperf_p_p.h" + +#include <qmlengine.h> + #include <QImageReader> #include <QHash> #include <QNetworkReply> #include <QPixmapCache> -#include <private/qfxperf_p_p.h> -#include <qmlengine.h> #include <QFile> #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index 0fad226..b9ec67a 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -39,17 +39,21 @@ ** ****************************************************************************/ -#include "private/qobject_p.h" -#include <private/qmlopenmetaobject_p.h> -#include <private/qmlpropertychanges_p.h> -#include <QtCore/qdebug.h> +#include "qmlpropertychanges_p.h" + +#include "qmlopenmetaobject_p.h" + #include <qmlinfo.h> -#include <private/qmlcustomparser_p.h> -#include <private/qmlparser_p.h> +#include <qmlcustomparser_p.h> +#include <qmlparser_p.h> #include <qmlexpression.h> #include <qmlbinding.h> #include <qmlcontext.h> +#include <QtCore/qdebug.h> + +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/declarative/util/qmlpropertychanges_p.h b/src/declarative/util/qmlpropertychanges_p.h index 2c0cba9..461730d 100644 --- a/src/declarative/util/qmlpropertychanges_p.h +++ b/src/declarative/util/qmlpropertychanges_p.h @@ -42,7 +42,7 @@ #ifndef QMLPROPERTYCHANGES_H #define QMLPROPERTYCHANGES_H -#include <private/qmlstateoperations_p.h> +#include "qmlstateoperations_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlpropertymap.cpp b/src/declarative/util/qmlpropertymap.cpp index c0e3340..d0a0428 100644 --- a/src/declarative/util/qmlpropertymap.cpp +++ b/src/declarative/util/qmlpropertymap.cpp @@ -40,7 +40,9 @@ ****************************************************************************/ #include "qmlpropertymap.h" -#include <private/qmlopenmetaobject_p.h> + +#include "qmlopenmetaobject_p.h" + #include <QDebug> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index 9cdadcf..29dcf91 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -39,12 +39,16 @@ ** ****************************************************************************/ +#include "qmlspringfollow_p.h" + +#include "qmlanimation_p_p.h" + +#include <QtCore/qdebug.h> + +#include <private/qobject_p.h> + #include <limits.h> #include <math.h> -#include <QtCore/qdebug.h> -#include "private/qobject_p.h" -#include <private/qmlspringfollow_p.h> -#include <private/qmlanimation_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index dd66107..98cc0b6 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -39,16 +39,19 @@ ** ****************************************************************************/ -#include <private/qmltransition_p.h> -#include <private/qmlstategroup_p.h> -#include <private/qmlstate_p_p.h> -#include "qmlbinding.h" -#include <private/qmlstateoperations_p.h> -#include <private/qmlanimation_p.h> -#include <private/qmlanimation_p_p.h> -#include <private/qmlstate_p.h> +#include "qmlstate_p_p.h" +#include "qmlstate_p.h" + +#include "qmltransition_p.h" +#include "qmlstategroup_p.h" +#include "qmlstateoperations_p.h" +#include "qmlanimation_p.h" +#include "qmlanimation_p_p.h" + +#include <qmlbinding.h> +#include <qmlglobal_p.h> + #include <QtCore/qdebug.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h index 856af8a..33e66d8 100644 --- a/src/declarative/util/qmlstate_p.h +++ b/src/declarative/util/qmlstate_p.h @@ -42,9 +42,10 @@ #ifndef QMLSTATE_H #define QMLSTATE_H -#include <QtCore/qobject.h> #include <qml.h> +#include <QtCore/qobject.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h index 75eb3fd..ee08949 100644 --- a/src/declarative/util/qmlstate_p_p.h +++ b/src/declarative/util/qmlstate_p_p.h @@ -53,10 +53,12 @@ // We mean it. // -#include <private/qmlstate_p.h> +#include "qmlstate_p.h" + +#include "qmlanimation_p_p.h" +#include "qmltransitionmanager_p_p.h" + #include <private/qobject_p.h> -#include <private/qmlanimation_p_p.h> -#include <private/qmltransitionmanager_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index 19408f8..373d457 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -39,13 +39,17 @@ ** ****************************************************************************/ -#include "private/qobject_p.h" -#include <private/qmlstategroup_p.h> -#include <private/qmltransition_p.h> -#include <private/qmlstate_p_p.h> +#include "qmlstategroup_p.h" + +#include "qmltransition_p.h" +#include "qmlstate_p_p.h" + #include <qmlbinding.h> +#include <qmlglobal_p.h> + #include <QtCore/qdebug.h> -#include <private/qmlglobal_p.h> + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlstategroup_p.h b/src/declarative/util/qmlstategroup_p.h index ddd27d7..82cc504 100644 --- a/src/declarative/util/qmlstategroup_p.h +++ b/src/declarative/util/qmlstategroup_p.h @@ -42,7 +42,7 @@ #ifndef QMLSTATEGROUP_H #define QMLSTATEGROUP_H -#include <private/qmlstate_p.h> +#include "qmlstate_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index 82fc9ba..ebbb5ee 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -39,18 +39,21 @@ ** ****************************************************************************/ -#include <private/qobject_p.h> +#include "qmlstateoperations_p.h" + #include <qml.h> #include <qmlcontext.h> #include <qmlexpression.h> -#include <private/qmlstateoperations_p.h> -#include <QtCore/qdebug.h> #include <qmlinfo.h> -#include <private/qmlgraphicsanchors_p_p.h> -#include <private/qmlgraphicsitem_p.h> +#include <qmlgraphicsanchors_p_p.h> +#include <qmlgraphicsitem_p.h> + +#include <QtCore/qdebug.h> #include <QtGui/qgraphicsitem.h> #include <QtCore/qmath.h> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlParentChangePrivate : public QObjectPrivate @@ -823,8 +826,8 @@ void QmlAnchorChanges::saveCurrentValues() d->rewindBaseline = d->target->anchors()->baseline(); } -#include "qmlstateoperations.moc" -#include "moc_qmlstateoperations_p.cpp" +#include <qmlstateoperations.moc> +#include <moc_qmlstateoperations_p.cpp> QT_END_NAMESPACE diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h index 589fe20..b03af48 100644 --- a/src/declarative/util/qmlstateoperations_p.h +++ b/src/declarative/util/qmlstateoperations_p.h @@ -42,9 +42,10 @@ #ifndef QMLSTATEOPERATIONS_H #define QMLSTATEOPERATIONS_H -#include <private/qmlstate_p.h> +#include "qmlstate_p.h" + #include <qmlgraphicsitem.h> -#include <private/qmlgraphicsanchors_p.h> +#include <qmlgraphicsanchors_p.h> #include <qmlscriptstring.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmlsystempalette.cpp b/src/declarative/util/qmlsystempalette.cpp index da08369..d43a971 100644 --- a/src/declarative/util/qmlsystempalette.cpp +++ b/src/declarative/util/qmlsystempalette.cpp @@ -39,10 +39,12 @@ ** ****************************************************************************/ -#include "private/qobject_p.h" -#include <private/qmlsystempalette_p.h> +#include "qmlsystempalette_p.h" + #include <QApplication> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE class QmlSystemPalettePrivate : public QObjectPrivate diff --git a/src/declarative/util/qmlsystempalette_p.h b/src/declarative/util/qmlsystempalette_p.h index 8ee511a..7c39d4a 100644 --- a/src/declarative/util/qmlsystempalette_p.h +++ b/src/declarative/util/qmlsystempalette_p.h @@ -42,8 +42,9 @@ #ifndef QMLSYSTEMPALETTE_H #define QMLSYSTEMPALETTE_H -#include <QtCore/qobject.h> #include <qml.h> + +#include <QtCore/qobject.h> #include <QPalette> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltimeline.cpp b/src/declarative/util/qmltimeline.cpp index 8b9a872..130e02d 100644 --- a/src/declarative/util/qmltimeline.cpp +++ b/src/declarative/util/qmltimeline.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qmltimeline_p_p.h> +#include "qmltimeline_p_p.h" + #include <QDebug> #include <QMutex> #include <QThread> diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp index ad69369..046dfe9 100644 --- a/src/declarative/util/qmltimer.cpp +++ b/src/declarative/util/qmltimer.cpp @@ -39,11 +39,13 @@ ** ****************************************************************************/ -#include "QtCore/qcoreapplication.h" -#include "QtCore/qpauseanimation.h" -#include "private/qobject_p.h" -#include <private/qmltimer_p.h> -#include "qdebug.h" +#include "qmltimer_p.h" + +#include <QtCore/qcoreapplication.h> +#include <QtCore/qpauseanimation.h> +#include <qdebug.h> + +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltimer_p.h b/src/declarative/util/qmltimer_p.h index 50cae2b..fcd6c84 100644 --- a/src/declarative/util/qmltimer_p.h +++ b/src/declarative/util/qmltimer_p.h @@ -42,9 +42,10 @@ #ifndef QMLTIMER_H #define QMLTIMER_H +#include <qml.h> + #include <QtCore/qobject.h> #include <QtCore/qabstractanimation.h> -#include <qml.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index ad79890..a9c9596 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -39,13 +39,14 @@ ** ****************************************************************************/ -#include <private/qmlstate_p.h> -#include <private/qmlstategroup_p.h> -#include <private/qmlstate_p_p.h> -#include <private/qmlstateoperations_p.h> -#include <private/qmlanimation_p.h> -#include <private/qmlanimation_p_p.h> -#include <private/qmltransitionmanager_p_p.h> +#include "qmlstate_p.h" +#include "qmlstategroup_p.h" +#include "qmlstate_p_p.h" +#include "qmlstateoperations_p.h" +#include "qmlanimation_p.h" +#include "qmlanimation_p_p.h" +#include "qmltransitionmanager_p_p.h" + #include <QParallelAnimationGroup> QT_BEGIN_NAMESPACE @@ -257,4 +258,4 @@ QmlList<QmlAbstractAnimation *>* QmlTransition::animations() QT_END_NAMESPACE -#include "qmltransition.moc" +#include <qmltransition.moc> diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h index 1891a6e..3dd0244 100644 --- a/src/declarative/util/qmltransition_p.h +++ b/src/declarative/util/qmltransition_p.h @@ -42,10 +42,12 @@ #ifndef QMLTRANSITION_H #define QMLTRANSITION_H -#include <QtCore/qobject.h> -#include <private/qmlstate_p.h> +#include "qmlstate_p.h" + #include <qml.h> +#include <QtCore/qobject.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltransitionmanager.cpp b/src/declarative/util/qmltransitionmanager.cpp index 1a164c7..8ae5785 100644 --- a/src/declarative/util/qmltransitionmanager.cpp +++ b/src/declarative/util/qmltransitionmanager.cpp @@ -39,9 +39,11 @@ ** ****************************************************************************/ +#include "qmltransitionmanager_p_p.h" + +#include "qmlstate_p_p.h" + #include <qmlbinding.h> -#include <private/qmltransitionmanager_p_p.h> -#include <private/qmlstate_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmltransitionmanager_p_p.h b/src/declarative/util/qmltransitionmanager_p_p.h index 9a05684..c7e609f 100644 --- a/src/declarative/util/qmltransitionmanager_p_p.h +++ b/src/declarative/util/qmltransitionmanager_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qmlstateoperations_p.h> +#include "qmlstateoperations_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp index c4eb539..b5f33f2 100644 --- a/src/declarative/util/qmlview.cpp +++ b/src/declarative/util/qmlview.cpp @@ -39,30 +39,31 @@ ** ****************************************************************************/ -#include "qscriptvalueiterator.h" -#include "qdebug.h" -#include "qtimer.h" -#include "qevent.h" -#include "qdir.h" -#include "qcoreapplication.h" -#include "qfontdatabase.h" -#include "qicon.h" -#include "qurl.h" -#include "qboxlayout.h" -#include "qbasictimer.h" - -#include "qml.h" -#include "qmlgraphicsitem.h" -#include <private/qperformancelog_p_p.h> -#include <private/qfxperf_p_p.h> - #include "qmlview.h" + +#include "qperformancelog_p_p.h" +#include "qfxperf_p_p.h" + +#include <qml.h> +#include <qmlgraphicsitem.h> #include <qmlengine.h> #include <qmlcontext.h> -#include <private/qmldebug_p.h> -#include <private/qmldebugservice_p.h> +#include <qmldebug_p.h> +#include <qmldebugservice_p.h> +#include <qmlglobal_p.h> + +#include <qscriptvalueiterator.h> +#include <qdebug.h> +#include <qtimer.h> +#include <qevent.h> +#include <qdir.h> +#include <qcoreapplication.h> +#include <qfontdatabase.h> +#include <qicon.h> +#include <qurl.h> +#include <qboxlayout.h> +#include <qbasictimer.h> #include <QtCore/qabstractanimation.h> -#include <private/qmlglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp index a274c6c..6f8da9c 100644 --- a/src/declarative/util/qmlxmllistmodel.cpp +++ b/src/declarative/util/qmlxmllistmodel.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include <private/qmlxmllistmodel_p.h> -#include "private/qobject_p.h" +#include "qmlxmllistmodel_p.h" #include <qmlcontext.h> #include <qmlengine.h> + #include <QDebug> #include <QApplication> #include <QThread> @@ -56,6 +56,8 @@ #include <QNetworkRequest> #include <QNetworkReply> +#include <private/qobject_p.h> + QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,XmlRole,QmlXmlListModelRole) @@ -716,4 +718,4 @@ void QmlXmlListModel::queryCompleted(int id, int size) QT_END_NAMESPACE -#include "qmlxmllistmodel.moc" +#include <qmlxmllistmodel.moc> diff --git a/src/declarative/util/qmlxmllistmodel_p.h b/src/declarative/util/qmlxmllistmodel_p.h index 2fa1be8..e645740 100644 --- a/src/declarative/util/qmlxmllistmodel_p.h +++ b/src/declarative/util/qmlxmllistmodel_p.h @@ -43,9 +43,10 @@ #define QMLXMLLISTMODEL_H #include <qml.h> -#include <private/qlistmodelinterface_p.h> #include <qmlinfo.h> +#include <qlistmodelinterface_p.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qnumberformat.cpp b/src/declarative/util/qnumberformat.cpp index 68bb9e1..c6a03e9 100644 --- a/src/declarative/util/qnumberformat.cpp +++ b/src/declarative/util/qnumberformat.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/qnumberformat_p.h> +#include "qnumberformat_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qnumberformat_p.h b/src/declarative/util/qnumberformat_p.h index be3dfce..c73ef8a 100644 --- a/src/declarative/util/qnumberformat_p.h +++ b/src/declarative/util/qnumberformat_p.h @@ -43,6 +43,7 @@ #define NUMBERFORMAT_H #include <qml.h> + #include <QtCore/QLocale> #include <QtCore/QTime> diff --git a/src/declarative/util/qperformancelog.cpp b/src/declarative/util/qperformancelog.cpp index 83b0247..2f91dfb 100644 --- a/src/declarative/util/qperformancelog.cpp +++ b/src/declarative/util/qperformancelog.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/qperformancelog_p_p.h> +#include "qperformancelog_p_p.h" + #include <QHash> #include <QDebug> diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp index 3aaffe6..065040f 100644 --- a/src/declarative/widgets/graphicslayouts.cpp +++ b/src/declarative/widgets/graphicslayouts.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <private/graphicslayouts_p.h> +#include "graphicslayouts_p.h" + #include <QtGui/qgraphicswidget.h> #include <QtCore/qdebug.h> @@ -315,4 +316,4 @@ GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *ob QT_END_NAMESPACE -#include "graphicslayouts.moc" +#include <graphicslayouts.moc> diff --git a/src/declarative/widgets/graphicslayouts_p.h b/src/declarative/widgets/graphicslayouts_p.h index c44cb79..34e2556 100644 --- a/src/declarative/widgets/graphicslayouts_p.h +++ b/src/declarative/widgets/graphicslayouts_p.h @@ -42,7 +42,8 @@ #ifndef GRAPHICSLAYOUTS_H #define GRAPHICSLAYOUTS_H -#include <private/graphicswidgets_p.h> +#include "graphicswidgets_p.h" + #include <QtGui/QGraphicsLinearLayout> #include <QtGui/QGraphicsGridLayout> diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp index 884a6e9..4c13865 100644 --- a/src/declarative/widgets/graphicswidgets.cpp +++ b/src/declarative/widgets/graphicswidgets.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <private/graphicswidgets_p.h> +#include "graphicswidgets_p.h" QT_BEGIN_NAMESPACE @@ -160,4 +160,4 @@ QML_DEFINE_INTERFACE(QGraphicsItem) QT_END_NAMESPACE -#include "graphicswidgets.moc" +#include <graphicswidgets.moc> diff --git a/src/declarative/widgets/graphicswidgets_p.h b/src/declarative/widgets/graphicswidgets_p.h index 0254f10..b15bffa 100644 --- a/src/declarative/widgets/graphicswidgets_p.h +++ b/src/declarative/widgets/graphicswidgets_p.h @@ -43,6 +43,7 @@ #define GRAPHICSWIDGETS_H #include <qml.h> + #include <QtGui/QGraphicsScene> #include <QtGui/QGraphicsView> #include <QtGui/QGraphicsWidget> |