summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlstateoperations.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-22 03:41:56 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-22 03:41:56 (GMT)
commit1777678767e1f30ff5df0b0a7d19c0af9c5c9590 (patch)
treec16315aaae4132d86b0992a0410d05d3c9aa4115 /src/declarative/util/qmlstateoperations.h
parent34055e0160e2e94b0dd6b972c5bdc96a421adcf1 (diff)
downloadQt-1777678767e1f30ff5df0b0a7d19c0af9c5c9590.zip
Qt-1777678767e1f30ff5df0b0a7d19c0af9c5c9590.tar.gz
Qt-1777678767e1f30ff5df0b0a7d19c0af9c5c9590.tar.bz2
Remove moveToParent property.
Functionality has been moved to ParentChange.
Diffstat (limited to 'src/declarative/util/qmlstateoperations.h')
-rw-r--r--src/declarative/util/qmlstateoperations.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index 221373b..acbe05e 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -43,6 +43,7 @@
#define QMLSTATEOPERATIONS_H
#include <QtDeclarative/qmlstate.h>
+#include <QtDeclarative/qfxitem.h>
QT_BEGIN_HEADER
@@ -51,24 +52,28 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
class QmlParentChangePrivate;
-class Q_DECLARATIVE_EXPORT QmlParentChange : public QmlStateOperation
+class Q_DECLARATIVE_EXPORT QmlParentChange : public QmlStateOperation, public ActionEvent
{
Q_OBJECT
Q_DECLARE_PRIVATE(QmlParentChange)
- Q_PROPERTY(QObject *target READ object WRITE setObject)
- Q_PROPERTY(QObject *parent READ parent WRITE setParent)
+ Q_PROPERTY(QFxItem *target READ object WRITE setObject)
+ Q_PROPERTY(QFxItem *parent READ parent WRITE setParent)
public:
QmlParentChange(QObject *parent=0);
~QmlParentChange();
- QObject *object() const;
- void setObject(QObject *);
+ QFxItem *object() const;
+ void setObject(QFxItem *);
- QObject *parent() const;
- void setParent(QObject *);
+ QFxItem *parent() const;
+ void setParent(QFxItem *);
virtual ActionList actions();
+
+ virtual void execute();
+ virtual bool isReversable();
+ virtual void reverse();
};
class QmlRunScriptPrivate;