Renames QAnimation2ChangeListener to QAnimationJobChangeListener

Change-Id: I921b252380d095fb878b4e5d36df0b5a13a3888f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

diff --git a/src/declarative/animations/qabstractanimationjob.cpp b/src/declarative/animations/qabstractanimationjob.cpp
index cd5730d..4d149ce 100644 (file)
--- 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 dcbc749..675082f 100644 (file)
--- 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 5bcd704..a6b47cb 100644 (file)
--- 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 726c39f..6cf372e 100644 (file)
--- 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 f54e9b3..3c57f22 100644 (file)
--- 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:

diff --git a/tests/auto/declarative/animation/qanimationgroupjob/tst_qanimationgroupjob.cpp b/tests/auto/declarative/animation/qanimationgroupjob/tst_qanimationgroupjob.cpp
index 196f917..2bb974a 100644 (file)
--- a/tests/auto/declarative/animation/qanimationgroupjob/tst_qanimationgroupjob.cpp
+++ b/tests/auto/declarative/animation/qanimationgroupjob/tst_qanimationgroupjob.cpp
@@ -112,7 +112,7 @@ private:
     int id;
 };
 
-class StateChangeListener: public QAnimation2ChangeListener
+class StateChangeListener: public QAnimationJobChangeListener
 {
 public:
     virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State)

diff --git a/tests/auto/declarative/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp b/tests/auto/declarative/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp
index 52c0ff2..ef24182 100644 (file)
--- a/tests/auto/declarative/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp
+++ b/tests/auto/declarative/animation/qparallelanimationgroupjob/tst_qparallelanimationgroupjob.cpp
@@ -128,7 +128,7 @@ private:
     int id;
 };
 
-class StateChangeListener: public QAnimation2ChangeListener
+class StateChangeListener: public QAnimationJobChangeListener
 {
 public:
     virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State)
@@ -142,7 +142,7 @@ public:
     QList<QAbstractAnimationJob::State> states;
 };
 
-class FinishedListener: public QAnimation2ChangeListener
+class FinishedListener: public QAnimationJobChangeListener
 {
 public:
     FinishedListener() : m_count(0) {}

diff --git a/tests/auto/declarative/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp b/tests/auto/declarative/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp
index 895e4f8..d5a9b07 100644 (file)
--- a/tests/auto/declarative/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp
+++ b/tests/auto/declarative/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp
@@ -135,7 +135,7 @@ protected:
     }
 };
 
-class StateChangeListener: public QAnimation2ChangeListener
+class StateChangeListener: public QAnimationJobChangeListener
 {
 public:
     virtual void animationStateChanged(QAbstractAnimationJob *, QAbstractAnimationJob::State newState, QAbstractAnimationJob::State)
@@ -149,7 +149,7 @@ public:
     QList<QAbstractAnimationJob::State> states;
 };
 
-class FinishedListener: public QAnimation2ChangeListener
+class FinishedListener: public QAnimationJobChangeListener
 {
 public:
     FinishedListener() : m_count(0) {}
@@ -1520,7 +1520,7 @@ void tst_QSequentialAnimationGroupJob::insertAnimation()
     group.appendAnimation(new TestAnimation);
 }
 
-class ClearFinishedListener: public QAnimation2ChangeListener
+class ClearFinishedListener: public QAnimationJobChangeListener
 {
 public:
     ClearFinishedListener(QSequentialAnimationGroupJob *g) : group(g) {}
@@ -1533,7 +1533,7 @@ public:
     QSequentialAnimationGroupJob *group;
 };
 
-class RefillFinishedListener: public QAnimation2ChangeListener
+class RefillFinishedListener: public QAnimationJobChangeListener
 {
 public:
     RefillFinishedListener(QSequentialAnimationGroupJob *g) : group(g) {}