diff -r 5dc02b23752f -r 3e2da88830cd src/declarative/util/qdeclarativeanimation_p_p.h --- a/src/declarative/util/qdeclarativeanimation_p_p.h Tue Jul 06 15:10:48 2010 +0300 +++ b/src/declarative/util/qdeclarativeanimation_p_p.h Wed Aug 18 10:37:55 2010 +0300 @@ -96,7 +96,7 @@ }; //performs an action of type QAbstractAnimationAction -class QActionAnimation : public QAbstractAnimation +class Q_AUTOTEST_EXPORT QActionAnimation : public QAbstractAnimation { Q_OBJECT public: @@ -143,7 +143,7 @@ }; //animates QDeclarativeBulkValueUpdater (assumes start and end values will be reals or compatible) -class QDeclarativeBulkValueAnimator : public QVariantAnimation +class Q_AUTOTEST_EXPORT QDeclarativeBulkValueAnimator : public QVariantAnimation { Q_OBJECT public: @@ -311,8 +311,6 @@ QVariant from; QVariant to; - QEasingCurve easing; - QObject *target; QString propertyName; QString properties; @@ -378,6 +376,22 @@ QList targets; }; +class Q_AUTOTEST_EXPORT QDeclarativeAnimationPropertyUpdater : public QDeclarativeBulkValueUpdater +{ +public: + QDeclarativeStateActions actions; + int interpolatorType; //for Number/ColorAnimation + int prevInterpolatorType; //for generic + QVariantAnimation::Interpolator interpolator; + bool reverse; + bool fromSourced; + bool fromDefined; + bool *wasDeleted; + QDeclarativeAnimationPropertyUpdater() : prevInterpolatorType(0), wasDeleted(0) {} + ~QDeclarativeAnimationPropertyUpdater() { if (wasDeleted) *wasDeleted = true; } + void setValue(qreal v); +}; + QT_END_NAMESPACE #endif // QDECLARATIVEANIMATION_P_H