diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-07 03:50:34 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-07 03:50:34 (GMT) |
| commit | 25657bfa7588d6df713d4e15cebc23556b489693 (patch) | |
| tree | befa4a56e8d7c7bf0428a7a6bd637d14f1928721 /src/declarative/util/qmlanimation_p_p.h | |
| parent | 856b2cb8cdd0a5493f555b3d622fb819af9d826d (diff) | |
| parent | 55a3fda3baf545cc7fbfa6b2c00705be40a7319b (diff) | |
| download | Qt-25657bfa7588d6df713d4e15cebc23556b489693.zip Qt-25657bfa7588d6df713d4e15cebc23556b489693.tar.gz Qt-25657bfa7588d6df713d4e15cebc23556b489693.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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; |