From 54893c6d89753d1bb096eeb2e033bb3b9a8330a1 Mon Sep 17 00:00:00 2001
From: Pierre Lamot <pierre@videolabs.io>
Date: Tue, 15 Oct 2019 09:32:00 +0200
Subject: [PATCH] qt: move epg dialog to its own folder
no functional changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/qt/Makefile.am | 34 +++++++++----------
.../epg/EPGChannels.cpp | 0
.../epg/EPGChannels.hpp | 0
.../{components => dialogs}/epg/EPGItem.cpp | 0
.../{components => dialogs}/epg/EPGItem.hpp | 0
.../epg/EPGProgram.cpp | 0
.../epg/EPGProgram.hpp | 0
.../{components => dialogs}/epg/EPGRuler.cpp | 0
.../{components => dialogs}/epg/EPGRuler.hpp | 0
.../{components => dialogs}/epg/EPGView.cpp | 0
.../{components => dialogs}/epg/EPGView.hpp | 0
.../{components => dialogs}/epg/EPGWidget.cpp | 0
.../{components => dialogs}/epg/EPGWidget.hpp | 0
modules/gui/qt/dialogs/{ => epg}/epg.cpp | 6 ++--
modules/gui/qt/dialogs/{ => epg}/epg.hpp | 0
modules/gui/qt/dialogs_provider.cpp | 2 +-
po/POTFILES.in | 28 +++++++--------
17 files changed, 35 insertions(+), 35 deletions(-)
rename modules/gui/qt/{components => dialogs}/epg/EPGChannels.cpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGChannels.hpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGItem.cpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGItem.hpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGProgram.cpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGProgram.hpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGRuler.cpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGRuler.hpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGView.cpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGView.hpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGWidget.cpp (100%)
rename modules/gui/qt/{components => dialogs}/epg/EPGWidget.hpp (100%)
rename modules/gui/qt/dialogs/{ => epg}/epg.cpp (98%)
rename modules/gui/qt/dialogs/{ => epg}/epg.hpp (100%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index e384284ce6b8..5f7de3494c3a 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -57,7 +57,6 @@ libqt_plugin_la_SOURCES = \
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/epg.cpp gui/qt/dialogs/epg.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 \
@@ -121,16 +120,17 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/voutwindow/qvoutwindowdummy.hpp \
gui/qt/components/custom_menus.cpp \
gui/qt/components/custom_menus.hpp \
- gui/qt/components/epg/EPGChannels.cpp \
- gui/qt/components/epg/EPGChannels.hpp \
- gui/qt/components/epg/EPGItem.cpp \
- gui/qt/components/epg/EPGItem.hpp \
- gui/qt/components/epg/EPGProgram.cpp \
- gui/qt/components/epg/EPGProgram.hpp \
- gui/qt/components/epg/EPGRuler.cpp gui/qt/components/epg/EPGRuler.hpp \
- gui/qt/components/epg/EPGView.cpp gui/qt/components/epg/EPGView.hpp \
- gui/qt/components/epg/EPGWidget.cpp \
- gui/qt/components/epg/EPGWidget.hpp \
+ gui/qt/dialogs/epg/epg.cpp gui/qt/dialogs/epg/epg.hpp \
+ gui/qt/dialogs/epg/EPGChannels.cpp \
+ gui/qt/dialogs/epg/EPGChannels.hpp \
+ gui/qt/dialogs/epg/EPGItem.cpp \
+ gui/qt/dialogs/epg/EPGItem.hpp \
+ gui/qt/dialogs/epg/EPGProgram.cpp \
+ gui/qt/dialogs/epg/EPGProgram.hpp \
+ gui/qt/dialogs/epg/EPGRuler.cpp gui/qt/dialogs/epg/EPGRuler.hpp \
+ gui/qt/dialogs/epg/EPGView.cpp gui/qt/dialogs/epg/EPGView.hpp \
+ gui/qt/dialogs/epg/EPGWidget.cpp \
+ gui/qt/dialogs/epg/EPGWidget.hpp \
gui/qt/medialibrary/medialib.cpp \
gui/qt/medialibrary/medialib.hpp \
gui/qt/medialibrary/mlhelper.hpp \
@@ -240,7 +240,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/mediainfo.moc.cpp \
gui/qt/dialogs/extended.moc.cpp \
gui/qt/dialogs/messages.moc.cpp \
- gui/qt/dialogs/epg.moc.cpp \
gui/qt/dialogs/errors.moc.cpp \
gui/qt/dialogs/plugins/addons_manager.moc.cpp \
gui/qt/dialogs/plugins/plugins.moc.cpp \
@@ -282,11 +281,12 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/voutwindow/videosurface.moc.cpp \
gui/qt/components/voutwindow/qvoutwindow.moc.cpp \
gui/qt/components/voutwindow/qvoutwindowdummy.moc.cpp \
- gui/qt/components/epg/EPGChannels.moc.cpp \
- gui/qt/components/epg/EPGProgram.moc.cpp \
- gui/qt/components/epg/EPGRuler.moc.cpp \
- gui/qt/components/epg/EPGView.moc.cpp \
- gui/qt/components/epg/EPGWidget.moc.cpp \
+ gui/qt/dialogs/epg/epg.moc.cpp \
+ gui/qt/dialogs/epg/EPGChannels.moc.cpp \
+ gui/qt/dialogs/epg/EPGProgram.moc.cpp \
+ gui/qt/dialogs/epg/EPGRuler.moc.cpp \
+ gui/qt/dialogs/epg/EPGView.moc.cpp \
+ gui/qt/dialogs/epg/EPGWidget.moc.cpp \
gui/qt/medialibrary/medialib.moc.cpp \
gui/qt/medialibrary/mlqmltypes.moc.cpp \
gui/qt/medialibrary/mlbasemodel.moc.cpp \
diff --git a/modules/gui/qt/components/epg/EPGChannels.cpp b/modules/gui/qt/dialogs/epg/EPGChannels.cpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGChannels.cpp
rename to modules/gui/qt/dialogs/epg/EPGChannels.cpp
diff --git a/modules/gui/qt/components/epg/EPGChannels.hpp b/modules/gui/qt/dialogs/epg/EPGChannels.hpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGChannels.hpp
rename to modules/gui/qt/dialogs/epg/EPGChannels.hpp
diff --git a/modules/gui/qt/components/epg/EPGItem.cpp b/modules/gui/qt/dialogs/epg/EPGItem.cpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGItem.cpp
rename to modules/gui/qt/dialogs/epg/EPGItem.cpp
diff --git a/modules/gui/qt/components/epg/EPGItem.hpp b/modules/gui/qt/dialogs/epg/EPGItem.hpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGItem.hpp
rename to modules/gui/qt/dialogs/epg/EPGItem.hpp
diff --git a/modules/gui/qt/components/epg/EPGProgram.cpp b/modules/gui/qt/dialogs/epg/EPGProgram.cpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGProgram.cpp
rename to modules/gui/qt/dialogs/epg/EPGProgram.cpp
diff --git a/modules/gui/qt/components/epg/EPGProgram.hpp b/modules/gui/qt/dialogs/epg/EPGProgram.hpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGProgram.hpp
rename to modules/gui/qt/dialogs/epg/EPGProgram.hpp
diff --git a/modules/gui/qt/components/epg/EPGRuler.cpp b/modules/gui/qt/dialogs/epg/EPGRuler.cpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGRuler.cpp
rename to modules/gui/qt/dialogs/epg/EPGRuler.cpp
diff --git a/modules/gui/qt/components/epg/EPGRuler.hpp b/modules/gui/qt/dialogs/epg/EPGRuler.hpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGRuler.hpp
rename to modules/gui/qt/dialogs/epg/EPGRuler.hpp
diff --git a/modules/gui/qt/components/epg/EPGView.cpp b/modules/gui/qt/dialogs/epg/EPGView.cpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGView.cpp
rename to modules/gui/qt/dialogs/epg/EPGView.cpp
diff --git a/modules/gui/qt/components/epg/EPGView.hpp b/modules/gui/qt/dialogs/epg/EPGView.hpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGView.hpp
rename to modules/gui/qt/dialogs/epg/EPGView.hpp
diff --git a/modules/gui/qt/components/epg/EPGWidget.cpp b/modules/gui/qt/dialogs/epg/EPGWidget.cpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGWidget.cpp
rename to modules/gui/qt/dialogs/epg/EPGWidget.cpp
diff --git a/modules/gui/qt/components/epg/EPGWidget.hpp b/modules/gui/qt/dialogs/epg/EPGWidget.hpp
similarity index 100%
rename from modules/gui/qt/components/epg/EPGWidget.hpp
rename to modules/gui/qt/dialogs/epg/EPGWidget.hpp
diff --git a/modules/gui/qt/dialogs/epg.cpp b/modules/gui/qt/dialogs/epg/epg.cpp
similarity index 98%
rename from modules/gui/qt/dialogs/epg.cpp
rename to modules/gui/qt/dialogs/epg/epg.cpp
index a78a6068d336..a3cffa2f971d 100644
--- a/modules/gui/qt/dialogs/epg.cpp
+++ b/modules/gui/qt/dialogs/epg/epg.cpp
@@ -24,10 +24,10 @@
# include "config.h"
#endif
-#include "dialogs/epg.hpp"
+#include "epg.hpp"
-#include "components/epg/EPGWidget.hpp"
-#include "components/epg/EPGItem.hpp"
+#include "EPGWidget.hpp"
+#include "EPGItem.hpp"
#include <QVBoxLayout>
#include <QSplitter>
diff --git a/modules/gui/qt/dialogs/epg.hpp b/modules/gui/qt/dialogs/epg/epg.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/epg.hpp
rename to modules/gui/qt/dialogs/epg/epg.hpp
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index ea4bd76c32a0..981a41af00e2 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -54,7 +54,7 @@
#include "dialogs/toolbar.hpp"
#include "dialogs/toolbareditor.hpp"
#include "dialogs/plugins/plugins.hpp"
-#include "dialogs/epg.hpp"
+#include "dialogs/epg/epg.hpp"
#include "dialogs/errors.hpp"
#include <QEvent>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 49abe79acae4..31df9950da42 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -680,18 +680,18 @@ modules/gui/qt/components/controller_widget.cpp
modules/gui/qt/components/controller_widget.hpp
modules/gui/qt/components/custom_menus.cpp
modules/gui/qt/components/custom_menus.hpp
-modules/gui/qt/components/epg/EPGChannels.cpp
-modules/gui/qt/components/epg/EPGChannels.hpp
-modules/gui/qt/components/epg/EPGItem.cpp
-modules/gui/qt/components/epg/EPGItem.hpp
-modules/gui/qt/components/epg/EPGProgram.cpp
-modules/gui/qt/components/epg/EPGProgram.hpp
-modules/gui/qt/components/epg/EPGRuler.cpp
-modules/gui/qt/components/epg/EPGRuler.hpp
-modules/gui/qt/components/epg/EPGView.cpp
-modules/gui/qt/components/epg/EPGView.hpp
-modules/gui/qt/components/epg/EPGWidget.cpp
-modules/gui/qt/components/epg/EPGWidget.hpp
+modules/gui/qt/dialogs/epg/EPGChannels.cpp
+modules/gui/qt/dialogs/epg/EPGChannels.hpp
+modules/gui/qt/dialogs/epg/EPGItem.cpp
+modules/gui/qt/dialogs/epg/EPGItem.hpp
+modules/gui/qt/dialogs/epg/EPGProgram.cpp
+modules/gui/qt/dialogs/epg/EPGProgram.hpp
+modules/gui/qt/dialogs/epg/EPGRuler.cpp
+modules/gui/qt/dialogs/epg/EPGRuler.hpp
+modules/gui/qt/dialogs/epg/EPGView.cpp
+modules/gui/qt/dialogs/epg/EPGView.hpp
+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
@@ -715,8 +715,8 @@ modules/gui/qt/dialogs/bookmarks.cpp
modules/gui/qt/dialogs/bookmarks.hpp
modules/gui/qt/dialogs/convert.cpp
modules/gui/qt/dialogs/convert.hpp
-modules/gui/qt/dialogs/epg.cpp
-modules/gui/qt/dialogs/epg.hpp
+modules/gui/qt/dialogs/epg/epg.cpp
+modules/gui/qt/dialogs/epg/epg.hpp
modules/gui/qt/dialogs/errors.cpp
modules/gui/qt/dialogs/errors.hpp
modules/gui/qt/dialogs/extended.cpp
--
GitLab