[vlc-commits] qt: move components/voutwindow to voutwindow

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Mon Dec  9 11:58:59 2019 +0100| [b99c6fea09942f14ac7fea87aa05fe7a7ddedc99] | committer: Jean-Baptiste Kempf

qt: move components/voutwindow to voutwindow

  no functionnal changes

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b99c6fea09942f14ac7fea87aa05fe7a7ddedc99
---

 modules/gui/qt/Makefile.am                             | 18 +++++++++---------
 modules/gui/qt/maininterface/main_interface.cpp        |  2 +-
 modules/gui/qt/maininterface/main_interface.hpp        |  2 +-
 .../gui/qt/{components => }/voutwindow/qvoutwindow.cpp |  0
 .../gui/qt/{components => }/voutwindow/qvoutwindow.hpp |  0
 .../{components => }/voutwindow/qvoutwindowdummy.cpp   |  0
 .../{components => }/voutwindow/qvoutwindowdummy.hpp   |  0
 .../qt/{components => }/voutwindow/videosurface.cpp    |  0
 .../qt/{components => }/voutwindow/videosurface.hpp    |  0
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 0d698390af..5e4722fd91 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -107,12 +107,12 @@ libqt_plugin_la_SOURCES = \
 	gui/qt/util/settings.hpp \
 	gui/qt/util/audio_device_model.cpp  \
 	gui/qt/util/audio_device_model.hpp \
-	gui/qt/components/voutwindow/videosurface.cpp \
-	gui/qt/components/voutwindow/videosurface.hpp \
-	gui/qt/components/voutwindow/qvoutwindow.cpp \
-	gui/qt/components/voutwindow/qvoutwindow.hpp \
-	gui/qt/components/voutwindow/qvoutwindowdummy.cpp \
-	gui/qt/components/voutwindow/qvoutwindowdummy.hpp \
+	gui/qt/voutwindow/videosurface.cpp \
+	gui/qt/voutwindow/videosurface.hpp \
+	gui/qt/voutwindow/qvoutwindow.cpp \
+	gui/qt/voutwindow/qvoutwindow.hpp \
+	gui/qt/voutwindow/qvoutwindowdummy.cpp \
+	gui/qt/voutwindow/qvoutwindowdummy.hpp \
 	gui/qt/menus/custom_menus.cpp \
 	gui/qt/menus/custom_menus.hpp \
 	gui/qt/dialogs/epg/epg.cpp gui/qt/dialogs/epg/epg.hpp \
@@ -261,9 +261,9 @@ nodist_libqt_plugin_la_SOURCES = \
 	gui/qt/util/selectable_list_model.moc.cpp \
 	gui/qt/util/settings.moc.cpp \
 	gui/qt/util/audio_device_model.moc.cpp \
-	gui/qt/components/voutwindow/videosurface.moc.cpp \
-	gui/qt/components/voutwindow/qvoutwindow.moc.cpp \
-	gui/qt/components/voutwindow/qvoutwindowdummy.moc.cpp \
+	gui/qt/voutwindow/videosurface.moc.cpp \
+	gui/qt/voutwindow/qvoutwindow.moc.cpp \
+	gui/qt/voutwindow/qvoutwindowdummy.moc.cpp \
 	gui/qt/dialogs/epg/epg.moc.cpp \
 	gui/qt/dialogs/epg/EPGChannels.moc.cpp \
 	gui/qt/dialogs/epg/EPGProgram.moc.cpp \
diff --git a/modules/gui/qt/maininterface/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp
index 3849c2c3c8..9eea5706fc 100644
--- a/modules/gui/qt/maininterface/main_interface.cpp
+++ b/modules/gui/qt/maininterface/main_interface.cpp
@@ -63,7 +63,7 @@
 #include "dialogs/dialogs/dialogmodel.hpp"
 #include "player/playercontrolbarmodel.hpp"
 
-#include "components/voutwindow/qvoutwindowdummy.hpp"
+#include "voutwindow/qvoutwindowdummy.hpp"
 
 #include "util/qml_main_context.hpp"
 
diff --git a/modules/gui/qt/maininterface/main_interface.hpp b/modules/gui/qt/maininterface/main_interface.hpp
index 2362603e5b..9333d9918d 100644
--- a/modules/gui/qt/maininterface/main_interface.hpp
+++ b/modules/gui/qt/maininterface/main_interface.hpp
@@ -28,7 +28,7 @@
 
 #include "widgets/native/qvlcframe.hpp"
 #include "player/player_controller.hpp"
-#include "components/voutwindow/qvoutwindow.hpp"
+#include "voutwindow/qvoutwindow.hpp"
 
 #include <QSystemTrayIcon>
 #include <QStackedWidget>
diff --git a/modules/gui/qt/components/voutwindow/qvoutwindow.cpp b/modules/gui/qt/voutwindow/qvoutwindow.cpp
similarity index 100%
rename from modules/gui/qt/components/voutwindow/qvoutwindow.cpp
rename to modules/gui/qt/voutwindow/qvoutwindow.cpp
diff --git a/modules/gui/qt/components/voutwindow/qvoutwindow.hpp b/modules/gui/qt/voutwindow/qvoutwindow.hpp
similarity index 100%
rename from modules/gui/qt/components/voutwindow/qvoutwindow.hpp
rename to modules/gui/qt/voutwindow/qvoutwindow.hpp
diff --git a/modules/gui/qt/components/voutwindow/qvoutwindowdummy.cpp b/modules/gui/qt/voutwindow/qvoutwindowdummy.cpp
similarity index 100%
rename from modules/gui/qt/components/voutwindow/qvoutwindowdummy.cpp
rename to modules/gui/qt/voutwindow/qvoutwindowdummy.cpp
diff --git a/modules/gui/qt/components/voutwindow/qvoutwindowdummy.hpp b/modules/gui/qt/voutwindow/qvoutwindowdummy.hpp
similarity index 100%
rename from modules/gui/qt/components/voutwindow/qvoutwindowdummy.hpp
rename to modules/gui/qt/voutwindow/qvoutwindowdummy.hpp
diff --git a/modules/gui/qt/components/voutwindow/videosurface.cpp b/modules/gui/qt/voutwindow/videosurface.cpp
similarity index 100%
rename from modules/gui/qt/components/voutwindow/videosurface.cpp
rename to modules/gui/qt/voutwindow/videosurface.cpp
diff --git a/modules/gui/qt/components/voutwindow/videosurface.hpp b/modules/gui/qt/voutwindow/videosurface.hpp
similarity index 100%
rename from modules/gui/qt/components/voutwindow/videosurface.hpp
rename to modules/gui/qt/voutwindow/videosurface.hpp