From d7cf06b49db321dcf071b48068abeadb0aafe46a Mon Sep 17 00:00:00 2001
From: Pierre Lamot <pierre@videolabs.io>
Date: Tue, 15 Oct 2019 16:34:57 +0200
Subject: [PATCH] qt: move media info dialogs component to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/qt/Makefile.am | 12 ++++++------
modules/gui/qt/components/interface_widgets.hpp | 2 +-
.../mediainfo}/info_panels.cpp | 2 +-
.../mediainfo}/info_panels.hpp | 0
.../mediainfo}/info_widgets.cpp | 0
.../mediainfo}/info_widgets.hpp | 0
modules/gui/qt/dialogs/{ => mediainfo}/mediainfo.cpp | 2 +-
modules/gui/qt/dialogs/{ => mediainfo}/mediainfo.hpp | 2 +-
modules/gui/qt/dialogs_provider.cpp | 2 +-
po/POTFILES.in | 12 ++++++------
10 files changed, 17 insertions(+), 17 deletions(-)
rename modules/gui/qt/{components => dialogs/mediainfo}/info_panels.cpp (99%)
rename modules/gui/qt/{components => dialogs/mediainfo}/info_panels.hpp (100%)
rename modules/gui/qt/{components => dialogs/mediainfo}/info_widgets.cpp (100%)
rename modules/gui/qt/{components => dialogs/mediainfo}/info_widgets.hpp (100%)
rename modules/gui/qt/dialogs/{ => mediainfo}/mediainfo.cpp (99%)
rename modules/gui/qt/dialogs/{ => mediainfo}/mediainfo.hpp (98%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 0c078dba1036..530f9c408eeb 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -55,7 +55,9 @@ libqt_plugin_la_SOURCES = \
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/mediainfo.cpp gui/qt/dialogs/mediainfo.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 \
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 \
@@ -85,8 +87,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/dialogmodel.hpp \
gui/qt/components/extended_panels.cpp \
gui/qt/components/extended_panels.hpp \
- gui/qt/components/info_panels.cpp gui/qt/components/info_panels.hpp \
- gui/qt/components/info_widgets.cpp gui/qt/components/info_widgets.hpp \
gui/qt/components/navigation_history.cpp gui/qt/components/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 \
@@ -237,7 +237,9 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/adapters/variables.moc.cpp \
gui/qt/adapters/var_choice_model.moc.cpp \
gui/qt/dialogs/bookmarks.moc.cpp \
- gui/qt/dialogs/mediainfo.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 \
gui/qt/dialogs/extended.moc.cpp \
gui/qt/dialogs/messages.moc.cpp \
gui/qt/dialogs/errors.moc.cpp \
@@ -259,8 +261,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/help/aboutmodel.moc.cpp \
gui/qt/components/dialogmodel.moc.cpp \
gui/qt/components/extended_panels.moc.cpp \
- gui/qt/components/info_panels.moc.cpp \
- gui/qt/components/info_widgets.moc.cpp \
gui/qt/player/player_controller.moc.cpp \
gui/qt/player/playercontrolbarmodel.moc.cpp \
gui/qt/dialogs/preferences/preferences.moc.cpp \
diff --git a/modules/gui/qt/components/interface_widgets.hpp b/modules/gui/qt/components/interface_widgets.hpp
index 09bfa2f68cec..ebc51f8cfb8c 100644
--- a/modules/gui/qt/components/interface_widgets.hpp
+++ b/modules/gui/qt/components/interface_widgets.hpp
@@ -35,7 +35,7 @@
#include "components/controller.hpp"
#include "components/controller_widget.hpp"
#include "dialogs_provider.hpp"
-#include "components/info_panels.hpp"
+#include "dialogs/mediainfo/info_panels.hpp"
#include <QWidget>
#include <QFrame>
diff --git a/modules/gui/qt/components/info_panels.cpp b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
similarity index 99%
rename from modules/gui/qt/components/info_panels.cpp
rename to modules/gui/qt/dialogs/mediainfo/info_panels.cpp
index 715bdfa521c7..354f473725f5 100644
--- a/modules/gui/qt/components/info_panels.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
@@ -27,7 +27,7 @@
#endif
#include "qt.hpp"
-#include "components/info_panels.hpp"
+#include "info_panels.hpp"
#include "components/interface_widgets.hpp"
#include "info_widgets.hpp"
#include "dialogs/fingerprint/fingerprintdialog.hpp"
diff --git a/modules/gui/qt/components/info_panels.hpp b/modules/gui/qt/dialogs/mediainfo/info_panels.hpp
similarity index 100%
rename from modules/gui/qt/components/info_panels.hpp
rename to modules/gui/qt/dialogs/mediainfo/info_panels.hpp
diff --git a/modules/gui/qt/components/info_widgets.cpp b/modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
similarity index 100%
rename from modules/gui/qt/components/info_widgets.cpp
rename to modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
diff --git a/modules/gui/qt/components/info_widgets.hpp b/modules/gui/qt/dialogs/mediainfo/info_widgets.hpp
similarity index 100%
rename from modules/gui/qt/components/info_widgets.hpp
rename to modules/gui/qt/dialogs/mediainfo/info_widgets.hpp
diff --git a/modules/gui/qt/dialogs/mediainfo.cpp b/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/mediainfo.cpp
rename to modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
index de2c86dd8169..649d821ab7f5 100644
--- a/modules/gui/qt/dialogs/mediainfo.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
@@ -25,7 +25,7 @@
# include "config.h"
#endif
-#include "dialogs/mediainfo.hpp"
+#include "mediainfo.hpp"
#include "player/player_controller.hpp"
#include <vlc_url.h>
diff --git a/modules/gui/qt/dialogs/mediainfo.hpp b/modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
similarity index 98%
rename from modules/gui/qt/dialogs/mediainfo.hpp
rename to modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
index 0f951877b3dd..52e119b96e12 100644
--- a/modules/gui/qt/dialogs/mediainfo.hpp
+++ b/modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
@@ -25,7 +25,7 @@
#define QVLC_MEDIAINFO_DIALOG_H_ 1
#include "util/qvlcframe.hpp"
-#include "components/info_panels.hpp"
+#include "info_panels.hpp"
#include "util/singleton.hpp"
class QTabWidget;
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index a3f9a9262ef3..827641e63887 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -40,7 +40,7 @@
/* The dialogs */
#include "dialogs/bookmarks.hpp"
#include "dialogs/preferences/preferences.hpp"
-#include "dialogs/mediainfo.hpp"
+#include "dialogs/mediainfo/mediainfo.hpp"
#include "dialogs/messages.hpp"
#include "dialogs/extended.hpp"
#include "dialogs/vlm.hpp"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e6430e8dde04..8c424d9c3665 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -694,10 +694,10 @@ modules/gui/qt/dialogs/epg/EPGWidget.cpp
modules/gui/qt/dialogs/epg/EPGWidget.hpp
modules/gui/qt/components/extended_panels.cpp
modules/gui/qt/components/extended_panels.hpp
-modules/gui/qt/components/info_panels.cpp
-modules/gui/qt/components/info_panels.hpp
-modules/gui/qt/components/info_widgets.cpp
-modules/gui/qt/components/info_widgets.hpp
+modules/gui/qt/dialogs/mediainfo/info_panels.cpp
+modules/gui/qt/dialogs/mediainfo/info_panels.hpp
+modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
+modules/gui/qt/dialogs/mediainfo/info_widgets.hpp
modules/gui/qt/components/interface_widgets.cpp
modules/gui/qt/components/interface_widgets.hpp
modules/gui/qt/components/open_panels.cpp
@@ -731,8 +731,8 @@ modules/gui/qt/dialogs/gototime.cpp
modules/gui/qt/dialogs/gototime.hpp
modules/gui/qt/dialogs/help/help.cpp
modules/gui/qt/dialogs/help/help.hpp
-modules/gui/qt/dialogs/mediainfo.cpp
-modules/gui/qt/dialogs/mediainfo.hpp
+modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
+modules/gui/qt/dialogs/mediainfo/mediainfo.hpp
modules/gui/qt/dialogs/messages.cpp
modules/gui/qt/dialogs/messages.hpp
modules/gui/qt/dialogs/open.cpp
--
GitLab