summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-12 01:04:34 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-12 01:05:38 (GMT)
commit8905d8445dfe8977441302003fa21dde140fa0fe (patch)
tree1b71c64272782ebba21fb7f7bcebb0b927f686a5
parent517a48de8ec497f7e8367d64a28bf4c19e8a4744 (diff)
downloadQt-8905d8445dfe8977441302003fa21dde140fa0fe.zip
Qt-8905d8445dfe8977441302003fa21dde140fa0fe.tar.gz
Qt-8905d8445dfe8977441302003fa21dde140fa0fe.tar.bz2
Remove accidental left over debugging output
-rw-r--r--src/corelib/animation/qabstractanimation.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 185d8e5..c1da692 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -205,7 +205,6 @@ void QUnifiedTimer::updateAnimationsTime()
QAbstractAnimation *animation = animations.at(currentAnimationIdx);
int elapsed = QAbstractAnimationPrivate::get(animation)->totalCurrentTime
+ (animation->direction() == QAbstractAnimation::Forward ? delta : -delta);
- //qWarning() << "SCT" << elapsed;
animation->setCurrentTime(elapsed);
}
currentAnimationIdx = 0;
@@ -232,7 +231,6 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event)
{
if ((consistentTiming && startStopAnimationTimer.isActive()) ||
(event->timerId() == startStopAnimationTimer.timerId())) {
- //qWarning() << "A SSAT";
startStopAnimationTimer.stop();
//we transfer the waiting animations into the "really running" state
@@ -254,7 +252,6 @@ void QUnifiedTimer::timerEvent(QTimerEvent *event)
if (event->timerId() == animationTimer.timerId()) {
// update current time on all top level animations
- //qWarning() << "A AT";
updateAnimationsTime();
restartAnimationTimer();
}
@@ -267,10 +264,8 @@ void QUnifiedTimer::registerAnimation(QAbstractAnimation *animation, bool isTopL
Q_ASSERT(!QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer);
QAbstractAnimationPrivate::get(animation)->hasRegisteredTimer = true;
animationsToStart << animation;
- if (!startStopAnimationTimer.isActive()) {
- //qWarning("Starting SSAT 1");
+ if (!startStopAnimationTimer.isActive())
startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, this);
- }
}
}
@@ -288,10 +283,8 @@ void QUnifiedTimer::unregisterAnimation(QAbstractAnimation *animation)
if (idx <= currentAnimationIdx)
--currentAnimationIdx;
- if (animations.isEmpty() && !startStopAnimationTimer.isActive()) {
- //qWarning("Starting SSAT 2");
+ if (animations.isEmpty() && !startStopAnimationTimer.isActive())
startStopAnimationTimer.start(STARTSTOP_TIMER_DELAY, this);
- }
} else {
animationsToStart.removeOne(animation);
}