fromState -> from, toState -> to for Transition.

21 files changed, 45 insertions, 45 deletions

diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml
index e82561e..ca31bcc 100644
--- a/examples/declarative/flowview/flowview.qml
+++ b/examples/declarative/flowview/flowview.qml
@@ -22,7 +22,7 @@ Rectangle {
             PropertyChanges { target: RightBar; x: 770 }
         }
         transitions: Transition {
-            fromState: "" ; toState: "rotated"
+            from: "" ; to: "rotated"
             reversible: true
             SequentialAnimation {
                 NumberAnimation { targets: [TopBar, BottomBar]; properties: "x,y"; easing: "easeInOutQuad" }
@@ -64,7 +64,7 @@ Rectangle {
                     ]
                     transitions: [
                     Transition {
-                        fromState: "*"; toState: "InGrid"
+                        from: "*"; to: "InGrid"
                         SequentialAnimation { 
                             ParentAction{} 
                             PauseAnimation { duration: 50 * List.FlowView.column }
@@ -72,7 +72,7 @@ Rectangle {
                         } 
                     },
                     Transition {
-                        fromState: "*"; toState: "InList"
+                        from: "*"; to: "InList"
                         SequentialAnimation { 
                             ParentAction{} 
                             PauseAnimation { duration: 50 * (Grid.FlowView.row * 2 + Grid.FlowView.column) }
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 639a8cc..48cceb7 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -24,8 +24,8 @@ Rectangle {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "*"
+                from: "*"
+                to: "*"
                 NumberAnimation {
                     properties: "opacity"
                     duration: 400
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml
index 17e5a48..021cef3 100644
--- a/examples/declarative/snow/ImageBatch.qml
+++ b/examples/declarative/snow/ImageBatch.qml
@@ -52,7 +52,7 @@ GridView {
         }
         transitions: [
             Transition {
-                toState: "selected"
+                to: "selected"
                 SequentialAnimation {
                     PauseAnimation { duration: 150 }
                     PropertyAction { properties: "z" }
@@ -60,7 +60,7 @@ GridView {
                 }
             },
             Transition {
-                fromState: "selected"
+                from: "selected"
                 SequentialAnimation {
                     NumberAnimation { properties: "scale"; duration: 150 }
                     PropertyAction { properties: "z" }
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 0be9b01..be1419d 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -51,13 +51,13 @@ Rectangle {
         // When transitioning to 'Position1' move x,y over a duration of 1 second,
         // with easeOutBounce easing function.
         Transition {
-            fromState: "*"; toState: "Position1"
+            from: "*"; to: "Position1"
             NumberAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
         },
         // When transitioning to 'Position2' move x,y over a duration of 2 seconds,
         // with easeInOutQuad easing function.
         Transition {
-            fromState: "*"; toState: "Position2"
+            from: "*"; to: "Position2"
             NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
         },
         // For any other state changes move x,y linearly over duration of 200ms.
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
index d75eedc..75d5aaa 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
@@ -101,8 +101,8 @@ Rectangle {
 //! [transition]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
index de9f15a..5ac62ce 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
@@ -100,8 +100,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
index de9f15a..5ac62ce 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
@@ -100,8 +100,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
index 07a0814..eb694ce 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
@@ -102,8 +102,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
index be5f871..b1cd72e 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
@@ -108,8 +108,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
index 0b9c02a..1517a74 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
@@ -48,8 +48,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
index 8a9424f..3a8bb7f 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
@@ -128,8 +128,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
index fc260e3..1276c6b 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
@@ -103,8 +103,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
index 691918f..ccd756e 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
@@ -46,8 +46,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
index 62fb08f..8f98ede 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
@@ -129,8 +129,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
index abf8fd9..8938184 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
@@ -108,8 +108,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
index 476f170..9719231 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
@@ -34,16 +34,16 @@ Item {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "pressed"
+                from: "*"
+                to: "pressed"
                 ColorAnimation {
                     property: "color"
                     duration: 200
                 }
             },
             Transition {
-                fromState: "pressed"
-                toState: "*"
+                from: "pressed"
+                to: "*"
                 ColorAnimation {
                     property: "color"
                     duration: 1000
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
index 691918f..ccd756e 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
@@ -46,8 +46,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
index e05708f..228a00d 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
@@ -129,8 +129,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
index 6bca8b9..3c77cd8 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
@@ -107,8 +107,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
index b652eac..daf32d5 100644
--- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
@@ -25,8 +25,8 @@ Rectangle {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "down"
+                from: "*"
+                to: "down"
                 reversible: true
                 ParallelAnimation {
                     NumberAnimation {
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index d7d47b1..6395284 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -72,8 +72,8 @@ Rectangle {
                     ]
                     transitions: [
                         Transition {
-                            fromState: "*"
-                            toState: "Details"
+                            from: "*"
+                            to: "Details"
                             reversible: true
                             SequentialAnimation {
                                 NumberAnimation {