whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix QDefaultAnimationDriver 

Animation drivers were changed to used signals instead of virtual
functions, but the default animation driver was left behind.

Reviewed-by: Michael Brasser
bb10
Alan Alpert 2011-05-10 13:43:58 +10:00
parent 7eef0de091
commit 8fb5928469
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/animation/qabstractanimation.cpp
View File

@ -580,6 +580,8 @@ qint64 QAnimationDriver::elapsed() const
QDefaultAnimationDriver::QDefaultAnimationDriver(QUnifiedTimer *timer)
: QAnimationDriver(0), m_unified_timer(timer)
{
connect(this, SIGNAL(started()), this, SLOT(startTimer()));
connect(this, SIGNAL(stopped()), this, SLOT(stopTimer()));
}
void QDefaultAnimationDriver::timerEvent(QTimerEvent *e)
@ -589,12 +591,12 @@ void QDefaultAnimationDriver::timerEvent(QTimerEvent *e)
advance();
}
void QDefaultAnimationDriver::started()
void QDefaultAnimationDriver::startTimer()
{
m_timer.start(m_unified_timer->timingInterval, this);
}
void QDefaultAnimationDriver::stopped()
void QDefaultAnimationDriver::stopTimer()
{
m_timer.stop();
}

5
src/corelib/animation/qabstractanimation_p.h
View File

@ -124,8 +124,9 @@ public:
QDefaultAnimationDriver(QUnifiedTimer *timer);
void timerEvent(QTimerEvent *e);
void started();
void stopped();
private Q_SLOTS:
void startTimer();
void stopTimer();
private:
QBasicTimer m_timer;