diff options
Diffstat (limited to 'src/declarative/util/qmlanimation_p_p.h')
-rw-r--r-- | src/declarative/util/qmlanimation_p_p.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index 71b6caa..fbd7114 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -203,7 +203,7 @@ public: QmlAbstractAnimationPrivate() : running(false), paused(false), alwaysRunToEnd(false), repeat(false), connectedTimeLine(false), componentComplete(true), startOnCompletion(false), - target(0), group(0) {} + group(0) {} bool running:1; bool paused:1; @@ -217,8 +217,6 @@ public: void commence(); QmlNullableValue<QmlMetaProperty> userProperty; - QObject *target; - QString propertyName; QmlMetaProperty property; QmlAnimationGroup *group; @@ -264,10 +262,12 @@ class QmlPropertyActionPrivate : public QmlAbstractAnimationPrivate Q_DECLARE_PUBLIC(QmlPropertyAction) public: QmlPropertyActionPrivate() - : QmlAbstractAnimationPrivate(), proxy(this), spa(0) {} + : QmlAbstractAnimationPrivate(), target(0), proxy(this), spa(0) {} void init(); + QObject *target; + QString propertyName; QString properties; QList<QObject *> targets; QList<QObject *> exclude; @@ -342,8 +342,8 @@ class QmlPropertyAnimationPrivate : public QmlAbstractAnimationPrivate Q_DECLARE_PUBLIC(QmlPropertyAnimation) public: QmlPropertyAnimationPrivate() - : QmlAbstractAnimationPrivate(), fromSourced(false), fromIsDefined(false), toIsDefined(false), - defaultToInterpolatorType(0), interpolatorType(0), interpolator(0), va(0), + : QmlAbstractAnimationPrivate(), target(0), fromSourced(false), fromIsDefined(false), toIsDefined(false), + rangeIsSet(false), defaultToInterpolatorType(0), interpolatorType(0), interpolator(0), va(0), value(this, &QmlPropertyAnimationPrivate::valueChanged) {} void init(); @@ -353,14 +353,17 @@ public: QString easing; + QObject *target; + QString propertyName; QString properties; QList<QObject *> targets; QList<QObject *> exclude; bool fromSourced; - bool fromIsDefined; - bool toIsDefined; - bool defaultToInterpolatorType; + bool fromIsDefined:1; + bool toIsDefined:1; + bool rangeIsSet:1; + bool defaultToInterpolatorType:1; int interpolatorType; QVariantAnimation::Interpolator interpolator; |