diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 23:41:10 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 23:41:10 (GMT) |
commit | f3164b608e83a3e2c54643aea984095edc275346 (patch) | |
tree | 14b532e90e2a15b8d2ac5d46738971b0bedc561e /src/corelib/statemachine/qabstracttransition.h | |
parent | b7ac7f5b4d4c8e08b4ded43c9720c712a3663810 (diff) | |
parent | 90057dabcb99759bcb42c1c21db7151c69d98706 (diff) | |
download | Qt-f3164b608e83a3e2c54643aea984095edc275346.zip Qt-f3164b608e83a3e2c54643aea984095edc275346.tar.gz Qt-f3164b608e83a3e2c54643aea984095edc275346.tar.bz2 |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/corelib/animation/qabstractanimation.cpp
src/corelib/animation/qabstractanimation_p.h
src/corelib/animation/qpropertyanimation.cpp
Diffstat (limited to 'src/corelib/statemachine/qabstracttransition.h')
-rw-r--r-- | src/corelib/statemachine/qabstracttransition.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index c49731f..e207944 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -55,6 +55,7 @@ QT_MODULE(Core) class QEvent; class QAbstractState; class QState; +class QStateMachine; #ifndef QT_NO_ANIMATION class QAbstractAnimation; @@ -64,9 +65,9 @@ class QAbstractTransitionPrivate; class Q_CORE_EXPORT QAbstractTransition : public QObject { Q_OBJECT - Q_PROPERTY(QState* source READ sourceState) - Q_PROPERTY(QAbstractState* target READ targetState WRITE setTargetState) - Q_PROPERTY(QList<QAbstractState*> targets READ targetStates WRITE setTargetStates) + Q_PROPERTY(QState* sourceState READ sourceState) + Q_PROPERTY(QAbstractState* targetState READ targetState WRITE setTargetState) + Q_PROPERTY(QList<QAbstractState*> targetStates READ targetStates WRITE setTargetStates) public: QAbstractTransition(QState *sourceState = 0); QAbstractTransition(const QList<QAbstractState*> &targets, QState *sourceState = 0); @@ -78,6 +79,8 @@ public: QList<QAbstractState*> targetStates() const; void setTargetStates(const QList<QAbstractState*> &targets); + QStateMachine *machine() const; + #ifndef QT_NO_ANIMATION void addAnimation(QAbstractAnimation *animation); void removeAnimation(QAbstractAnimation *animation); @@ -87,7 +90,7 @@ public: protected: virtual bool eventTest(QEvent *event) const = 0; - virtual void onTransition() = 0; + virtual void onTransition(QEvent *event) = 0; bool event(QEvent *e); |