From cb8cf18238d3494341e569bcd7248f513283e8fc Mon Sep 17 00:00:00 2001
From: Pierre Lamot <pierre@videolabs.io>
Date: Fri, 6 Dec 2019 11:42:27 +0100
Subject: [PATCH] qt: move errors dialog to its own folder
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/qt/Makefile.am | 4 ++--
modules/gui/qt/dialogs/{ => errors}/errors.cpp | 2 +-
modules/gui/qt/dialogs/{ => errors}/errors.hpp | 0
modules/gui/qt/dialogs/preferences/preferences.cpp | 2 +-
modules/gui/qt/dialogs_provider.cpp | 2 +-
po/POTFILES.in | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
rename modules/gui/qt/dialogs/{ => errors}/errors.cpp (99%)
rename modules/gui/qt/dialogs/{ => errors}/errors.hpp (100%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 4846ae8f0f6e..2fe3321504e9 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -60,7 +60,7 @@ libqt_plugin_la_SOURCES = \
gui/qt/dialogs/mediainfo/info_widgets.cpp gui/qt/dialogs/mediainfo/info_widgets.hpp \
gui/qt/dialogs/extended/extended.cpp gui/qt/dialogs/extended/extended.hpp \
gui/qt/dialogs/messages/messages.cpp gui/qt/dialogs/messages/messages.hpp \
- gui/qt/dialogs/errors.cpp gui/qt/dialogs/errors.hpp \
+ gui/qt/dialogs/errors/errors.cpp gui/qt/dialogs/errors/errors.hpp \
gui/qt/dialogs/plugins/plugins.cpp gui/qt/dialogs/plugins/plugins.hpp \
gui/qt/dialogs/plugins/addons_manager.cpp gui/qt/dialogs/plugins/addons_manager.hpp \
gui/qt/dialogs/help/help.cpp gui/qt/dialogs/help/help.hpp \
@@ -242,7 +242,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/dialogs/mediainfo/info_widgets.moc.cpp \
gui/qt/dialogs/extended/extended.moc.cpp \
gui/qt/dialogs/messages/messages.moc.cpp \
- gui/qt/dialogs/errors.moc.cpp \
+ gui/qt/dialogs/errors/errors.moc.cpp \
gui/qt/dialogs/plugins/addons_manager.moc.cpp \
gui/qt/dialogs/plugins/plugins.moc.cpp \
gui/qt/dialogs/help/help.moc.cpp \
diff --git a/modules/gui/qt/dialogs/errors.cpp b/modules/gui/qt/dialogs/errors/errors.cpp
similarity index 99%
rename from modules/gui/qt/dialogs/errors.cpp
rename to modules/gui/qt/dialogs/errors/errors.cpp
index 7bceb2d743a1..77eb07cac9ca 100644
--- a/modules/gui/qt/dialogs/errors.cpp
+++ b/modules/gui/qt/dialogs/errors/errors.cpp
@@ -24,7 +24,7 @@
# include "config.h"
#endif
-#include "dialogs/errors.hpp"
+#include "errors.hpp"
#include <QTextCursor>
#include <QTextEdit>
diff --git a/modules/gui/qt/dialogs/errors.hpp b/modules/gui/qt/dialogs/errors/errors.hpp
similarity index 100%
rename from modules/gui/qt/dialogs/errors.hpp
rename to modules/gui/qt/dialogs/errors/errors.hpp
diff --git a/modules/gui/qt/dialogs/preferences/preferences.cpp b/modules/gui/qt/dialogs/preferences/preferences.cpp
index 034913558ea5..ffcfbb375874 100644
--- a/modules/gui/qt/dialogs/preferences/preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/preferences.cpp
@@ -27,7 +27,7 @@
#include "dialogs/preferences/preferences.hpp"
#include "util/qvlcframe.hpp"
-#include "dialogs/errors.hpp"
+#include "dialogs/errors/errors.hpp"
#include "dialogs/preferences/complete_preferences.hpp"
#include "dialogs/preferences/simple_preferences.hpp"
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 6b3b3f370c91..2f24b3f33cb9 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -55,7 +55,7 @@
#include "dialogs/toolbar/toolbareditor.hpp"
#include "dialogs/plugins/plugins.hpp"
#include "dialogs/epg/epg.hpp"
-#include "dialogs/errors.hpp"
+#include "dialogs/errors/errors.hpp"
#include <QEvent>
#include <QApplication>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 49eb8fdf1265..cb17b1b2f094 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -717,8 +717,8 @@ modules/gui/qt/dialogs/sout/convert.cpp
modules/gui/qt/dialogs/sout/convert.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/errors/errors.cpp
+modules/gui/qt/dialogs/errors/errors.hpp
modules/gui/qt/dialogs/extended/extended.cpp
modules/gui/qt/dialogs/extended/extended.hpp
modules/gui/qt/dialogs/extensions/extensions.cpp
--
GitLab