From 90b4528b846542bfa6f0723487315140b9de17b4 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 17 Sep 2019 18:10:59 +0200
Subject: Avoid discouraged patterns in examples

In particular, use required properties where applicable, explicitly
import QtQml where we use it, avoid unqualified access into the root
scope of a component, use JavaScript functions with explicit parameters
as signal handlers.

Change-Id: I3eaaba47cc3c7a2a12d488e36f9eec145cedbb0e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 examples/quick/models/objectlistmodel/main.cpp | 14 +++++++-------
 examples/quick/models/objectlistmodel/view.qml |  8 +++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'examples/quick/models/objectlistmodel')

diff --git a/examples/quick/models/objectlistmodel/main.cpp b/examples/quick/models/objectlistmodel/main.cpp
index 977bbfb93b..8fbe7c183c 100644
--- a/examples/quick/models/objectlistmodel/main.cpp
+++ b/examples/quick/models/objectlistmodel/main.cpp
@@ -68,16 +68,16 @@ int main(int argc, char ** argv)
 {
     QGuiApplication app(argc, argv);
 
-    QList<QObject*> dataList;
-    dataList.append(new DataObject("Item 1", "red"));
-    dataList.append(new DataObject("Item 2", "green"));
-    dataList.append(new DataObject("Item 3", "blue"));
-    dataList.append(new DataObject("Item 4", "yellow"));
+    QList<QObject *> dataList = {
+        new DataObject("Item 1", "red"),
+        new DataObject("Item 2", "green"),
+        new DataObject("Item 3", "blue"),
+        new DataObject("Item 4", "yellow")
+    };
 
     QQuickView view;
     view.setResizeMode(QQuickView::SizeRootObjectToView);
-    QQmlContext *ctxt = view.rootContext();
-    ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
+    view.setInitialProperties({{ "model", QVariant::fromValue(dataList) }});
 //![0]
 
     view.setSource(QUrl("qrc:view.qml"));
diff --git a/examples/quick/models/objectlistmodel/view.qml b/examples/quick/models/objectlistmodel/view.qml
index d9a32aff14..ba0c905e1e 100644
--- a/examples/quick/models/objectlistmodel/view.qml
+++ b/examples/quick/models/objectlistmodel/view.qml
@@ -53,13 +53,15 @@ import QtQuick 2.0
 //![0]
 ListView {
     width: 100; height: 100
+    required model
 
-    model: myModel
     delegate: Rectangle {
+        required color
+        required property string name
+
         height: 25
         width: 100
-        color: model.modelData.color
-        Text { text: name }
+        Text { text: parent.name }
     }
 }
 //![0]
-- 
cgit v1.2.3