From caaeb2043541865ef7a9da424238d54b6556f8aa Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 4 Oct 2012 11:12:45 +0200 Subject: [PATCH] [QTBUG-13230] Make QVariantAnimation non-abstract MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Task-number: QTBUG-13230 Change-Id: I689b4a80fc7d5dfae67c2255777f89afb16f9c21 Reviewed-by: Andre Somers Reviewed-by: Konstantin Ritt Reviewed-by: Thiago Macieira --- src/corelib/animation/qvariantanimation.cpp | 7 ++++--- 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 824eeb5..e2b6fdf 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 7ce44d3..7df8859 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: -- 2.7.4