summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeanimation_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-23 01:12:46 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-23 03:49:12 (GMT)
commit7711d400e4ad4d65363bc910d76acdf0d1065195 (patch)
tree1fb64c9471a8a0f14bde5e3b442cafa7ece2baba /src/declarative/util/qdeclarativeanimation_p.h
parentda96ef1a17a27b09129f73c6e7f3134806545d92 (diff)
downloadQt-7711d400e4ad4d65363bc910d76acdf0d1065195.zip
Qt-7711d400e4ad4d65363bc910d76acdf0d1065195.tar.gz
Qt-7711d400e4ad4d65363bc910d76acdf0d1065195.tar.bz2
Remove ParentAction.
It has been replaced with ParentAnimation.
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation_p.h')
-rw-r--r--src/declarative/util/qdeclarativeanimation_p.h27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 925eb36..cb8ea3b 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -227,32 +227,6 @@ protected:
};
class QDeclarativeItem;
-class QDeclarativeParentActionPrivate;
-class QDeclarativeParentAction : public QDeclarativeAbstractAnimation
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QDeclarativeParentAction)
-
- Q_PROPERTY(QDeclarativeItem *target READ object WRITE setObject)
- Q_PROPERTY(QDeclarativeItem *parent READ parent WRITE setParent) //### newParent
-
-public:
- QDeclarativeParentAction(QObject *parent=0);
- virtual ~QDeclarativeParentAction();
-
- QDeclarativeItem *object() const;
- void setObject(QDeclarativeItem *);
-
- QDeclarativeItem *parent() const;
- void setParent(QDeclarativeItem *);
-
-protected:
- virtual void transition(QDeclarativeStateActions &actions,
- QDeclarativeProperties &modified,
- TransitionDirection direction);
- virtual QAbstractAnimation *qtAnimation();
-};
-
class QDeclarativePropertyAnimationPrivate;
class Q_AUTOTEST_EXPORT QDeclarativePropertyAnimation : public QDeclarativeAbstractAnimation
{
@@ -506,7 +480,6 @@ QML_DECLARE_TYPE(QDeclarativeAbstractAnimation)
QML_DECLARE_TYPE(QDeclarativePauseAnimation)
QML_DECLARE_TYPE(QDeclarativeScriptAction)
QML_DECLARE_TYPE(QDeclarativePropertyAction)
-QML_DECLARE_TYPE(QDeclarativeParentAction)
QML_DECLARE_TYPE(QDeclarativePropertyAnimation)
QML_DECLARE_TYPE(QDeclarativeColorAnimation)
QML_DECLARE_TYPE(QDeclarativeNumberAnimation)