[vlc-commits] qt: move the dialog provider to the dialog folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:36 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Dec 6 12:06:02 2019 +0100| [630f639f2dc8d4a97911bb92790f438b6b01b87c] | committer: Jean-Baptiste Kempf
qt: move the dialog provider to the dialog 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=630f639f2dc8d4a97911bb92790f438b6b01b87c
---
modules/gui/qt/Makefile.am | 6 +++---
modules/gui/qt/components/controller.cpp | 2 +-
modules/gui/qt/components/interface_widgets.cpp | 2 +-
modules/gui/qt/components/interface_widgets.hpp | 2 +-
modules/gui/qt/{ => dialogs}/dialogs_provider.cpp | 0
modules/gui/qt/{ => dialogs}/dialogs_provider.hpp | 0
modules/gui/qt/dialogs/extended/extended_panels.cpp | 2 +-
modules/gui/qt/dialogs/open/open.cpp | 2 +-
modules/gui/qt/dialogs/open/open_panels.cpp | 2 +-
modules/gui/qt/main_interface_win32.cpp | 2 +-
modules/gui/qt/menus.cpp | 2 +-
modules/gui/qt/qt.cpp | 2 +-
modules/gui/qt/recents.cpp | 2 +-
po/POTFILES.in | 4 ++--
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 49193f1fed..cb52d8314e 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -48,7 +48,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/qt.cpp gui/qt/qt.hpp \
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/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/adapters/var_common_p.hpp \
@@ -226,12 +226,12 @@ moc_verbose__0 = $(moc_verbose_0)
$(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $<
# These MOC files depend on the configure settings:
-dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h
+dialogs/dialogs_provider.moc.cpp dialogs/vlm/vlm.moc.cpp: $(top_builddir)/config.h
nodist_libqt_plugin_la_SOURCES = \
gui/qt/main_interface.moc.cpp \
gui/qt/menus.moc.cpp \
- gui/qt/dialogs_provider.moc.cpp \
+ gui/qt/dialogs/dialogs_provider.moc.cpp \
gui/qt/managers/renderer_manager.moc.cpp \
gui/qt/recents.moc.cpp \
gui/qt/adapters/variables.moc.cpp \
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index 922bdcc4de..6a7199872b 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -33,7 +33,7 @@
#include "util/buttons/BrowseButton.hpp"
#include "util/buttons/RoundButton.hpp"
-#include "dialogs_provider.hpp" /* Opening Dialogs */
+#include "dialogs/dialogs_provider.hpp" /* Opening Dialogs */
#include "playlist/playlist_controller.hpp"
#include "util/input_slider.hpp" /* SeekSlider */
diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 3105d5466e..c8b9c9e8de 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -29,7 +29,7 @@
#include "qt.hpp"
#include "components/interface_widgets.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs/dialogs_provider.hpp"
#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include <QLabel>
diff --git a/modules/gui/qt/components/interface_widgets.hpp b/modules/gui/qt/components/interface_widgets.hpp
index ebc51f8cfb..53a91a6b3b 100644
--- a/modules/gui/qt/components/interface_widgets.hpp
+++ b/modules/gui/qt/components/interface_widgets.hpp
@@ -34,7 +34,7 @@
#include "components/controller.hpp"
#include "components/controller_widget.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs/dialogs_provider.hpp"
#include "dialogs/mediainfo/info_panels.hpp"
#include <QWidget>
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs/dialogs_provider.cpp
similarity index 100%
rename from modules/gui/qt/dialogs_provider.cpp
rename to modules/gui/qt/dialogs/dialogs_provider.cpp
diff --git a/modules/gui/qt/dialogs_provider.hpp b/modules/gui/qt/dialogs/dialogs_provider.hpp
similarity index 100%
rename from modules/gui/qt/dialogs_provider.hpp
rename to modules/gui/qt/dialogs/dialogs_provider.hpp
diff --git a/modules/gui/qt/dialogs/extended/extended_panels.cpp b/modules/gui/qt/dialogs/extended/extended_panels.cpp
index 4bf104f3c1..9c524f589e 100644
--- a/modules/gui/qt/dialogs/extended/extended_panels.cpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.cpp
@@ -50,7 +50,7 @@
#include "player/player_controller.hpp"
#include "util/qt_dirs.hpp"
#include "util/customwidgets.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs/dialogs_provider.hpp"
#include "../../../../audio_filter/equalizer_presets.h"
#include <vlc_modules.h>
diff --git a/modules/gui/qt/dialogs/open/open.cpp b/modules/gui/qt/dialogs/open/open.cpp
index c82e4e9e06..aa67b83c51 100644
--- a/modules/gui/qt/dialogs/open/open.cpp
+++ b/modules/gui/qt/dialogs/open/open.cpp
@@ -25,7 +25,7 @@
#endif
#include "dialogs/open/open.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs/dialogs_provider.hpp"
#include "recents.hpp"
#include "util/qt_dirs.hpp"
diff --git a/modules/gui/qt/dialogs/open/open_panels.cpp b/modules/gui/qt/dialogs/open/open_panels.cpp
index 970cefc6eb..3bdaaf5328 100644
--- a/modules/gui/qt/dialogs/open/open_panels.cpp
+++ b/modules/gui/qt/dialogs/open/open_panels.cpp
@@ -32,7 +32,7 @@
#include "qt.hpp"
#include "open_panels.hpp"
#include "dialogs/open/open.hpp"
-#include "dialogs_provider.hpp" /* Open Subtitle file */
+#include "dialogs/dialogs_provider.hpp" /* Open Subtitle file */
#include "util/qt_dirs.hpp"
#include "util/validators.hpp"
#include <vlc_intf_strings.h>
diff --git a/modules/gui/qt/main_interface_win32.cpp b/modules/gui/qt/main_interface_win32.cpp
index 86307da7e5..aad0c7e33e 100644
--- a/modules/gui/qt/main_interface_win32.cpp
+++ b/modules/gui/qt/main_interface_win32.cpp
@@ -28,7 +28,7 @@
#include "main_interface_win32.hpp"
#include "player/player_controller.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs/dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
#include <QBitmap>
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 174a46a7a8..f3095ee28f 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -38,7 +38,7 @@
#include "menus.hpp"
#include "main_interface.hpp" /* View modifications */
-#include "dialogs_provider.hpp" /* Dialogs display */
+#include "dialogs/dialogs_provider.hpp" /* Dialogs display */
#include "player/player_controller.hpp" /* Input Management */
#include "playlist/playlist_controller.hpp"
#include "recents.hpp" /* Recent Items */
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 823b9be45e..1997e8d7b8 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -48,7 +48,7 @@ extern "C" char **environ;
#include "player/player_controller.hpp" /* THEMIM destruction */
#include "playlist/playlist_controller.hpp" /* THEMPL creation */
-#include "dialogs_provider.hpp" /* THEDP creation */
+#include "dialogs/dialogs_provider.hpp" /* THEDP creation */
#ifdef _WIN32
# include "main_interface_win32.hpp"
#else
diff --git a/modules/gui/qt/recents.cpp b/modules/gui/qt/recents.cpp
index b4f289ebbc..284f1cef12 100644
--- a/modules/gui/qt/recents.cpp
+++ b/modules/gui/qt/recents.cpp
@@ -23,7 +23,7 @@
#include "qt.hpp"
#include "recents.hpp"
-#include "dialogs_provider.hpp"
+#include "dialogs/dialogs_provider.hpp"
#include "menus.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_cxx_helpers.hpp>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cb17b1b2f0..04135f9d11 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -751,8 +751,8 @@ modules/gui/qt/dialogs/toolbar/toolbar.cpp
modules/gui/qt/dialogs/toolbar/toolbar.hpp
modules/gui/qt/dialogs/vlm/vlm.cpp
modules/gui/qt/dialogs/vlm/vlm.hpp
-modules/gui/qt/dialogs_provider.cpp
-modules/gui/qt/dialogs_provider.hpp
+modules/gui/qt/dialogs/dialogs_provider.cpp
+modules/gui/qt/dialogs/dialogs_provider.hpp
modules/gui/qt/dialogs/extensions/extensions_manager.cpp
modules/gui/qt/dialogs/extensions/extensions_manager.hpp
modules/gui/qt/main_interface.cpp
More information about the vlc-commits
mailing list