From bb0247bdf1be054f13c94a4c8bac36d294783b6c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 7 Feb 2024 14:15:32 +0100
Subject: Brush up the usingmodel example

Although not any more in Qt, it nicely shows the use of roles
and delegates in QML.

- Use a little data class for Person.
- Change the custom role name away from "modelData" which is
  now a reserved name and caused it to no longer work.
- Use a modern decorator.

Pick-to: 6.5
Task-number: PYSIDE-2206
Change-Id: I3a3c1ad96f3a7ee89ada839236b45f461af149c7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 1cb34de532ac9d5735d3bcbe7f6a40608d29e5ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 examples/qml/usingmodel/usingmodel.py | 48 +++++++++++++++++++----------------
 examples/qml/usingmodel/view.qml      | 12 ++-------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/examples/qml/usingmodel/usingmodel.py b/examples/qml/usingmodel/usingmodel.py
index 6f8ea5a21..008a1b94b 100644
--- a/examples/qml/usingmodel/usingmodel.py
+++ b/examples/qml/usingmodel/usingmodel.py
@@ -2,24 +2,37 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 import os
+from dataclasses import dataclass
 from pathlib import Path
 import sys
 from PySide6.QtCore import QAbstractListModel, Qt, QUrl, QByteArray
 from PySide6.QtGui import QGuiApplication
 from PySide6.QtQuick import QQuickView
-from PySide6.QtQml import qmlRegisterSingletonType
+from PySide6.QtQml import QmlElement, QmlSingleton
 
 
+QML_IMPORT_NAME = "PersonModel"
+QML_IMPORT_MAJOR_VERSION = 1
+
+
+@dataclass
+class Person:
+    name: str
+    myrole: str
+
+
+@QmlElement
+@QmlSingleton
 class PersonModel (QAbstractListModel):
     MyRole = Qt.UserRole + 1
 
-    def __init__(self, parent=None):
-        QAbstractListModel.__init__(self, parent)
-        self._data = []
+    def __init__(self, data, parent=None):
+        super().__init__(parent)
+        self._data = data
 
     def roleNames(self):
         roles = {
-            PersonModel.MyRole: QByteArray(b'modelData'),
+            PersonModel.MyRole: QByteArray(b'myrole'),
             Qt.DisplayRole: QByteArray(b'display')
         }
         return roles
@@ -29,26 +42,18 @@ class PersonModel (QAbstractListModel):
 
     def data(self, index, role):
         d = self._data[index.row()]
-
         if role == Qt.DisplayRole:
-            return d['name']
-        elif role == Qt.DecorationRole:
+            return d.name
+        if role == Qt.DecorationRole:
             return Qt.black
-        elif role == PersonModel.MyRole:
-            return d['myrole']
+        if role == PersonModel.MyRole:
+            return d.myrole
         return None
 
-    def populate(self, data=None):
-        for item in data:
-            self._data.append(item)
-
-
-def model_callback(engine):
-    my_model = PersonModel()
-    data = [{'name': 'Qt', 'myrole': 'role1'},
-            {'name': 'PySide', 'myrole': 'role2'}]
-    my_model.populate(data)
-    return my_model
+    @staticmethod
+    def create(engine):
+        data = [Person('Qt', 'myrole'), Person('PySide', 'role2')]
+        return PersonModel(data)
 
 
 if __name__ == '__main__':
@@ -56,7 +61,6 @@ if __name__ == '__main__':
     view = QQuickView()
     view.setResizeMode(QQuickView.SizeRootObjectToView)
 
-    qmlRegisterSingletonType(PersonModel, "PersonModel", 1, 0, "MyModel", model_callback)
     qml_file = os.fspath(Path(__file__).resolve().parent / 'view.qml')
     view.setSource(QUrl.fromLocalFile(qml_file))
     if view.status() == QQuickView.Error:
diff --git a/examples/qml/usingmodel/view.qml b/examples/qml/usingmodel/view.qml
index c5aa7e0fc..e8b1fb2fb 100644
--- a/examples/qml/usingmodel/view.qml
+++ b/examples/qml/usingmodel/view.qml
@@ -8,21 +8,13 @@ ListView {
     width: 100
     height: 100
     anchors.fill: parent
-    model: MyModel
+    model: PersonModel
     delegate: Component {
         Rectangle {
             height: 25
             width: 100
             Text {
-                function displayText() {
-                    var result = ""
-                    if (typeof display !== "undefined")
-                        result = display + ": "
-                    result += modelData
-                    return result
-                }
-
-                text: displayText()
+                text: display + ": " + myrole
             }
         }
     }
-- 
cgit v1.2.3