From ffc9e62cbf7e24cd04a1202de1b3e618f9e12642 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 26 Jun 2009 11:16:57 +1000 Subject: Rename NumericAnimation -> NumberAnimation --- demos/declarative/calculator/calculator.qml | 4 +- demos/declarative/contacts/Button.qml | 2 +- demos/declarative/contacts/ContactField.qml | 2 +- demos/declarative/contacts/FieldText.qml | 4 +- demos/declarative/contacts/RemoveButton.qml | 4 +- demos/declarative/contacts/contacts.qml | 8 +-- demos/declarative/flickr/content/ImageDetails.qml | 2 +- demos/declarative/flickr/content/Loading.qml | 2 +- demos/declarative/flickr/content/MediaLineEdit.qml | 2 +- demos/declarative/flickr/content/ScrollBar.qml | 2 +- demos/declarative/flickr/content/Star.qml | 2 +- demos/declarative/flickr/flickr.qml | 6 +-- demos/declarative/flickr/flickr2.qml | 12 ++--- demos/declarative/webbrowser/webbrowser.qml | 10 ++-- doc/src/declarative/animation.qdoc | 12 ++--- doc/src/declarative/elements.qdoc | 2 +- doc/src/declarative/qmlforcpp.qdoc | 6 +-- doc/src/declarative/tutorial3.qdoc | 4 +- examples/declarative/animation/animation.qml | 4 +- examples/declarative/behaviours/test.qml | 10 ++-- examples/declarative/easing/easing.qml | 4 +- examples/declarative/flowview/flowview.qml | 8 +-- examples/declarative/follow/follow.qml | 4 +- examples/declarative/follow/pong.qml | 4 +- examples/declarative/listview/highlight.qml | 2 +- examples/declarative/listview/recipes.qml | 2 +- examples/declarative/minehunt/minehunt.qml | 4 +- examples/declarative/scrollbar/display.qml | 2 +- examples/declarative/slideswitch/Switch.qml | 2 +- examples/declarative/states/transitions.qml | 6 +-- .../1_Drawing_and_Animation/5/RemoveButton.qml | 2 +- .../contacts/1_Drawing_and_Animation/GroupBox.qml | 2 +- .../tutorials/contacts/2_Reuse/1/RemoveButton.qml | 2 +- .../tutorials/contacts/2_Reuse/1a/RemoveButton.qml | 2 +- .../contacts/2_Reuse/1b/lib/RemoveButton.qml | 2 +- .../tutorials/contacts/2_Reuse/2/RemoveButton.qml | 2 +- .../tutorials/contacts/2_Reuse/3/ContactField.qml | 2 +- .../tutorials/contacts/2_Reuse/3/FieldText.qml | 4 +- .../tutorials/contacts/2_Reuse/3/RemoveButton.qml | 2 +- .../tutorials/contacts/2_Reuse/4/ContactField.qml | 2 +- .../tutorials/contacts/2_Reuse/4/FieldText.qml | 4 +- .../tutorials/contacts/2_Reuse/4/RemoveButton.qml | 2 +- .../tutorials/contacts/2_Reuse/GroupBox.qml | 2 +- .../contacts/3_Collections/2/ContactView.qml | 2 +- .../contacts/3_Collections/3/ContactView.qml | 2 +- .../tutorials/contacts/3_Collections/GroupBox.qml | 2 +- .../contacts/3_Collections/lib/Button.qml | 2 +- .../contacts/3_Collections/lib/ContactField.qml | 2 +- .../contacts/3_Collections/lib/FieldText.qml | 4 +- .../contacts/3_Collections/lib/RemoveButton.qml | 2 +- .../tutorials/helloworld/t3/tutorial3.qml | 2 +- examples/declarative/velocity/Day.qml | 2 +- .../declarative/webview/content/SpinSquare.qml | 2 +- examples/declarative/xmldata/yahoonews.qml | 4 +- src/declarative/fx/qfxflipable.cpp | 2 +- src/declarative/fx/qfxhighlightfilter.cpp | 2 +- src/declarative/fx/qfxlayouts.cpp | 24 ++++----- src/declarative/qml/qmldom.cpp | 10 ++-- src/declarative/util/qmlanimation.cpp | 60 +++++++++++----------- src/declarative/util/qmlanimation.h | 8 +-- src/declarative/util/qmlbehaviour.cpp | 2 +- src/declarative/util/qmlfollow.cpp | 2 +- .../auto/declarative/animations/data/badtype2.qml | 2 +- .../auto/declarative/animations/data/badtype4.qml | 2 +- .../visual/bindinganimation/bindinganimation.qml | 2 +- tests/auto/declarative/visual/easing/easing.qml | 2 +- .../auto/declarative/visual/flipable/flipable.xml | 10 ++-- .../visual/pauseAnimation/pauseAnimation.qml | 4 +- 68 files changed, 163 insertions(+), 163 deletions(-) diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index 145435b..2a297ef 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.qml @@ -120,8 +120,8 @@ Rect { transitions: [ Transition { - NumericAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 } - NumericAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 } + NumberAnimation { properties: "x,y,width"; easing: "easeOutBounce"; duration: 500 } + NumberAnimation { properties: "opacity"; easing: "easeInOutQuad"; duration: 500 } } ] } diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml index 3b76a13..295e6cd 100644 --- a/demos/declarative/contacts/Button.qml +++ b/demos/declarative/contacts/Button.qml @@ -49,7 +49,7 @@ Item { ] } opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } diff --git a/demos/declarative/contacts/ContactField.qml b/demos/declarative/contacts/ContactField.qml index 003e723..156c00d 100644 --- a/demos/declarative/contacts/ContactField.qml +++ b/demos/declarative/contacts/ContactField.qml @@ -51,7 +51,7 @@ Item { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "width,rightMargin" duration: 200 } diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml index 39e45d4..333a5f6 100644 --- a/demos/declarative/contacts/FieldText.qml +++ b/demos/declarative/contacts/FieldText.qml @@ -74,7 +74,7 @@ Rect { text: fieldText.label opacity: textEdit.text == '' ? 1 : 0 opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -148,7 +148,7 @@ Rect { fromState: "" toState: "*" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,leftMargin,rightMargin" duration: 200 } diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml index 8f46fcb..514c978 100644 --- a/demos/declarative/contacts/RemoveButton.qml +++ b/demos/declarative/contacts/RemoveButton.qml @@ -77,7 +77,7 @@ Rect { opacity: 0 } opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -117,7 +117,7 @@ Rect { fromState: "*" toState: "opened" reversible: true - NumericAnimation { + NumberAnimation { properties: "opacity,x,width" duration: 200 } diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml index 0ce9948..c52ef6d 100644 --- a/demos/declarative/contacts/contacts.qml +++ b/demos/declarative/contacts/contacts.qml @@ -123,7 +123,7 @@ Rect { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { duration: 500 properties: "yPosition,height,opacity" } @@ -221,7 +221,7 @@ Rect { color: 'white' opacity: contacts.mode == 'list' ? 1 : 0 opacity: Behavior { - NumericAnimation { + NumberAnimation { property: "opacity" duration: 250 } @@ -288,7 +288,7 @@ Rect { Transition { fromState: "*" toState: "*" - NumericAnimation { + NumberAnimation { property: "bottomMargin" duration: 250 } @@ -319,7 +319,7 @@ Rect { Transition { fromState: "*" toState: "*" - NumericAnimation { + NumberAnimation { property: "opacity" duration: 500 } diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index ccc91cb..a413726 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -135,7 +135,7 @@ Flipable { transitions: [ Transition { - NumericAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 } + NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 } } ] } diff --git a/demos/declarative/flickr/content/Loading.qml b/demos/declarative/flickr/content/Loading.qml index 7488a66..0a8a51a 100644 --- a/demos/declarative/flickr/content/Loading.qml +++ b/demos/declarative/flickr/content/Loading.qml @@ -1,6 +1,6 @@ Image { id: Loading; source: "pics/loading.png"; transformOrigin: "Center" - rotation: NumericAnimation { + rotation: NumberAnimation { id: "RotationAnimation"; from: 0; to: 360; running: Loading.visible == true; repeat: true; duration: 900 } } diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml index 691bb5b..b9a5775 100644 --- a/demos/declarative/flickr/content/MediaLineEdit.qml +++ b/demos/declarative/flickr/content/MediaLineEdit.qml @@ -41,7 +41,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,width"; duration: 500; easing: "easeInOutQuad" } } ] diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml index 2c4ff54..551f0ea 100644 --- a/demos/declarative/flickr/content/ScrollBar.qml +++ b/demos/declarative/flickr/content/ScrollBar.qml @@ -28,7 +28,7 @@ Item { Transition { fromState: "*" toState: "*" - NumericAnimation { + NumberAnimation { target: Container properties: "opacity" duration: 400 diff --git a/demos/declarative/flickr/content/Star.qml b/demos/declarative/flickr/content/Star.qml index 22fc138..437450d 100644 --- a/demos/declarative/flickr/content/Star.qml +++ b/demos/declarative/flickr/content/Star.qml @@ -35,7 +35,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "opacity,scale,x,y" easing: "easeOutBounce" } diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 83448ee..3ce442e 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -99,13 +99,13 @@ Item { Transition { fromState: "*"; toState: "Details" ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } }, Transition { fromState: "Details"; toState: "*" SequentialAnimation { ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } SetPropertyAction { filter: Wrapper; properties: "z" } } } @@ -194,7 +194,7 @@ Item { transitions: [ Transition { fromState: "*"; toState: "*" - NumericAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" } + NumberAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" } } ] } diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml index 79f7a32..807a0ca 100644 --- a/demos/declarative/flickr/flickr2.qml +++ b/demos/declarative/flickr/flickr2.qml @@ -100,13 +100,13 @@ Item { Transition { fromState: "*"; toState: "Details" ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } }, Transition { fromState: "Details"; toState: "*" SequentialAnimation { ParentChangeAction { } - NumericAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } + NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" } SetPropertyAction { filter: Wrapper; properties: "z" } } } @@ -146,14 +146,14 @@ Item { SequentialAnimation { SetPropertyAction { target: Wrapper; property: "moveToParent" } ParallelAnimation { - NumericAnimation { + NumberAnimation { target: Wrapper properties: "x,y" to: 0 easing: "easeOutQuad" duration: 350 } - NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 } + NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 350 } } } }, @@ -163,14 +163,14 @@ Item { PauseAnimation { duration: Math.floor(index/7)*100 } SetPropertyAction { target: Wrapper; property: "moveToParent" } ParallelAnimation { - NumericAnimation { + NumberAnimation { target: Wrapper properties: "x,y" to: 0 easing: "easeOutQuad" duration: 250 } - NumericAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 } + NumberAnimation { target: Wrapper; properties: "scale,angle"; duration: 250 } } } } diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index 889ab87..c8fa832 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -169,7 +169,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { target: Header properties: "progressOff" easing: "easeInOutQuad" @@ -283,7 +283,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "opacity" easing: "easeInOutQuad" duration: 300 @@ -355,7 +355,7 @@ Item { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "opacity" easing: "easeInOutQuad" duration: 320 @@ -406,13 +406,13 @@ Item { value: false } ParallelAnimation { - NumericAnimation { + NumberAnimation { target: WebView properties: "zoomedOut" easing: "easeInOutQuad" duration: 200 } - NumericAnimation { + NumberAnimation { target: Flick properties: "xPosition,yPosition" easing: "easeInOutQuad" diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index f17f5c9..0517009 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -25,7 +25,7 @@ Other Features: \o Animation synchronization \endlist -The simplest form of animation is using \l NumericAnimation +The simplest form of animation is using \l NumberAnimation The following example creates a bouncing effect: \code @@ -40,9 +40,9 @@ Rect { y: SequentialAnimation { running: true repeat: true - NumericAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 } + NumberAnimation { to: 200-img.height; easing: "easeOutBounce"; duration: 2000 } PauseAnimation { duration: 1000 } - NumericAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 } + NumberAnimation { to: 0; easing: "easeOutQuad"; duration: 1000 } } } } @@ -113,7 +113,7 @@ For the previous example, a transition could describe how \c myrect moved from i \code transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "x,y" easing: "easeOutBounce" duration: 200 @@ -147,13 +147,13 @@ Transition { duration: 1000 } ParallelAnimation { - NumericAnimation { + NumberAnimation { duration: 1000 easing: "easeOutBounce" target: box1 properties: "x,y" } - NumericAnimation { + NumberAnimation { duration: 1000 target: box2 properties: "x,y" diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index daf34c4..192dfa1 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -27,7 +27,7 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list \o \l PropertyAnimation -\o \l NumericAnimation +\o \l NumberAnimation \o \l ColorAnimation \o \l PauseAnimation \o \l SequentialAnimation diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc index 4095071..c95cb71 100644 --- a/doc/src/declarative/qmlforcpp.qdoc +++ b/doc/src/declarative/qmlforcpp.qdoc @@ -438,7 +438,7 @@ \code Button { id: MyButton - onClicked: NumericAnimation { + onClicked: NumberAnimation { target: MyButton property: "x" to: 100 @@ -555,12 +555,12 @@ \code Rect { - x: NumericAnimation { running: true; repeat; true; from: 0; to: 100; } + x: NumberAnimation { running: true; repeat; true; from: 0; to: 100; } } \endcode Here the \c x property of the rectangle will be animated from 0 to 100. - To support this, the NumericAnimation class inherits the + To support this, the NumberAnimation class inherits the QmlPropertyValueSource class. If a type inherits this class and is assigned to a property for which type assignment would otherwise fail (ie. the property itself doesn't have a type of QmlPropertyValueSource *), the QML diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc index 0b97e63..e9f861e 100644 --- a/doc/src/declarative/tutorial3.qdoc +++ b/doc/src/declarative/tutorial3.qdoc @@ -46,7 +46,7 @@ Rect { toState: "down" reversible: true ParallelAnimation { - NumericAnimation { + NumberAnimation { properties: "y" duration: 500 easing: "easeOutBounce" @@ -114,7 +114,7 @@ Because we want the same transition to be run in reverse when changing back from \code ParallelAnimation { - NumericAnimation { + NumberAnimation { properties: "y" duration: 500 easing: "easeOutBounce" 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" } diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 4c02e74..9595724 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -94,7 +94,7 @@ Flipable { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { easing: "easeInOutQuad" properties: "rotation" } diff --git a/src/declarative/fx/qfxhighlightfilter.cpp b/src/declarative/fx/qfxhighlightfilter.cpp index 1671fc6..78a91af 100644 --- a/src/declarative/fx/qfxhighlightfilter.cpp +++ b/src/declarative/fx/qfxhighlightfilter.cpp @@ -80,7 +80,7 @@ Text { text: "Highlight" filter: Highlight { source: "pics/highlight.png" - xOffset: NumericAnimation { + xOffset: NumberAnimation { running: true repeat: true from: 320 diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index a975778..e27135c 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -132,7 +132,7 @@ BaseLayout { id: layout y: 0 move: Transition { - NumericAnimation { + NumberAnimation { properties: "y" ease: "easeOutBounce" } @@ -161,7 +161,7 @@ BaseLayout { id: layout y: 0 add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -196,7 +196,7 @@ BaseLayout { id: layout y: 0 remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -512,7 +512,7 @@ VerticalLayout { VerticalLayout { id: layout remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -539,7 +539,7 @@ VerticalLayout { VerticalLayout { id: layout add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -566,7 +566,7 @@ VerticalLayout { VerticalLayout { id: layout move: Transition { - NumericAnimation { + NumberAnimation { properties: "y" ease: "easeOutBounce" } @@ -683,7 +683,7 @@ HorizontalLayout { HorizontalLayout { id: layout remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -705,7 +705,7 @@ HorizontalLayout { HorizontalLayout { id: layout add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -727,7 +727,7 @@ HorizontalLayout { HorizontalLayout { id: layout move: Transition { - NumericAnimation { + NumberAnimation { properties: "x" ease: "easeOutBounce" } @@ -875,7 +875,7 @@ GridLayout { GridLayout { id: layout remove: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 1 @@ -900,7 +900,7 @@ GridLayout { GridLayout { id: layout add: Transition { - NumericAnimation { + NumberAnimation { target: layout.item properties: "opacity" from: 0 @@ -923,7 +923,7 @@ GridLayout { GridLayout { id: layout move: Transition { - NumericAnimation { + NumberAnimation { properties: "x,y" ease: "easeOutBounce" } diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index d2608c8..be58071 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -959,11 +959,11 @@ void QmlDomValueBinding::setBinding(const QString &expression) In QML, value sources are special value generating types that may be assigned to properties. Value sources inherit the QmlPropertyValueSource class. In the example below, the "x" property is being assigned the - NumericAnimation value source. + NumberAnimation value source. \qml Rect { - x: NumericAnimation { + x: NumberAnimation { from: 0 to: 100 repeat: true @@ -1008,11 +1008,11 @@ QmlDomValueValueSource &QmlDomValueValueSource::operator=(const QmlDomValueValue /*! Return the value source object. - In the example below, an object representing the NumericAnimation will be + In the example below, an object representing the NumberAnimation will be returned. \qml Rect { - x: NumericAnimation { + x: NumberAnimation { from: 0 to: 100 repeat: true @@ -1357,7 +1357,7 @@ Item { \qml Item { x: 10 - x: NumericAnimation { + x: NumberAnimation { running: false from: 0 to: 100 diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 42ed40b..b2a3356 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -179,7 +179,7 @@ QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObj \code Rect { width: 100; height: 100 - x: NumericAnimation { + x: NumberAnimation { running: MyMouse.pressed from: 0; to: 100 } @@ -192,7 +192,7 @@ QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObj or not the animation is running. \code - NumericAnimation { id: MyAnimation } + NumberAnimation { id: MyAnimation } Text { text: MyAnimation.running ? "Animation is running" : "Animation is not running" } \endcode @@ -349,7 +349,7 @@ void QmlAbstractAnimation::setFinishPlaying(bool f) \code Rect { - rotation: NumericAnimation { running: true; repeat: true; from: 0 to: 360 } + rotation: NumberAnimation { running: true; repeat: true; from: 0 to: 360 } } \endcode */ @@ -512,7 +512,7 @@ void QmlAbstractAnimation::resume() no further influence on property values. In this example animation \code Rect { - x: NumericAnimation { from: 0; to: 100; duration: 500 } + x: NumberAnimation { from: 0; to: 100; duration: 500 } } \endcode was stopped at time 250ms, the \c x property will have a value of 50. @@ -550,7 +550,7 @@ void QmlAbstractAnimation::restart() its end. In the following example, \code Rect { - x: NumericAnimation { from: 0; to: 100; duration: 500 } + x: NumberAnimation { from: 0; to: 100; duration: 500 } } \endcode calling \c stop() at time 250ms will result in the \c x property having @@ -606,9 +606,9 @@ void QmlAbstractAnimation::timelineComplete() A 500ms animation sequence, with a 100ms pause between two animations: \code SequentialAnimation { - NumericAnimation { ... duration: 200 } + NumberAnimation { ... duration: 200 } PauseAnimation { duration: 100 } - NumericAnimation { ... duration: 200 } + NumberAnimation { ... duration: 200 } } \endcode */ @@ -1175,29 +1175,29 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction) /*! - \qmlclass NumericAnimation QmlNumericAnimation + \qmlclass NumberAnimation QmlNumberAnimation \inherits PropertyAnimation - \brief The NumericAnimation allows you to animate changes in properties of type qreal. + \brief The NumberAnimation allows you to animate changes in properties of type qreal. Animate a set of properties over 200ms, from their values in the start state to their values in the end state of the transition: \code - NumericAnimation { properties: "x,y,scale"; duration: 200 } + NumberAnimation { properties: "x,y,scale"; duration: 200 } \endcode */ /*! \internal - \class QmlNumericAnimation + \class QmlNumberAnimation \ingroup group_animation \ingroup group_states - \brief The QmlNumericAnimation class allows you to animate changes in properties of type qreal. + \brief The QmlNumberAnimation class allows you to animate changes in properties of type qreal. - A QmlNumericAnimation object can be instantiated in Qml using the tag - \l{xmlNumericAnimation} {<NumericAnimation>}. + A QmlNumberAnimation object can be instantiated in Qml using the tag + \l{xmlNumberAnimation} {<NumberAnimation>}. */ -QmlNumericAnimation::QmlNumericAnimation(QObject *parent) +QmlNumberAnimation::QmlNumberAnimation(QObject *parent) : QmlPropertyAnimation(parent) { Q_D(QmlPropertyAnimation); @@ -1206,51 +1206,51 @@ QmlNumericAnimation::QmlNumericAnimation(QObject *parent) d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType); } -QmlNumericAnimation::~QmlNumericAnimation() +QmlNumberAnimation::~QmlNumberAnimation() { } /*! - \qmlproperty real NumericAnimation::from + \qmlproperty real NumberAnimation::from This property holds the starting value. If not set, then the value defined in the start state of the transition. */ /*! - \property QmlNumericAnimation::from + \property QmlNumberAnimation::from \brief the starting value. */ -qreal QmlNumericAnimation::from() const +qreal QmlNumberAnimation::from() const { Q_D(const QmlPropertyAnimation); return d->from.toDouble(); //### toFloat? } -void QmlNumericAnimation::setFrom(qreal f) +void QmlNumberAnimation::setFrom(qreal f) { QmlPropertyAnimation::setFrom(f); } /*! - \qmlproperty real NumericAnimation::to + \qmlproperty real NumberAnimation::to This property holds the ending value. If not set, then the value defined in the end state of the transition. */ /*! - \property QmlNumericAnimation::to + \property QmlNumberAnimation::to \brief the ending value. */ -qreal QmlNumericAnimation::to() const +qreal QmlNumberAnimation::to() const { Q_D(const QmlPropertyAnimation); return d->to.toDouble(); //### toFloat? } -void QmlNumericAnimation::setTo(qreal t) +void QmlNumberAnimation::setTo(qreal t) { QmlPropertyAnimation::setTo(t); } -QML_DEFINE_TYPE(QmlNumericAnimation,NumericAnimation) +QML_DEFINE_TYPE(QmlNumberAnimation,NumberAnimation) QmlAnimationGroup::QmlAnimationGroup(QObject *parent) : QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent) @@ -1279,8 +1279,8 @@ QmlList *QmlAnimationGroup::animations() \code SequentialAnimation { - NumericAnimation { target: MyItem; property: "x"; to: 100 } - NumericAnimation { target: MyItem; property: "x"; to: 0 } + NumberAnimation { target: MyItem; property: "x"; to: 100 } + NumberAnimation { target: MyItem; property: "x"; to: 0 } } \endcode @@ -1362,8 +1362,8 @@ QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation) \code ParallelAnimation { - NumericAnimation { target: MyItem; property: "x"; to: 100 } - NumericAnimation { target: MyItem; property: "y"; to: 100 } + NumberAnimation { target: MyItem; property: "x"; to: 100 } + NumberAnimation { target: MyItem; property: "y"; to: 100 } } \endcode @@ -1782,7 +1782,7 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions, struct PropertyUpdater : public QmlTimeLineValue { QmlStateActions actions; - int interpolatorType; //for Numeric/ColorAnimation + int interpolatorType; //for Number/ColorAnimation int prevInterpolatorType; //for generic QVariantAnimation::Interpolator interpolator; void setValue(qreal v) diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h index a91394d..110c43e 100644 --- a/src/declarative/util/qmlanimation.h +++ b/src/declarative/util/qmlanimation.h @@ -317,7 +317,7 @@ public: }; QML_DECLARE_TYPE(QmlColorAnimation) -class QmlNumericAnimation : public QmlPropertyAnimation +class QmlNumberAnimation : public QmlPropertyAnimation { Q_OBJECT Q_DECLARE_PRIVATE(QmlPropertyAnimation) @@ -326,8 +326,8 @@ class QmlNumericAnimation : public QmlPropertyAnimation Q_PROPERTY(qreal to READ to WRITE setTo NOTIFY toChanged) public: - QmlNumericAnimation(QObject *parent=0); - virtual ~QmlNumericAnimation(); + QmlNumberAnimation(QObject *parent=0); + virtual ~QmlNumberAnimation(); qreal from() const; void setFrom(qreal); @@ -335,7 +335,7 @@ public: qreal to() const; void setTo(qreal); }; -QML_DECLARE_TYPE(QmlNumericAnimation) +QML_DECLARE_TYPE(QmlNumberAnimation) class QmlAnimationGroupPrivate; class QmlAnimationGroup : public QmlAbstractAnimation diff --git a/src/declarative/util/qmlbehaviour.cpp b/src/declarative/util/qmlbehaviour.cpp index 3617541..4beca5e 100644 --- a/src/declarative/util/qmlbehaviour.cpp +++ b/src/declarative/util/qmlbehaviour.cpp @@ -115,7 +115,7 @@ public: color: "#00ff00" y: 200 //initial value y: Behavior { - NumericAnimation { + NumberAnimation { easing: "easeOutBounce(amplitude:100)" duration: 200 } diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index d1ecac4..95e7792 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -183,7 +183,7 @@ void QmlFollowPrivate::stop() y: SequentialAnimation { running: true repeat: true - NumericAnimation { + NumberAnimation { to: 200 easing: "easeOutBounce(amplitude:100)" duration: 2000 diff --git a/tests/auto/declarative/animations/data/badtype2.qml b/tests/auto/declarative/animations/data/badtype2.qml index 18d9079..aa248a6 100644 --- a/tests/auto/declarative/animations/data/badtype2.qml +++ b/tests/auto/declarative/animations/data/badtype2.qml @@ -5,6 +5,6 @@ Rect { color: "red" width: 50; height: 50 x: 100; y: 100 - x: NumericAnimation { from: "blue"; to: "green"; running: true; } + x: NumberAnimation { from: "blue"; to: "green"; running: true; } } } diff --git a/tests/auto/declarative/animations/data/badtype4.qml b/tests/auto/declarative/animations/data/badtype4.qml index e3d312e..fa4eebe 100644 --- a/tests/auto/declarative/animations/data/badtype4.qml +++ b/tests/auto/declarative/animations/data/badtype4.qml @@ -18,6 +18,6 @@ Rect { } transitions: Transition { ColorAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color - //NumericAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color + //NumberAnimation { properties: "x,color"; duration: 1000 } //x is real, color is color } } diff --git a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml index 61cedc2..b06314f 100644 --- a/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml +++ b/tests/auto/declarative/visual/bindinganimation/bindinganimation.qml @@ -27,7 +27,7 @@ Rect { ] transitions: [ Transition { - NumericAnimation { + NumberAnimation { properties: "x" } } diff --git a/tests/auto/declarative/visual/easing/easing.qml b/tests/auto/declarative/visual/easing/easing.qml index 4a0ed14..59dd25c 100644 --- a/tests/auto/declarative/visual/easing/easing.qml +++ b/tests/auto/declarative/visual/easing/easing.qml @@ -169,7 +169,7 @@ Rect { fromState: "*" toState: "to" reversible: true - NumericAnimation { + NumberAnimation { properties: "x" easing: type } diff --git a/tests/auto/declarative/visual/flipable/flipable.xml b/tests/auto/declarative/visual/flipable/flipable.xml index d769e55..9288acc 100644 --- a/tests/auto/declarative/visual/flipable/flipable.xml +++ b/tests/auto/declarative/visual/flipable/flipable.xml @@ -104,17 +104,17 @@ - + - - + + - - + + diff --git a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml index 5c00f58..e0880f0 100644 --- a/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml +++ b/tests/auto/declarative/visual/pauseAnimation/pauseAnimation.qml @@ -11,11 +11,11 @@ Rect { y: SequentialAnimation { running: true repeat: true - NumericAnimation { + NumberAnimation { to: 0; duration: 500 easing: "easeInOutQuad" } - NumericAnimation { + NumberAnimation { to: 200-img.height easing: "easeOutBounce" duration: 2000 -- cgit v0.12