1 files changed, 26 insertions, 26 deletions
diff --git a/tests/auto/declarative/pathview/tst_pathview.cpp b/tests/auto/declarative/pathview/tst_pathview.cpp
index 6e670bf..d5b922a 100644
--- a/tests/auto/declarative/pathview/tst_pathview.cpp
+++ b/tests/auto/declarative/pathview/tst_pathview.cpp
@@ -7,11 +7,11 @@
 #include <qmlcontext.h>
 #include <qmlexpression.h>
 
-class tst_QFxPathView : public QObject
+class tst_QmlGraphicsPathView : public QObject
 {
     Q_OBJECT
 public:
-    tst_QFxPathView();
+    tst_QmlGraphicsPathView();
 
 private slots:
     void items();
@@ -21,7 +21,7 @@ private slots:
 private:
     QmlView *createView(const QString &filename);
     template<typename T>
-    T *findItem(QFxItem *parent, const QString &id, int index=-1);
+    T *findItem(QmlGraphicsItem *parent, const QString &id, int index=-1);
 };
 
 class TestModel : public QListModelInterface
@@ -95,11 +95,11 @@ private:
     QList<QPair<QString,QString> > list;
 };
 
-tst_QFxPathView::tst_QFxPathView()
+tst_QmlGraphicsPathView::tst_QmlGraphicsPathView()
 {
 }
 
-void tst_QFxPathView::items()
+void tst_QmlGraphicsPathView::items()
 {
     QmlView *canvas = createView(SRCDIR "/data/pathview.qml");
 
@@ -114,16 +114,16 @@ void tst_QFxPathView::items()
     canvas->execute();
     qApp->processEvents();
 
-    QFxPathView *pathview = findItem<QFxPathView>(canvas->root(), "view");
+    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->root(), "view");
     QVERIFY(pathview != 0);
 
     QCOMPARE(pathview->childItems().count(), model.count()); // assumes all are visible
 
     for (int i = 0; i < model.count(); ++i) {
-        QFxText *name = findItem<QFxText>(pathview, "textName", i);
+        QmlGraphicsText *name = findItem<QmlGraphicsText>(pathview, "textName", i);
         QVERIFY(name != 0);
         QCOMPARE(name->text(), model.name(i));
-        QFxText *number = findItem<QFxText>(pathview, "textNumber", i);
+        QmlGraphicsText *number = findItem<QmlGraphicsText>(pathview, "textNumber", i);
         QVERIFY(number != 0);
         QCOMPARE(number->text(), model.number(i));
     }
@@ -131,7 +131,7 @@ void tst_QFxPathView::items()
     delete canvas;
 }
 
-void tst_QFxPathView::pathMoved()
+void tst_QmlGraphicsPathView::pathMoved()
 {
     QmlView *canvas = createView(SRCDIR "/data/pathview.qml");
 
@@ -147,12 +147,12 @@ void tst_QFxPathView::pathMoved()
     canvas->execute();
     qApp->processEvents();
 
-    QFxPathView *pathview = findItem<QFxPathView>(canvas->root(), "view");
+    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->root(), "view");
     QVERIFY(pathview != 0);
 
-    QFxRect *firstItem = findItem<QFxRect>(pathview, "wrapper", 0);
+    QmlGraphicsRect *firstItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 0);
     QVERIFY(firstItem);
-    QFxPath *path = qobject_cast<QFxPath*>(pathview->path());
+    QmlGraphicsPath *path = qobject_cast<QmlGraphicsPath*>(pathview->path());
     QVERIFY(path);
     QPointF start = path->pointAt(0.0);
     QPointF offset;//Center of item is at point, but pos is from corner
@@ -163,7 +163,7 @@ void tst_QFxPathView::pathMoved()
     QTest::qWait(1000);//Moving is animated?
 
     for(int i=0; i<model.count(); i++){
-        QFxRect *curItem = findItem<QFxRect>(pathview, "wrapper", i);
+        QmlGraphicsRect *curItem = findItem<QmlGraphicsRect>(pathview, "wrapper", i);
         QCOMPARE(curItem->pos() + offset, path->pointAt(0.1 + i*0.25));
     }
 
@@ -174,7 +174,7 @@ void tst_QFxPathView::pathMoved()
     delete canvas;
 }
 
-void tst_QFxPathView::limitedItems()
+void tst_QmlGraphicsPathView::limitedItems()
 {
     QmlView *canvas = createView(SRCDIR "/data/pathview.qml");
 
@@ -188,32 +188,32 @@ void tst_QFxPathView::limitedItems()
     canvas->execute();
     qApp->processEvents();
 
-    QFxPathView *pathview = findItem<QFxPathView>(canvas->root(), "view");
+    QmlGraphicsPathView *pathview = findItem<QmlGraphicsPathView>(canvas->root(), "view");
     QVERIFY(pathview != 0);
 
     pathview->setPathItemCount(10);
     QCOMPARE(pathview->pathItemCount(), 10);
 
-    QFxRect *testItem = findItem<QFxRect>(pathview, "wrapper", 0);
+    QmlGraphicsRect *testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 0);
     QVERIFY(testItem != 0);
-    testItem = findItem<QFxRect>(pathview, "wrapper", 9);
+    testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 9);
     QVERIFY(testItem != 0);
-    testItem = findItem<QFxRect>(pathview, "wrapper", 10);
+    testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 10);
     QVERIFY(testItem == 0);
 
     pathview->setCurrentIndex(50);
     QTest::qWait(5100);//Moving is animated and it's travelling far - should be reconsidered.
-    testItem = findItem<QFxRect>(pathview, "wrapper", 0);
+    testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 0);
     QVERIFY(testItem == 0);
-    testItem = findItem<QFxRect>(pathview, "wrapper", 1);
+    testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 1);
     QVERIFY(testItem == 0);
-    testItem = findItem<QFxRect>(pathview, "wrapper", 9);
+    testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 9);
     QVERIFY(testItem == 0);
-    testItem = findItem<QFxRect>(pathview, "wrapper", 50);
+    testItem = findItem<QmlGraphicsRect>(pathview, "wrapper", 50);
     QVERIFY(testItem != 0);
 }
 
-QmlView *tst_QFxPathView::createView(const QString &filename)
+QmlView *tst_QmlGraphicsPathView::createView(const QString &filename)
 {
     QmlView *canvas = new QmlView(0);
     canvas->setFixedSize(240,320);
@@ -231,11 +231,11 @@ QmlView *tst_QFxPathView::createView(const QString &filename)
    item must also evaluate the {index} expression equal to index
 */
 template<typename T>
-T *tst_QFxPathView::findItem(QFxItem *parent, const QString &objectName, int index)
+T *tst_QmlGraphicsPathView::findItem(QmlGraphicsItem *parent, const QString &objectName, int index)
 {
     const QMetaObject &mo = T::staticMetaObject;
     for (int i = 0; i < parent->children().count(); ++i) {
-        QFxItem *item = qobject_cast<QFxItem*>(parent->children().at(i));
+        QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem*>(parent->children().at(i));
         if(!item)
             continue;
         if (mo.cast(item) && (objectName.isEmpty() || item->objectName() == objectName)) {
@@ -256,6 +256,6 @@ T *tst_QFxPathView::findItem(QFxItem *parent, const QString &objectName, int ind
     return 0;
 }
 
-QTEST_MAIN(tst_QFxPathView)
+QTEST_MAIN(tst_QmlGraphicsPathView)
 
 #include "tst_pathview.moc"