[vlc-commits] qt: remove unneeded vout includes

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Oct 26 08:16:53 2018 +0200| [99ca992af9fd821cbfb1ff7e9048da0849b670a6] | committer: Steve Lhomme

qt: remove unneeded vout includes

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

 modules/gui/qt/actions_manager.cpp              | 2 +-
 modules/gui/qt/components/controller.cpp        | 2 --
 modules/gui/qt/components/controller_widget.hpp | 1 -
 modules/gui/qt/components/extended_panels.cpp   | 1 -
 modules/gui/qt/components/interface_widgets.cpp | 1 -
 modules/gui/qt/dialogs/toolbar.cpp              | 1 -
 modules/gui/qt/main_interface.cpp               | 2 +-
 modules/gui/qt/menus.cpp                        | 1 -
 8 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt/actions_manager.cpp b/modules/gui/qt/actions_manager.cpp
index 4b9d4e6ad5..fcda4f616c 100644
--- a/modules/gui/qt/actions_manager.cpp
+++ b/modules/gui/qt/actions_manager.cpp
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc_vout.h>
+#include <vlc_common.h>
 #include <vlc_actions.h>
 
 #include "actions_manager.hpp"
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index 63ac60dd77..84a816c7f4 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -26,8 +26,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_vout.h>                       /* vout_thread_t for FSC */
-
 /* Widgets */
 #include "components/controller.hpp"
 #include "components/controller_widget.hpp"
diff --git a/modules/gui/qt/components/controller_widget.hpp b/modules/gui/qt/components/controller_widget.hpp
index 5709bb651a..265758b220 100644
--- a/modules/gui/qt/components/controller_widget.hpp
+++ b/modules/gui/qt/components/controller_widget.hpp
@@ -30,7 +30,6 @@
 
 #include "qt.hpp"
 #include "input_manager.hpp"
-#include <vlc_vout.h>                       /* vout_thread_t for aspect ratio combobox */
 
 #include <QWidget>
 #include <QToolButton>
diff --git a/modules/gui/qt/components/extended_panels.cpp b/modules/gui/qt/components/extended_panels.cpp
index bf9f3a1ea4..7ed16fd900 100644
--- a/modules/gui/qt/components/extended_panels.cpp
+++ b/modules/gui/qt/components/extended_panels.cpp
@@ -54,7 +54,6 @@
 #include "dialogs_provider.hpp"
 
 #include "../../audio_filter/equalizer_presets.h"
-#include <vlc_vout.h>
 #include <vlc_modules.h>
 #include <vlc_plugin.h>
 
diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 03519a7b21..04adbba168 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -70,7 +70,6 @@
 #include <math.h>
 #include <assert.h>
 
-#include <vlc_vout.h>
 #include <vlc_vout_window.h>
 
 /**********************************************************************
diff --git a/modules/gui/qt/dialogs/toolbar.cpp b/modules/gui/qt/dialogs/toolbar.cpp
index 58a90f7c5b..7edb7935af 100644
--- a/modules/gui/qt/dialogs/toolbar.cpp
+++ b/modules/gui/qt/dialogs/toolbar.cpp
@@ -38,7 +38,6 @@
 
 #include "qt.hpp"
 #include "input_manager.hpp"
-#include <vlc_vout.h>                       /* vout_thread_t for aspect ratio combobox */
 
 #include <QGroupBox>
 #include <QLabel>
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 08a91e1831..7b38d7f1c8 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -74,7 +74,7 @@
 #include <QTimer>
 
 #include <vlc_actions.h>                    /* Wheel event */
-#include <vlc_vout_display.h>               /* vout_thread_t and VOUT_ events */
+#include <vlc_vout_window.h>                /* VOUT_ events */
 
 // #define DEBUG_INTF
 
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 1f877cba58..eab268b6db 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -33,7 +33,6 @@
 
 #include <vlc_common.h>
 #include <vlc_intf_strings.h>
-#include <vlc_vout.h>                             /* vout_thread_t */
 #include <vlc_aout.h>                             /* audio_output_t */
 
 #include "menus.hpp"