summaryrefslogtreecommitdiffstats
path: root/examples/declarative/tutorials
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/declarative/tutorials
parent662488175fb9c6a44e9641867177b5396c507891 (diff)
downloadQt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.zip
Qt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.tar.gz
Qt-ffc9e62cbf7e24cd04a1202de1b3e618f9e12642.tar.bz2
Rename NumericAnimation -> NumberAnimation
Diffstat (limited to 'examples/declarative/tutorials')
-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
21 files changed, 24 insertions, 24 deletions
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"