qmlstatemachine: Rename StateBase to State

As discussed with Brett Stottlmyer and Alan Alpert.

Add a section about the implications when importing both
QtQml.StateMachine
and QtQuick in one single QML file.

Change-Id: I8755f4b578e2a6ff4c2377c7a8a0b996ba9b7129
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

8 files changed, 34 insertions, 34 deletions

diff --git a/tests/auto/qmltest/statemachine/tst_anonymousstate.qml b/tests/auto/qmltest/statemachine/tst_anonymousstate.qml
index cce5f8dcb7..b05d5c67a9 100644
--- a/tests/auto/qmltest/statemachine/tst_anonymousstate.qml
+++ b/tests/auto/qmltest/statemachine/tst_anonymousstate.qml
@@ -31,12 +31,12 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
-        StateBase {
+        State {
         }
     }
     name: "anonymousState"
diff --git a/tests/auto/qmltest/statemachine/tst_guardcondition.qml b/tests/auto/qmltest/statemachine/tst_guardcondition.qml
index 71171b2079..0390b5f8fa 100644
--- a/tests/auto/qmltest/statemachine/tst_guardcondition.qml
+++ b/tests/auto/qmltest/statemachine/tst_guardcondition.qml
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     id: testCase
     StateMachine {
         id: machine
         initialState: startState
-        StateBase {
+        State {
             id: startState
             SignalTransition {
                 id: signalTrans
diff --git a/tests/auto/qmltest/statemachine/tst_historystate.qml b/tests/auto/qmltest/statemachine/tst_historystate.qml
index f2fc110c24..6e2aa70417 100644
--- a/tests/auto/qmltest/statemachine/tst_historystate.qml
+++ b/tests/auto/qmltest/statemachine/tst_historystate.qml
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
 
@@ -40,7 +40,7 @@ TestCase {
         id: stateMachine
         initialState: historyState1
 
-        StateBase {
+        State {
             id: state1
             SignalTransition {
                 id: st1
@@ -48,14 +48,14 @@ TestCase {
             }
         }
 
-        StateBase {
+        State {
             id: state2
             initialState: historyState2
             HistoryState {
                 id: historyState2
                 defaultState: state21
             }
-            StateBase {
+            State {
                 id: state21
             }
         }
diff --git a/tests/auto/qmltest/statemachine/tst_initialstate.qml b/tests/auto/qmltest/statemachine/tst_initialstate.qml
index 6d5fbadf26..c08b3f7001 100644
--- a/tests/auto/qmltest/statemachine/tst_initialstate.qml
+++ b/tests/auto/qmltest/statemachine/tst_initialstate.qml
@@ -31,15 +31,15 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
         id: myStateMachine
         initialState: myState;
         running: true
-        StateBase {
+        State {
             id: myState
         }
     }
diff --git a/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml b/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
index 2906de2986..443771f8f4 100644
--- a/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
+++ b/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml
@@ -31,20 +31,20 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
         id: myStateMachine
         initialState: parentState
-        StateBase {
+        State {
             id: parentState
             initialState: childState1
-            StateBase {
+            State {
                 id: childState1
             }
-            StateBase {
+            State {
                 id: childState2
             }
         }
diff --git a/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml b/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
index 41a2c2a852..f584b7cd01 100644
--- a/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
+++ b/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml
@@ -31,23 +31,23 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
         id: myStateMachine
         initialState: parentState
-        StateBase {
+        State {
             id: parentState
             initialState: childStateMachine
             StateMachine {
                 id: childStateMachine
                 initialState: childState2
-                StateBase {
+                State {
                     id: childState1
                 }
-                StateBase {
+                State {
                     id: childState2
                 }
             }
diff --git a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
index 0f35af0d99..2e3a5efdfd 100644
--- a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
+++ b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
@@ -31,30 +31,30 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
         id: myStateMachine
-        childMode: StateBase.ParallelStates
-        StateBase {
+        childMode: State.ParallelStates
+        State {
             id: childState1
-            childMode: StateBase.ParallelStates
-            StateBase {
+            childMode: State.ParallelStates
+            State {
                 id: childState11
             }
-            StateBase {
+            State {
                 id: childState12
             }
         }
-        StateBase {
+        State {
             id: childState2
             initialState: childState21
-            StateBase {
+            State {
                 id: childState21
             }
-            StateBase {
+            State {
                 id: childState22
             }
         }
diff --git a/tests/auto/qmltest/statemachine/tst_trafficlight.qml b/tests/auto/qmltest/statemachine/tst_trafficlight.qml
index 8a7cad8268..3f731a4014 100644
--- a/tests/auto/qmltest/statemachine/tst_trafficlight.qml
+++ b/tests/auto/qmltest/statemachine/tst_trafficlight.qml
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
@@ -42,10 +42,10 @@ TestCase {
             id: finalState
         }
 
-        StateBase {
+        State {
             id: red
             initialState: justRed
-            StateBase {
+            State {
                 id: justRed
                 SignalTransition {
                     id: e1
@@ -56,7 +56,7 @@ TestCase {
                     targetState: finalState
                 }
             }
-            StateBase {
+            State {
                 id: waitingForGreen
                 TimeoutTransition {
                     id: e2
@@ -65,7 +65,7 @@ TestCase {
                 }
             }
         }
-        StateBase {
+        State {
             id: yellowred
             TimeoutTransition {
                 id: e3
@@ -73,7 +73,7 @@ TestCase {
                 timeout: 10
             }
         }
-        StateBase {
+        State {
             id: green
             TimeoutTransition {
                 id: e4
@@ -81,7 +81,7 @@ TestCase {
                 timeout: 50
             }
         }
-        StateBase {
+        State {
             id: yellow
             TimeoutTransition {
                 id: e5