[vlc-commits] qt: move utility classes and models to util
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:52 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Mon Dec 9 11:56:12 2019 +0100| [197c49851666cb17d3f7b758f445c636d24ba9a0] | committer: Jean-Baptiste Kempf
qt: move utility classes and models to util
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=197c49851666cb17d3f7b758f445c636d24ba9a0
---
modules/gui/qt/Makefile.am | 42 +++++++++++-----------
.../gui/qt/components/voutwindow/videosurface.hpp | 2 +-
modules/gui/qt/dialogs/dialogs/dialogmodel.hpp | 2 +-
modules/gui/qt/dialogs/dialogs_provider.cpp | 2 +-
modules/gui/qt/dialogs/open/open.cpp | 2 +-
modules/gui/qt/dialogs/toolbar/toolbareditor.cpp | 2 +-
modules/gui/qt/dialogs/toolbar/toolbareditor.hpp | 2 +-
modules/gui/qt/maininterface/main_interface.cpp | 10 +++---
modules/gui/qt/medialibrary/medialib.cpp | 2 +-
modules/gui/qt/menus/custom_menus.cpp | 2 +-
modules/gui/qt/menus/menus.cpp | 2 +-
modules/gui/qt/network/networkdevicemodel.hpp | 2 +-
modules/gui/qt/network/networkmediamodel.hpp | 2 +-
modules/gui/qt/network/networksourcelistener.hpp | 2 +-
modules/gui/qt/player/player_controller.cpp | 2 +-
modules/gui/qt/player/player_controller.hpp | 2 +-
modules/gui/qt/player/playercontrolbarmodel.hpp | 2 +-
modules/gui/qt/playlist/playlist_model.hpp | 2 +-
modules/gui/qt/qt.cpp | 2 +-
.../qt/{components => util}/audio_device_model.cpp | 0
.../qt/{components => util}/audio_device_model.hpp | 0
.../qt/{components => util}/navigation_history.cpp | 0
.../qt/{components => util}/navigation_history.hpp | 0
.../qt/{components => util}/qml_main_context.cpp | 0
.../qt/{components => util}/qml_main_context.hpp | 0
.../qt/{components => util}/recent_media_model.cpp | 0
.../qt/{components => util}/recent_media_model.hpp | 2 +-
modules/gui/qt/{ => util}/recents.cpp | 2 +-
modules/gui/qt/{ => util}/recents.hpp | 0
.../gui/qt/{managers => util}/renderer_manager.cpp | 0
.../gui/qt/{managers => util}/renderer_manager.hpp | 0
.../{components => util}/selectable_list_model.cpp | 0
.../{components => util}/selectable_list_model.hpp | 0
modules/gui/qt/{components => util}/settings.cpp | 0
modules/gui/qt/{components => util}/settings.hpp | 0
po/POTFILES.in | 4 +--
36 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index bb6f09331f..0d698390af 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -49,8 +49,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/menus/menus.cpp gui/qt/menus/menus.hpp \
gui/qt/maininterface/main_interface.cpp gui/qt/maininterface/main_interface.hpp \
gui/qt/dialogs/dialogs_provider.cpp gui/qt/dialogs/dialogs_provider.hpp \
- gui/qt/managers/renderer_manager.cpp gui/qt/managers/renderer_manager.hpp \
- gui/qt/recents.cpp gui/qt/recents.hpp \
+ gui/qt/util/renderer_manager.cpp gui/qt/util/renderer_manager.hpp \
+ gui/qt/util/recents.cpp gui/qt/util/recents.hpp \
gui/qt/util/var_common_p.hpp \
gui/qt/util/variables.cpp gui/qt/util/variables.hpp \
gui/qt/util/varchoicemodel.cpp gui/qt/util/varchoicemodel.hpp \
@@ -78,19 +78,19 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/fingerprint/fingerprintdialog.hpp \
gui/qt/dialogs/fingerprint/chromaprint.cpp \
gui/qt/dialogs/fingerprint/chromaprint.hpp \
- gui/qt/components/qml_main_context.cpp \
- gui/qt/components/qml_main_context.hpp \
+ gui/qt/util/qml_main_context.cpp \
+ gui/qt/util/qml_main_context.hpp \
gui/qt/dialogs/help/aboutmodel.cpp \
gui/qt/dialogs/help/aboutmodel.hpp \
gui/qt/dialogs/dialogs/dialogmodel.cpp \
gui/qt/dialogs/dialogs/dialogmodel.hpp \
gui/qt/dialogs/extended/extended_panels.cpp \
gui/qt/dialogs/extended/extended_panels.hpp \
- gui/qt/components/navigation_history.cpp gui/qt/components/navigation_history.hpp \
+ gui/qt/util/navigation_history.cpp gui/qt/util/navigation_history.hpp \
gui/qt/player/player_controller.cpp gui/qt/player/player_controller.hpp gui/qt/player/player_controller_p.hpp \
gui/qt/player/playercontrolbarmodel.cpp gui/qt/player/playercontrolbarmodel.hpp \
- gui/qt/components/selectable_list_model.hpp \
- gui/qt/components/selectable_list_model.cpp \
+ gui/qt/util/selectable_list_model.hpp \
+ gui/qt/util/selectable_list_model.cpp \
gui/qt/dialogs/preferences/preferences.cpp gui/qt/preferences/preferences.hpp \
gui/qt/dialogs/preferences/preferences_widgets.cpp \
gui/qt/dialogs/preferences/preferences_widgets.hpp \
@@ -101,12 +101,12 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/open/open_panels.cpp gui/qt/dialogs/open/open_panels.hpp \
gui/qt/widgets/native/interface_widgets.cpp \
gui/qt/widgets/native/interface_widgets.hpp \
- gui/qt/components/recent_media_model.cpp \
- gui/qt/components/recent_media_model.hpp \
- gui/qt/components/settings.cpp \
- gui/qt/components/settings.hpp \
- gui/qt/components/audio_device_model.cpp \
- gui/qt/components/audio_device_model.hpp \
+ gui/qt/util/recent_media_model.cpp \
+ gui/qt/util/recent_media_model.hpp \
+ gui/qt/util/settings.cpp \
+ gui/qt/util/settings.hpp \
+ gui/qt/util/audio_device_model.cpp \
+ gui/qt/util/audio_device_model.hpp \
gui/qt/components/voutwindow/videosurface.cpp \
gui/qt/components/voutwindow/videosurface.hpp \
gui/qt/components/voutwindow/qvoutwindow.cpp \
@@ -219,8 +219,8 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/maininterface/main_interface.moc.cpp \
gui/qt/menus/menus.moc.cpp \
gui/qt/dialogs/dialogs_provider.moc.cpp \
- gui/qt/managers/renderer_manager.moc.cpp \
- gui/qt/recents.moc.cpp \
+ gui/qt/util/renderer_manager.moc.cpp \
+ gui/qt/util/recents.moc.cpp \
gui/qt/util/variables.moc.cpp \
gui/qt/util/varchoicemodel.moc.cpp \
gui/qt/dialogs/bookmarks/bookmarks.moc.cpp \
@@ -243,7 +243,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/extensions/extensions.moc.cpp \
gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
- gui/qt/components/qml_main_context.moc.cpp \
+ gui/qt/util/qml_main_context.moc.cpp \
gui/qt/dialogs/help/aboutmodel.moc.cpp \
gui/qt/dialogs/dialogs/dialogmodel.moc.cpp \
gui/qt/dialogs/extended/extended_panels.moc.cpp \
@@ -255,12 +255,12 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/preferences/simple_preferences.moc.cpp \
gui/qt/dialogs/open/open_panels.moc.cpp \
gui/qt/widgets/native/interface_widgets.moc.cpp \
- gui/qt/components/navigation_history.moc.cpp \
+ gui/qt/util/navigation_history.moc.cpp \
gui/qt/menus/custom_menus.moc.cpp \
- gui/qt/components/recent_media_model.moc.cpp \
- gui/qt/components/selectable_list_model.moc.cpp \
- gui/qt/components/settings.moc.cpp \
- gui/qt/components/audio_device_model.moc.cpp \
+ gui/qt/util/recent_media_model.moc.cpp \
+ gui/qt/util/selectable_list_model.moc.cpp \
+ gui/qt/util/settings.moc.cpp \
+ gui/qt/util/audio_device_model.moc.cpp \
gui/qt/components/voutwindow/videosurface.moc.cpp \
gui/qt/components/voutwindow/qvoutwindow.moc.cpp \
gui/qt/components/voutwindow/qvoutwindowdummy.moc.cpp \
diff --git a/modules/gui/qt/components/voutwindow/videosurface.hpp b/modules/gui/qt/components/voutwindow/videosurface.hpp
index a25c1358ad..47d5828a80 100644
--- a/modules/gui/qt/components/voutwindow/videosurface.hpp
+++ b/modules/gui/qt/components/voutwindow/videosurface.hpp
@@ -20,7 +20,7 @@
#include <QtQuick/QQuickItem>
#include <QCursor>
-#include <components/qml_main_context.hpp>
+#include <util/qml_main_context.hpp>
#include "qt.hpp"
class VideoSurfaceProvider : public QObject
diff --git a/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
index 3db8e22dc0..40cd932f84 100644
--- a/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
+++ b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
@@ -27,7 +27,7 @@
#include <QObject>
-#include "components/qml_main_context.hpp"
+#include "util/qml_main_context.hpp"
class DialogId {
diff --git a/modules/gui/qt/dialogs/dialogs_provider.cpp b/modules/gui/qt/dialogs/dialogs_provider.cpp
index 8d8be5806f..c985615490 100644
--- a/modules/gui/qt/dialogs/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs/dialogs_provider.cpp
@@ -32,7 +32,7 @@
#include "player/player_controller.hpp" /* Load Subtitles */
#include "playlist/playlist_controller.hpp"
#include "menus/menus.hpp"
-#include "recents.hpp"
+#include "util/recents.hpp"
#include "util/qt_dirs.hpp"
#include "widgets/native/customwidgets.hpp" /* VLCKeyToString() */
#include "maininterface/main_interface.hpp"
diff --git a/modules/gui/qt/dialogs/open/open.cpp b/modules/gui/qt/dialogs/open/open.cpp
index aa67b83c51..0080e892b6 100644
--- a/modules/gui/qt/dialogs/open/open.cpp
+++ b/modules/gui/qt/dialogs/open/open.cpp
@@ -26,7 +26,7 @@
#include "dialogs/open/open.hpp"
#include "dialogs/dialogs_provider.hpp"
-#include "recents.hpp"
+#include "util/recents.hpp"
#include "util/qt_dirs.hpp"
#include <QTabWidget>
diff --git a/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
index d59894a9e1..36f60de727 100644
--- a/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
+++ b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
@@ -21,7 +21,7 @@
#endif
#include "toolbareditor.hpp"
-#include "components/settings.hpp"
+#include "util/settings.hpp"
#include "player/playercontrolbarmodel.hpp"
#include "maininterface/main_interface.hpp"
diff --git a/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
index 069a943578..2002b335a2 100644
--- a/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
+++ b/modules/gui/qt/dialogs/toolbar/toolbareditor.hpp
@@ -20,7 +20,7 @@
#define QVLC_TOOLBAREDITOR_DIALOG_H_ 1
#include "widgets/native/qvlcframe.hpp" /* QVLCDialog */
-#include "components/qml_main_context.hpp"
+#include "util/qml_main_context.hpp"
#include "dialogs/sout/profile_selector.hpp"
#include <QAbstractListModel>
diff --git a/modules/gui/qt/maininterface/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp
index ab1290b938..3849c2c3c8 100644
--- a/modules/gui/qt/maininterface/main_interface.cpp
+++ b/modules/gui/qt/maininterface/main_interface.cpp
@@ -30,7 +30,7 @@
#include "maininterface/main_interface.hpp"
#include "player/player_controller.hpp" // Creation
-#include "managers/renderer_manager.hpp"
+#include "util/renderer_manager.hpp"
#include "widgets/native/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include "util/qt_dirs.hpp" // toNativeSeparators
@@ -52,20 +52,20 @@
#include "medialibrary/mlvideomodel.hpp"
#include "medialibrary/mlrecentsvideomodel.hpp"
-#include "components/recent_media_model.hpp"
-#include "components/settings.hpp"
+#include "util/recent_media_model.hpp"
+#include "util/settings.hpp"
#include "network/networkmediamodel.hpp"
#include "network/networkdevicemodel.hpp"
-#include "components/navigation_history.hpp"
+#include "util/navigation_history.hpp"
#include "dialogs/help/aboutmodel.hpp"
#include "dialogs/dialogs/dialogmodel.hpp"
#include "player/playercontrolbarmodel.hpp"
#include "components/voutwindow/qvoutwindowdummy.hpp"
-#include "components/qml_main_context.hpp"
+#include "util/qml_main_context.hpp"
#include "util/qmleventfilter.hpp"
diff --git a/modules/gui/qt/medialibrary/medialib.cpp b/modules/gui/qt/medialibrary/medialib.cpp
index 3a63a293bd..bd840c418c 100644
--- a/modules/gui/qt/medialibrary/medialib.cpp
+++ b/modules/gui/qt/medialibrary/medialib.cpp
@@ -18,7 +18,7 @@
#include "medialib.hpp"
#include "mlhelper.hpp"
-#include "recents.hpp"
+#include "util/recents.hpp"
#include <vlc_playlist.h>
#include <vlc_input_item.h>
diff --git a/modules/gui/qt/menus/custom_menus.cpp b/modules/gui/qt/menus/custom_menus.cpp
index 80dba7db89..02b29285f9 100644
--- a/modules/gui/qt/menus/custom_menus.cpp
+++ b/modules/gui/qt/menus/custom_menus.cpp
@@ -26,7 +26,7 @@
#include <vlc_renderer_discovery.h>
#include "custom_menus.hpp"
-#include "../managers/renderer_manager.hpp"
+#include "util/renderer_manager.hpp"
#include <QMenu>
#include <QAction>
diff --git a/modules/gui/qt/menus/menus.cpp b/modules/gui/qt/menus/menus.cpp
index 3ca0ebdc7a..ebee61e41c 100644
--- a/modules/gui/qt/menus/menus.cpp
+++ b/modules/gui/qt/menus/menus.cpp
@@ -41,7 +41,7 @@
#include "dialogs/dialogs_provider.hpp" /* Dialogs display */
#include "player/player_controller.hpp" /* Input Management */
#include "playlist/playlist_controller.hpp"
-#include "recents.hpp" /* Recent Items */
+#include "util/recents.hpp" /* Recent Items */
#include "dialogs/extensions/extensions_manager.hpp" /* Extensions menu */
#include "dialogs/extended/extended_panels.hpp"
#include "util/varchoicemodel.hpp"
diff --git a/modules/gui/qt/network/networkdevicemodel.hpp b/modules/gui/qt/network/networkdevicemodel.hpp
index ddb66d85d3..2387a3cbc8 100644
--- a/modules/gui/qt/network/networkdevicemodel.hpp
+++ b/modules/gui/qt/network/networkdevicemodel.hpp
@@ -30,7 +30,7 @@
#include <vlc_threads.h>
#include <vlc_cxx_helpers.hpp>
-#include <components/qml_main_context.hpp>
+#include <util/qml_main_context.hpp>
#include "networksourcelistener.hpp"
#include <memory>
diff --git a/modules/gui/qt/network/networkmediamodel.hpp b/modules/gui/qt/network/networkmediamodel.hpp
index 611ea3a9de..5000207c2c 100644
--- a/modules/gui/qt/network/networkmediamodel.hpp
+++ b/modules/gui/qt/network/networkmediamodel.hpp
@@ -30,7 +30,7 @@
#include <vlc_threads.h>
#include <vlc_cxx_helpers.hpp>
-#include <components/qml_main_context.hpp>
+#include <util/qml_main_context.hpp>
#include "networksourcelistener.hpp"
#include <memory>
diff --git a/modules/gui/qt/network/networksourcelistener.hpp b/modules/gui/qt/network/networksourcelistener.hpp
index ed63965425..9392f28883 100644
--- a/modules/gui/qt/network/networksourcelistener.hpp
+++ b/modules/gui/qt/network/networksourcelistener.hpp
@@ -28,7 +28,7 @@
#include <vlc_threads.h>
#include <vlc_cxx_helpers.hpp>
-#include <components/qml_main_context.hpp>
+#include <util/qml_main_context.hpp>
#include <memory>
#include <functional>
diff --git a/modules/gui/qt/player/player_controller.cpp b/modules/gui/qt/player/player_controller.cpp
index 164fd5f3d1..3dfb375724 100644
--- a/modules/gui/qt/player/player_controller.cpp
+++ b/modules/gui/qt/player/player_controller.cpp
@@ -22,7 +22,7 @@
#include "player_controller.hpp"
#include "player_controller_p.hpp"
-#include "recents.hpp"
+#include "util/recents.hpp"
#include <vlc_actions.h> /* ACTION_ID */
#include <vlc_url.h> /* vlc_uri_decode */
diff --git a/modules/gui/qt/player/player_controller.hpp b/modules/gui/qt/player/player_controller.hpp
index 7d987cd7b5..703b9b56a8 100644
--- a/modules/gui/qt/player/player_controller.hpp
+++ b/modules/gui/qt/player/player_controller.hpp
@@ -30,7 +30,7 @@
#include <QScopedPointer>
#include <vlc_cxx_helpers.hpp>
#include "player/input_models.hpp"
-#include "components/audio_device_model.hpp"
+#include "util/audio_device_model.hpp"
#include "util/varchoicemodel.hpp"
#include "util/vlctick.hpp"
diff --git a/modules/gui/qt/player/playercontrolbarmodel.hpp b/modules/gui/qt/player/playercontrolbarmodel.hpp
index f2ffdb5559..7f3319cb54 100644
--- a/modules/gui/qt/player/playercontrolbarmodel.hpp
+++ b/modules/gui/qt/player/playercontrolbarmodel.hpp
@@ -22,7 +22,7 @@
#include <QAbstractListModel>
#include <QVector>
-#include "components/qml_main_context.hpp"
+#include "util/qml_main_context.hpp"
class PlayerControlBarModel : public QAbstractListModel
{
diff --git a/modules/gui/qt/playlist/playlist_model.hpp b/modules/gui/qt/playlist/playlist_model.hpp
index 4aef54178b..c0b775d0f2 100644
--- a/modules/gui/qt/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 "components/selectable_list_model.hpp"
+#include "util/selectable_list_model.hpp"
namespace vlc {
namespace playlist {
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 176c6a6da7..88f3427d16 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -57,7 +57,7 @@ extern "C" char **environ;
#include "dialogs/extensions/extensions_manager.hpp" /* Extensions manager */
#include "dialogs/plugins/addons_manager.hpp" /* Addons manager */
#include "dialogs/help/help.hpp" /* Launch Update */
-#include "recents.hpp" /* Recents Item destruction */
+#include "util/recents.hpp" /* Recents Item destruction */
#include "util/qvlcapp.hpp" /* QVLCApplication definition */
#include <QVector>
diff --git a/modules/gui/qt/components/audio_device_model.cpp b/modules/gui/qt/util/audio_device_model.cpp
similarity index 100%
rename from modules/gui/qt/components/audio_device_model.cpp
rename to modules/gui/qt/util/audio_device_model.cpp
diff --git a/modules/gui/qt/components/audio_device_model.hpp b/modules/gui/qt/util/audio_device_model.hpp
similarity index 100%
rename from modules/gui/qt/components/audio_device_model.hpp
rename to modules/gui/qt/util/audio_device_model.hpp
diff --git a/modules/gui/qt/components/navigation_history.cpp b/modules/gui/qt/util/navigation_history.cpp
similarity index 100%
rename from modules/gui/qt/components/navigation_history.cpp
rename to modules/gui/qt/util/navigation_history.cpp
diff --git a/modules/gui/qt/components/navigation_history.hpp b/modules/gui/qt/util/navigation_history.hpp
similarity index 100%
rename from modules/gui/qt/components/navigation_history.hpp
rename to modules/gui/qt/util/navigation_history.hpp
diff --git a/modules/gui/qt/components/qml_main_context.cpp b/modules/gui/qt/util/qml_main_context.cpp
similarity index 100%
rename from modules/gui/qt/components/qml_main_context.cpp
rename to modules/gui/qt/util/qml_main_context.cpp
diff --git a/modules/gui/qt/components/qml_main_context.hpp b/modules/gui/qt/util/qml_main_context.hpp
similarity index 100%
rename from modules/gui/qt/components/qml_main_context.hpp
rename to modules/gui/qt/util/qml_main_context.hpp
diff --git a/modules/gui/qt/components/recent_media_model.cpp b/modules/gui/qt/util/recent_media_model.cpp
similarity index 100%
rename from modules/gui/qt/components/recent_media_model.cpp
rename to modules/gui/qt/util/recent_media_model.cpp
diff --git a/modules/gui/qt/components/recent_media_model.hpp b/modules/gui/qt/util/recent_media_model.hpp
similarity index 98%
rename from modules/gui/qt/components/recent_media_model.hpp
rename to modules/gui/qt/util/recent_media_model.hpp
index c37fae9b77..b45799e2aa 100644
--- a/modules/gui/qt/components/recent_media_model.hpp
+++ b/modules/gui/qt/util/recent_media_model.hpp
@@ -30,7 +30,7 @@
#include <QObject>
#include <QStringList>
-#include "recents.hpp"
+#include "util/recents.hpp"
class VLCRecentMediaModel : public QAbstractListModel
{
diff --git a/modules/gui/qt/recents.cpp b/modules/gui/qt/util/recents.cpp
similarity index 99%
rename from modules/gui/qt/recents.cpp
rename to modules/gui/qt/util/recents.cpp
index 3ca98ffb44..9ea0c68ab5 100644
--- a/modules/gui/qt/recents.cpp
+++ b/modules/gui/qt/util/recents.cpp
@@ -22,7 +22,7 @@
*****************************************************************************/
#include "qt.hpp"
-#include "recents.hpp"
+#include "util/recents.hpp"
#include "dialogs/dialogs_provider.hpp"
#include "menus/menus.hpp"
#include "util/qt_dirs.hpp"
diff --git a/modules/gui/qt/recents.hpp b/modules/gui/qt/util/recents.hpp
similarity index 100%
rename from modules/gui/qt/recents.hpp
rename to modules/gui/qt/util/recents.hpp
diff --git a/modules/gui/qt/managers/renderer_manager.cpp b/modules/gui/qt/util/renderer_manager.cpp
similarity index 100%
rename from modules/gui/qt/managers/renderer_manager.cpp
rename to modules/gui/qt/util/renderer_manager.cpp
diff --git a/modules/gui/qt/managers/renderer_manager.hpp b/modules/gui/qt/util/renderer_manager.hpp
similarity index 100%
rename from modules/gui/qt/managers/renderer_manager.hpp
rename to modules/gui/qt/util/renderer_manager.hpp
diff --git a/modules/gui/qt/components/selectable_list_model.cpp b/modules/gui/qt/util/selectable_list_model.cpp
similarity index 100%
rename from modules/gui/qt/components/selectable_list_model.cpp
rename to modules/gui/qt/util/selectable_list_model.cpp
diff --git a/modules/gui/qt/components/selectable_list_model.hpp b/modules/gui/qt/util/selectable_list_model.hpp
similarity index 100%
rename from modules/gui/qt/components/selectable_list_model.hpp
rename to modules/gui/qt/util/selectable_list_model.hpp
diff --git a/modules/gui/qt/components/settings.cpp b/modules/gui/qt/util/settings.cpp
similarity index 100%
rename from modules/gui/qt/components/settings.cpp
rename to modules/gui/qt/util/settings.cpp
diff --git a/modules/gui/qt/components/settings.hpp b/modules/gui/qt/util/settings.hpp
similarity index 100%
rename from modules/gui/qt/components/settings.hpp
rename to modules/gui/qt/util/settings.hpp
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0898d11531..eca756ff76 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -759,8 +759,8 @@ modules/gui/qt/menus/menus.cpp
modules/gui/qt/menus/menus.hpp
modules/gui/qt/qt.cpp
modules/gui/qt/qt.hpp
-modules/gui/qt/recents.cpp
-modules/gui/qt/recents.hpp
+modules/gui/qt/util/recents.cpp
+modules/gui/qt/util/recents.hpp
modules/gui/qt/widgets/native/animators.cpp
modules/gui/qt/widgets/native/animators.hpp
modules/gui/qt/widgets/native/customwidgets.cpp
More information about the vlc-commits
mailing list