Update QQMLPropertyList API

Use lambdas with local typedefs for index type

Change-Id: I2876c71d619815e7e777f936e8bb0835b8269336
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 35 insertions, 41 deletions

diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
index 505495eb3..431391af6 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
@@ -56,47 +56,41 @@ Quick3DLayerFilter::Quick3DLayerFilter(QObject *parent)
 
 QQmlListProperty<QLayer> Quick3DLayerFilter::qmlLayers()
 {
-    return QQmlListProperty<QLayer>(this, 0,
-                                    &Quick3DLayerFilter::appendLayer,
-                                    &Quick3DLayerFilter::layerCount,
-                                    &Quick3DLayerFilter::layerAt,
-                                    &Quick3DLayerFilter::clearLayers);
-}
-
-void Quick3DLayerFilter::appendLayer(QQmlListProperty<QLayer> *list, QLayer *layer)
-{
-    Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
-    if (filter) {
-        filter->parentFilter()->addLayer(layer);
-    }
-}
-
-QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty<QLayer> *list, qsizetype index)
-{
-    Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
-    if (filter) {
-        return filter->parentFilter()->layers().at(index);
-    }
-    return 0;
-}
-
-qsizetype Quick3DLayerFilter::layerCount(QQmlListProperty<QLayer> *list)
-{
-    Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
-    if (filter) {
-        return filter->parentFilter()->layers().count();
-    }
-    return 0;
-}
-
-void Quick3DLayerFilter::clearLayers(QQmlListProperty<QLayer> *list)
-{
-    Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
-    if (filter) {
-        const auto layers = filter->parentFilter()->layers();
-        for (QLayer *layer : layers)
-            filter->parentFilter()->removeLayer(layer);
-    }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    using qt_size_type = qsizetype;
+#else
+    using qt_size_type = int;
+#endif
+
+    using ListContentType = QLayer;
+    auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *layer) {
+        Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
+        if (filter) {
+            filter->parentFilter()->addLayer(layer);
+        }
+    };
+    auto countFunction = [](QQmlListProperty<ListContentType> *list) -> qt_size_type {
+        Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
+        if (filter)
+            return filter->parentFilter()->layers().count();
+        return 0;
+    };
+    auto atFunction = [](QQmlListProperty<ListContentType> *list, qt_size_type index) -> ListContentType * {
+        Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
+        if (filter)
+            return filter->parentFilter()->layers().at(index);
+        return nullptr;
+    };
+    auto clearFunction = [](QQmlListProperty<ListContentType> *list) {
+        Quick3DLayerFilter *filter = qobject_cast<Quick3DLayerFilter *>(list->object);
+        if (filter) {
+            const auto layers = filter->parentFilter()->layers();
+            for (QLayer *layer : layers)
+                filter->parentFilter()->removeLayer(layer);
+        }
+    };
+
+    return QQmlListProperty<ListContentType>(this, nullptr, appendFunction, countFunction, atFunction, clearFunction);
 }
 
 } // Quick