From 595ff14e90105a25f67974325f747b2ea94fd1b8 Mon Sep 17 00:00:00 2001
From: Pierre Lamot <pierre@videolabs.io>
Date: Tue, 15 Oct 2019 09:25:50 +0200
Subject: [PATCH] qt: move plugin dialog to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/qt/Makefile.am | 8 ++++----
.../qt/{managers => dialogs/plugins}/addons_manager.cpp | 0
.../qt/{managers => dialogs/plugins}/addons_manager.hpp | 0
modules/gui/qt/dialogs/{ => plugins}/plugins.cpp | 2 +-
modules/gui/qt/dialogs/{ => plugins}/plugins.hpp | 0
modules/gui/qt/dialogs_provider.cpp | 2 +-
modules/gui/qt/qt.cpp | 2 +-
po/POTFILES.in | 8 ++++----
8 files changed, 11 insertions(+), 11 deletions(-)
rename modules/gui/qt/{managers => dialogs/plugins}/addons_manager.cpp (100%)
rename modules/gui/qt/{managers => dialogs/plugins}/addons_manager.hpp (100%)
rename modules/gui/qt/dialogs/{ => plugins}/plugins.cpp (99%)
rename modules/gui/qt/dialogs/{ => plugins}/plugins.hpp (100%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 1af1ce41f4e0..e384284ce6b8 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -49,7 +49,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/menus.cpp gui/qt/menus.hpp \
gui/qt/main_interface.cpp gui/qt/main_interface.hpp \
gui/qt/dialogs_provider.cpp gui/qt/dialogs_provider.hpp \
- gui/qt/managers/addons_manager.cpp gui/qt/managers/addons_manager.hpp \
gui/qt/managers/renderer_manager.cpp gui/qt/managers/renderer_manager.hpp \
gui/qt/recents.cpp gui/qt/recents.hpp \
gui/qt/adapters/chromaprint.cpp gui/qt/adapters/chromaprint.hpp \
@@ -62,7 +61,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/extended.cpp gui/qt/dialogs/extended.hpp \
gui/qt/dialogs/messages.cpp gui/qt/dialogs/messages.hpp \
gui/qt/dialogs/errors.cpp gui/qt/dialogs/errors.hpp \
- gui/qt/dialogs/plugins.cpp gui/qt/dialogs/plugins.hpp \
+ gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
+ gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
gui/qt/dialogs/sout.cpp gui/qt/dialogs/sout.hpp \
gui/qt/dialogs/convert.cpp gui/qt/dialogs/convert.hpp \
gui/qt/dialogs/help.cpp gui/qt/dialogs/help.hpp \
@@ -231,7 +231,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/main_interface.moc.cpp \
gui/qt/menus.moc.cpp \
gui/qt/dialogs_provider.moc.cpp \
- gui/qt/managers/addons_manager.moc.cpp \
gui/qt/managers/renderer_manager.moc.cpp \
gui/qt/recents.moc.cpp \
gui/qt/adapters/chromaprint.moc.cpp \
@@ -243,7 +242,8 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/messages.moc.cpp \
gui/qt/dialogs/epg.moc.cpp \
gui/qt/dialogs/errors.moc.cpp \
- gui/qt/dialogs/plugins.moc.cpp \
+ gui/qt/dialogs/plugins/addons_manager.moc.cpp \
+ gui/qt/dialogs/plugins/plugins.moc.cpp \
gui/qt/dialogs/sout.moc.cpp \
gui/qt/dialogs/convert.moc.cpp \
gui/qt/dialogs/help.moc.cpp \
diff --git a/modules/gui/qt/managers/addons_manager.cpp b/modules/gui/qt/dialogs/plugins/addons_manager.cpp
similarity index 100%
rename from modules/gui/qt/managers/addons_manager.cpp
rename to modules/gui/qt/dialogs/plugins/addons_manager.cpp
diff --git a/modules/gui/qt/managers/addons_manager.hpp b/modules/gui/qt/dialogs/plugins/addons_manager.hpp
similarity index 100%
rename from modules/gui/qt/managers/addons_manager.hpp
rename to modules/gui/qt/dialogs/plugins/addons_manager.hpp
diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins/plugins.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/plugins.cpp
rename to modules/gui/qt/dialogs/plugins/plugins.cpp
index e36dcba3ae4b..aacc65b03a63 100644
--- a/modules/gui/qt/dialogs/plugins.cpp
+++ b/modules/gui/qt/dialogs/plugins/plugins.cpp
@@ -29,7 +29,7 @@
#include "util/searchlineedit.hpp"
#include "dialogs/extensions/extensions_manager.hpp"
-#include "managers/addons_manager.hpp"
+#include "addons_manager.hpp"
#include "util/animators.hpp"
#include "util/imagehelper.hpp"
diff --git a/modules/gui/qt/dialogs/plugins.hpp b/modules/gui/qt/dialogs/plugins/plugins.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/plugins.hpp
rename to modules/gui/qt/dialogs/plugins/plugins.hpp
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 6be4665a2437..ea4bd76c32a0 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -53,7 +53,7 @@
#include "dialogs/podcast_configuration.hpp"
#include "dialogs/toolbar.hpp"
#include "dialogs/toolbareditor.hpp"
-#include "dialogs/plugins.hpp"
+#include "dialogs/plugins/plugins.hpp"
#include "dialogs/epg.hpp"
#include "dialogs/errors.hpp"
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index d145ba438f62..3cd9e1e19c6e 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -55,7 +55,7 @@ extern "C" char **environ;
# include "main_interface.hpp" /* MainInterface creation */
#endif
#include "dialogs/extensions/extensions_manager.hpp" /* Extensions manager */
-#include "managers/addons_manager.hpp" /* Addons manager */
+#include "dialogs/plugins/addons_manager.hpp" /* Addons manager */
#include "dialogs/help.hpp" /* Launch Update */
#include "recents.hpp" /* Recents Item destruction */
#include "util/qvlcapp.hpp" /* QVLCApplication definition */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1109527637be..49abe79acae4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -739,8 +739,8 @@ modules/gui/qt/dialogs/open.cpp
modules/gui/qt/dialogs/open.hpp
modules/gui/qt/dialogs/openurl.cpp
modules/gui/qt/dialogs/openurl.hpp
-modules/gui/qt/dialogs/plugins.cpp
-modules/gui/qt/dialogs/plugins.hpp
+modules/gui/qt/dialogs/plugins/plugins.cpp
+modules/gui/qt/dialogs/plugins/plugins.hpp
modules/gui/qt/dialogs/podcast_configuration.cpp
modules/gui/qt/dialogs/podcast_configuration.hpp
modules/gui/qt/dialogs/preferences/preferences.cpp
@@ -759,8 +759,8 @@ modules/gui/qt/main_interface.cpp
modules/gui/qt/main_interface.hpp
modules/gui/qt/main_interface_win32.cpp
modules/gui/qt/main_interface_win32.hpp
-modules/gui/qt/managers/addons_manager.cpp
-modules/gui/qt/managers/addons_manager.hpp
+modules/gui/qt/dialogs/plugins/addons_manager.cpp
+modules/gui/qt/dialogs/plugins/addons_manager.hpp
modules/gui/qt/menus.cpp
modules/gui/qt/menus.hpp
modules/gui/qt/qt.cpp
--
GitLab