Move vlc/wrapper include files to common include directory

...that are inclued from both vlc and vlc/wrapper.  Change done in preparation
of loplugin:inlcudeform.

Change-Id: Ic7dc08b93d8a33b21dc64dfc0bfbe3952039f05b
Reviewed-on: https://gerrit.libreoffice.org/43556
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

15 files changed, 38 insertions, 37 deletions

diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 0ee5cd2d0d46..3db43315e67e 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmedia
 $(eval $(call gb_Library_set_include,avmediavlc,\
     $$(INCLUDE) \
     -I$(SRCDIR)/avmedia/source/inc \
+    -I$(SRCDIR)/avmedia/source/vlc/inc \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,avmediavlc,\
diff --git a/avmedia/source/vlc/wrapper/Common.hxx b/avmedia/source/vlc/inc/wrapper/Common.hxx
index f4984b6b1482..6935eca96bc7 100644
--- a/avmedia/source/vlc/wrapper/Common.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Common.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_COMMON_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_COMMON_HXX
 
 namespace avmedia
 {
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx
index e9d8cc224294..0315b809507d 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.hxx
+++ b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx
@@ -7,12 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTHANDLER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTHANDLER_HXX
 
 #include <functional>
 #include <salhelper/thread.hxx>
-#include "ThreadsafeQueue.hxx"
+#include "wrapper/ThreadsafeQueue.hxx"
 
 namespace avmedia
 {
diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/inc/wrapper/EventManager.hxx
index 85939877cb42..eb4f2980284a 100644
--- a/avmedia/source/vlc/wrapper/EventManager.hxx
+++ b/avmedia/source/vlc/inc/wrapper/EventManager.hxx
@@ -7,11 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX
 
 #include <functional>
-#include "Player.hxx"
+#include "wrapper/Player.hxx"
 
 struct libvlc_event_manager_t;
 struct libvlc_event_t;
diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/inc/wrapper/Instance.hxx
index 241caf6d94e3..f2e8c9c8ef0e 100644
--- a/avmedia/source/vlc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Instance.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_INSTANCE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_INSTANCE_HXX
 
 struct libvlc_instance_t;
 
diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/inc/wrapper/Media.hxx
index a7535f7d783e..77d17118f2f7 100644
--- a/avmedia/source/vlc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Media.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_MEDIA_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_MEDIA_HXX
 
 struct libvlc_media_t;
 
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/inc/wrapper/Player.hxx
index a7306825f5f6..2e2921682260 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Player.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_PLAYER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_PLAYER_HXX
 #if defined UNX
 # include <stdint.h>
 #endif
diff --git a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx b/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx
index 86904e669204..f76a08fda276 100644
--- a/avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx
+++ b/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_THREADSAFEQUEUE_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_THREADSAFEQUEUE_HXX
 #include <queue>
 #include <iostream>
 #include <osl/mutex.hxx>
@@ -79,5 +79,5 @@ void ThreadsafeQueue<T>::pop( T& data )
 }
 }
 
-#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
+#endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Wrapper.hxx b/avmedia/source/vlc/inc/wrapper/Wrapper.hxx
index b7d1c2265ab2..a2c6a0c5eebc 100644
--- a/avmedia/source/vlc/wrapper/Wrapper.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Wrapper.hxx
@@ -7,16 +7,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_WRAPPER_HXX
-#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_WRAPPER_HXX
+#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX
+#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX
 
-#include "Common.hxx"
-#include "EventHandler.hxx"
-#include "EventManager.hxx"
-#include "Instance.hxx"
-#include "Media.hxx"
-#include "Player.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"
 
-#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_WRAPPER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Common.cxx b/avmedia/source/vlc/wrapper/Common.cxx
index 674f1803c6f8..2e832f5423c8 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 "Common.hxx"
+#include "wrapper/Common.hxx"
 #include "SymbolLoader.hxx"
 
 namespace
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 39a610137157..6397c27df6fa 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 "EventHandler.hxx"
+#include "wrapper/EventHandler.hxx"
 
 namespace avmedia
 {
diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx
index 585a72557c98..d6af35d325e7 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 "EventManager.hxx"
+#include "wrapper/EventManager.hxx"
 #include "SymbolLoader.hxx"
-#include "EventHandler.hxx"
+#include "wrapper/EventHandler.hxx"
 #include "Types.hxx"
 
 namespace
diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx
index dec2ff75edea..97b3200ff561 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 "Instance.hxx"
+#include "wrapper/Instance.hxx"
 #include "SymbolLoader.hxx"
 
 namespace
diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx
index 84a0078aacdc..75c850e08390 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -8,11 +8,11 @@
  */
 
 #include <rtl/ustring.h>
-#include "Media.hxx"
+#include "wrapper/Media.hxx"
 #include "SymbolLoader.hxx"
-#include "Instance.hxx"
+#include "wrapper/Instance.hxx"
 #include "Types.hxx"
-#include "Common.hxx"
+#include "wrapper/Common.hxx"
 
 struct libvlc_instance_t;
 
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index ae49540baada..50e9d160c7da 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -9,10 +9,10 @@
 
 #include <rtl/ustring.h>
 #include "Types.hxx"
-#include "Player.hxx"
-#include "Media.hxx"
+#include "wrapper/Player.hxx"
+#include "wrapper/Media.hxx"
 #include "SymbolLoader.hxx"
-#include "Common.hxx"
+#include "wrapper/Common.hxx"
 
 struct libvlc_media_t;