[vlc-commits] qt: move podcast configuration dialog to its own folder

Pierre Lamot git at videolan.org
Tue Dec 17 15:37:28 CET 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Thu Dec  5 16:54:17 2019 +0100| [5170f808ec54d94e3e09a011582a2115aa160e2e] | committer: Jean-Baptiste Kempf

qt: move podcast configuration dialog 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=5170f808ec54d94e3e09a011582a2115aa160e2e
---

 modules/gui/qt/Makefile.am                                     | 10 +++++-----
 modules/gui/qt/dialogs/{ => podcast}/podcast_configuration.cpp |  0
 modules/gui/qt/dialogs/{ => podcast}/podcast_configuration.hpp |  2 +-
 .../gui/qt/{ui => dialogs/podcast}/podcast_configuration.ui    |  0
 modules/gui/qt/dialogs_provider.cpp                            |  2 +-
 po/POTFILES.in                                                 |  6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 0341a71726..a1f11fc166 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -71,8 +71,8 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/open/openurl.cpp gui/qt/dialogs/open/openurl.hpp \
 	gui/qt/dialogs/vlm.cpp gui/qt/dialogs/vlm.hpp \
 	gui/qt/dialogs/firstrun/firstrun.cpp gui/qt/dialogs/firstrun/firstrun.hpp \
-	gui/qt/dialogs/podcast_configuration.cpp \
-	gui/qt/dialogs/podcast_configuration.hpp \
+	gui/qt/dialogs/podcast/podcast_configuration.cpp \
+	gui/qt/dialogs/podcast/podcast_configuration.hpp \
 	gui/qt/dialogs/extensions/extensions.cpp gui/qt/dialogs/extensions/extensions.hpp \
 	gui/qt/dialogs/extensions/extensions_manager.cpp gui/qt/dialogs/extensions/extensions_manager.hpp \
 	gui/qt/dialogs/fingerprint/fingerprintdialog.cpp \
@@ -251,7 +251,7 @@ nodist_libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/toolbareditor.moc.cpp \
 	gui/qt/dialogs/open/open.moc.cpp \
 	gui/qt/dialogs/open/openurl.moc.cpp \
-	gui/qt/dialogs/podcast_configuration.moc.cpp \
+	gui/qt/dialogs/podcast/podcast_configuration.moc.cpp \
 	gui/qt/dialogs/firstrun/firstrun.moc.cpp \
 	gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
 	gui/qt/dialogs/extensions/extensions.moc.cpp \
@@ -340,7 +340,7 @@ nodist_libqt_plugin_la_SOURCES += \
 	gui/qt/dialogs/open/ui_open_capture.h \
 	gui/qt/dialogs/open/ui_open.h \
 	gui/qt/ui/ui_vlm.h \
-	gui/qt/ui/ui_podcast_configuration.h \
+	gui/qt/dialogs/podcast/ui_podcast_configuration.h \
 	gui/qt/dialogs/sout/ui_profiles.h \
 	gui/qt/dialogs/preferences/ui_sprefs_audio.h \
 	gui/qt/dialogs/preferences/ui_sprefs_input.h \
@@ -379,7 +379,7 @@ libqt_plugin_la_UI = \
 	gui/qt/dialogs/open/open_net.ui \
 	gui/qt/dialogs/open/open_capture.ui \
 	gui/qt/dialogs/open/open.ui \
-	gui/qt/ui/podcast_configuration.ui \
+	gui/qt/dialogs/podcast/podcast_configuration.ui \
 	gui/qt/dialogs/sout/profiles.ui \
 	gui/qt/dialogs/preferences/sprefs_audio.ui \
 	gui/qt/dialogs/preferences/sprefs_input.ui \
diff --git a/modules/gui/qt/dialogs/podcast_configuration.cpp b/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
similarity index 100%
rename from modules/gui/qt/dialogs/podcast_configuration.cpp
rename to modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
diff --git a/modules/gui/qt/dialogs/podcast_configuration.hpp b/modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
similarity index 96%
rename from modules/gui/qt/dialogs/podcast_configuration.hpp
rename to modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
index 2be8ad4e0b..331ce1eb55 100644
--- a/modules/gui/qt/dialogs/podcast_configuration.hpp
+++ b/modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
@@ -24,7 +24,7 @@
 #define QVLC_PODCAST_CONFIGURATION_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
-#include "ui_podcast_configuration.h"
+#include "dialogs/podcast/ui_podcast_configuration.h"
 #include "util/singleton.hpp"
 
 class PodcastConfigDialog : public QVLCDialog, public Singleton<PodcastConfigDialog>
diff --git a/modules/gui/qt/ui/podcast_configuration.ui b/modules/gui/qt/dialogs/podcast/podcast_configuration.ui
similarity index 100%
rename from modules/gui/qt/ui/podcast_configuration.ui
rename to modules/gui/qt/dialogs/podcast/podcast_configuration.ui
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 72075c0d8c..5b3a143665 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -50,7 +50,7 @@
 #include "dialogs/open/openurl.hpp"
 #include "dialogs/help/help.hpp"
 #include "dialogs/gototime.hpp"
-#include "dialogs/podcast_configuration.hpp"
+#include "dialogs/podcast/podcast_configuration.hpp"
 #include "dialogs/toolbar.hpp"
 #include "dialogs/toolbareditor.hpp"
 #include "dialogs/plugins/plugins.hpp"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a3fe95ed80..80540652bb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -741,8 +741,8 @@ modules/gui/qt/dialogs/open/openurl.cpp
 modules/gui/qt/dialogs/open/openurl.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/podcast/podcast_configuration.cpp
+modules/gui/qt/dialogs/podcast/podcast_configuration.hpp
 modules/gui/qt/dialogs/preferences/preferences.cpp
 modules/gui/qt/dialogs/preferences/preferences.hpp
 modules/gui/qt/dialogs/sout/sout.cpp
@@ -1283,7 +1283,7 @@ share/lua/http/mobile_view.html
 #modules/gui/qt/dialogs/open/ui_open_disk.h
 #modules/gui/qt/dialogs/open/ui_open_file.h
 #modules/gui/qt/dialogs/open/ui_open_net.h
-#modules/gui/qt/ui/ui_podcast_configuration.h
+#modules/gui/qt/dialogs/podcast/ui_podcast_configuration.h
 #modules/gui/qt/dialogs/sout/ui_profiles.h
 #modules/gui/qt/dialogs/sout/ui_sout.h
 #modules/gui/qt/dialogs/preferences/ui_sprefs_audio.h



More information about the vlc-commits mailing list