diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/quick/particles/qquickitemparticle_p.h | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/particles/qquickitemparticle_p.h')
| -rw-r--r-- | src/quick/particles/qquickitemparticle_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/particles/qquickitemparticle_p.h b/src/quick/particles/qquickitemparticle_p.h index df104a5644..d02659889e 100644 --- a/src/quick/particles/qquickitemparticle_p.h +++ b/src/quick/particles/qquickitemparticle_p.h @@ -44,7 +44,7 @@ #include "qquickparticlepainter_p.h" #include <QPointer> #include <QSet> -#include <private/qdeclarativeanimation_p_p.h> +#include <private/qquickanimation_p_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -56,7 +56,7 @@ class QQuickItemParticle : public QQuickParticlePainter { Q_OBJECT Q_PROPERTY(bool fade READ fade WRITE setFade NOTIFY fadeChanged) - Q_PROPERTY(QDeclarativeComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) public: explicit QQuickItemParticle(QQuickItem *parent = 0); ~QQuickItemParticle(); @@ -66,7 +66,7 @@ public: virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); static QQuickItemParticleAttached *qmlAttachedProperties(QObject *object); - QDeclarativeComponent* delegate() const + QQmlComponent* delegate() const { return m_delegate; } @@ -74,7 +74,7 @@ public: signals: void fadeChanged(); - void delegateChanged(QDeclarativeComponent* arg); + void delegateChanged(QQmlComponent* arg); public slots: //TODO: Add a follow mode, where moving the delegate causes the logical particle to go with it? @@ -84,7 +84,7 @@ public slots: void give(QQuickItem* item);//give from modelparticle void setFade(bool arg){if (arg == m_fade) return; m_fade = arg; emit fadeChanged();} - void setDelegate(QDeclarativeComponent* arg) + void setDelegate(QQmlComponent* arg) { if (m_delegate != arg) { m_delegate = arg; @@ -108,7 +108,7 @@ private: QSet<QQuickItem*> m_stasis; qreal m_lastT; int m_activeCount; - QDeclarativeComponent* m_delegate; + QQmlComponent* m_delegate; typedef QTickAnimationProxy<QQuickItemParticle, &QQuickItemParticle::tick> Clock; Clock *clock; |