diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-06-25 12:01:46 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:21:36 +0200 |
commit | 5df94d89033e7bbb3f41840a4c07a628ed66b4d5 (patch) | |
tree | e42bcd16d8f5f3a192c48794b610ffeb05b9dc02 /src/particles/qquickcustomaffector_p.h | |
parent | 2241d6fa2d39fe890ba0d17ff58b5e0615c1cd7b (diff) |
Rename speed -> velocity in the particle system
Matches the convention set in the QtQuick module, for example by
ListView and Flickable.
Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/particles/qquickcustomaffector_p.h')
-rw-r--r-- | src/particles/qquickcustomaffector_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h index 1266830f94..74121903be 100644 --- a/src/particles/qquickcustomaffector_p.h +++ b/src/particles/qquickcustomaffector_p.h @@ -57,7 +57,7 @@ class QQuickCustomAffector : public QQuickParticleAffector Q_OBJECT Q_PROPERTY(bool relative READ relative WRITE setRelative NOTIFY relativeChanged) Q_PROPERTY(QQuickDirection *position READ position WRITE setPosition NOTIFY positionChanged RESET positionReset) - Q_PROPERTY(QQuickDirection *speed READ speed WRITE setSpeed NOTIFY speedChanged RESET speedReset) + Q_PROPERTY(QQuickDirection *velocity READ velocity WRITE setVelocity NOTIFY velocityChanged RESET velocityReset) Q_PROPERTY(QQuickDirection *acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged RESET accelerationReset) public: @@ -69,9 +69,9 @@ public: return m_position; } - QQuickDirection * speed() const + QQuickDirection * velocity() const { - return m_speed; + return m_velocity; } QQuickDirection * acceleration() const @@ -84,9 +84,9 @@ public: m_position = &m_nullVector; } - void speedReset() + void velocityReset() { - m_speed = &m_nullVector; + m_velocity = &m_nullVector; } void accelerationReset() @@ -105,7 +105,7 @@ signals: void positionChanged(QQuickDirection * arg); - void speedChanged(QQuickDirection * arg); + void velocityChanged(QQuickDirection * arg); void accelerationChanged(QQuickDirection * arg); @@ -120,11 +120,11 @@ public slots: } } - void setSpeed(QQuickDirection * arg) + void setVelocity(QQuickDirection * arg) { - if (m_speed != arg) { - m_speed = arg; - emit speedChanged(arg); + if (m_velocity != arg) { + m_velocity = arg; + emit velocityChanged(arg); } } @@ -150,7 +150,7 @@ protected: private: void affectProperties(const QList<QQuickParticleData*> particles, qreal dt); QQuickDirection * m_position; - QQuickDirection * m_speed; + QQuickDirection * m_velocity; QQuickDirection * m_acceleration; QQuickDirection m_nullVector; |