Renames QAnimation2ChangeListener to QAnimationJobChangeListener

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

2 files changed, 8 insertions, 8 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 *) {}