Rename SpriteImage to SpriteSequence

Also rename Sprite::frames->Sprite::frameCount

Change-Id: I2e7a71adc37044fd696ffda2a5da4835725ba3a8
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

7 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/qtquick2/qquickanimatedsprite/data/basic.qml b/tests/auto/qtquick2/qquickanimatedsprite/data/basic.qml
index f219e5fb81..2dd20630d9 100644
--- a/tests/auto/qtquick2/qquickanimatedsprite/data/basic.qml
+++ b/tests/auto/qtquick2/qquickanimatedsprite/data/basic.qml
@@ -50,7 +50,7 @@ Rectangle {
         objectName: "sprite"
         loops: 3
         source: "squarefacesprite.png"
-        frames: 6
+        frameCount: 6
         frameDuration: 120
         width: 160
         height: 160
diff --git a/tests/auto/qtquick2/qquickspriteimage/data/advance.qml b/tests/auto/qtquick2/qquickspritesequence/data/advance.qml
index 46a49ca673..5866dcbfac 100644
--- a/tests/auto/qtquick2/qquickspriteimage/data/advance.qml
+++ b/tests/auto/qtquick2/qquickspritesequence/data/advance.qml
@@ -46,18 +46,18 @@ Rectangle {
     width: 320
     height: 320
 
-    SpriteImage {
+    SpriteSequence {
         objectName: "sprite"
         sprites: [Sprite {
             name: "firstState"
             source: "squarefacesprite.png"
-            frames: 3
+            frameCount: 3
             frameSync: true
             to: {"secondState":1}
         }, Sprite {
             name: "secondState"
             source: "squarefacesprite.png"
-            frames: 6
+            frameCount: 6
             frameSync: true
         } ]
         width: 160
diff --git a/tests/auto/qtquick2/qquickspriteimage/data/basic.qml b/tests/auto/qtquick2/qquickspritesequence/data/basic.qml
index 2f2b1c96fa..5eb7475f11 100644
--- a/tests/auto/qtquick2/qquickspriteimage/data/basic.qml
+++ b/tests/auto/qtquick2/qquickspritesequence/data/basic.qml
@@ -46,12 +46,12 @@ Rectangle {
     width: 320
     height: 320
 
-    SpriteImage {
+    SpriteSequence {
         objectName: "sprite"
         sprites: Sprite {
             name: "happy"
             source: "squarefacesprite.png"
-            frames: 6
+            frameCount: 6
             frameDuration: 120
         }
         width: 160
diff --git a/tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png b/tests/auto/qtquick2/qquickspritesequence/data/squarefacesprite.png
index f9a5d5fcce..f9a5d5fcce 100644
--- a/tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png
+++ b/tests/auto/qtquick2/qquickspritesequence/data/squarefacesprite.png
diff --git a/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro b/tests/auto/qtquick2/qquickspritesequence/qquickspritesequence.pro
index 0d63007c65..16c20ef75b 100644
--- a/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro
+++ b/tests/auto/qtquick2/qquickspritesequence/qquickspritesequence.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
-TARGET = tst_qquickspriteimage
-SOURCES += tst_qquickspriteimage.cpp
+TARGET = tst_qquickspritesequence
+SOURCES += tst_qquickspritesequence.cpp
 
 include (../../shared/util.pri)
 
diff --git a/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp b/tests/auto/qtquick2/qquickspritesequence/tst_qquickspritesequence.cpp
index 37453521fa..848d6a343c 100644
--- a/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp
+++ b/tests/auto/qtquick2/qquickspritesequence/tst_qquickspritesequence.cpp
@@ -41,20 +41,20 @@
 #include <QtTest/QtTest>
 #include "../../shared/util.h"
 #include <QtQuick/qquickview.h>
-#include <private/qquickspriteimage_p.h>
+#include <private/qquickspritesequence_p.h>
 
-class tst_qquickspriteimage : public QDeclarativeDataTest
+class tst_qquickspritesequence : public QDeclarativeDataTest
 {
     Q_OBJECT
 public:
-    tst_qquickspriteimage(){}
+    tst_qquickspritesequence(){}
 
 private slots:
     void test_properties();
     void test_framerateAdvance();//Separate codepath for QQuickSpriteEngine
 };
 
-void tst_qquickspriteimage::test_properties()
+void tst_qquickspritesequence::test_properties()
 {
     QQuickView *canvas = new QQuickView(0);
 
@@ -63,7 +63,7 @@ void tst_qquickspriteimage::test_properties()
     QTest::qWaitForWindowShown(canvas);
 
     QVERIFY(canvas->rootObject());
-    QQuickSpriteImage* sprite = canvas->rootObject()->findChild<QQuickSpriteImage*>("sprite");
+    QQuickSpriteSequence* sprite = canvas->rootObject()->findChild<QQuickSpriteSequence*>("sprite");
     QVERIFY(sprite);
 
     QVERIFY(sprite->running());
@@ -77,7 +77,7 @@ void tst_qquickspriteimage::test_properties()
     delete canvas;
 }
 
-void tst_qquickspriteimage::test_framerateAdvance()
+void tst_qquickspritesequence::test_framerateAdvance()
 {
     QQuickView *canvas = new QQuickView(0);
 
@@ -86,13 +86,13 @@ void tst_qquickspriteimage::test_framerateAdvance()
     QTest::qWaitForWindowShown(canvas);
 
     QVERIFY(canvas->rootObject());
-    QQuickSpriteImage* sprite = canvas->rootObject()->findChild<QQuickSpriteImage*>("sprite");
+    QQuickSpriteSequence* sprite = canvas->rootObject()->findChild<QQuickSpriteSequence*>("sprite");
     QVERIFY(sprite);
 
     QTRY_COMPARE(sprite->currentSprite(), QLatin1String("secondState"));
     delete canvas;
 }
 
-QTEST_MAIN(tst_qquickspriteimage)
+QTEST_MAIN(tst_qquickspritesequence)
 
-#include "tst_qquickspriteimage.moc"
+#include "tst_qquickspritesequence.moc"
diff --git a/tests/auto/qtquick2/qtquick2.pro b/tests/auto/qtquick2/qtquick2.pro
index 60e302759e..9034cb445a 100644
--- a/tests/auto/qtquick2/qtquick2.pro
+++ b/tests/auto/qtquick2/qtquick2.pro
@@ -53,7 +53,7 @@ QUICKTESTS =  \
     qquickpositioners \
     qquickrepeater \
     qquickshadereffect \
-    qquickspriteimage \
+    qquickspritesequence \
     qquicktext \
     qquicktextedit \
     qquicktextinput \