Rename Qt Quick-specific classes to QQuick*

[profile/ivi/qtdeclarative.git] / tests / auto / declarative / qquickvisualdatamodel / tst_qquickvisualdatamodel.cpp

diff --git a/tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp b/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
similarity index 86%
rename from tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
rename to tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 0194931..aba760d 100644 (file)
--- a/tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
+++ b/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -46,10 +46,10 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtDeclarative/qdeclarativecontext.h>
 #include <QtDeclarative/qdeclarativeexpression.h>
-#include <QtDeclarative/qsgview.h>
-#include <private/qsglistview_p.h>
-#include <private/qsgtext_p.h>
-#include <private/qsgvisualdatamodel_p.h>
+#include <QtDeclarative/qquickview.h>
+#include <private/qquicklistview_p.h>
+#include <private/qquicktext_p.h>
+#include <private/qquickvisualdatamodel_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include <private/qdeclarativechangeset_p.h>
 #include <private/qdeclarativeengine_p.h>
@@ -112,11 +112,11 @@ protected:
 };
 
 
-class tst_qsgvisualdatamodel : public QObject
+class tst_qquickvisualdatamodel : public QObject
 {
     Q_OBJECT
 public:
-    tst_qsgvisualdatamodel();
+    tst_qquickvisualdatamodel();
 
 private slots:
     void initTestCase();
@@ -139,7 +139,7 @@ private slots:
 private:
     template <int N> void groups_verify(
             const SingleRoleModel &model,
-            QSGItem *contentItem,
+            QQuickItem *contentItem,
             const int (&mIndex)[N],
             const int (&iIndex)[N],
             const int (&vIndex)[N],
@@ -149,9 +149,9 @@ private:
 
     template <int N> void get_verify(
             const SingleRoleModel &model,
-            QSGVisualDataModel *visualModel,
-            QSGVisualDataGroup *visibleItems,
-            QSGVisualDataGroup *selectedItems,
+            QQuickVisualDataModel *visualModel,
+            QQuickVisualDataGroup *visibleItems,
+            QQuickVisualDataGroup *selectedItems,
             const int (&mIndex)[N],
             const int (&iIndex)[N],
             const int (&vIndex)[N],
@@ -162,17 +162,17 @@ private:
     bool failed;
     QDeclarativeEngine engine;
     template<typename T>
-    T *findItem(QSGItem *parent, const QString &objectName, int index);
+    T *findItem(QQuickItem *parent, const QString &objectName, int index);
 };
 
 Q_DECLARE_METATYPE(QDeclarativeChangeSet)
 
-void tst_qsgvisualdatamodel::initTestCase()
+void tst_qquickvisualdatamodel::initTestCase()
 {
     qRegisterMetaType<QDeclarativeChangeSet>();
 }
 
-void tst_qsgvisualdatamodel::cleanupTestCase()
+void tst_qquickvisualdatamodel::cleanupTestCase()
 {
 
 }
@@ -231,11 +231,11 @@ template <> void evaluate<void>(QObject *scope, const QString &expression)
         qWarning() << expr.error().toString();
 }
 
-tst_qsgvisualdatamodel::tst_qsgvisualdatamodel()
+tst_qquickvisualdatamodel::tst_qquickvisualdatamodel()
 {
 }
 
-void tst_qsgvisualdatamodel::rootIndex()
+void tst_qquickvisualdatamodel::rootIndex()
 {
     QDeclarativeEngine engine;
     QDeclarativeComponent c(&engine, QUrl::fromLocalFile(TESTDATA("visualdatamodel.qml")));
@@ -245,7 +245,7 @@ void tst_qsgvisualdatamodel::rootIndex()
 
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QSGVisualDataModel *obj = qobject_cast<QSGVisualDataModel*>(c.create());
+    QQuickVisualDataModel *obj = qobject_cast<QQuickVisualDataModel*>(c.create());
     QVERIFY(obj != 0);
 
     QMetaObject::invokeMethod(obj, "setRoot");
@@ -262,9 +262,9 @@ void tst_qsgvisualdatamodel::rootIndex()
     delete obj;
 }
 
-void tst_qsgvisualdatamodel::updateLayout()
+void tst_qquickvisualdatamodel::updateLayout()
 {
-    QSGView view;
+    QQuickView view;
 
     QStandardItemModel model;
     initStandardTreeModel(&model);
@@ -273,38 +273,38 @@ void tst_qsgvisualdatamodel::updateLayout()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("datalist.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGText *name = findItem<QSGText>(contentItem, "display", 0);
+    QQuickText *name = findItem<QQuickText>(contentItem, "display", 0);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 1 Item"));
-    name = findItem<QSGText>(contentItem, "display", 1);
+    name = findItem<QQuickText>(contentItem, "display", 1);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 2 Item"));
-    name = findItem<QSGText>(contentItem, "display", 2);
+    name = findItem<QQuickText>(contentItem, "display", 2);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 3 Item"));
 
     model.invisibleRootItem()->sortChildren(0, Qt::DescendingOrder);
 
-    name = findItem<QSGText>(contentItem, "display", 0);
+    name = findItem<QQuickText>(contentItem, "display", 0);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 3 Item"));
-    name = findItem<QSGText>(contentItem, "display", 1);
+    name = findItem<QQuickText>(contentItem, "display", 1);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 2 Item"));
-    name = findItem<QSGText>(contentItem, "display", 2);
+    name = findItem<QQuickText>(contentItem, "display", 2);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 1 Item"));
 }
 
-void tst_qsgvisualdatamodel::childChanged()
+void tst_qquickvisualdatamodel::childChanged()
 {
-    QSGView view;
+    QQuickView view;
 
     QStandardItemModel model;
     initStandardTreeModel(&model);
@@ -313,53 +313,53 @@ void tst_qsgvisualdatamodel::childChanged()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("datalist.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGVisualDataModel *vdm = listview->findChild<QSGVisualDataModel*>("visualModel");
+    QQuickVisualDataModel *vdm = listview->findChild<QQuickVisualDataModel*>("visualModel");
     vdm->setRootIndex(QVariant::fromValue(model.indexFromItem(model.item(1,0))));
     QCOMPARE(listview->count(), 1);
 
-    QSGText *name = findItem<QSGText>(contentItem, "display", 0);
+    QQuickText *name = findItem<QQuickText>(contentItem, "display", 0);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 2 Child Item"));
 
     model.item(1,0)->child(0,0)->setText("Row 2 updated child");
 
-    name = findItem<QSGText>(contentItem, "display", 0);
+    name = findItem<QQuickText>(contentItem, "display", 0);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 2 updated child"));
 
     model.item(1,0)->appendRow(new QStandardItem(QLatin1String("Row 2 Child Item 2")));
     QCOMPARE(listview->count(), 2);
 
-    name = findItem<QSGText>(contentItem, "display", 1);
+    name = findItem<QQuickText>(contentItem, "display", 1);
     QVERIFY(name != 0);
     QCOMPARE(name->text(), QString("Row 2 Child Item 2"));
 
     model.item(1,0)->takeRow(1);
-    name = findItem<QSGText>(contentItem, "display", 1);
+    name = findItem<QQuickText>(contentItem, "display", 1);
     QVERIFY(name == 0);
 
     vdm->setRootIndex(QVariant::fromValue(QModelIndex()));
     QCOMPARE(listview->count(), 3);
-    name = findItem<QSGText>(contentItem, "display", 0);
+    name = findItem<QQuickText>(contentItem, "display", 0);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 1 Item"));
-    name = findItem<QSGText>(contentItem, "display", 1);
+    name = findItem<QQuickText>(contentItem, "display", 1);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 2 Item"));
-    name = findItem<QSGText>(contentItem, "display", 2);
+    name = findItem<QQuickText>(contentItem, "display", 2);
     QVERIFY(name);
     QCOMPARE(name->text(), QString("Row 3 Item"));
 }
 
-void tst_qsgvisualdatamodel::objectListModel()
+void tst_qquickvisualdatamodel::objectListModel()
 {
-    QSGView view;
+    QQuickView view;
 
     QList<QObject*> dataList;
     dataList.append(new DataObject("Item 1", "red"));
@@ -372,26 +372,26 @@ void tst_qsgvisualdatamodel::objectListModel()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("objectlist.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGText *name = findItem<QSGText>(contentItem, "name", 0);
+    QQuickText *name = findItem<QQuickText>(contentItem, "name", 0);
     QCOMPARE(name->text(), QString("Item 1"));
 
-    QSGText *section = findItem<QSGText>(contentItem, "section", 0);
+    QQuickText *section = findItem<QQuickText>(contentItem, "section", 0);
     QCOMPARE(section->text(), QString("Item 1"));
 
     dataList[0]->setProperty("name", QLatin1String("Changed"));
     QCOMPARE(name->text(), QString("Changed"));
 }
 
-void tst_qsgvisualdatamodel::singleRole()
+void tst_qquickvisualdatamodel::singleRole()
 {
     {
-        QSGView view;
+        QQuickView view;
 
         SingleRoleModel model;
 
@@ -400,20 +400,20 @@ void tst_qsgvisualdatamodel::singleRole()
 
         view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole1.qml")));
 
-        QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
         QVERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QVERIFY(contentItem != 0);
 
-        QSGText *name = findItem<QSGText>(contentItem, "name", 1);
+        QQuickText *name = findItem<QQuickText>(contentItem, "name", 1);
         QCOMPARE(name->text(), QString("two"));
 
         model.set(1, "Changed");
         QCOMPARE(name->text(), QString("Changed"));
     }
     {
-        QSGView view;
+        QQuickView view;
 
         SingleRoleModel model;
 
@@ -422,20 +422,20 @@ void tst_qsgvisualdatamodel::singleRole()
 
         view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole2.qml")));
 
-        QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
         QVERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QVERIFY(contentItem != 0);
 
-        QSGText *name = findItem<QSGText>(contentItem, "name", 1);
+        QQuickText *name = findItem<QQuickText>(contentItem, "name", 1);
         QCOMPARE(name->text(), QString("two"));
 
         model.set(1, "Changed");
         QCOMPARE(name->text(), QString("Changed"));
     }
     {
-        QSGView view;
+        QQuickView view;
 
         SingleRoleModel model("modelData");
 
@@ -444,13 +444,13 @@ void tst_qsgvisualdatamodel::singleRole()
 
         view.setSource(QUrl::fromLocalFile(TESTDATA("singlerole2.qml")));
 
-        QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
         QVERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QVERIFY(contentItem != 0);
 
-        QSGText *name = findItem<QSGText>(contentItem, "name", 1);
+        QQuickText *name = findItem<QQuickText>(contentItem, "name", 1);
         QCOMPARE(name->text(), QString("two"));
 
         model.set(1, "Changed");
@@ -458,10 +458,10 @@ void tst_qsgvisualdatamodel::singleRole()
     }
 }
 
-void tst_qsgvisualdatamodel::modelProperties()
+void tst_qquickvisualdatamodel::modelProperties()
 {
     {
-        QSGView view;
+        QQuickView view;
 
         SingleRoleModel model;
 
@@ -470,13 +470,13 @@ void tst_qsgvisualdatamodel::modelProperties()
 
         view.setSource(QUrl::fromLocalFile(TESTDATA("modelproperties.qml")));
 
-        QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
         QVERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QVERIFY(contentItem != 0);
 
-        QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", 1);
+        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 1);
         QVERIFY(delegate);
         QCOMPARE(delegate->property("test1").toString(),QString("two"));
         QCOMPARE(delegate->property("test2").toString(),QString("two"));
@@ -490,7 +490,7 @@ void tst_qsgvisualdatamodel::modelProperties()
     }
 
     {
-        QSGView view;
+        QQuickView view;
 
         QList<QObject*> dataList;
         dataList.append(new DataObject("Item 1", "red"));
@@ -503,13 +503,13 @@ void tst_qsgvisualdatamodel::modelProperties()
 
         view.setSource(QUrl::fromLocalFile(TESTDATA("modelproperties.qml")));
 
-        QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
         QVERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QVERIFY(contentItem != 0);
 
-        QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", 1);
+        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 1);
         QVERIFY(delegate);
         QCOMPARE(delegate->property("test1").toString(),QString("Item 2"));
         QCOMPARE(delegate->property("test2").toString(),QString("Item 2"));
@@ -523,7 +523,7 @@ void tst_qsgvisualdatamodel::modelProperties()
     }
 
     {
-        QSGView view;
+        QQuickView view;
 
         QStandardItemModel model;
         initStandardTreeModel(&model);
@@ -545,13 +545,13 @@ void tst_qsgvisualdatamodel::modelProperties()
 
         view.setSource(source);
 
-        QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+        QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
         QVERIFY(listview != 0);
 
-        QSGItem *contentItem = listview->contentItem();
+        QQuickItem *contentItem = listview->contentItem();
         QVERIFY(contentItem != 0);
 
-        QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", 1);
+        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 1);
         QVERIFY(delegate);
         QCOMPARE(delegate->property("test1").toString(),QString("Row 2 Item"));
         QCOMPARE(delegate->property("test2").toString(),QString("Row 2 Item"));
@@ -567,9 +567,9 @@ void tst_qsgvisualdatamodel::modelProperties()
     //### should also test QStringList and QVariantList
 }
 
-void tst_qsgvisualdatamodel::noDelegate()
+void tst_qquickvisualdatamodel::noDelegate()
 {
-    QSGView view;
+    QQuickView view;
 
     QStandardItemModel model;
     initStandardTreeModel(&model);
@@ -578,10 +578,10 @@ void tst_qsgvisualdatamodel::noDelegate()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("datalist.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGVisualDataModel *vdm = listview->findChild<QSGVisualDataModel*>("visualModel");
+    QQuickVisualDataModel *vdm = listview->findChild<QQuickVisualDataModel*>("visualModel");
     QVERIFY(vdm != 0);
     QCOMPARE(vdm->count(), 3);
 
@@ -590,7 +590,7 @@ void tst_qsgvisualdatamodel::noDelegate()
 }
 
 
-void tst_qsgvisualdatamodel::qaimRowsMoved()
+void tst_qquickvisualdatamodel::qaimRowsMoved()
 {
     // Test parameters passed in QAIM::rowsMoved() signal are converted correctly
     // when translated and emitted as the QListModelInterface::itemsMoved() signal
@@ -610,7 +610,7 @@ void tst_qsgvisualdatamodel::qaimRowsMoved()
         model.list << ("item " + i);
     engine.rootContext()->setContextProperty("myModel", &model);
 
-    QSGVisualDataModel *obj = qobject_cast<QSGVisualDataModel*>(c.create());
+    QQuickVisualDataModel *obj = qobject_cast<QQuickVisualDataModel*>(c.create());
     QVERIFY(obj != 0);
 
     QSignalSpy spy(obj, SIGNAL(modelUpdated(QDeclarativeChangeSet,bool)));
@@ -639,7 +639,7 @@ void tst_qsgvisualdatamodel::qaimRowsMoved()
     delete obj;
 }
 
-void tst_qsgvisualdatamodel::qaimRowsMoved_data()
+void tst_qquickvisualdatamodel::qaimRowsMoved_data()
 {
     QTest::addColumn<int>("sourceFirst");
     QTest::addColumn<int>("sourceLast");
@@ -669,9 +669,9 @@ void tst_qsgvisualdatamodel::qaimRowsMoved_data()
         << 10 << 1 << 5;
 }
 
-void tst_qsgvisualdatamodel::remove()
+void tst_qquickvisualdatamodel::remove()
 {
-    QSGView view;
+    QQuickView view;
 
     SingleRoleModel model;
     model.list = QStringList()
@@ -693,13 +693,13 @@ void tst_qsgvisualdatamodel::remove()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGVisualDataModel *visualModel = qobject_cast<QSGVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
     {
@@ -709,7 +709,7 @@ void tst_qsgvisualdatamodel::remove()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -723,7 +723,7 @@ void tst_qsgvisualdatamodel::remove()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -737,7 +737,7 @@ void tst_qsgvisualdatamodel::remove()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -766,9 +766,9 @@ void tst_qsgvisualdatamodel::remove()
     }
 }
 
-void tst_qsgvisualdatamodel::move()
+void tst_qquickvisualdatamodel::move()
 {
-    QSGView view;
+    QQuickView view;
 
     SingleRoleModel model;
     model.list = QStringList()
@@ -790,13 +790,13 @@ void tst_qsgvisualdatamodel::move()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGVisualDataModel *visualModel = qobject_cast<QSGVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
     {
@@ -806,7 +806,7 @@ void tst_qsgvisualdatamodel::move()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -820,7 +820,7 @@ void tst_qsgvisualdatamodel::move()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -834,7 +834,7 @@ void tst_qsgvisualdatamodel::move()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -848,7 +848,7 @@ void tst_qsgvisualdatamodel::move()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -862,7 +862,7 @@ void tst_qsgvisualdatamodel::move()
         static const int iIndex[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11 };
 
         for (int i = 0; i < lengthOf(mIndex); ++i) {
-            QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+            QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
             QVERIFY(delegate);
             QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
             QCOMPARE(delegate->property("test2").toInt(), mIndex[i]);
@@ -907,9 +907,9 @@ void tst_qsgvisualdatamodel::move()
 }
 
 
-template <int N> void tst_qsgvisualdatamodel::groups_verify(
+template <int N> void tst_qquickvisualdatamodel::groups_verify(
         const SingleRoleModel &model,
-        QSGItem *contentItem,
+        QQuickItem *contentItem,
         const int (&mIndex)[N],
         const int (&iIndex)[N],
         const int (&vIndex)[N],
@@ -919,7 +919,7 @@ template <int N> void tst_qsgvisualdatamodel::groups_verify(
 {
     failed = true;
     for (int i = 0; i < N; ++i) {
-        QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", mIndex[i]);
+        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", mIndex[i]);
         QVERIFY(delegate);
         QCOMPARE(delegate->property("test1").toString(), model.list.at(mIndex[i]));
         QCOMPARE(delegate->property("test2").toInt() , mIndex[i]);
@@ -941,9 +941,9 @@ template <int N> void tst_qsgvisualdatamodel::groups_verify(
     QVERIFY(!failed)
 
 
-void tst_qsgvisualdatamodel::groups()
+void tst_qquickvisualdatamodel::groups()
 {
-    QSGView view;
+    QQuickView view;
 
     SingleRoleModel model;
     model.list = QStringList()
@@ -965,19 +965,19 @@ void tst_qsgvisualdatamodel::groups()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGVisualDataModel *visualModel = qobject_cast<QSGVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
-    QSGVisualDataGroup *visibleItems = visualModel->findChild<QSGVisualDataGroup *>("visibleItems");
+    QQuickVisualDataGroup *visibleItems = visualModel->findChild<QQuickVisualDataGroup *>("visibleItems");
     QVERIFY(visibleItems);
 
-    QSGVisualDataGroup *selectedItems = visualModel->findChild<QSGVisualDataGroup *>("selectedItems");
+    QQuickVisualDataGroup *selectedItems = visualModel->findChild<QQuickVisualDataGroup *>("selectedItems");
     QVERIFY(selectedItems);
 
     const bool f = false;
@@ -1148,7 +1148,7 @@ void tst_qsgvisualdatamodel::groups()
         QCOMPARE(visibleItems->count(), 9);
         QCOMPARE(selectedItems->count(), 2);
     } {
-        QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", 5);
+        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 5);
         QVERIFY(delegate);
 
         evaluate<void>(delegate, "hide()");
@@ -1164,7 +1164,7 @@ void tst_qsgvisualdatamodel::groups()
         static const bool sMember[] = { f, f, f, f, f, f, f, f, t, t, f, f };
         VERIFY_GROUPS;
     } {
-        QSGItem *delegate = findItem<QSGItem>(contentItem, "delegate", 5);
+        QQuickItem *delegate = findItem<QQuickItem>(contentItem, "delegate", 5);
         QVERIFY(delegate);
 
         evaluate<void>(delegate, "select()");
@@ -1195,11 +1195,11 @@ void tst_qsgvisualdatamodel::groups()
     }
 }
 
-template <int N> void tst_qsgvisualdatamodel::get_verify(
+template <int N> void tst_qquickvisualdatamodel::get_verify(
         const SingleRoleModel &model,
-        QSGVisualDataModel *visualModel,
-        QSGVisualDataGroup *visibleItems,
-        QSGVisualDataGroup *selectedItems,
+        QQuickVisualDataModel *visualModel,
+        QQuickVisualDataGroup *visibleItems,
+        QQuickVisualDataGroup *selectedItems,
         const int (&mIndex)[N],
         const int (&iIndex)[N],
         const int (&vIndex)[N],
@@ -1259,9 +1259,9 @@ template <int N> void tst_qsgvisualdatamodel::get_verify(
     get_verify(model, visualModel, visibleItems, selectedItems, mIndex, iIndex, vIndex, sIndex, vMember, sMember); \
     QVERIFY(!failed)
 
-void tst_qsgvisualdatamodel::get()
+void tst_qquickvisualdatamodel::get()
 {
-    QSGView view;
+    QQuickView view;
 
     SingleRoleModel model;
     model.list = QStringList()
@@ -1283,19 +1283,19 @@ void tst_qsgvisualdatamodel::get()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("groups.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGVisualDataModel *visualModel = qobject_cast<QSGVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
-    QSGVisualDataGroup *visibleItems = visualModel->findChild<QSGVisualDataGroup *>("visibleItems");
+    QQuickVisualDataGroup *visibleItems = visualModel->findChild<QQuickVisualDataGroup *>("visibleItems");
     QVERIFY(visibleItems);
 
-    QSGVisualDataGroup *selectedItems = visualModel->findChild<QSGVisualDataGroup *>("selectedItems");
+    QQuickVisualDataGroup *selectedItems = visualModel->findChild<QQuickVisualDataGroup *>("selectedItems");
     QVERIFY(selectedItems);
 
     QV8Engine *v8Engine = QDeclarativeEnginePrivate::getV8Engine(ctxt->engine());
@@ -1410,9 +1410,9 @@ void tst_qsgvisualdatamodel::get()
     }
 }
 
-void tst_qsgvisualdatamodel::create()
+void tst_qquickvisualdatamodel::create()
 {
-    QSGView view;
+    QQuickView view;
 
     SingleRoleModel model;
     model.list = QStringList()
@@ -1442,23 +1442,23 @@ void tst_qsgvisualdatamodel::create()
 
     view.setSource(QUrl::fromLocalFile(TESTDATA("create.qml")));
 
-    QSGListView *listview = qobject_cast<QSGListView*>(view.rootObject());
+    QQuickListView *listview = qobject_cast<QQuickListView*>(view.rootObject());
     QVERIFY(listview != 0);
 
-    QSGItem *contentItem = listview->contentItem();
+    QQuickItem *contentItem = listview->contentItem();
     QVERIFY(contentItem != 0);
 
-    QSGVisualDataModel *visualModel = qobject_cast<QSGVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
+    QQuickVisualDataModel *visualModel = qobject_cast<QQuickVisualDataModel *>(qvariant_cast<QObject *>(listview->model()));
     QVERIFY(visualModel);
 
     QCOMPARE(listview->count(), 20);
 
-    QSGItem *delegate;
+    QQuickItem *delegate;
 
     // Request an item instantiated by the view.
-    QVERIFY(findItem<QSGItem>(contentItem, "delegate", 1));
-    QVERIFY(delegate = qobject_cast<QSGItem *>(evaluate<QObject *>(visualModel, "items.create(1)")));
-    QCOMPARE(delegate, findItem<QSGItem>(contentItem, "delegate", 1));
+    QVERIFY(findItem<QQuickItem>(contentItem, "delegate", 1));
+    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(1)")));
+    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 1));
     QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
 
@@ -1469,9 +1469,9 @@ void tst_qsgvisualdatamodel::create()
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
 
     // Request an item not instantiated by the view.
-    QVERIFY(!findItem<QSGItem>(contentItem, "delegate", 15));
-    QVERIFY(delegate = qobject_cast<QSGItem *>(evaluate<QObject *>(visualModel, "items.create(15)")));
-    QCOMPARE(delegate, findItem<QSGItem>(contentItem, "delegate", 15));
+    QVERIFY(!findItem<QQuickItem>(contentItem, "delegate", 15));
+    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(15)")));
+    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 15));
     QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
 
@@ -1480,9 +1480,9 @@ void tst_qsgvisualdatamodel::create()
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
 
     // Request an item not instantiated by the view, then scroll the view so it will request it.
-    QVERIFY(!findItem<QSGItem>(contentItem, "delegate", 16));
-    QVERIFY(delegate = qobject_cast<QSGItem *>(evaluate<QObject *>(visualModel, "items.create(16)")));
-    QCOMPARE(delegate, findItem<QSGItem>(contentItem, "delegate", 16));
+    QVERIFY(!findItem<QQuickItem>(contentItem, "delegate", 16));
+    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(16)")));
+    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 16));
     QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
 
@@ -1494,9 +1494,9 @@ void tst_qsgvisualdatamodel::create()
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 0);
 
     // Request and release an item instantiated by the view, then scroll the view so it releases it.
-    QVERIFY(findItem<QSGItem>(contentItem, "delegate", 17));
-    QVERIFY(delegate = qobject_cast<QSGItem *>(evaluate<QObject *>(visualModel, "items.create(17)")));
-    QCOMPARE(delegate, findItem<QSGItem>(contentItem, "delegate", 17));
+    QVERIFY(findItem<QQuickItem>(contentItem, "delegate", 17));
+    QVERIFY(delegate = qobject_cast<QQuickItem *>(evaluate<QObject *>(visualModel, "items.create(17)")));
+    QCOMPARE(delegate, findItem<QQuickItem>(contentItem, "delegate", 17));
     QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
 
@@ -1512,10 +1512,10 @@ void tst_qsgvisualdatamodel::create()
     // the view it will be persisted.
     evaluate<void>(visualModel, "items.addGroups(18, \"persistedItems\")");
     QCOMPARE(evaluate<int>(visualModel, "persistedItems.count"), 1);
-    QVERIFY(!findItem<QSGItem>(contentItem, "delegate", 18));
+    QVERIFY(!findItem<QQuickItem>(contentItem, "delegate", 18));
     evaluate<void>(listview, "positionViewAtIndex(19, ListView.End)");
     QCOMPARE(listview->count(), 20);
-    QVERIFY(delegate = findItem<QSGItem>(contentItem, "delegate", 18));
+    QVERIFY(delegate = findItem<QQuickItem>(contentItem, "delegate", 18));
     QCOMPARE(evaluate<bool>(delegate, "VisualDataModel.inPersistedItems"), true);
     QCOMPARE(evaluate<bool>(delegate, "destroyed"), false);
     evaluate<void>(listview, "positionViewAtIndex(1, ListView.Beginning)");
@@ -1524,12 +1524,12 @@ void tst_qsgvisualdatamodel::create()
 }
 
 template<typename T>
-T *tst_qsgvisualdatamodel::findItem(QSGItem *parent, const QString &objectName, int index)
+T *tst_qquickvisualdatamodel::findItem(QQuickItem *parent, const QString &objectName, int index)
 {
     const QMetaObject &mo = T::staticMetaObject;
     //qDebug() << parent->childItems().count() << "children";
     for (int i = 0; i < parent->childItems().count(); ++i) {
-        QSGItem *item = qobject_cast<QSGItem*>(parent->childItems().at(i));
+        QQuickItem *item = qobject_cast<QQuickItem*>(parent->childItems().at(i));
         if (!item)
             continue;
         //qDebug() << "try" << item;
@@ -1550,6 +1550,6 @@ T *tst_qsgvisualdatamodel::findItem(QSGItem *parent, const QString &objectName,
     return 0;
 }
 
-QTEST_MAIN(tst_qsgvisualdatamodel)
+QTEST_MAIN(tst_qquickvisualdatamodel)
 
-#include "tst_qsgvisualdatamodel.moc"
+#include "tst_qquickvisualdatamodel.moc"