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

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Dec  6 11:56:11 2019 +0100| [95a6fa69b22001b641679258d7817e16228e481b] | committer: Jean-Baptiste Kempf

qt: move dialog dialogs 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=95a6fa69b22001b641679258d7817e16228e481b
---

 modules/gui/qt/Makefile.am                                     | 10 +++++-----
 modules/gui/qt/{components => dialogs/dialogs}/dialogmodel.cpp |  0
 modules/gui/qt/{components => dialogs/dialogs}/dialogmodel.hpp |  2 +-
 .../gui/qt/{qml/dialogs => dialogs/dialogs/qml}/Dialogs.qml    |  0
 .../qt/{qml/dialogs => dialogs/dialogs/qml}/ModalDialog.qml    |  0
 modules/gui/qt/main_interface.cpp                              |  2 +-
 modules/gui/qt/vlc.qrc                                         |  4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 2fe3321504..49193f1fed 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -83,8 +83,8 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/components/qml_main_context.hpp \
 	gui/qt/dialogs/help/aboutmodel.cpp \
 	gui/qt/dialogs/help/aboutmodel.hpp \
-	gui/qt/components/dialogmodel.cpp \
-	gui/qt/components/dialogmodel.hpp \
+	gui/qt/dialogs/dialogs/dialogmodel.cpp \
+	gui/qt/dialogs/dialogs/dialogmodel.hpp \
 	gui/qt/dialogs/extended/extended_panels.cpp \
 	gui/qt/dialogs/extended/extended_panels.hpp \
 	gui/qt/components/navigation_history.cpp gui/qt/components/navigation_history.hpp \
@@ -259,7 +259,7 @@ nodist_libqt_plugin_la_SOURCES = \
 	gui/qt/dialogs/fingerprint/chromaprint.moc.cpp \
 	gui/qt/components/qml_main_context.moc.cpp \
 	gui/qt/dialogs/help/aboutmodel.moc.cpp \
-	gui/qt/components/dialogmodel.moc.cpp \
+	gui/qt/dialogs/dialogs/dialogmodel.moc.cpp \
 	gui/qt/dialogs/extended/extended_panels.moc.cpp \
 	gui/qt/player/player_controller.moc.cpp \
 	gui/qt/player/playercontrolbarmodel.moc.cpp \
@@ -577,8 +577,8 @@ libqt_plugin_la_QML = \
 	gui/qt/player/qml/TeletextWidget.qml \
 	gui/qt/player/qml/MiniPlayer.qml \
 	gui/qt/player/qml/TopBar.qml \
-	gui/qt/qml/dialogs/Dialogs.qml \
-	gui/qt/qml/dialogs/ModalDialog.qml \
+	gui/qt/dialogs/dialogs/qml/Dialogs.qml \
+	gui/qt/dialogs/dialogs/qml/ModalDialog.qml \
 	gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
 	gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
 	gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
diff --git a/modules/gui/qt/components/dialogmodel.cpp b/modules/gui/qt/dialogs/dialogs/dialogmodel.cpp
similarity index 100%
rename from modules/gui/qt/components/dialogmodel.cpp
rename to modules/gui/qt/dialogs/dialogs/dialogmodel.cpp
diff --git a/modules/gui/qt/components/dialogmodel.hpp b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
similarity index 98%
rename from modules/gui/qt/components/dialogmodel.hpp
rename to modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
index cc711fa1e5..3db8e22dc0 100644
--- a/modules/gui/qt/components/dialogmodel.hpp
+++ b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
@@ -27,7 +27,7 @@
 
 #include <QObject>
 
-#include "qml_main_context.hpp"
+#include "components/qml_main_context.hpp"
 
 
 class DialogId {
diff --git a/modules/gui/qt/qml/dialogs/Dialogs.qml b/modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/Dialogs.qml
rename to modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml
diff --git a/modules/gui/qt/qml/dialogs/ModalDialog.qml b/modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml
similarity index 100%
rename from modules/gui/qt/qml/dialogs/ModalDialog.qml
rename to modules/gui/qt/dialogs/dialogs/qml/ModalDialog.qml
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index f31fcc0b6f..1f0a2582a9 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -60,7 +60,7 @@
 
 #include "components/navigation_history.hpp"
 #include "dialogs/help/aboutmodel.hpp"
-#include "components/dialogmodel.hpp"
+#include "dialogs/dialogs/dialogmodel.hpp"
 #include "player/playercontrolbarmodel.hpp"
 
 #include "components/voutwindow/qvoutwindowdummy.hpp"
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 0792ff3905..e714e1a309 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -280,8 +280,8 @@
         <file alias="About.qml">dialogs/help/qml/About.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
-        <file alias="Dialogs.qml">qml/dialogs/Dialogs.qml</file>
-        <file alias="ModalDialog.qml">qml/dialogs/ModalDialog.qml</file>
+        <file alias="Dialogs.qml">dialogs/dialogs/qml/Dialogs.qml</file>
+        <file alias="ModalDialog.qml">dialogs/dialogs/qml/ModalDialog.qml</file>
         <file alias="EditorDummyButton.qml">dialogs/toolbar/qml/EditorDummyButton.qml</file>
         <file alias="EditorDNDDelegate.qml">dialogs/toolbar/qml/EditorDNDDelegate.qml</file>
         <file alias="ToolbarEditorButtonList.qml">dialogs/toolbar/qml/ToolbarEditorButtonList.qml</file>