diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2011-12-12 14:30:11 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-13 02:23:47 +0100 |
commit | 08d378d9331c5be75087b1158a50076d12e14ea5 (patch) | |
tree | 2e0e4f43d1f502543bb9819097a06ce5fcbafa1e /src/corelib/animation/qabstractanimation_p.h | |
parent | 3bd3b82a2f6e61bb9f5bcc095ef96b39d8e19b80 (diff) |
Cleanup pause timer handling in QUnifiedTimer.
The animationTimer is now only used for pauses, so can be renamed to
pauseTimer, and directly queried for whether it is active.
Change-Id: I3d9319b6ee76158e875ab43657126a0aa0a1cf2e
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/corelib/animation/qabstractanimation_p.h')
-rw-r--r-- | src/corelib/animation/qabstractanimation_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 61a68a7032..e7c1effa9f 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -206,7 +206,7 @@ private: QAnimationDriver *driver; QDefaultAnimationDriver defaultDriver; - QBasicTimer animationTimer; + QBasicTimer pauseTimer; // timer used to delay the check if we should start/stop the animation timer QBasicTimer startStopAnimationTimer; @@ -226,9 +226,6 @@ private: // stops all animations. qreal slowdownFactor; - // bool to indicate that only pause animations are active - bool isPauseTimerActive; - QList<QAbstractAnimation*> animations, animationsToStart; // this is the count of running animations that are not a group neither a pause animation |