diff options
author | Furkan Ahmet Kara <furkanahmetkara.fk@gmail.com> | 2020-03-20 04:56:14 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-03-22 19:59:43 +0100 |
commit | f13913d510672cd4f28726ef18c4f3d014b6f06c (patch) | |
tree | a7dd5270670e02b10fe7310ff118c37948a6946f /avmedia | |
parent | 1098ed05edfd86d4518ae6c9d43448e3e2f21ba6 (diff) |
tdf#124176: Use pragma once instead of include guards
Change-Id: I24df5daa3ded43f1fa031a9e2714453cb03b92f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90769
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/Common.hxx | 6 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/EventHandler.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/EventManager.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/Instance.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/Media.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/Player.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx | 4 | ||||
-rw-r--r-- | avmedia/source/vlc/inc/wrapper/Wrapper.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/vlccommon.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/vlcframegrabber.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/vlcmanager.hxx | 6 | ||||
-rw-r--r-- | avmedia/source/vlc/vlcplayer.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/vlcwindow.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 5 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Types.hxx | 5 |
16 files changed, 17 insertions, 62 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index e188c8876004..afee28f37dbc 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX -#define INCLUDED_AVMEDIA_SOURCE_VIEWER_MEDIAWINDOW_IMPL_HXX +#pragma once #include <vcl/transfer.hxx> #include <vcl/syschild.hxx> @@ -155,6 +154,4 @@ private: }} // end namespace avmedia::priv -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/Common.hxx b/avmedia/source/vlc/inc/wrapper/Common.hxx index 6935eca96bc7..c9b7f9682dd2 100644 --- a/avmedia/source/vlc/inc/wrapper/Common.hxx +++ b/avmedia/source/vlc/inc/wrapper/Common.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_COMMON_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_COMMON_HXX +#pragma once namespace avmedia { @@ -27,5 +26,4 @@ namespace wrapper } } -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/EventHandler.hxx b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx index e84ea1bfe5ea..955c8347839d 100644 --- a/avmedia/source/vlc/inc/wrapper/EventHandler.hxx +++ b/avmedia/source/vlc/inc/wrapper/EventHandler.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTHANDLER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTHANDLER_HXX +#pragma once #include <functional> #include <salhelper/thread.hxx> @@ -40,6 +39,4 @@ namespace wrapper } } -#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/EventManager.hxx b/avmedia/source/vlc/inc/wrapper/EventManager.hxx index 02d8490c5660..9a85154831b1 100644 --- a/avmedia/source/vlc/inc/wrapper/EventManager.hxx +++ b/avmedia/source/vlc/inc/wrapper/EventManager.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX +#pragma once #include <functional> #include <wrapper/Player.hxx> @@ -53,6 +52,4 @@ namespace wrapper } } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/Instance.hxx b/avmedia/source/vlc/inc/wrapper/Instance.hxx index e944fe423309..7e4ba7741019 100644 --- a/avmedia/source/vlc/inc/wrapper/Instance.hxx +++ b/avmedia/source/vlc/inc/wrapper/Instance.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_INSTANCE_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_INSTANCE_HXX +#pragma once struct libvlc_instance_t; @@ -39,5 +38,4 @@ namespace wrapper } } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/Media.hxx b/avmedia/source/vlc/inc/wrapper/Media.hxx index d52bf8a6795a..288bb0d43198 100644 --- a/avmedia/source/vlc/inc/wrapper/Media.hxx +++ b/avmedia/source/vlc/inc/wrapper/Media.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_MEDIA_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_MEDIA_HXX +#pragma once struct libvlc_media_t; @@ -45,5 +44,4 @@ namespace wrapper } } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/Player.hxx b/avmedia/source/vlc/inc/wrapper/Player.hxx index 84b064493d61..a41e01b10b9c 100644 --- a/avmedia/source/vlc/inc/wrapper/Player.hxx +++ b/avmedia/source/vlc/inc/wrapper/Player.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_PLAYER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_PLAYER_HXX +#pragma once #if defined UNX # include <stdint.h> #endif @@ -71,6 +70,4 @@ namespace wrapper } } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx b/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx index f76a08fda276..f8eb480dd9aa 100644 --- a/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx +++ b/avmedia/source/vlc/inc/wrapper/ThreadsafeQueue.hxx @@ -16,8 +16,7 @@ * 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_INC_WRAPPER_THREADSAFEQUEUE_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_THREADSAFEQUEUE_HXX +#pragma once #include <queue> #include <iostream> #include <osl/mutex.hxx> @@ -79,5 +78,4 @@ void ThreadsafeQueue<T>::pop( T& data ) } } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/inc/wrapper/Wrapper.hxx b/avmedia/source/vlc/inc/wrapper/Wrapper.hxx index f5276e4bb237..c381ea8db028 100644 --- a/avmedia/source/vlc/inc/wrapper/Wrapper.hxx +++ b/avmedia/source/vlc/inc/wrapper/Wrapper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX +#pragma once #include <wrapper/Common.hxx> #include <wrapper/EventHandler.hxx> @@ -17,6 +16,4 @@ #include <wrapper/Media.hxx> #include <wrapper/Player.hxx> -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx index effa79f90e3e..13719516ba79 100644 --- a/avmedia/source/vlc/vlccommon.hxx +++ b/avmedia/source/vlc/vlccommon.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX +#pragma once #include <osl/mutex.hxx> #include <tools/stream.hxx> @@ -38,6 +37,4 @@ #include <com/sun/star/media/XManager.hpp> #include <com/sun/star/media/XPlayerWindow.hpp> -#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCCOMMON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index 5599f3689f6d..77684d6b9eff 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX +#pragma once #include <com/sun/star/media/XFrameGrabber.hpp> #include <cppuhelper/implbase.hxx> @@ -50,6 +49,4 @@ public: } } -#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index 478a2e9d664d..3615ab17d187 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCMANAGER_HXX +#pragma once #include <com/sun/star/media/XManager.hpp> #include "vlccommon.hxx" #include <wrapper/Wrapper.hxx> @@ -52,7 +51,4 @@ private: } } - -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index c5248707d044..4c3c03d0bd14 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCPLAYER_HXX +#pragma once #include "vlccommon.hxx" #include <cppuhelper/compbase.hxx> @@ -84,6 +83,4 @@ private: } } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index df0530035412..e70c8e80fb88 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -16,8 +16,7 @@ * 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_VLCWINDOW_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX +#pragma once #include "vlccommon.hxx" #include <cppuhelper/implbase.hxx> @@ -72,6 +71,4 @@ public: } } -#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 03952eaff371..64789b326ebf 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX +#pragma once #if defined(_WIN32) #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN @@ -124,6 +123,4 @@ struct ApiMap } } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/Types.hxx b/avmedia/source/vlc/wrapper/Types.hxx index eb5dd3a4f9d4..c66a88bdc9ee 100644 --- a/avmedia/source/vlc/wrapper/Types.hxx +++ b/avmedia/source/vlc/wrapper/Types.hxx @@ -9,8 +9,7 @@ /* Typedefs and structures that represent the libvlc API / ABI */ -#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX -#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX +#pragma once #include <sal/config.h> @@ -56,6 +55,4 @@ struct libvlc_track_description_t } -#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_TYPES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |