diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-09-28 13:52:32 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-09-28 13:57:39 (GMT) |
| commit | 7626109da40a91cb38fbe3f23e08b50a04d2194a (patch) | |
| tree | b53358c91c08ecde5f4d12d5f20e1f6609fa17e7 /tests | |
| parent | 124b4a1a5832d21d63722ee5ac68007083a4f8ae (diff) | |
| download | Qt-7626109da40a91cb38fbe3f23e08b50a04d2194a.zip Qt-7626109da40a91cb38fbe3f23e08b50a04d2194a.tar.gz Qt-7626109da40a91cb38fbe3f23e08b50a04d2194a.tar.bz2 | |
Animations: updateCurrentTime now receives the currentTime as paramater
Reviewed-by: Leo
Diffstat (limited to 'tests')
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp index f86e81d..51ef2da 100644 --- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp @@ -55,10 +55,10 @@ public: int duration() const { return -1; /* not time driven */ } protected: - void updateCurrentTime() + void updateCurrentTime(int currentTime) { - QPropertyAnimation::updateCurrentTime(); - if (currentTime() >= QPropertyAnimation::duration() || currentLoop() >= 1) + QPropertyAnimation::updateCurrentTime(currentTime); + if (currentTime >= QPropertyAnimation::duration() || currentLoop() >= 1) stop(); } }; diff --git a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index b14d6f8..aa6801a 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() + void updateCurrentTime(int currentTime) { - QPropertyAnimation::updateCurrentTime(); - if (currentTime() >= QPropertyAnimation::duration()) + QPropertyAnimation::updateCurrentTime(currentTime); + if (currentTime >= QPropertyAnimation::duration()) stop(); } }; diff --git a/tests/benchmarks/qanimation/rectanimation.cpp b/tests/benchmarks/qanimation/rectanimation.cpp index 5522847..ab381f4 100644 --- a/tests/benchmarks/qanimation/rectanimation.cpp +++ b/tests/benchmarks/qanimation/rectanimation.cpp @@ -73,9 +73,9 @@ int RectAnimation::duration() const } -void RectAnimation::updateCurrentTime() +void RectAnimation::updateCurrentTime(int currentTime) { - qreal progress = m_easing.valueForProgress( currentTime() / 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 995becb..ea1f804 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(); + virtual void updateCurrentTime(int currentTime); virtual void updateState(QAbstractAnimation::State state); private: |