[vlc-commits] qml: rename Player root object

Pierre Lamot git at videolan.org
Sun Jul 28 08:43:58 CEST 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Jul 26 18:06:56 2019 +0200| [83e3d772ab49844358701403eb1f60232a057e74] | committer: Jean-Baptiste Kempf

qml: rename Player root object

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

 modules/gui/qt/qml/player/Player.qml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt/qml/player/Player.qml b/modules/gui/qt/qml/player/Player.qml
index 83eb46e98f..6339857e6d 100644
--- a/modules/gui/qt/qml/player/Player.qml
+++ b/modules/gui/qt/qml/player/Player.qml
@@ -28,7 +28,7 @@ import "qrc:///playlist/" as PL
 import "qrc:///menus/" as Menus
 
 Utils.NavigableFocusScope {
-    id: root
+    id: rootPlayer
 
     //center image
     Rectangle {
@@ -132,7 +132,7 @@ Utils.NavigableFocusScope {
         }
         component: Rectangle {
             color: VLCStyle.colors.setColorAlpha(VLCStyle.colors.banner, 0.8)
-            width: root.width/4
+            width: rootPlayer.width/4
             height: playlistpopup.height
 
             PL.PlaylistListView {
@@ -195,11 +195,11 @@ Utils.NavigableFocusScope {
                             toolbarAutoHide.restart()
                     }
 
-                    onActionUp: root.actionUp(index)
-                    onActionDown: root.actionDown(index)
-                    onActionLeft: root.actionLeft(index)
-                    onActionRight: root.actionRight(index)
-                    onActionCancel: root.actionCancel(index)
+                    onActionUp: rootPlayer.actionUp(index)
+                    onActionDown: rootPlayer.actionDown(index)
+                    onActionLeft: rootPlayer.actionLeft(index)
+                    onActionRight: rootPlayer.actionRight(index)
+                    onActionCancel: rootPlayer.actionCancel(index)
 
                     //unhandled keys are forwarded as hotkeys
                     Keys.onPressed: {



More information about the vlc-commits mailing list