[vlc-commits] [Git][videolan/vlc][master] qml: remove VanillaObject.qml

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
56e673c1 by Fatih Uzunoglu at 2023-12-07T14:23:25+00:00
qml: remove VanillaObject.qml

- - - - -


4 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/util/qml/NativeMenu.qml
- − modules/gui/qt/util/qml/VanillaObject.qml
- modules/gui/qt/vlc.qrc


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -992,7 +992,6 @@ libqt_plugin_la_QML = \
 	gui/qt/util/qml/BindingRev14.qml \
 	gui/qt/util/qml/FSM.qml \
 	gui/qt/util/qml/FSMState.qml \
-	gui/qt/util/qml/VanillaObject.qml \
 	gui/qt/util/qml/NativeMenu.qml \
 	gui/qt/util/qml/MLContextMenu.qml \
 	gui/qt/util/qml/ListViewRev15.qml \


=====================================
modules/gui/qt/util/qml/NativeMenu.qml
=====================================
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-import QtQml 2.11
+import QtQml 2.12
 
 import org.videolan.vlc 0.1
 
@@ -24,7 +24,7 @@ import org.videolan.vlc 0.1
 // @brief - a class that can be used to create native menus with support
 // to asyncronously retreive data from MLBaseModel like model
 
-VanillaObject {
+QtObject {
     id: root
 
     /**
@@ -97,7 +97,7 @@ VanillaObject {
     }
 
 
-    StringListMenu {
+    readonly property StringListMenu _menu: StringListMenu {
         id: menu
 
         onSelected: {


=====================================
modules/gui/qt/util/qml/VanillaObject.qml deleted
=====================================
@@ -1,27 +0,0 @@
-
-/*****************************************************************************
- * Copyright (C) 2022 VLC authors and VideoLAN
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * ( at your option ) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-import QtQuick 2.12
-
-QtObject {
-    id: object
-
-    default property alias children: object.__children
-
-    property list<QtObject> __children: [QtObject {}]
-}


=====================================
modules/gui/qt/vlc.qrc
=====================================
@@ -76,7 +76,6 @@
         <file alias="ViewDragAutoScrollHandler.qml">util/qml/ViewDragAutoScrollHandler.qml</file>
         <file alias="BindingRev8.qml">util/qml/BindingRev8.qml</file>
         <file alias="BindingRev14.qml">util/qml/BindingRev14.qml</file>
-        <file alias="VanillaObject.qml">util/qml/VanillaObject.qml</file>
         <file alias="NativeMenu.qml">util/qml/NativeMenu.qml</file>
         <file alias="MLContextMenu.qml">util/qml/MLContextMenu.qml</file>
         <file alias="ListViewRev15.qml">util/qml/ListViewRev15.qml</file>



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/56e673c141422ed218eb0dfbeda2c3b2da927407

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/56e673c141422ed218eb0dfbeda2c3b2da927407
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance