From b22cb209e706317f12416df1a1e8a8a19a271827 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Wed, 3 Oct 2018 08:55:13 +0200
Subject: Replace obsolete VisualDataModel, *Group and VisualItemModel in tests

VisualDataModel, VisualDataGroup, and VisualItemModel
are replaced with DelegateModel, DelegateModelGroup, and ObjectModel
respectively (since 7cad0e52c5a020bd29635e9912fd8946a6b48124).

git grep -l 'VisualDataModel' | xargs sed -i 's/VisualDataModel/DelegateModel/g'
git grep -l 'VisualDataGroup' | xargs sed -i 's/VisualDataGroup/DelegateModelGroup/g'
git grep -l 'VisualItemModel' | xargs sed -i 's/VisualItemModel/ObjectModel/g'

Change-Id: Ie91b37b204f08a5d1f1f38594fb22ed70a6e2080
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 tests/auto/quick/qquickrepeater/data/itemlist.qml       | 17 +++++++++--------
 .../auto/quick/qquickrepeater/data/visualitemmodel.qml  |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'tests/auto/quick/qquickrepeater')

diff --git a/tests/auto/quick/qquickrepeater/data/itemlist.qml b/tests/auto/quick/qquickrepeater/data/itemlist.qml
index 174bfd4d18..12470f9fd9 100644
--- a/tests/auto/quick/qquickrepeater/data/itemlist.qml
+++ b/tests/auto/quick/qquickrepeater/data/itemlist.qml
@@ -1,7 +1,8 @@
 // This example demonstrates placing items in a view using
-// a VisualItemModel
+// an ObjectModel
 
 import QtQuick 2.0
+import QtQml.Models 2.12
 
 Rectangle {
     id: root
@@ -22,38 +23,38 @@ Rectangle {
         root.itemModel = itemModel2
     }
 
-    VisualItemModel {
+    ObjectModel {
         id: itemModel1
         objectName: "itemModel1"
         Rectangle {
             objectName: "item1"
             height: 50; width: 100; color: "#FFFEF0"
-            Text { objectName: "text1"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+            Text { objectName: "text1"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent }
         }
         Rectangle {
             objectName: "item2"
             height: 50; width: 100; color: "#F0FFF7"
-            Text { objectName: "text2"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+            Text { objectName: "text2"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent }
         }
         Rectangle {
             objectName: "item3"
             height: 50; width: 100; color: "#F4F0FF"
-            Text { objectName: "text3"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+            Text { objectName: "text3"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent }
         }
     }
 
-    VisualItemModel {
+    ObjectModel {
         id: itemModel2
         objectName: "itemModel2"
         Rectangle {
             objectName: "item4"
             height: 50; width: 100; color: "#FFFEF0"
-            Text { objectName: "text4"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+            Text { objectName: "text4"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent }
         }
         Rectangle {
             objectName: "item5"
             height: 50; width: 100; color: "#F0FFF7"
-            Text { objectName: "text5"; text: "index: " + parent.VisualItemModel.index; font.bold: true; anchors.centerIn: parent }
+            Text { objectName: "text5"; text: "index: " + parent.ObjectModel.index; font.bold: true; anchors.centerIn: parent }
         }
     }
 
diff --git a/tests/auto/quick/qquickrepeater/data/visualitemmodel.qml b/tests/auto/quick/qquickrepeater/data/visualitemmodel.qml
index b1b7b97881..0fb930449a 100644
--- a/tests/auto/quick/qquickrepeater/data/visualitemmodel.qml
+++ b/tests/auto/quick/qquickrepeater/data/visualitemmodel.qml
@@ -1,10 +1,11 @@
 import QtQuick 2.0
+import QtQml.Models 2.12
 
 Rectangle {
     width: 360
     height: 360
 
-    VisualItemModel {
+    ObjectModel {
         id: visItemModel
         Rectangle {
             width: 20
-- 
cgit v1.2.3