diff options
author | Charles Yin <charles.yin@nokia.com> | 2012-02-21 11:06:57 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 05:35:37 +0100 |
commit | 2b508c59bd676bc8a44897c1ddf4a8ad14177905 (patch) | |
tree | eacebd46732fbecadf83b8e147c1bab648a0832c /src | |
parent | 15bb4b57e808cbff2a92cf8132958dc924db5a60 (diff) |
Renames QAnimation2ChangeListener to QAnimationJobChangeListener
Change-Id: I921b252380d095fb878b4e5d36df0b5a13a3888f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/declarative/animations/qabstractanimationjob.cpp | 4 | ||||
-rw-r--r-- | src/declarative/animations/qabstractanimationjob_p.h | 12 | ||||
-rw-r--r-- | src/quick/util/qdeclarativeanimation_p_p.h | 2 | ||||
-rw-r--r-- | src/quick/util/qdeclarativebehavior.cpp | 2 | ||||
-rw-r--r-- | src/quick/util/qdeclarativetimer.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/declarative/animations/qabstractanimationjob.cpp b/src/declarative/animations/qabstractanimationjob.cpp index cd5730d9be..4d149ce99a 100644 --- a/src/declarative/animations/qabstractanimationjob.cpp +++ b/src/declarative/animations/qabstractanimationjob.cpp @@ -528,12 +528,12 @@ void QAbstractAnimationJob::currentLoopChanged(int currentLoop) } } -void QAbstractAnimationJob::addAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes) +void QAbstractAnimationJob::addAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes) { changeListeners.append(ChangeListener(listener, changes)); } -void QAbstractAnimationJob::removeAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes) +void QAbstractAnimationJob::removeAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes changes) { changeListeners.removeOne(ChangeListener(listener, changes)); } diff --git a/src/declarative/animations/qabstractanimationjob_p.h b/src/declarative/animations/qabstractanimationjob_p.h index dcbc749a05..675082f0b7 100644 --- a/src/declarative/animations/qabstractanimationjob_p.h +++ b/src/declarative/animations/qabstractanimationjob_p.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QAnimationGroupJob; -class QAnimation2ChangeListener; +class QAnimationJobChangeListener; class Q_DECLARATIVE_EXPORT QAbstractAnimationJob { Q_DISABLE_COPY(QAbstractAnimationJob) @@ -107,8 +107,8 @@ public: }; Q_DECLARE_FLAGS(ChangeTypes, ChangeType) - void addAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes); - void removeAnimationChangeListener(QAnimation2ChangeListener *listener, QAbstractAnimationJob::ChangeTypes); + void addAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes); + void removeAnimationChangeListener(QAnimationJobChangeListener *listener, QAbstractAnimationJob::ChangeTypes); QAbstractAnimationJob *nextSibling() const { return m_nextSibling; } QAbstractAnimationJob *previousSibling() const { return m_previousSibling; } @@ -144,8 +144,8 @@ protected: bool *m_wasDeleted; struct ChangeListener { - ChangeListener(QAnimation2ChangeListener *l, QAbstractAnimationJob::ChangeTypes t) : listener(l), types(t) {} - QAnimation2ChangeListener *listener; + ChangeListener(QAnimationJobChangeListener *l, QAbstractAnimationJob::ChangeTypes t) : listener(l), types(t) {} + QAnimationJobChangeListener *listener; QAbstractAnimationJob::ChangeTypes types; bool operator==(const ChangeListener &other) const { return listener == other.listener && types == other.types; } }; @@ -158,7 +158,7 @@ protected: friend class QAnimationGroupJob; }; -class Q_AUTOTEST_EXPORT QAnimation2ChangeListener +class Q_AUTOTEST_EXPORT QAnimationJobChangeListener { public: virtual void animationFinished(QAbstractAnimationJob *) {} diff --git a/src/quick/util/qdeclarativeanimation_p_p.h b/src/quick/util/qdeclarativeanimation_p_p.h index 5bcd70472d..a6b47cbc17 100644 --- a/src/quick/util/qdeclarativeanimation_p_p.h +++ b/src/quick/util/qdeclarativeanimation_p_p.h @@ -168,7 +168,7 @@ private: T *m_instance; }; -class QDeclarativeAbstractAnimationPrivate : public QObjectPrivate, public QAnimation2ChangeListener +class QDeclarativeAbstractAnimationPrivate : public QObjectPrivate, public QAnimationJobChangeListener { Q_DECLARE_PUBLIC(QDeclarativeAbstractAnimation) public: diff --git a/src/quick/util/qdeclarativebehavior.cpp b/src/quick/util/qdeclarativebehavior.cpp index 726c39fa9f..6cf372ece9 100644 --- a/src/quick/util/qdeclarativebehavior.cpp +++ b/src/quick/util/qdeclarativebehavior.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -class QDeclarativeBehaviorPrivate : public QObjectPrivate, public QAnimation2ChangeListener +class QDeclarativeBehaviorPrivate : public QObjectPrivate, public QAnimationJobChangeListener { Q_DECLARE_PUBLIC(QDeclarativeBehavior) public: diff --git a/src/quick/util/qdeclarativetimer.cpp b/src/quick/util/qdeclarativetimer.cpp index f54e9b305a..3c57f22c58 100644 --- a/src/quick/util/qdeclarativetimer.cpp +++ b/src/quick/util/qdeclarativetimer.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -class QDeclarativeTimerPrivate : public QObjectPrivate, public QAnimation2ChangeListener +class QDeclarativeTimerPrivate : public QObjectPrivate, public QAnimationJobChangeListener { Q_DECLARE_PUBLIC(QDeclarativeTimer) public: |