[vlc-devel] [PATCH 03/11] qml: move Network model to the vlc namespace
Pierre Lamot
pierre at videolabs.io
Fri Oct 9 12:07:33 CEST 2020
---
modules/gui/qt/maininterface/mainui.cpp | 13 +++++++------
modules/gui/qt/medialibrary/qml/MainDisplay.qml | 1 -
modules/gui/qt/network/qml/DiscoverDisplay.qml | 1 -
modules/gui/qt/network/qml/NetworkBrowseDisplay.qml | 1 -
modules/gui/qt/network/qml/NetworkDisplay.qml | 1 -
modules/gui/qt/network/qml/NetworkGridItem.qml | 1 -
.../qt/network/qml/NetworkHomeDeviceListView.qml | 2 +-
modules/gui/qt/network/qml/NetworkHomeDisplay.qml | 2 +-
modules/gui/qt/network/qml/NetworkListItem.qml | 1 -
modules/gui/qt/network/qml/NetworkThumbnailItem.qml | 1 -
modules/gui/qt/network/qml/ServicesHomeDisplay.qml | 1 -
modules/gui/qt/widgets/qml/GridItem.qml | 2 +-
12 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/modules/gui/qt/maininterface/mainui.cpp b/modules/gui/qt/maininterface/mainui.cpp
index 9b8bc9e93f..e1f0a3af15 100644
--- a/modules/gui/qt/maininterface/mainui.cpp
+++ b/modules/gui/qt/maininterface/mainui.cpp
@@ -169,12 +169,6 @@ void MainUI::registerQMLTypes()
qmlRegisterType<MLUrlModel>( "org.videolan.medialib", 0, 1, "MLUrlModel" );
qmlRegisterType<MLVideoModel>( "org.videolan.medialib", 0, 1, "MLVideoModel" );
qmlRegisterType<MLRecentsVideoModel>( "org.videolan.medialib", 0, 1, "MLRecentsVideoModel" );
- qRegisterMetaType<NetworkTreeItem>();
- qmlRegisterType<NetworkMediaModel>( "org.videolan.medialib", 0, 1, "NetworkMediaModel");
- qmlRegisterType<NetworkDeviceModel>( "org.videolan.medialib", 0, 1, "NetworkDeviceModel");
- qmlRegisterType<NetworkSourcesModel>( "org.videolan.medialib", 0, 1, "NetworkSourcesModel");
- qmlRegisterType<ServicesDiscoveryModel>( "org.videolan.medialib", 0, 1, "ServicesDiscoveryModel");
- qmlRegisterType<MlFoldersModel>( "org.videolan.medialib", 0, 1, "MLFolderModel");
//expose base object, they aren't instanciable from QML side
registerAnonymousType<MLAlbum>("org.videolan.medialib", 1);
@@ -191,6 +185,13 @@ void MainUI::registerQMLTypes()
qmlRegisterType<VideoContextMenu>( "org.videolan.medialib", 0, 1, "VideoContextMenu" );
}
+ qRegisterMetaType<NetworkTreeItem>();
+ qmlRegisterType<NetworkMediaModel>( "org.videolan.vlc", 0, 1, "NetworkMediaModel");
+ qmlRegisterType<NetworkDeviceModel>( "org.videolan.vlc", 0, 1, "NetworkDeviceModel");
+ qmlRegisterType<NetworkSourcesModel>( "org.videolan.vlc", 0, 1, "NetworkSourcesModel");
+ qmlRegisterType<ServicesDiscoveryModel>( "org.videolan.vlc", 0, 1, "ServicesDiscoveryModel");
+ qmlRegisterType<MlFoldersModel>( "org.videolan.vlc", 0, 1, "MLFolderModel");
+
qmlRegisterUncreatableType<NavigationHistory>("org.videolan.vlc", 0, 1, "History", "Type of global variable history" );
qmlRegisterUncreatableType<TrackListModel>("org.videolan.vlc", 0, 1, "TrackListModel", "available tracks of a media (audio/video/sub)" );
diff --git a/modules/gui/qt/medialibrary/qml/MainDisplay.qml b/modules/gui/qt/medialibrary/qml/MainDisplay.qml
index 1dcaf1a9f0..06a6cffabe 100644
--- a/modules/gui/qt/medialibrary/qml/MainDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/MainDisplay.qml
@@ -19,7 +19,6 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
-import org.videolan.medialib 0.1
import org.videolan.vlc 0.1
import "qrc:///style/"
diff --git a/modules/gui/qt/network/qml/DiscoverDisplay.qml b/modules/gui/qt/network/qml/DiscoverDisplay.qml
index fc2275549a..f0fe939178 100644
--- a/modules/gui/qt/network/qml/DiscoverDisplay.qml
+++ b/modules/gui/qt/network/qml/DiscoverDisplay.qml
@@ -21,7 +21,6 @@ import QtQml.Models 2.2
import QtQml 2.11
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util
diff --git a/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml b/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
index 1ec12913c4..e1630d72da 100644
--- a/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
+++ b/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
@@ -23,7 +23,6 @@ import QtQml 2.11
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///util/" as Util
import "qrc:///widgets/" as Widgets
diff --git a/modules/gui/qt/network/qml/NetworkDisplay.qml b/modules/gui/qt/network/qml/NetworkDisplay.qml
index e81242c7c8..e0c94f3d1b 100644
--- a/modules/gui/qt/network/qml/NetworkDisplay.qml
+++ b/modules/gui/qt/network/qml/NetworkDisplay.qml
@@ -21,7 +21,6 @@ import QtQml.Models 2.2
import QtQml 2.11
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
diff --git a/modules/gui/qt/network/qml/NetworkGridItem.qml b/modules/gui/qt/network/qml/NetworkGridItem.qml
index e79a341de0..52e9fc0496 100644
--- a/modules/gui/qt/network/qml/NetworkGridItem.qml
+++ b/modules/gui/qt/network/qml/NetworkGridItem.qml
@@ -21,7 +21,6 @@ import QtQml.Models 2.2
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
diff --git a/modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml b/modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml
index d7871c6341..11d7eb6a69 100644
--- a/modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml
+++ b/modules/gui/qt/network/qml/NetworkHomeDeviceListView.qml
@@ -19,7 +19,7 @@ import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQml.Models 2.2
-import org.videolan.medialib 0.1
+import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util
diff --git a/modules/gui/qt/network/qml/NetworkHomeDisplay.qml b/modules/gui/qt/network/qml/NetworkHomeDisplay.qml
index d9ad027f34..857e1440d2 100644
--- a/modules/gui/qt/network/qml/NetworkHomeDisplay.qml
+++ b/modules/gui/qt/network/qml/NetworkHomeDisplay.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 2.4
import QtQml.Models 2.2
import QtQml 2.11
-import org.videolan.medialib 0.1
+import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util
diff --git a/modules/gui/qt/network/qml/NetworkListItem.qml b/modules/gui/qt/network/qml/NetworkListItem.qml
index 2f4287a9ea..c1383fa620 100644
--- a/modules/gui/qt/network/qml/NetworkListItem.qml
+++ b/modules/gui/qt/network/qml/NetworkListItem.qml
@@ -20,7 +20,6 @@ import QtQuick.Controls 2.4
import QtQml.Models 2.2
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
diff --git a/modules/gui/qt/network/qml/NetworkThumbnailItem.qml b/modules/gui/qt/network/qml/NetworkThumbnailItem.qml
index 8b56cfef61..a031114080 100644
--- a/modules/gui/qt/network/qml/NetworkThumbnailItem.qml
+++ b/modules/gui/qt/network/qml/NetworkThumbnailItem.qml
@@ -22,7 +22,6 @@ import QtQml.Models 2.2
import QtGraphicalEffects 1.0
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
diff --git a/modules/gui/qt/network/qml/ServicesHomeDisplay.qml b/modules/gui/qt/network/qml/ServicesHomeDisplay.qml
index d74ed06187..3ee2bbab1a 100644
--- a/modules/gui/qt/network/qml/ServicesHomeDisplay.qml
+++ b/modules/gui/qt/network/qml/ServicesHomeDisplay.qml
@@ -22,7 +22,6 @@ import QtQuick.Layouts 1.11
import QtQuick.Shapes 1.0
import org.videolan.vlc 0.1
-import org.videolan.medialib 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///util/" as Util
diff --git a/modules/gui/qt/widgets/qml/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml
index 5f6daf79d2..184193587b 100644
--- a/modules/gui/qt/widgets/qml/GridItem.qml
+++ b/modules/gui/qt/widgets/qml/GridItem.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 2.4
import QtQuick.Layouts 1.3
import QtQml.Models 2.2
import QtGraphicalEffects 1.0
-import org.videolan.medialib 0.1
+import org.videolan.vlc 0.1
import "qrc:///widgets/" as Widgets
import "qrc:///style/"
--
2.25.1
More information about the vlc-devel
mailing list