summaryrefslogtreecommitdiff
path: root/src/corelib/animation
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/animation')
-rw-r--r--src/corelib/animation/qanimationgroup.cpp2
-rw-r--r--src/corelib/animation/qpropertyanimation.h4
-rw-r--r--src/corelib/animation/qvariantanimation.cpp15
3 files changed, 15 insertions, 6 deletions
diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp
index ed06effcf5..839b5226c2 100644
--- a/src/corelib/animation/qanimationgroup.cpp
+++ b/src/corelib/animation/qanimationgroup.cpp
@@ -236,7 +236,7 @@ void QAnimationGroup::removeAnimation(QAbstractAnimation *animation)
\note The ownership of the animation is transferred to the caller.
- \sa removeAnimation(), addAnimation(), insertAnimation(), indexOfAnimation()
+ \sa removeAnimation(), addAnimation(), insertAnimationAt(), indexOfAnimation()
*/
QAbstractAnimation *QAnimationGroup::takeAnimationAt(int index)
{
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index 5b06bd290a..39317ba474 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -72,11 +72,11 @@ public:
protected:
bool event(QEvent *event);
-
void updateCurrentValue(const QVariant &value);
void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
- Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed());
+
private:
+ Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed());
Q_DISABLE_COPY(QPropertyAnimation)
Q_DECLARE_PRIVATE(QPropertyAnimation)
};
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index a6834bbf9c..4542a86ea7 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -63,9 +63,8 @@ QT_BEGIN_NAMESPACE
shared functionality.
QVariantAnimation cannot be used directly as it is an abstract
- class; it does not implement
- \l{QAbstractAnimation::}{updateCurrentValue()} from
- QAbstractAnimation. The class performs interpolation over
+ class; it has a pure virtual method called updateCurrentValue().
+ The class performs interpolation over
\l{QVariant}s, but leaves using the interpolated values to its
subclasses. Currently, Qt provides QPropertyAnimation, which
animates Qt \l{Qt's Property System}{properties}. See the
@@ -130,6 +129,16 @@ QT_BEGIN_NAMESPACE
\sa currentValue, startValue, endValue
*/
+/*!
+ \fn void QVariantAnimation::updateCurrentValue(const QVariant &value) = 0;
+
+ This pure virtual function is called every time the animation's current
+ value changes. The \a value argument is the new current value.
+
+ \sa currentValue
+*/
+
+
static bool animationValueLessThan(const QVariantAnimation::KeyValue &p1, const QVariantAnimation::KeyValue &p2)
{
return p1.first < p2.first;