[vlc-commits] qml: rename gridDelegate to delegate in ExpandGridView

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Tue Aug 27 14:46:04 2019 +0200| [57668aa72f6b8786d5a8953ba2ab698254ab7c28] | committer: Jean-Baptiste Kempf

qml: rename gridDelegate to delegate in ExpandGridView

  this is more consistent with other Qml widgets

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=57668aa72f6b8786d5a8953ba2ab698254ab7c28
---

 modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml  | 2 +-
 modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml | 2 +-
 modules/gui/qt/qml/utils/ExpandGridView.qml            | 4 ++--
 modules/gui/qt/qml/utils/KeyNavigableGridView.qml      | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml b/modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml
index 02ec94b496..f65a28797c 100644
--- a/modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml
@@ -117,7 +117,7 @@ Utils.NavigableFocusScope {
             cellWidth: VLCStyle.cover_normal + VLCStyle.margin_small
             cellHeight: VLCStyle.cover_normal + VLCStyle.fontHeight_normal * 2
 
-            gridDelegate: Utils.GridItem {
+            delegate: Utils.GridItem {
                 property variant delegateModelItem: ({
                     model: ({}),
                     itemsIndex: 0,
diff --git a/modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml b/modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml
index ef76fee556..9bcadc86bc 100644
--- a/modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml
+++ b/modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml
@@ -42,7 +42,7 @@ Utils.ExpandGridView {
     property real gridDelegatePictureHeight: VLCStyle.video_normal_height
 
 
-    gridDelegate: Utils.GridItem {
+    delegate: Utils.GridItem {
         property variant delegateModelItem: ({
                                                  model: ({}),
                                                  itemsIndex: 0,
diff --git a/modules/gui/qt/qml/utils/ExpandGridView.qml b/modules/gui/qt/qml/utils/ExpandGridView.qml
index 0780c4f2e8..aabeb4c9d2 100644
--- a/modules/gui/qt/qml/utils/ExpandGridView.qml
+++ b/modules/gui/qt/qml/utils/ExpandGridView.qml
@@ -47,7 +47,7 @@ NavigableFocusScope {
     property int _newExpandIndex: -1
 
     //delegate to display the extended item
-    property Component gridDelegate: Item{}
+    property Component delegate: Item{}
     property Component expandDelegate: Item{}
     property Item expanderItem: Item{}
 
@@ -229,7 +229,7 @@ NavigableFocusScope {
             if (nbItems > _unusedItemList.length + Object.keys(toKeep).length) {
                 var toCreate = nbItems - (_unusedItemList.length + Object.keys(toKeep).length)
                 for (i = 0; i < toCreate; ++i) {
-                    val = root.gridDelegate.createObject(contentItem);
+                    val = root.delegate.createObject(contentItem);
                     _unusedItemList.push(val)
                 }
             }
diff --git a/modules/gui/qt/qml/utils/KeyNavigableGridView.qml b/modules/gui/qt/qml/utils/KeyNavigableGridView.qml
index 6fc8ac9d7e..e4af15c35e 100644
--- a/modules/gui/qt/qml/utils/KeyNavigableGridView.qml
+++ b/modules/gui/qt/qml/utils/KeyNavigableGridView.qml
@@ -31,6 +31,7 @@ NavigableFocusScope {
     //forward view properties
     property alias interactive: view.interactive
     property alias model: view.model
+    property alias delegate: view.delegate
 
     property alias cellWidth: view.cellWidth
     property alias cellHeight: view.cellHeight