[vlc-commits] qml: rename Utils.Drawer

[Rohan Rajpal]

vlc | branch: master | Rohan Rajpal <rohan17089 at iiitd.ac.in> | Mon Jul 29 00:44:19 2019 +0530| [2c3a670c3eaadd35b0ce6a1ea7afe73627b18369] | committer: Jean-Baptiste Kempf

qml: rename Utils.Drawer

rename drawer to avoid confusion with default
qml drawer.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt/Makefile.am                             | 2 +-
 modules/gui/qt/qml/dialogs/Dialogs.qml                 | 2 +-
 modules/gui/qt/qml/mediacenter/MCMainDisplay.qml       | 2 +-
 modules/gui/qt/qml/player/Player.qml                   | 4 ++--
 modules/gui/qt/qml/utils/{Drawer.qml => DrawerExt.qml} | 0
 modules/gui/qt/vlc.qrc                                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 917134b885..eee22d92e9 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -554,7 +554,7 @@ libqt_plugin_la_QML = \
 	gui/qt/qml/dialogs/ModalDialog.qml \
 	gui/qt/qml/utils/DNDLabel.qml \
 	gui/qt/qml/utils/ToolTipArea.qml \
-	gui/qt/qml/utils/Drawer.qml \
+	gui/qt/qml/utils/DrawerExt.qml \
 	gui/qt/qml/utils/GridItem.qml \
 	gui/qt/qml/utils/IconToolButton.qml \
 	gui/qt/qml/utils/ImageToolButton.qml \
diff --git a/modules/gui/qt/qml/dialogs/Dialogs.qml b/modules/gui/qt/qml/dialogs/Dialogs.qml
index 5f207058f6..44801f527c 100644
--- a/modules/gui/qt/qml/dialogs/Dialogs.qml
+++ b/modules/gui/qt/qml/dialogs/Dialogs.qml
@@ -30,7 +30,7 @@ Item {
     signal restoreFocus();
     property var bgContent: undefined
 
-    Utils.Drawer {
+    Utils.DrawerExt {
         id: errorPopup
         anchors {
             bottom: parent.bottom
diff --git a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml b/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
index 6652a97106..efdabbdd9a 100644
--- a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
@@ -199,7 +199,7 @@ Utils.NavigableFocusScope {
                                 })
                         }
 
-                        Utils.Drawer {
+                        Utils.DrawerExt {
                             z: 1
                             id: playlist
                             anchors {
diff --git a/modules/gui/qt/qml/player/Player.qml b/modules/gui/qt/qml/player/Player.qml
index de7393a229..e41392cd4d 100644
--- a/modules/gui/qt/qml/player/Player.qml
+++ b/modules/gui/qt/qml/player/Player.qml
@@ -118,7 +118,7 @@ Utils.NavigableFocusScope {
         }
     }
 
-    Utils.Drawer {
+    Utils.DrawerExt {
         id: playlistpopup
         anchors {
             top: parent.top
@@ -164,7 +164,7 @@ Utils.NavigableFocusScope {
     }
 
 
-    Utils.Drawer {
+    Utils.DrawerExt {
         id: controlBarView
         focus: true
         anchors {
diff --git a/modules/gui/qt/qml/utils/Drawer.qml b/modules/gui/qt/qml/utils/DrawerExt.qml
similarity index 100%
rename from modules/gui/qt/qml/utils/Drawer.qml
rename to modules/gui/qt/qml/utils/DrawerExt.qml
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index cf4382f3cc..c9574d3639 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -178,7 +178,7 @@
         <file alias="MultiCoverPreview.qml">qml/utils/MultiCoverPreview.qml</file>
         <file alias="GridItem.qml">qml/utils/GridItem.qml</file>
         <file alias="ListItem.qml">qml/utils/ListItem.qml</file>
-        <file alias="Drawer.qml">qml/utils/Drawer.qml</file>
+        <file alias="DrawerExt.qml">qml/utils/DrawerExt.qml</file>
         <file alias="SelectableDelegateModel.qml">qml/utils/SelectableDelegateModel.qml</file>
         <file alias="KeyNavigableGridView.qml">qml/utils/KeyNavigableGridView.qml</file>
         <file alias="KeyNavigableListView.qml">qml/utils/KeyNavigableListView.qml</file>