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

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Thu Dec  5 18:34:13 2019 +0100| [3be36d458072d2c6944892e06cd35d15070e26e3] | committer: Jean-Baptiste Kempf

qt: move bookmarks 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=3be36d458072d2c6944892e06cd35d15070e26e3
---

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

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 936217a0df..006fc297c6 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -54,7 +54,7 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/adapters/var_common_p.hpp \
 	gui/qt/adapters/variables.cpp gui/qt/adapters/variables.hpp \
 	gui/qt/adapters/var_choice_model.cpp  gui/qt/adapters/var_choice_model.hpp \
-	gui/qt/dialogs/bookmarks.cpp gui/qt/dialogs/bookmarks.hpp \
+	gui/qt/dialogs/bookmarks/bookmarks.cpp gui/qt/dialogs/bookmarks/bookmarks.hpp \
 	gui/qt/dialogs/mediainfo/mediainfo.cpp gui/qt/dialogs/mediainfo/mediainfo.hpp \
 	gui/qt/dialogs/mediainfo/info_panels.cpp gui/qt/dialogs/mediainfo/info_panels.hpp \
 	gui/qt/dialogs/mediainfo/info_widgets.cpp gui/qt/dialogs/mediainfo/info_widgets.hpp \
@@ -236,7 +236,7 @@ nodist_libqt_plugin_la_SOURCES = \
 	gui/qt/recents.moc.cpp \
 	gui/qt/adapters/variables.moc.cpp \
 	gui/qt/adapters/var_choice_model.moc.cpp \
-	gui/qt/dialogs/bookmarks.moc.cpp \
+	gui/qt/dialogs/bookmarks/bookmarks.moc.cpp \
 	gui/qt/dialogs/mediainfo/mediainfo.moc.cpp \
 	gui/qt/dialogs/mediainfo/info_panels.moc.cpp \
 	gui/qt/dialogs/mediainfo/info_widgets.moc.cpp \
diff --git a/modules/gui/qt/dialogs/bookmarks.cpp b/modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/bookmarks.cpp
rename to modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
index a9ff4f907a..8202e388f7 100644
--- a/modules/gui/qt/dialogs/bookmarks.cpp
+++ b/modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include "dialogs/bookmarks.hpp"
+#include "bookmarks.hpp"
 #include "player/player_controller.hpp"
 
 #include <QHBoxLayout>
diff --git a/modules/gui/qt/dialogs/bookmarks.hpp b/modules/gui/qt/dialogs/bookmarks/bookmarks.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/bookmarks.hpp
rename to modules/gui/qt/dialogs/bookmarks/bookmarks.hpp
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 5fce30e2b3..ee642bf845 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -38,7 +38,7 @@
 #include "main_interface.hpp"
 
 /* The dialogs */
-#include "dialogs/bookmarks.hpp"
+#include "dialogs/bookmarks/bookmarks.hpp"
 #include "dialogs/preferences/preferences.hpp"
 #include "dialogs/mediainfo/mediainfo.hpp"
 #include "dialogs/messages/messages.hpp"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9375a37994..ffaf2519bb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -711,8 +711,8 @@ modules/gui/qt/dialogs/sout/profile_selector.hpp
 modules/gui/qt/dialogs/sout/profiles.hpp
 modules/gui/qt/dialogs/sout/sout_widgets.cpp
 modules/gui/qt/dialogs/sout/sout_widgets.hpp
-modules/gui/qt/dialogs/bookmarks.cpp
-modules/gui/qt/dialogs/bookmarks.hpp
+modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
+modules/gui/qt/dialogs/bookmarks/bookmarks.hpp
 modules/gui/qt/dialogs/sout/convert.cpp
 modules/gui/qt/dialogs/sout/convert.hpp
 modules/gui/qt/dialogs/epg/epg.cpp