diff options
Diffstat (limited to 'src/declarative/graphicsitems')
32 files changed, 71 insertions, 72 deletions
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri index da3a0d4..5675130 100644 --- a/src/declarative/graphicsitems/graphicsitems.pri +++ b/src/declarative/graphicsitems/graphicsitems.pri @@ -85,4 +85,3 @@ contains(QT_CONFIG, webkit) { HEADERS += graphicsitems/qmlgraphicswebview_p.h HEADERS += graphicsitems/qmlgraphicswebview_p_p.h } - 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/qmlgraphicsflickable_p_p.h b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h index 8044ba7..210052e 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsflickable_p_p.h @@ -57,8 +57,8 @@ #include "qmlgraphicsflickable_p.h" #include "qmlgraphicsitem_p.h" #include "qml.h" -#include "private/qmltimeline_p_p.h" -#include "private/qmlanimation_p_p.h" +#include "qmltimeline_p_p.h" +#include "qmlanimation_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp index b964e22..c271010 100644 --- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlgraphicsflipable_p.h" -#include "private/qmlgraphicsitem_p.h" +#include "qmlgraphicsitem_p.h" #include "QtGui/qgraphicstransform.h" #include <qmlinfo.h> diff --git a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp index 294a374..bdad6ae 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.cpp @@ -43,7 +43,7 @@ #include <QGraphicsObject> #include <QGraphicsWidget> #include <QGraphicsSceneResizeEvent> -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp index 81128e7..f223413 100644 --- a/src/declarative/graphicsitems/qmlgraphicsgridview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsgridview.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include "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 "qmlgraphicsvisualitemmodel_p.h" +#include "qlistmodelinterface_p.h" +#include "qmleasefollow_p.h" +#include "qmlgraphicsflickable_p_p.h" #include <QKeyEvent> 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/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp index 8374c9f..c6954fb 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp @@ -45,7 +45,7 @@ #include <QNetworkReply> #include <QFile> #include <qmlengine.h> -#include <private/qmlpixmapcache_p.h> +#include "qmlpixmapcache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index db59cf2..3ca9fce 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -47,21 +47,21 @@ #include <QNetworkRequest> #include <QGraphicsSceneMouseEvent> #include <QtScript/qscriptengine.h> -#include <private/qfxperf_p_p.h> +#include "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 "qmlopenmetaobject_p.h" +#include "qmlstate_p.h" +#include "qlistmodelinterface_p.h" #include "qmlview.h" -#include <private/qmlstategroup_p.h> +#include "qmlstategroup_p.h" #include "qmlgraphicsitem_p.h" #include "qmlgraphicsitem.h" -#include <private/qmlgraphicsevents_p_p.h> +#include "qmlgraphicsevents_p_p.h" #include <qmlcomponent.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h index 0c722ac..0c6960e 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h @@ -54,10 +54,10 @@ // #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 "qmlstate_p.h" +#include "qmlgraphicsanchors_p.h" +#include "qmlnullablevalue_p_p.h" +#include "qmlgraphicsanchors_p_p.h" #include <qml.h> #include <qmlcontext.h> #include <QtCore/qlist.h> diff --git a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h index 35905b5..1acb5c1 100644 --- a/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h +++ b/src/declarative/graphicsitems/qmlgraphicslayoutitem_p.h @@ -42,7 +42,7 @@ #ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H #define QMLGRAPHICSGRAPHICSLAYOUTITEM_H #include <QGraphicsLayoutItem> -#include <QmlGraphicsItem> +#include <qmlgraphicsitem.h> #include <QSizeF> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index 9dd2ab4..61545ec 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qmlgraphicsflickable_p_p.h" -#include <private/qmleasefollow_p.h> -#include <private/qlistmodelinterface_p.h> +#include "qmlgraphicsflickable_p_p.h" +#include "qmleasefollow_p.h" +#include "qlistmodelinterface_p.h" #include "qmlgraphicsvisualitemmodel_p.h" #include "qmlgraphicslistview_p.h" #include <qmlexpression.h> diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h index cc74056..543c70a 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 c841efe..7b2c542 100644 --- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlgraphicsloader_p_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h index a938ecf..a49bbdf 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 f15d9f6..a1dbe14 100644 --- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qmlgraphicsitem_p.h" +#include "qmlgraphicsitem_p.h" #include <stdlib.h> #include <math.h> @@ -50,9 +50,9 @@ #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 "qmlpixmapcache_p.h" +#include "qfxperf_p_p.h" +#include "qmlanimation_p_p.h" #include <QNetworkReply> #include "qmlgraphicsparticles_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp index 1791074..269552a 100644 --- a/src/declarative/graphicsitems/qmlgraphicspath.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp @@ -41,7 +41,7 @@ #include "qmlgraphicspath_p.h" #include "qmlgraphicspath_p_p.h" -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <private/qbezier_p.h> #include <QSet> diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp index 92751a0..3a77274 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp @@ -42,12 +42,12 @@ #include <math.h> #include <QDebug> #include <QEvent> -#include <private/qmlstate_p.h> -#include <private/qlistmodelinterface_p.h> -#include <private/qmlopenmetaobject_p.h> +#include "qmlstate_p.h" +#include "qlistmodelinterface_p.h" +#include "qmlopenmetaobject_p.h" -#include <private/qmlgraphicspathview_p.h> -#include <private/qmlgraphicspathview_p_p.h> +#include "qmlgraphicspathview_p.h" +#include "qmlgraphicspathview_p_p.h" #include <QGraphicsSceneEvent> static const int FlickThreshold = 5; diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h index 38f1cd8..fef0798 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h @@ -43,7 +43,7 @@ #define QMLGRAPHICSPATHVIEW_H #include <qmlgraphicsitem.h> -#include <private/qmlgraphicspath_p.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 a0f2a3d..a61968c 100644 --- a/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspathview_p_p.h @@ -58,7 +58,7 @@ #include "qmlgraphicsitem_p.h" #include "qmlgraphicsvisualitemmodel_p.h" #include "qml.h" -#include "private/qmlanimation_p_p.h" +#include "qmlanimation_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp index 65e63eb..56fd98e 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp @@ -42,12 +42,12 @@ #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> +#include "qmlstate_p.h" +#include "qmlstategroup_p.h" +#include "qmlstateoperations_p.h" +#include "qfxperf_p_p.h" +#include "qmlgraphicspositioners_p.h" +#include "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..001ad80 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h @@ -45,7 +45,7 @@ #include <QtCore/QObject> #include <QtCore/QString> #include <qmlgraphicsitem.h> -#include <private/qmlstate_p.h> +#include "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 d7a31a3..ced545e 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p_p.h @@ -53,13 +53,13 @@ // We mean it. // -#include <private/qmlgraphicsitem_p.h> +#include "qmlgraphicsitem_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 "qmlgraphicspositioners_p.h" +#include "qmlstate_p.h" +#include "qmltransitionmanager_p_p.h" +#include "qmlstateoperations_p.h" #include <QtCore/QTimer> QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp index be10c24..967a29b 100644 --- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp @@ -41,9 +41,9 @@ #include "qmlgraphicsrepeater_p.h" #include "qmlgraphicsrepeater_p_p.h" -#include <private/qmllistaccessor_p.h> -#include <private/qmlgraphicsvisualitemmodel_p.h> -#include <private/qlistmodelinterface_p.h> +#include "qmllistaccessor_p.h" +#include "qmlgraphicsvisualitemmodel_p.h" +#include "qlistmodelinterface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h index 82e0a94..4283c19 100644 --- a/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsscalegrid_p_p.h @@ -44,7 +44,7 @@ #include <QtCore/QString> #include <QtCore/QObject> -#include <private/qmlpixmapcache_p.h> +#include "qmlpixmapcache_p.h" #include <qml.h> #include "qmlgraphicsborderimage_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp index d0aec8d..2d2c523 100644 --- a/src/declarative/graphicsitems/qmlgraphicstext.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp @@ -43,7 +43,7 @@ #include "qmlgraphicstext_p_p.h" #include <private/qtextcontrol_p.h> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QTextLayout> #include <QTextLine> #include <QTextDocument> diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp index 5f5269f..94c4a1e 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp +++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp @@ -42,8 +42,8 @@ #include "qmlgraphicstextedit_p.h" #include "qmlgraphicstextedit_p_p.h" #include <private/qtextcontrol_p.h> -#include <private/qfxperf_p_p.h> -#include <private/qmlgraphicsevents_p_p.h> +#include "qfxperf_p_p.h" +#include "qmlgraphicsevents_p_p.h" #include <QTextLayout> #include <QTextLine> #include <QTextDocument> diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h index 1ddfa6b..28d7d83 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h @@ -42,8 +42,8 @@ #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> diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp index e8ee196..cde1f8a 100644 --- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include <private/qlistmodelinterface_p.h> +#include "qlistmodelinterface_p.h" #include "qmlgraphicsitem.h" #include <qmlcontext.h> #include <qmlexpression.h> -#include <private/qmlpackage_p.h> +#include "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 "qmetaobjectbuilder_p.h" +#include "qmlopenmetaobject_p.h" +#include "qmllistaccessor_p.h" #include "qmlinfo.h" #include "qmlgraphicsvisualitemmodel_p.h" #include "private/qguard_p.h" diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index e21bda3..0a1587e 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -55,12 +55,12 @@ #include "qml.h" #include "qmlengine.h" -#include <private/qmlstate_p.h> -#include <private/qlistmodelinterface_p.h> +#include "qmlstate_p.h" +#include "qlistmodelinterface_p.h" #include "qmlgraphicswebview_p.h" #include "qmlgraphicswebview_p_p.h" -#include <private/qmlgraphicspainteditem_p_p.h> +#include "qmlgraphicspainteditem_p_p.h" QT_BEGIN_NAMESPACE QML_DEFINE_TYPE(Qt,4,6,WebView,QmlGraphicsWebView) diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h index 7ff51f3..1e44263 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h +++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h @@ -44,7 +44,7 @@ #include <QtGui/QAction> #include <QtCore/QUrl> -#include <private/qmlgraphicspainteditem_p.h> +#include "qmlgraphicspainteditem_p.h" #include <QtNetwork/qnetworkaccessmanager.h> #include <QtWebKit/QWebPage> |