From cb942e1326f2eaf4b1796c20dbb21602d3e02307 Mon Sep 17 00:00:00 2001 From: Furkan Ahmet Kara Date: Sat, 8 Feb 2020 17:30:12 +0200 Subject: tdf#124176: Use pragma once instead of include guards Change-Id: I4f0ff5864f343c016ae88477e064b0c643cd0d9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88268 Tested-by: Jenkins Reviewed-by: Muhammet Kara --- avmedia/inc/mediacontrol.hxx | 5 +---- avmedia/source/gstreamer/gstcommon.hxx | 5 +---- avmedia/source/gstreamer/gstframegrabber.hxx | 5 +---- avmedia/source/gstreamer/gstmanager.hxx | 5 +---- avmedia/source/gstreamer/gstplayer.hxx | 5 +---- avmedia/source/gstreamer/gstwindow.hxx | 5 +---- avmedia/source/inc/mediamisc.hxx | 5 +---- avmedia/source/macavf/framegrabber.hxx | 5 +---- avmedia/source/macavf/macavfcommon.hxx | 5 +---- 9 files changed, 9 insertions(+), 36 deletions(-) diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index b67ac0a36808..9899418a6052 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX -#define INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX +#pragma once #include @@ -79,6 +78,4 @@ private: } -#endif // INCLUDED_AVMEDIA_INC_MEDIACONTROL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx index 98c99c3b6b18..0e27907fb312 100644 --- a/avmedia/source/gstreamer/gstcommon.hxx +++ b/avmedia/source/gstreamer/gstcommon.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX -#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX +#pragma once #include @@ -41,6 +40,4 @@ #define WM_GRAPHNOTIFY (WM_USER + 567) -#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTCOMMON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index 2b2f644f8b0f..fce3edd70fe9 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX -#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX +#pragma once #include "gstplayer.hxx" #include @@ -59,6 +58,4 @@ private: } // namespace gst } // namespace avmedia -#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTFRAMEGRABBER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index 2b695541d9ab..cd7622f62d22 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX -#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX +#pragma once #include "gstcommon.hxx" #include @@ -46,6 +45,4 @@ public: } // namespace gstreamer } // namespace avmedia -#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTMANAGER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 67aabb998d7a..bd778edfe859 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX -#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX +#pragma once #include #include "gstcommon.hxx" @@ -106,6 +105,4 @@ private: } // namespace gstreamer } // namespace avmedia -#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTPLAYER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index 5c81e71afd04..60b2aa835d6f 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX -#define INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX +#pragma once #include "gstcommon.hxx" #include @@ -81,6 +80,4 @@ private: } // namespace gstreamer } // namespace avmedia -#endif // INCLUDED_AVMEDIA_SOURCE_GSTREAMER_GSTWINDOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 873146e19807..504a136aa5ce 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX -#define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX +#pragma once #include @@ -43,6 +42,4 @@ inline OUString AvmResId(const char* pId) return Translate::get(pId, Translate::Create("avmedia")); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx index 2bcd5011497c..a0fceec3bf47 100644 --- a/avmedia/source/macavf/framegrabber.hxx +++ b/avmedia/source/macavf/framegrabber.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX -#define INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX +#pragma once #include "macavfcommon.hxx" #include @@ -55,6 +54,4 @@ private: } // namespace macavf } // namespace avmedia -#endif // INCLUDED_AVMEDIA_SOURCE_MACAVF_FRAMEGRABBER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/macavf/macavfcommon.hxx b/avmedia/source/macavf/macavfcommon.hxx index cac042102bfb..c682755ce8a8 100644 --- a/avmedia/source/macavf/macavfcommon.hxx +++ b/avmedia/source/macavf/macavfcommon.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_SOURCE_MACAVF_MACAVFCOMMON_HXX -#define INCLUDED_AVMEDIA_SOURCE_MACAVF_MACAVFCOMMON_HXX +#pragma once #include #import @@ -89,6 +88,4 @@ public: }} -#endif // INCLUDED_AVMEDIA_SOURCE_MACAVF_MACAVFCOMMON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit