diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-08 04:27:59 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-08 04:27:59 (GMT) |
commit | f3db8cb262688a62537fd09f42c0af0115410066 (patch) | |
tree | 73e1d22daf05b333a62996c63fc71618b6c189d9 /src/corelib/statemachine/qabstractstate_p.h | |
parent | 225b30555b34885c028fc7a5f79a805cf5167669 (diff) | |
parent | 089bcd8a643dc206e23cac14c5fc03fc0acb02d8 (diff) | |
download | Qt-f3db8cb262688a62537fd09f42c0af0115410066.zip Qt-f3db8cb262688a62537fd09f42c0af0115410066.tar.gz Qt-f3db8cb262688a62537fd09f42c0af0115410066.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/corelib/statemachine/qabstractstate_p.h')
-rw-r--r-- | src/corelib/statemachine/qabstractstate_p.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/corelib/statemachine/qabstractstate_p.h b/src/corelib/statemachine/qabstractstate_p.h index 7c565f0..6c09696 100644 --- a/src/corelib/statemachine/qabstractstate_p.h +++ b/src/corelib/statemachine/qabstractstate_p.h @@ -57,28 +57,10 @@ #include <private/qobject_p.h> #endif -#include <QtCore/qlist.h> -#include <QtCore/qbytearray.h> -#include <QtCore/qvariant.h> - QT_BEGIN_NAMESPACE -class QAbstractTransition; -class QHistoryState; class QStateMachine; -struct QPropertyAssignment -{ - QPropertyAssignment(QObject *o, const QByteArray &n, - const QVariant &v, bool es = true) - : object(o), propertyName(n), value(v), explicitlySet(es) - {} - QObject *object; - QByteArray propertyName; - QVariant value; - bool explicitlySet; -}; - class QAbstractState; class Q_CORE_EXPORT QAbstractStatePrivate #ifndef QT_STATEMACHINE_SOLUTION @@ -95,11 +77,11 @@ public: QStateMachine *machine() const; - void callOnEntry(); - void callOnExit(); + void callOnEntry(QEvent *e); + void callOnExit(QEvent *e); - QAbstractState::RestorePolicy restorePolicy; - QList<QPropertyAssignment> propertyAssignments; + void emitEntered(); + void emitExited(); #ifdef QT_STATEMACHINE_SOLUTION QAbstractState *q_ptr; |