Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

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;