[vlc-commits] qt: move playlist component to its own folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:11 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 11 16:11:24 2019 +0200| [4d646bdd8803015aba8dd3f892b4a218d9f10966] | committer: Jean-Baptiste Kempf
qt: move playlist component to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d646bdd8803015aba8dd3f892b4a218d9f10966
---
modules/gui/qt/Makefile.am | 42 +++++++++++-----------
modules/gui/qt/components/controller.cpp | 2 +-
modules/gui/qt/components/controller_widget.cpp | 2 +-
modules/gui/qt/components/controller_widget.hpp | 2 +-
.../gui/qt/components/mediacenter/mcmedialib.cpp | 4 +--
.../mediacenter/mlnetworkdevicemodel.cpp | 4 +--
.../components/mediacenter/mlnetworkmediamodel.cpp | 5 ++-
modules/gui/qt/components/qml_main_context.hpp | 2 +-
modules/gui/qt/dialogs_provider.cpp | 2 +-
modules/gui/qt/main_interface.cpp | 2 +-
modules/gui/qt/menus.cpp | 2 +-
modules/gui/qt/{components => }/playlist/media.hpp | 0
.../{components => }/playlist/playlist_common.cpp | 0
.../{components => }/playlist/playlist_common.hpp | 0
.../playlist/playlist_controller.cpp | 0
.../playlist/playlist_controller.hpp | 0
.../playlist/playlist_controller_p.hpp | 0
.../qt/{components => }/playlist/playlist_item.cpp | 0
.../qt/{components => }/playlist/playlist_item.hpp | 0
.../{components => }/playlist/playlist_model.cpp | 0
.../{components => }/playlist/playlist_model.hpp | 2 +-
.../{components => }/playlist/playlist_model_p.hpp | 0
.../qt/{qml/playlist => playlist/qml}/PLItem.qml | 0
.../playlist => playlist/qml}/PLItemFooter.qml | 0
.../playlist => playlist/qml}/PlaylistListView.qml | 0
.../playlist => playlist/qml}/PlaylistMainView.qml | 0
.../playlist => playlist/qml}/PlaylistMenu.qml | 0
.../playlist => playlist/qml}/PlaylistToolbar.qml | 0
modules/gui/qt/qt.cpp | 4 +--
modules/gui/qt/recents.cpp | 2 +-
modules/gui/qt/vlc.qrc | 12 +++----
31 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 8be23583cc..1f197ef4d6 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -167,17 +167,17 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/mediacenter/mlvideomodel.hpp \
gui/qt/components/mediacenter/mlrecentsvideomodel.cpp \
gui/qt/components/mediacenter/mlrecentsvideomodel.hpp \
- gui/qt/components/playlist/media.hpp \
- gui/qt/components/playlist/playlist_common.cpp \
- gui/qt/components/playlist/playlist_common.hpp \
- gui/qt/components/playlist/playlist_controller.cpp \
- gui/qt/components/playlist/playlist_controller.hpp \
- gui/qt/components/playlist/playlist_controller_p.hpp \
- gui/qt/components/playlist/playlist_item.cpp \
- gui/qt/components/playlist/playlist_item.hpp \
- gui/qt/components/playlist/playlist_model.cpp \
- gui/qt/components/playlist/playlist_model.hpp \
- gui/qt/components/playlist/playlist_model_p.hpp \
+ gui/qt/playlist/media.hpp \
+ gui/qt/playlist/playlist_common.cpp \
+ gui/qt/playlist/playlist_common.hpp \
+ gui/qt/playlist/playlist_controller.cpp \
+ gui/qt/playlist/playlist_controller.hpp \
+ gui/qt/playlist/playlist_controller_p.hpp \
+ gui/qt/playlist/playlist_item.cpp \
+ gui/qt/playlist/playlist_item.hpp \
+ gui/qt/playlist/playlist_model.cpp \
+ gui/qt/playlist/playlist_model.hpp \
+ gui/qt/playlist/playlist_model_p.hpp \
gui/qt/components/sout/profile_selector.cpp \
gui/qt/components/sout/profile_selector.hpp \
gui/qt/components/sout/sout_widgets.cpp \
@@ -304,10 +304,10 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/mediacenter/mlvideo.moc.cpp \
gui/qt/components/mediacenter/mlvideomodel.moc.cpp \
gui/qt/components/mediacenter/mlrecentsvideomodel.moc.cpp \
- gui/qt/components/playlist/playlist_common.moc.cpp \
- gui/qt/components/playlist/playlist_item.moc.cpp \
- gui/qt/components/playlist/playlist_model.moc.cpp \
- gui/qt/components/playlist/playlist_controller.moc.cpp \
+ gui/qt/playlist/playlist_common.moc.cpp \
+ gui/qt/playlist/playlist_item.moc.cpp \
+ gui/qt/playlist/playlist_model.moc.cpp \
+ gui/qt/playlist/playlist_controller.moc.cpp \
gui/qt/components/sout/profile_selector.moc.cpp \
gui/qt/components/sout/sout_widgets.moc.cpp \
gui/qt/util/animators.moc.cpp \
@@ -648,12 +648,12 @@ libqt_plugin_la_QML = \
gui/qt/qml/mediacenter/NetworkListItem.qml \
gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml \
gui/qt/qml/mediacenter/VideoGridItem.qml \
- gui/qt/qml/playlist/PlaylistListView.qml \
- gui/qt/qml/playlist/PlaylistMainView.qml \
- gui/qt/qml/playlist/PlaylistToolbar.qml \
- gui/qt/qml/playlist/PLItem.qml \
- gui/qt/qml/playlist/PLItemFooter.qml \
- gui/qt/qml/playlist/PlaylistMenu.qml \
+ gui/qt/playlist/qml/PlaylistListView.qml \
+ gui/qt/playlist/qml/PlaylistMainView.qml \
+ gui/qt/playlist/qml/PlaylistToolbar.qml \
+ gui/qt/playlist/qml/PLItem.qml \
+ gui/qt/playlist/qml/PLItemFooter.qml \
+ gui/qt/playlist/qml/PlaylistMenu.qml \
gui/qt/qml/style/qmldir \
gui/qt/qml/style/VLCIcons.qml \
gui/qt/qml/style/VLCStyle.qml \
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index ea189c22ca..922bdcc4de 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -34,7 +34,7 @@
#include "util/buttons/RoundButton.hpp"
#include "dialogs_provider.hpp" /* Opening Dialogs */
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/playlist_controller.hpp"
#include "util/input_slider.hpp" /* SeekSlider */
#include "util/customwidgets.hpp" /* qEventToKey */
diff --git a/modules/gui/qt/components/controller_widget.cpp b/modules/gui/qt/components/controller_widget.cpp
index 0f6ca67bf9..d3c182abad 100644
--- a/modules/gui/qt/components/controller_widget.cpp
+++ b/modules/gui/qt/components/controller_widget.cpp
@@ -27,7 +27,7 @@
#include "controller_widget.hpp"
#include "controller.hpp"
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/playlist_controller.hpp"
#include "components/player_controller.hpp" /* Get notification of Volume Change */
#include "util/input_slider.hpp" /* SoundSlider */
#include "util/imagehelper.hpp"
diff --git a/modules/gui/qt/components/controller_widget.hpp b/modules/gui/qt/components/controller_widget.hpp
index aeb2bee0d8..4bfc868a31 100644
--- a/modules/gui/qt/components/controller_widget.hpp
+++ b/modules/gui/qt/components/controller_widget.hpp
@@ -29,7 +29,7 @@
#include "qt.hpp"
#include "components/player_controller.hpp"
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/playlist_controller.hpp"
#include <QWidget>
#include <QToolButton>
diff --git a/modules/gui/qt/components/mediacenter/mcmedialib.cpp b/modules/gui/qt/components/mediacenter/mcmedialib.cpp
index 7c44fd9720..aa89961484 100644
--- a/modules/gui/qt/components/mediacenter/mcmedialib.cpp
+++ b/modules/gui/qt/components/mediacenter/mcmedialib.cpp
@@ -22,8 +22,8 @@
#include <vlc_playlist.h>
#include <vlc_input_item.h>
-#include "components/playlist/media.hpp"
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/media.hpp"
+#include "playlist/playlist_controller.hpp"
#include <QSettings>
MCMediaLib::MCMediaLib(intf_thread_t *_intf, QObject *_parent)
diff --git a/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp b/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp
index 316dcd6f1f..df5b79eb39 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp
+++ b/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp
@@ -19,8 +19,8 @@
#include "mlnetworkdevicemodel.hpp"
#include "mlnetworkmediamodel.hpp"
-#include "components/playlist/media.hpp"
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/media.hpp"
+#include "playlist/playlist_controller.hpp"
namespace {
diff --git a/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp b/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp
index 1454b06540..a0ac44a62f 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp
+++ b/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp
@@ -20,8 +20,8 @@
#include "mlhelper.hpp"
-#include "components/playlist/media.hpp"
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/media.hpp"
+#include "playlist/playlist_controller.hpp"
namespace {
@@ -380,4 +380,3 @@ bool MLNetworkMediaModel::canBeIndexed(const QUrl& url , ItemType itemType )
{
return static_cast<input_item_type_e>(itemType) != ITEM_TYPE_FILE && (url.scheme() == "smb" || url.scheme() == "ftp");
}
-
diff --git a/modules/gui/qt/components/qml_main_context.hpp b/modules/gui/qt/components/qml_main_context.hpp
index 688d125c75..3a0bce20e0 100644
--- a/modules/gui/qt/components/qml_main_context.hpp
+++ b/modules/gui/qt/components/qml_main_context.hpp
@@ -21,7 +21,7 @@
#include "qt.hpp"
#include <QObject>
-#include <components/playlist/playlist_common.hpp>
+#include <playlist/playlist_common.hpp>
class MainInterface;
/**
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 70551ea47d..3628a8fd67 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -30,7 +30,7 @@
#include "qt.hpp"
#include "dialogs_provider.hpp"
#include "components/player_controller.hpp" /* Load Subtitles */
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/playlist_controller.hpp"
#include "menus.hpp"
#include "recents.hpp"
#include "util/qt_dirs.hpp"
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 0c16f7a18d..d6cdbbd65c 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -40,7 +40,7 @@
#include "components/controller.hpp" // controllers
#include "dialogs/firstrun.hpp" // First Run
-#include "components/playlist/playlist_model.hpp"
+#include "playlist/playlist_model.hpp"
#include <vlc_playlist.h>
#include "components/mediacenter/mcmedialib.hpp"
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 7f60d55893..83f9830494 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -40,7 +40,7 @@
#include "main_interface.hpp" /* View modifications */
#include "dialogs_provider.hpp" /* Dialogs display */
#include "components/player_controller.hpp" /* Input Management */
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/playlist_controller.hpp"
#include "recents.hpp" /* Recent Items */
#include "extensions_manager.hpp" /* Extensions menu */
#include "components/extended_panels.hpp"
diff --git a/modules/gui/qt/components/playlist/media.hpp b/modules/gui/qt/playlist/media.hpp
similarity index 100%
rename from modules/gui/qt/components/playlist/media.hpp
rename to modules/gui/qt/playlist/media.hpp
diff --git a/modules/gui/qt/components/playlist/playlist_common.cpp b/modules/gui/qt/playlist/playlist_common.cpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_common.cpp
rename to modules/gui/qt/playlist/playlist_common.cpp
diff --git a/modules/gui/qt/components/playlist/playlist_common.hpp b/modules/gui/qt/playlist/playlist_common.hpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_common.hpp
rename to modules/gui/qt/playlist/playlist_common.hpp
diff --git a/modules/gui/qt/components/playlist/playlist_controller.cpp b/modules/gui/qt/playlist/playlist_controller.cpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_controller.cpp
rename to modules/gui/qt/playlist/playlist_controller.cpp
diff --git a/modules/gui/qt/components/playlist/playlist_controller.hpp b/modules/gui/qt/playlist/playlist_controller.hpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_controller.hpp
rename to modules/gui/qt/playlist/playlist_controller.hpp
diff --git a/modules/gui/qt/components/playlist/playlist_controller_p.hpp b/modules/gui/qt/playlist/playlist_controller_p.hpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_controller_p.hpp
rename to modules/gui/qt/playlist/playlist_controller_p.hpp
diff --git a/modules/gui/qt/components/playlist/playlist_item.cpp b/modules/gui/qt/playlist/playlist_item.cpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_item.cpp
rename to modules/gui/qt/playlist/playlist_item.cpp
diff --git a/modules/gui/qt/components/playlist/playlist_item.hpp b/modules/gui/qt/playlist/playlist_item.hpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_item.hpp
rename to modules/gui/qt/playlist/playlist_item.hpp
diff --git a/modules/gui/qt/components/playlist/playlist_model.cpp b/modules/gui/qt/playlist/playlist_model.cpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_model.cpp
rename to modules/gui/qt/playlist/playlist_model.cpp
diff --git a/modules/gui/qt/components/playlist/playlist_model.hpp b/modules/gui/qt/playlist/playlist_model.hpp
similarity index 98%
rename from modules/gui/qt/components/playlist/playlist_model.hpp
rename to modules/gui/qt/playlist/playlist_model.hpp
index cc932fed70..4aef54178b 100644
--- a/modules/gui/qt/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt/playlist/playlist_model.hpp
@@ -27,7 +27,7 @@
#include <QVector>
#include "playlist_common.hpp"
#include "playlist_item.hpp"
-#include "../selectable_list_model.hpp"
+#include "components/selectable_list_model.hpp"
namespace vlc {
namespace playlist {
diff --git a/modules/gui/qt/components/playlist/playlist_model_p.hpp b/modules/gui/qt/playlist/playlist_model_p.hpp
similarity index 100%
rename from modules/gui/qt/components/playlist/playlist_model_p.hpp
rename to modules/gui/qt/playlist/playlist_model_p.hpp
diff --git a/modules/gui/qt/qml/playlist/PLItem.qml b/modules/gui/qt/playlist/qml/PLItem.qml
similarity index 100%
rename from modules/gui/qt/qml/playlist/PLItem.qml
rename to modules/gui/qt/playlist/qml/PLItem.qml
diff --git a/modules/gui/qt/qml/playlist/PLItemFooter.qml b/modules/gui/qt/playlist/qml/PLItemFooter.qml
similarity index 100%
rename from modules/gui/qt/qml/playlist/PLItemFooter.qml
rename to modules/gui/qt/playlist/qml/PLItemFooter.qml
diff --git a/modules/gui/qt/qml/playlist/PlaylistListView.qml b/modules/gui/qt/playlist/qml/PlaylistListView.qml
similarity index 100%
rename from modules/gui/qt/qml/playlist/PlaylistListView.qml
rename to modules/gui/qt/playlist/qml/PlaylistListView.qml
diff --git a/modules/gui/qt/qml/playlist/PlaylistMainView.qml b/modules/gui/qt/playlist/qml/PlaylistMainView.qml
similarity index 100%
rename from modules/gui/qt/qml/playlist/PlaylistMainView.qml
rename to modules/gui/qt/playlist/qml/PlaylistMainView.qml
diff --git a/modules/gui/qt/qml/playlist/PlaylistMenu.qml b/modules/gui/qt/playlist/qml/PlaylistMenu.qml
similarity index 100%
rename from modules/gui/qt/qml/playlist/PlaylistMenu.qml
rename to modules/gui/qt/playlist/qml/PlaylistMenu.qml
diff --git a/modules/gui/qt/qml/playlist/PlaylistToolbar.qml b/modules/gui/qt/playlist/qml/PlaylistToolbar.qml
similarity index 100%
rename from modules/gui/qt/qml/playlist/PlaylistToolbar.qml
rename to modules/gui/qt/playlist/qml/PlaylistToolbar.qml
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 798f1c41e8..67d7e4f66d 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -47,7 +47,7 @@ extern "C" char **environ;
#include "qt.hpp"
#include "components/player_controller.hpp" /* THEMIM destruction */
-#include "components/playlist/playlist_controller.hpp" /* THEMPL creation */
+#include "playlist/playlist_controller.hpp" /* THEMPL creation */
#include "dialogs_provider.hpp" /* THEDP creation */
#ifdef _WIN32
# include "main_interface_win32.hpp"
@@ -61,7 +61,7 @@ extern "C" char **environ;
#include "util/qvlcapp.hpp" /* QVLCApplication definition */
#include <QVector>
-#include "components/playlist/playlist_item.hpp"
+#include "playlist/playlist_item.hpp"
#include <vlc_plugin.h>
#include <vlc_vout_window.h>
diff --git a/modules/gui/qt/recents.cpp b/modules/gui/qt/recents.cpp
index 4ba7d38fb1..b4f289ebbc 100644
--- a/modules/gui/qt/recents.cpp
+++ b/modules/gui/qt/recents.cpp
@@ -27,7 +27,7 @@
#include "menus.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_cxx_helpers.hpp>
-#include "components/playlist/playlist_controller.hpp"
+#include "playlist/playlist_controller.hpp"
#include <QStringList>
#include <QRegExp>
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 60d8c79190..b226e53120 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -239,12 +239,12 @@
<file alias="VLCIcons.qml">qml/style/VLCIcons.qml</file>
</qresource>
<qresource prefix="/playlist">
- <file alias="PLItem.qml">qml/playlist/PLItem.qml</file>
- <file alias="PlaylistListView.qml">qml/playlist/PlaylistListView.qml</file>
- <file alias="PlaylistMenu.qml">qml/playlist/PlaylistMenu.qml</file>
- <file alias="PLItemFooter.qml">qml/playlist/PLItemFooter.qml</file>
- <file alias="PlaylistMainView.qml">qml/playlist/PlaylistMainView.qml</file>
- <file alias="PlaylistToolbar.qml">qml/playlist/PlaylistToolbar.qml</file>
+ <file alias="PLItem.qml">playlist/qml/PLItem.qml</file>
+ <file alias="PlaylistListView.qml">playlist/qml/PlaylistListView.qml</file>
+ <file alias="PlaylistMenu.qml">playlist/qml/PlaylistMenu.qml</file>
+ <file alias="PLItemFooter.qml">playlist/qml/PLItemFooter.qml</file>
+ <file alias="PlaylistMainView.qml">playlist/qml/PlaylistMainView.qml</file>
+ <file alias="PlaylistToolbar.qml">playlist/qml/PlaylistToolbar.qml</file>
</qresource>
<qresource prefix="/menus">
<file alias="AudioMenu.qml">qml/menus/AudioMenu.qml</file>
More information about the vlc-commits
mailing list