Small change in the API of animations

We're not taking a parameter in updateCurrentTime any more
because that parameter was the total currenttime. So it was taking into
account the currenttime and the currentloop at once. This was inconsistent

Reviewed-by: Leo

3 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
index 209e68b..b14d6f8 100644
--- a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
+++ b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
@@ -169,10 +169,10 @@ public:
     int duration() const { return -1; /* not time driven */ }
 
 protected:
-    void updateCurrentTime(int msecs)
+    void updateCurrentTime()
     {
-        QPropertyAnimation::updateCurrentTime(msecs);
-        if (msecs >= QPropertyAnimation::duration())
+        QPropertyAnimation::updateCurrentTime();
+        if (currentTime() >= QPropertyAnimation::duration())
             stop();
     }
 };
diff --git a/tests/benchmarks/qanimation/rectanimation.cpp b/tests/benchmarks/qanimation/rectanimation.cpp
index e5f2f57..5522847 100644
--- a/tests/benchmarks/qanimation/rectanimation.cpp
+++ b/tests/benchmarks/qanimation/rectanimation.cpp
@@ -73,9 +73,9 @@ int RectAnimation::duration() const
 }
 
 
-void RectAnimation::updateCurrentTime(int msecs)
+void RectAnimation::updateCurrentTime()
 {
-    qreal progress = m_easing.valueForProgress( qreal(msecs) / qreal(m_dura) );
+    qreal progress = m_easing.valueForProgress( currentTime() / qreal(m_dura) );
     QRect now;
     now.setCoords(interpolateInteger(m_start.left(), m_end.left(), progress),
                   interpolateInteger(m_start.top(), m_end.top(), progress),
diff --git a/tests/benchmarks/qanimation/rectanimation.h b/tests/benchmarks/qanimation/rectanimation.h
index 84ec97d..995becb 100644
--- a/tests/benchmarks/qanimation/rectanimation.h
+++ b/tests/benchmarks/qanimation/rectanimation.h
@@ -58,7 +58,7 @@ public:
     void setDuration(int d);
     int duration() const;
 
-    virtual void updateCurrentTime(int msecs);
+    virtual void updateCurrentTime();
     virtual void updateState(QAbstractAnimation::State state);
 
 private: