diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-27 02:49:18 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-27 02:49:18 (GMT) |
commit | ecf0a1937d81e047e25ac551703a77f75767d881 (patch) | |
tree | c89fe2890d96fd65713951403c28714c5ab48f05 /src/declarative/util/qmlanimation_p.h | |
parent | f1326b02c582b5044b8a2f491eed649020846111 (diff) | |
download | Qt-ecf0a1937d81e047e25ac551703a77f75767d881.zip Qt-ecf0a1937d81e047e25ac551703a77f75767d881.tar.gz Qt-ecf0a1937d81e047e25ac551703a77f75767d881.tar.bz2 |
Rename GfxValue to QmlTimeLineValue.
Diffstat (limited to 'src/declarative/util/qmlanimation_p.h')
-rw-r--r-- | src/declarative/util/qmlanimation_p.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index db7cb18..f14df82 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -52,7 +52,7 @@ #include <QVariantAnimation> #include <QAnimationGroup> #include <QColor> -#include <gfxvalueproxy.h> +#include <qmltimelinevalueproxy.h> QT_BEGIN_NAMESPACE @@ -112,13 +112,13 @@ private: DeletionPolicy policy; }; -//animates GfxValue (assumes start and end values will be reals or compatible) -class GfxValueAnimator : public QVariantAnimation +//animates QmlTimeLineValue (assumes start and end values will be reals or compatible) +class QmlTimeLineValueAnimator : public QVariantAnimation { public: - GfxValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), policy(KeepWhenStopped) {} - GfxValueAnimator(GfxValue *value, QObject *parent = 0) : QVariantAnimation(parent), animValue(value), policy(KeepWhenStopped) {} - void setAnimValue(GfxValue *value, DeletionPolicy p) + QmlTimeLineValueAnimator(QObject *parent = 0) : QVariantAnimation(parent), animValue(0), policy(KeepWhenStopped) {} + QmlTimeLineValueAnimator(QmlTimeLineValue *value, QObject *parent = 0) : QVariantAnimation(parent), animValue(value), policy(KeepWhenStopped) {} + void setAnimValue(QmlTimeLineValue *value, DeletionPolicy p) { if (state() == Running) stop(); @@ -141,7 +141,7 @@ protected: } private: - GfxValue *animValue; + QmlTimeLineValue *animValue; DeletionPolicy policy; }; @@ -214,10 +214,10 @@ public: bool fromSourced; QColor fromValue; QColor toValue; - GfxValueAnimator *ca; + QmlTimeLineValueAnimator *ca; virtual void valueChanged(qreal); - GfxValueProxy<QmlColorAnimationPrivate> value; + QmlTimeLineValueProxy<QmlColorAnimationPrivate> value; }; class QmlRunScriptActionPrivate : public QmlAbstractAnimationPrivate @@ -295,10 +295,10 @@ public: bool fromSourced; qreal fromValue; - GfxValueAnimator *na; + QmlTimeLineValueAnimator *na; virtual void valueChanged(qreal); - GfxValueProxy<QmlNumericAnimationPrivate> value; + QmlTimeLineValueProxy<QmlNumericAnimationPrivate> value; }; class QmlAnimationGroupPrivate : public QmlAbstractAnimationPrivate @@ -360,10 +360,10 @@ public: bool fromSourced; QVariant fromValue; - GfxValueAnimator *va; + QmlTimeLineValueAnimator *va; virtual void valueChanged(qreal); - GfxValueProxy<QmlVariantAnimationPrivate> value; + QmlTimeLineValueProxy<QmlVariantAnimationPrivate> value; static QVariant interpolateVariant(const QVariant &from, const QVariant &to, qreal progress); static void convertVariant(QVariant &variant, QVariant::Type type); |