diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-10-04 11:12:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-09 00:24:14 +0200 |
| commit | caaeb2043541865ef7a9da424238d54b6556f8aa (patch) | |
| tree | 854f0df8dfc8f9ea79a226370e4f42cae4fcedb7 /src/corelib/animation | |
| parent | ffc60160d2c562f563b2f63280e4309be94d48fc (diff) | |
[QTBUG-13230] Make QVariantAnimation non-abstract
The bug report argues convincingly that, but for the pure virtual
updateCurrentValue(QVariant) function, QVariantAnimation is quite
usable as-is.
So add an empty implementation.
Reported-by: André Somers <andre@familiesomers.nl>
Task-number: QTBUG-13230
Change-Id: I689b4a80fc7d5dfae67c2255777f89afb16f9c21
Reviewed-by: Andre Somers <andre@familiesomers.nl>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/animation/qvariantanimation.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 824eeb5260..e2b6fdf70c 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -148,13 +148,14 @@ QT_BEGIN_NAMESPACE */ /*! - \fn void QVariantAnimation::updateCurrentValue(const QVariant &value) = 0; - - This pure virtual function is called every time the animation's current + This virtual function is called every time the animation's current value changes. The \a value argument is the new current value. + The base class implementation does nothing. + \sa currentValue */ +void QVariantAnimation::updateCurrentValue(const QVariant &) {} static bool animationValueLessThan(const QVariantAnimation::KeyValue &p1, const QVariantAnimation::KeyValue &p2) { diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index 7ce44d391c..7df885924b 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -104,7 +104,7 @@ protected: void updateCurrentTime(int); void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); - virtual void updateCurrentValue(const QVariant &value) = 0; + virtual void updateCurrentValue(const QVariant &value); virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; private: |