Make QStateMachine inherit QState

This removes the need for a "root state" in the machine; or rather,
the machine _is_ the root state.
User code can now pass in a QStateMachine directly to the QState
constructor, instead of machine->rootState().
This also means we could get rid of the "proxying" from the machine
to the root state for things like properties (initialState et al),
finished() signal and auto-reparenting of states (the ChildAdded
event hack).
A fun little side-effect of this change is that it's now possible
to embed state machines within state machines. We can't think of
a good use case yet where you would rather embed a stand-alone
state machine (with its own event processing etc.) rather than
having just a regular nested state, but it's neat and it works.

Reviewed-by: Eskil Abrahamsen Blomfeldt

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/qstate/tst_qstate.cpp
index ab87767..78b9853 100644
--- a/tests/auto/qstate/tst_qstate.cpp
+++ b/tests/auto/qstate/tst_qstate.cpp
@@ -60,10 +60,10 @@ tst_QState::~tst_QState()
 void tst_QState::test()
 {
     QStateMachine machine;
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
 
     QCOMPARE(s1->machine(), &machine);
-    QCOMPARE(s1->parentState(), machine.rootState());
+    QCOMPARE(s1->parentState(), &machine);
     QCOMPARE(s1->initialState(), (QState*)0);
     QVERIFY(s1->childStates().isEmpty());
     QVERIFY(s1->transitions().isEmpty());
@@ -218,7 +218,7 @@ void tst_QState::assignProperty()
     QObject *object = new QObject();
     object->setProperty("fooBar", 10);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(object, "fooBar", 20);
     
     machine.setInitialState(s1);
@@ -235,7 +235,7 @@ void tst_QState::assignPropertyTwice()
     QObject *object = new QObject();
     object->setProperty("fooBar", 10);
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     s1->assignProperty(object, "fooBar", 20);
     s1->assignProperty(object, "fooBar", 30);
     
@@ -271,9 +271,9 @@ void tst_QState::historyInitialState()
 {
     QStateMachine machine;
 
-    QState *s1 = new QState(machine.rootState());
+    QState *s1 = new QState(&machine);
     
-    QState *s2 = new QState(machine.rootState());
+    QState *s2 = new QState(&machine);
     QHistoryState *h1 = new QHistoryState(s2);
     
     s2->setInitialState(h1);