From 1077bc9a53792eb0891071ff2e1fed19a596b989 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:45:04 +0200 Subject: loplugin:includeform: avmedia Change-Id: I32b9617ffd78ec65a6af0fb7fb1c09f5f8cdde4e --- avmedia/source/vlc/inc/wrapper/EventHandler.hxx | 2 +- avmedia/source/vlc/inc/wrapper/EventManager.hxx | 2 +- avmedia/source/vlc/inc/wrapper/Wrapper.hxx | 12 ++++++------ avmedia/source/vlc/vlcframegrabber.cxx | 4 ++-- avmedia/source/vlc/vlcframegrabber.hxx | 2 +- avmedia/source/vlc/vlcmanager.cxx | 10 +++++----- avmedia/source/vlc/vlcmanager.hxx | 2 +- avmedia/source/vlc/vlcplayer.cxx | 2 +- avmedia/source/vlc/vlcplayer.hxx | 8 ++++---- avmedia/source/vlc/wrapper/Common.cxx | 2 +- avmedia/source/vlc/wrapper/EventHandler.cxx | 2 +- avmedia/source/vlc/wrapper/EventManager.cxx | 4 ++-- avmedia/source/vlc/wrapper/Instance.cxx | 2 +- avmedia/source/vlc/wrapper/Media.cxx | 6 +++--- avmedia/source/vlc/wrapper/Player.cxx | 6 +++--- 15 files changed, 33 insertions(+), 33 deletions(-) (limited to 'avmedia/source/vlc') diff --git a/avmedia/source/vlc/inc/wrapper/EventHandler.hxx b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx index 0315b809507d..e84ea1bfe5ea 100644 --- a/avmedia/source/vlc/inc/wrapper/EventHandler.hxx +++ b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx @@ -12,7 +12,7 @@ #include #include -#include "wrapper/ThreadsafeQueue.hxx" +#include namespace avmedia { diff --git a/avmedia/source/vlc/inc/wrapper/EventManager.hxx b/avmedia/source/vlc/inc/wrapper/EventManager.hxx index eb4f2980284a..02d8490c5660 100644 --- a/avmedia/source/vlc/inc/wrapper/EventManager.hxx +++ b/avmedia/source/vlc/inc/wrapper/EventManager.hxx @@ -11,7 +11,7 @@ #define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX #include -#include "wrapper/Player.hxx" +#include struct libvlc_event_manager_t; struct libvlc_event_t; diff --git a/avmedia/source/vlc/inc/wrapper/Wrapper.hxx b/avmedia/source/vlc/inc/wrapper/Wrapper.hxx index a2c6a0c5eebc..f5276e4bb237 100644 --- a/avmedia/source/vlc/inc/wrapper/Wrapper.hxx +++ b/avmedia/source/vlc/inc/wrapper/Wrapper.hxx @@ -10,12 +10,12 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX -#include "wrapper/Common.hxx" -#include "wrapper/EventHandler.hxx" -#include "wrapper/EventManager.hxx" -#include "wrapper/Instance.hxx" -#include "wrapper/Media.hxx" -#include "wrapper/Player.hxx" +#include +#include +#include +#include +#include +#include #endif diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 8642f08a63a1..50c60ce12a31 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -32,8 +32,8 @@ #include "vlcframegrabber.hxx" #include "vlcplayer.hxx" -#include "wrapper/Player.hxx" -#include "wrapper/EventManager.hxx" +#include +#include using namespace ::com::sun::star; diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index b78815006546..02853c8fda5d 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -23,7 +23,7 @@ #include #include #include "vlccommon.hxx" -#include "wrapper/Wrapper.hxx" +#include namespace avmedia { namespace vlc { diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 2b1c73fa70bf..d2c14f795910 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -13,11 +13,11 @@ #include #include "vlcmanager.hxx" #include "vlcplayer.hxx" -#include "wrapper/Instance.hxx" -#include "wrapper/EventManager.hxx" -#include "wrapper/Media.hxx" -#include "wrapper/Player.hxx" -#include "wrapper/Common.hxx" +#include +#include +#include +#include +#include using namespace ::com::sun::star; diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index f820fc1f72ee..d060aaaeeaf9 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -21,7 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX #include #include "vlccommon.hxx" -#include "wrapper/Wrapper.hxx" +#include #include #include diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index b93157d90da3..2b1c75967291 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -24,7 +24,7 @@ #include "vlcplayer.hxx" #include "vlcwindow.hxx" #include "vlcframegrabber.hxx" -#include "wrapper/Instance.hxx" +#include using namespace ::com::sun::star; diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index e2c7f0c32b2f..97b7ffa26425 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -25,10 +25,10 @@ #include #include -#include "wrapper/Instance.hxx" -#include "wrapper/Media.hxx" -#include "wrapper/Player.hxx" -#include "wrapper/EventManager.hxx" +#include +#include +#include +#include namespace avmedia { namespace vlc { diff --git a/avmedia/source/vlc/wrapper/Common.cxx b/avmedia/source/vlc/wrapper/Common.cxx index 2e832f5423c8..66eea5fa8bc6 100644 --- a/avmedia/source/vlc/wrapper/Common.cxx +++ b/avmedia/source/vlc/wrapper/Common.cxx @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "wrapper/Common.hxx" +#include #include "SymbolLoader.hxx" namespace diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx index 6397c27df6fa..2cc40606c62b 100644 --- a/avmedia/source/vlc/wrapper/EventHandler.cxx +++ b/avmedia/source/vlc/wrapper/EventHandler.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "wrapper/EventHandler.hxx" +#include namespace avmedia { diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx index d6af35d325e7..76259c933e15 100644 --- a/avmedia/source/vlc/wrapper/EventManager.cxx +++ b/avmedia/source/vlc/wrapper/EventManager.cxx @@ -7,9 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "wrapper/EventManager.hxx" +#include #include "SymbolLoader.hxx" -#include "wrapper/EventHandler.hxx" +#include #include "Types.hxx" namespace diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx index 97b3200ff561..6bc22ff75ec6 100644 --- a/avmedia/source/vlc/wrapper/Instance.cxx +++ b/avmedia/source/vlc/wrapper/Instance.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "wrapper/Instance.hxx" +#include #include "SymbolLoader.hxx" namespace diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx index 75c850e08390..0d8d3d17374f 100644 --- a/avmedia/source/vlc/wrapper/Media.cxx +++ b/avmedia/source/vlc/wrapper/Media.cxx @@ -8,11 +8,11 @@ */ #include -#include "wrapper/Media.hxx" +#include #include "SymbolLoader.hxx" -#include "wrapper/Instance.hxx" +#include #include "Types.hxx" -#include "wrapper/Common.hxx" +#include struct libvlc_instance_t; diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx index 50e9d160c7da..f54507db7d59 100644 --- a/avmedia/source/vlc/wrapper/Player.cxx +++ b/avmedia/source/vlc/wrapper/Player.cxx @@ -9,10 +9,10 @@ #include #include "Types.hxx" -#include "wrapper/Player.hxx" -#include "wrapper/Media.hxx" +#include +#include #include "SymbolLoader.hxx" -#include "wrapper/Common.hxx" +#include struct libvlc_media_t; -- cgit