From b6f0157f7213afef17b41d2bb3775d91bb41ebb6 Mon Sep 17 00:00:00 2001
From: Pierre Lamot <pierre@videolabs.io>
Date: Tue, 15 Oct 2019 10:15:45 +0200
Subject: [PATCH] qt: move fingerprint dialog component to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/qt/Makefile.am | 15 ++++++++-------
modules/gui/qt/components/info_panels.cpp | 4 ++--
.../fingerprint}/chromaprint.cpp | 0
.../fingerprint}/chromaprint.hpp | 0
.../{ => fingerprint}/fingerprintdialog.cpp | 6 +++---
.../{ => fingerprint}/fingerprintdialog.hpp | 0
.../fingerprint}/fingerprintdialog.ui | 0
po/POTFILES.in | 8 ++++----
8 files changed, 17 insertions(+), 16 deletions(-)
rename modules/gui/qt/{adapters => dialogs/fingerprint}/chromaprint.cpp (100%)
rename modules/gui/qt/{adapters => dialogs/fingerprint}/chromaprint.hpp (100%)
rename modules/gui/qt/dialogs/{ => fingerprint}/fingerprintdialog.cpp (96%)
rename modules/gui/qt/dialogs/{ => fingerprint}/fingerprintdialog.hpp (100%)
rename modules/gui/qt/{ui => dialogs/fingerprint}/fingerprintdialog.ui (100%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 5f7de3494c3a..aa171b4f5e84 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -51,7 +51,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs_provider.cpp gui/qt/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/chromaprint.cpp gui/qt/adapters/chromaprint.hpp \
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 \
@@ -76,8 +75,10 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/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/fingerprintdialog.cpp \
- gui/qt/dialogs/fingerprintdialog.hpp \
+ gui/qt/dialogs/fingerprint/fingerprintdialog.cpp \
+ gui/qt/dialogs/fingerprint/fingerprintdialog.hpp \
+ gui/qt/dialogs/fingerprint/chromaprint.cpp \
+ gui/qt/dialogs/fingerprint/chromaprint.hpp \
gui/qt/components/qml_main_context.cpp \
gui/qt/components/qml_main_context.hpp \
gui/qt/components/aboutmodel.cpp \
@@ -233,7 +234,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs_provider.moc.cpp \
gui/qt/managers/renderer_manager.moc.cpp \
gui/qt/recents.moc.cpp \
- gui/qt/adapters/chromaprint.moc.cpp \
gui/qt/adapters/variables.moc.cpp \
gui/qt/adapters/var_choice_model.moc.cpp \
gui/qt/dialogs/bookmarks.moc.cpp \
@@ -255,7 +255,8 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/firstrun.moc.cpp \
gui/qt/dialogs/extensions/extensions_manager.moc.cpp \
gui/qt/dialogs/extensions/extensions.moc.cpp \
- gui/qt/dialogs/fingerprintdialog.moc.cpp \
+ gui/qt/dialogs/fingerprint/fingerprintdialog.moc.cpp \
+ gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
gui/qt/components/qml_main_context.moc.cpp \
gui/qt/components/aboutmodel.moc.cpp \
gui/qt/components/dialogmodel.moc.cpp \
@@ -350,7 +351,7 @@ nodist_libqt_plugin_la_SOURCES += \
gui/qt/ui/ui_messages_panel.h \
gui/qt/ui/ui_about.h \
gui/qt/ui/ui_update.h \
- gui/qt/ui/ui_fingerprintdialog.h \
+ gui/qt/dialogs/fingerprint/ui_fingerprintdialog.h \
gui/qt/ui/ui_sout.h
# User interface compilation
@@ -391,7 +392,7 @@ libqt_plugin_la_UI = \
gui/qt/ui/update.ui \
gui/qt/ui/sout.ui \
gui/qt/ui/vlm.ui \
- gui/qt/ui/fingerprintdialog.ui
+ gui/qt/dialogs/fingerprint/fingerprintdialog.ui
EXTRA_DIST += $(libqt_plugin_la_UI)
ui_%.h: %.ui
diff --git a/modules/gui/qt/components/info_panels.cpp b/modules/gui/qt/components/info_panels.cpp
index 5aea94bf177c..715bdfa521c7 100644
--- a/modules/gui/qt/components/info_panels.cpp
+++ b/modules/gui/qt/components/info_panels.cpp
@@ -30,8 +30,8 @@
#include "components/info_panels.hpp"
#include "components/interface_widgets.hpp"
#include "info_widgets.hpp"
-#include "dialogs/fingerprintdialog.hpp"
-#include "adapters/chromaprint.hpp"
+#include "dialogs/fingerprint/fingerprintdialog.hpp"
+#include "dialogs/fingerprint/chromaprint.hpp"
#include <assert.h>
#include <vlc_url.h>
diff --git a/modules/gui/qt/adapters/chromaprint.cpp b/modules/gui/qt/dialogs/fingerprint/chromaprint.cpp
similarity index 100%
rename from modules/gui/qt/adapters/chromaprint.cpp
rename to modules/gui/qt/dialogs/fingerprint/chromaprint.cpp
diff --git a/modules/gui/qt/adapters/chromaprint.hpp b/modules/gui/qt/dialogs/fingerprint/chromaprint.hpp
similarity index 100%
rename from modules/gui/qt/adapters/chromaprint.hpp
rename to modules/gui/qt/dialogs/fingerprint/chromaprint.hpp
diff --git a/modules/gui/qt/dialogs/fingerprintdialog.cpp b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
similarity index 96%
rename from modules/gui/qt/dialogs/fingerprintdialog.cpp
rename to modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
index 5703dafe8067..a2efeda3abdb 100644
--- a/modules/gui/qt/dialogs/fingerprintdialog.cpp
+++ b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
@@ -18,10 +18,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "fingerprintdialog.hpp"
-#include "ui_fingerprintdialog.h"
+#include "dialogs/fingerprint/fingerprintdialog.hpp"
+#include "dialogs/fingerprint/ui_fingerprintdialog.h"
-#include "adapters/chromaprint.hpp"
+#include "dialogs/fingerprint/chromaprint.hpp"
#include <vlc_url.h>
#include <QLabel>
diff --git a/modules/gui/qt/dialogs/fingerprintdialog.hpp b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/fingerprintdialog.hpp
rename to modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
diff --git a/modules/gui/qt/ui/fingerprintdialog.ui b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.ui
similarity index 100%
rename from modules/gui/qt/ui/fingerprintdialog.ui
rename to modules/gui/qt/dialogs/fingerprint/fingerprintdialog.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 31df9950da42..5ebc656ae736 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -670,8 +670,8 @@ modules/gui/minimal_macosx/intf.h
modules/gui/minimal_macosx/intf.m
modules/gui/minimal_macosx/macosx.c
modules/gui/ncurses.c
-modules/gui/qt/adapters/chromaprint.cpp
-modules/gui/qt/adapters/chromaprint.hpp
+modules/gui/qt/dialogs/fingerprint/chromaprint.cpp
+modules/gui/qt/dialogs/fingerprint/chromaprint.hpp
modules/gui/qt/dialogs/preferences/complete_preferences.cpp
modules/gui/qt/dialogs/preferences/complete_preferences.hpp
modules/gui/qt/components/controller.cpp
@@ -723,8 +723,8 @@ modules/gui/qt/dialogs/extended.cpp
modules/gui/qt/dialogs/extended.hpp
modules/gui/qt/dialogs/extensions/extensions.cpp
modules/gui/qt/dialogs/extensions/extensions.hpp
-modules/gui/qt/dialogs/fingerprintdialog.cpp
-modules/gui/qt/dialogs/fingerprintdialog.hpp
+modules/gui/qt/dialogs/fingerprint/fingerprintdialog.cpp
+modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
modules/gui/qt/dialogs/firstrun.cpp
modules/gui/qt/dialogs/firstrun.hpp
modules/gui/qt/dialogs/gototime.cpp
--
GitLab