summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-26 01:16:57 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-26 02:04:36 (GMT)
commitffc9e62cbf7e24cd04a1202de1b3e618f9e12642 (patch)
treefaf828900c05b748e39158eb6a1fb59c44ba3763 /examples
parent662488175fb9c6a44e9641867177b5396c507891 (diff)
downloadQt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.zip
Qt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.tar.gz
Qt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.tar.bz2
Rename NumericAnimation -> NumberAnimation
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/animation/animation.qml4
-rw-r--r--examples/declarative/behaviours/test.qml10
-rw-r--r--examples/declarative/easing/easing.qml4
-rw-r--r--examples/declarative/flowview/flowview.qml8
-rw-r--r--examples/declarative/follow/follow.qml4
-rw-r--r--examples/declarative/follow/pong.qml4
-rw-r--r--examples/declarative/listview/highlight.qml2
-rw-r--r--examples/declarative/listview/recipes.qml2
-rw-r--r--examples/declarative/minehunt/minehunt.qml4
-rw-r--r--examples/declarative/scrollbar/display.qml2
-rw-r--r--examples/declarative/slideswitch/Switch.qml2
-rw-r--r--examples/declarative/states/transitions.qml6
-rw-r--r--examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml4
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml4
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml2
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml4
-rw-r--r--examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml2
-rw-r--r--examples/declarative/tutorials/helloworld/t3/tutorial3.qml2
-rw-r--r--examples/declarative/velocity/Day.qml2
-rw-r--r--examples/declarative/webview/content/SpinSquare.qml2
-rw-r--r--examples/declarative/xmldata/yahoonews.qml4
36 files changed, 54 insertions, 54 deletions
diff --git a/examples/declarative/animation/animation.qml b/examples/declarative/animation/animation.qml
index 5cb471e..272aeec 100644
--- a/examples/declarative/animation/animation.qml
+++ b/examples/declarative/animation/animation.qml
@@ -14,7 +14,7 @@ Rect {
running: true
repeat: true
// Move from 0 to 360 in 500ms, using the easeInOutQuad easing function
- NumericAnimation {
+ NumberAnimation {
from: 0
to: 360
easing: "easeInOutQuad"
@@ -25,7 +25,7 @@ Rect {
duration: 200
}
// Then move back to 0 in 2 seconds, using the easeInOutElastic easing function
- NumericAnimation {
+ NumberAnimation {
from: 360
to: 0
easing: "easeInOutElastic"
diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml
index e6a50cd..4c092bf 100644
--- a/examples/declarative/behaviours/test.qml
+++ b/examples/declarative/behaviours/test.qml
@@ -56,7 +56,7 @@ Rect {
id: bluerect
x: Behavior {
SequentialAnimation {
- NumericAnimation {
+ NumberAnimation {
target: bluerect
properties: "y"
from: 0
@@ -64,7 +64,7 @@ Rect {
easing: "easeOutBounce(amplitude:30)"
duration: 250
}
- NumericAnimation {
+ NumberAnimation {
target: bluerect
properties: "y"
from: 10
@@ -73,18 +73,18 @@ Rect {
duration: 250
}
}
- NumericAnimation { duration: 500 }
+ NumberAnimation { duration: 500 }
}
parent: Behavior {
SequentialAnimation {
- NumericAnimation {
+ NumberAnimation {
target: bluerect
properties: "opacity"
to: 0
duration: 150
}
SetPropertyAction {}
- NumericAnimation {
+ NumberAnimation {
target: bluerect
properties: "opacity"
to: 1
diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml
index af675d1..4fdf512 100644
--- a/examples/declarative/easing/easing.qml
+++ b/examples/declarative/easing/easing.qml
@@ -63,7 +63,7 @@ Rect {
font.italic: true
x: SequentialAnimation {
id: Anim
- NumericAnimation {
+ NumberAnimation {
from: 0
to: Window.width / 2
easing: type
@@ -72,7 +72,7 @@ Rect {
PauseAnimation {
duration: 300
}
- NumericAnimation {
+ NumberAnimation {
to: 0
from: Window.width / 2
easing: type
diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml
index 4c9aecc..61b8794 100644
--- a/examples/declarative/flowview/flowview.qml
+++ b/examples/declarative/flowview/flowview.qml
@@ -23,8 +23,8 @@ Rect {
fromState: "" ; toState: "rotated"
reversible: true
SequentialAnimation {
- NumericAnimation { filter: [TopBar, BottomBar]; properties: "x,y"; easing: "easeInOutQuad" }
- NumericAnimation { filter: [LeftBar, RightBar]; properties: "x,y"; easing: "easeInOutQuad"}
+ NumberAnimation { filter: [TopBar, BottomBar]; properties: "x,y"; easing: "easeInOutQuad" }
+ NumberAnimation { filter: [LeftBar, RightBar]; properties: "x,y"; easing: "easeInOutQuad"}
}
}
@@ -66,7 +66,7 @@ Rect {
SequentialAnimation {
ParentChangeAction{}
PauseAnimation { duration: 50 * List.FlowView.column }
- NumericAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" }
}
},
Transition {
@@ -74,7 +74,7 @@ Rect {
SequentialAnimation {
ParentChangeAction{}
PauseAnimation { duration: 50 * (Grid.FlowView.row * 2 + Grid.FlowView.column) }
- NumericAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,rotation"; easing: "easeInOutQuad" }
}
}
]
diff --git a/examples/declarative/follow/follow.qml b/examples/declarative/follow/follow.qml
index 3258ea6..21a0309 100644
--- a/examples/declarative/follow/follow.qml
+++ b/examples/declarative/follow/follow.qml
@@ -7,11 +7,11 @@ Rect {
y: 200; width: 60; height: 20
y: SequentialAnimation {
running: true; repeat: true
- NumericAnimation {
+ NumberAnimation {
to: 20; duration: 500
easing: "easeInOutQuad"
}
- NumericAnimation {
+ NumberAnimation {
to: 200; duration: 2000
easing: "easeOutBounce"
}
diff --git a/examples/declarative/follow/pong.qml b/examples/declarative/follow/pong.qml
index 582b04c..93ee6a7 100644
--- a/examples/declarative/follow/pong.qml
+++ b/examples/declarative/follow/pong.qml
@@ -16,9 +16,9 @@ Rect {
// Move the ball to the right and back to the left repeatedly
x: SequentialAnimation {
running: true; repeat: true
- NumericAnimation { to: Page.width-40; duration: 2000 }
+ NumberAnimation { to: Page.width-40; duration: 2000 }
SetPropertyAction { target: Ball; property: "direction"; value: "left" }
- NumericAnimation { to: 20; duration: 2000 }
+ NumberAnimation { to: 20; duration: 2000 }
SetPropertyAction { target: Ball; property: "direction"; value: "right" }
}
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml
index 9a672d9..d0a6e30 100644
--- a/examples/declarative/listview/highlight.qml
+++ b/examples/declarative/listview/highlight.qml
@@ -30,7 +30,7 @@ Rect {
]
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
properties: "x"; duration: 200
}
}
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index ae9756c..b012c5a 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -115,7 +115,7 @@ Rect {
// Make the state changes smooth
ParallelAnimation {
ColorAnimation { duration: 500 }
- NumericAnimation {
+ NumberAnimation {
duration: 300; properties: "detailsOpacity,x,yPosition,height,width"
}
}
diff --git a/examples/declarative/minehunt/minehunt.qml b/examples/declarative/minehunt/minehunt.qml
index db826a3..17fc177 100644
--- a/examples/declarative/minehunt/minehunt.qml
+++ b/examples/declarative/minehunt/minehunt.qml
@@ -29,7 +29,7 @@ Item {
source: "pics/flag.png"
opacity: modelData.hasFlag
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -77,7 +77,7 @@ Item {
PauseAnimation {
duration: {var ret = Math.abs(flipable.parent.x-field.clickx) + Math.abs(flipable.parent.y-field.clicky); if (ret > 0) {if(modelData.hasMine==true && modelData.flipped==true){ret*3;}else{ret;}} else {0}}
}
- NumericAnimation {
+ NumberAnimation {
easing: "easeInOutQuad"
properties: "rotation"
}
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 42e8f25..49f66cc 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -32,7 +32,7 @@ Rect {
Transition {
fromState: "*"
toState: "*"
- NumericAnimation {
+ NumberAnimation {
properties: "opacity"
duration: 400
}
diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml
index 8bc88e4..69633e3 100644
--- a/examples/declarative/slideswitch/Switch.qml
+++ b/examples/declarative/slideswitch/Switch.qml
@@ -50,7 +50,7 @@ Item {
]
transitions: [
Transition {
- NumericAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 }
+ NumberAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 }
}
]
}
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 4c1dceb..214f6e2 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -44,17 +44,17 @@ Rect {
// with easeOutBounce easing function.
Transition {
fromState: "*"; toState: "Position1"
- NumericAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
+ 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"
- NumericAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
+ NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
},
// For any other state changes move x,y linearly over duration of 200ms.
Transition {
- NumericAnimation { properties: "x,y"; duration: 200 }
+ NumberAnimation { properties: "x,y"; duration: 200 }
}
]
}
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 29d464b..280553e 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
@@ -107,7 +107,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml
index 0d607a9..064aaa2 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/GroupBox.qml
@@ -48,7 +48,7 @@ FocusRealm {
onClicked: { parent.parent.focus=true }
}
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
index 3142c45..c8df678 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
@@ -106,7 +106,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
index 3142c45..c8df678 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
@@ -106,7 +106,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
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 bf6e82d..afbb039 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
@@ -108,7 +108,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
index 99a521d..6e6a6e5 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
@@ -114,7 +114,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
index 890d781..ba7f676 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
@@ -51,7 +51,7 @@ Item {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "width,rightMargin"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
index 8bf5317..5afcac3 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
@@ -71,7 +71,7 @@ Rect {
text: fieldText.label
opacity: textEdit.text == '' ? 1 : 0
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -136,7 +136,7 @@ Rect {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,leftMargin,rightMargin"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
index 2f27a69..8f3604a 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
@@ -109,7 +109,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
index e9927e9..6499293 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
@@ -49,7 +49,7 @@ Item {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "width,rightMargin"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
index d4fbc20..dee15c6 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
@@ -73,7 +73,7 @@ Rect {
text: fieldText.label
opacity: textEdit.text == '' ? 1 : 0
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -137,7 +137,7 @@ Rect {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,leftMargin,rightMargin"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
index bfe496e..f7e2f22 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
@@ -114,7 +114,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml
index 0d607a9..064aaa2 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/GroupBox.qml
@@ -48,7 +48,7 @@ FocusRealm {
onClicked: { parent.parent.focus=true }
}
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml
index 0a293f5..b1e4721 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/2/ContactView.qml
@@ -102,7 +102,7 @@ Item {
//! [transitions]
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
duration: 500
properties: "yPosition,height,opacity"
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml
index 7a44a3f..e4a145f 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/3/ContactView.qml
@@ -118,7 +118,7 @@ Item {
]
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
duration: 500
properties: "yPosition,height,opacity"
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml
index 0d607a9..064aaa2 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/GroupBox.qml
@@ -48,7 +48,7 @@ FocusRealm {
onClicked: { parent.parent.focus=true }
}
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
index 3b76a13..295e6cd 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
@@ -49,7 +49,7 @@ Item {
]
}
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
index e9927e9..6499293 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
@@ -49,7 +49,7 @@ Item {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "width,rightMargin"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
index 111d9c5..4e699c3 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
@@ -73,7 +73,7 @@ Rect {
text: fieldText.label
opacity: textEdit.text == '' ? 1 : 0
opacity: Behavior {
- NumericAnimation {
+ NumberAnimation {
property: "opacity"
duration: 250
}
@@ -137,7 +137,7 @@ Rect {
fromState: ""
toState: "*"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,leftMargin,rightMargin"
duration: 200
}
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
index c0ea79d..a403be7 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
@@ -112,7 +112,7 @@ Rect {
fromState: "*"
toState: "opened"
reversible: true
- NumericAnimation {
+ NumberAnimation {
properties: "opacity,x,width"
duration: 200
}
diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
index bd89ecf..5ea0dd6 100644
--- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
@@ -32,7 +32,7 @@ Rect {
toState: "down"
reversible: true
ParallelAnimation {
- NumericAnimation {
+ NumberAnimation {
properties: "y"
duration: 500
easing: "easeOutBounce"
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index c70a211..8f78822 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -100,7 +100,7 @@ Rect {
]
transitions: [
Transition {
- NumericAnimation {
+ NumberAnimation {
properties: "rotation,scale"
duration: 200
}
diff --git a/examples/declarative/webview/content/SpinSquare.qml b/examples/declarative/webview/content/SpinSquare.qml
index 5e4735e..640416f 100644
--- a/examples/declarative/webview/content/SpinSquare.qml
+++ b/examples/declarative/webview/content/SpinSquare.qml
@@ -13,7 +13,7 @@ Item {
width: Root.width
height: width
}
- rotation: NumericAnimation {
+ rotation: NumberAnimation {
from: 0
to: 360
repeat: true
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index b465ef1..c2a0e34 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -82,12 +82,12 @@ Rect {
toState: "Details"
reversible: true
SequentialAnimation {
- NumericAnimation {
+ NumberAnimation {
duration: 200
properties: "height"
easing: "easeOutQuad"
}
- NumericAnimation {
+ NumberAnimation {
duration: 200
properties: "opacity"
}