End the deprecation period of SpriteImage

Also remove the stale files left around.

Change-Id: I2f275f23ebfb65045cc683ccd542cbc451b767fb
Reviewed-by: Martin Jones <martin.jones@nokia.com>

2 files changed, 13 insertions, 13 deletions

diff --git a/tests/testapplications/elements/content/GridViewElement.qml b/tests/testapplications/elements/content/GridViewElement.qml
index 0e0eaba312..a276b61efc 100644
--- a/tests/testapplications/elements/content/GridViewElement.qml
+++ b/tests/testapplications/elements/content/GridViewElement.qml
@@ -123,6 +123,6 @@ Rectangle {
         ListElement { label: "Shape"; help: "The Shape element allows you to specify an area for affectors and emitter." }
         ListElement { label: "TrailEmitter"; help: "The TrailEmitter element allows you to emit logical particles from other logical particles." }
         ListElement { label: "Direction"; help: "The Direction elements allow you to specify a vector space." }
-        ListElement { label: "SpriteImage"; help: "The SpriteImage element plays stochastic sprite animations." }
+        ListElement { label: "SpriteSequence"; help: "The SpriteSequence element plays stochastic sprite animations." }
     }
 }
diff --git a/tests/testapplications/elements/content/SpriteImageElement.qml b/tests/testapplications/elements/content/SpriteSequenceElement.qml
index 1270aef62c..8b0a93bb87 100644
--- a/tests/testapplications/elements/content/SpriteImageElement.qml
+++ b/tests/testapplications/elements/content/SpriteSequenceElement.qml
@@ -45,61 +45,61 @@ Item {
     id: spriteimageelementtest
     anchors.fill: parent
     property string testtext: ""
-    SpriteImage {
+    SpriteSequence {
         id: spriteimage
         sprites: [Sprite {
             name: "happy"
             source: "pics/squarefacesprite2.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"silly": 1, "sad":0}
         }, Sprite {
             name: "silly"
             source: "pics/squarefacesprite.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"happy": 1, "sad": 0}
         }, Sprite {
             name: "sad"
             source: "pics/squarefacesprite3.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"evil": 0.5, "sad": 1, "cyclops" : 0}
         }, Sprite {
             name: "cyclops"
             source: "pics/squarefacesprite4.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"love": 0.1, "boggled": 0.1, "cyclops" : 0.1}
         }, Sprite {
             name: "evil"
             source: "pics/squarefacesprite5.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"sad": 1.0, "cyclops" : 0}
         }, Sprite {
             name: "love"
             source: "pics/squarefacesprite6.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"love": 0.1, "boggled": 0.1, "cyclops" : 0.1}
         }, Sprite {
             name: "boggled"
             source: "pics/squarefacesprite7.png"
             frames: 6
-            duration: 120
+            frameDuration: 120
             to: {"love": 0.1, "boggled": 0.1, "cyclops" : 0.1, "dying":0}
         }, Sprite {
             name: "dying"
             source: "pics/squarefacespriteX.png"
             frames: 4
-            duration: 120
+            frameDuration: 120
             to: {"dead":1.0}
         }, Sprite {
             name: "dead"
             source: "pics/squarefacespriteXX.png"
             frames: 1
-            duration: 10000
+            frameDuration: 10000
         }]
 
         width: 300
@@ -118,7 +118,7 @@ Item {
         State { name: "start"; when: statenum == 1
             StateChangeScript { script: spriteimage.jumpTo("happy"); }
             PropertyChanges { target: spriteimageelementtest
-                testtext: "This is a SpriteImage element. It should be animating currently."+
+                testtext: "This is a SpriteSequence element. It should be animating currently."+
                 "It should alternate between winking and sticking out its tongue." }
         },
         State { name: "stochastic2"; when: statenum == 2
@@ -136,7 +136,7 @@ Item {
                 "When it does, it should first animate to and play through the 'big eyes' animation (if it is not currently playing that animation) before it enters the dying animation."}
         },
         State { name: "dead"; when: statenum == 4
-            PropertyChanges { target: spriteimage; goalState: "dead" }
+            PropertyChanges { target: spriteimage; goalSprite: "dead" }
             PropertyChanges { target: spriteimageelementtest
                 testtext: "After a brief dying animation, the image should now be static.\n"+
                 "Advance to restart the test." }