include/avmedia/MediaControlBase.hxx | 4 +--- include/avmedia/avmediadllapi.h | 5 +---- include/avmedia/mediaitem.hxx | 5 +---- include/avmedia/mediaplayer.hxx | 5 +---- include/avmedia/mediatoolbox.hxx | 5 +---- include/avmedia/mediawindow.hxx | 5 +---- 6 files changed, 6 insertions(+), 23 deletions(-)
New commits: commit fea79733c5b98554b4b092a82c30137437db1d7a Author: Adoche Onaji <[email protected]> AuthorDate: Mon Jan 30 04:17:56 2023 +0100 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Mon Jan 30 05:33:33 2023 +0000 tdf#143148 Use pragma once instead of include guards The headers in include/avmedia are changed to pragma once Change-Id: Id32159a291cbe2f18199e0e5b7e63b4feb2e591f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146312 Tested-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx index 1379a4364f33..38299e0faf60 100644 --- a/include/avmedia/MediaControlBase.hxx +++ b/include/avmedia/MediaControlBase.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_MEDIACONTROLBASE_HXX -#define INCLUDED_AVMEDIA_MEDIACONTROLBASE_HXX +#pragma once #include <config_options.h> #include <vcl/weld.hxx> @@ -69,6 +68,5 @@ protected: }; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/avmediadllapi.h b/include/avmedia/avmediadllapi.h index abe4fb48c844..f7f124d3dc93 100644 --- a/include/avmedia/avmediadllapi.h +++ b/include/avmedia/avmediadllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_AVMEDIADLLAPI_H -#define INCLUDED_AVMEDIA_AVMEDIADLLAPI_H +#pragma once #include <sal/types.h> @@ -29,6 +28,4 @@ #endif #define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE -#endif // INCLUDED_AVMEDIA_AVMEDIADLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index bbb5e06e49b1..f8b3c7c689c3 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_MEDIAITEM_HXX -#define INCLUDED_AVMEDIA_MEDIAITEM_HXX +#pragma once #include <svl/poolitem.hxx> #include <com/sun/star/media/ZoomLevel.hpp> @@ -164,6 +163,4 @@ struct AVMEDIA_DLLPUBLIC MediaTempFile } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index 52ecd942e49a..f0da5b2d84d7 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_MEDIAPLAYER_HXX -#define INCLUDED_AVMEDIA_MEDIAPLAYER_HXX +#pragma once #include <sfx2/dockwin.hxx> #include <sfx2/viewfrm.hxx> @@ -73,6 +72,4 @@ inline MediaFloater * getMediaFloater() { } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 434d202ca967..52ae7ad9b318 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX -#define INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX +#pragma once #include <sfx2/tbxctrl.hxx> #include <avmedia/avmediadllapi.h> @@ -50,6 +49,4 @@ private: } -#endif // INCLUDED_AVMEDIA_MEDIATOOLBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index e8515d77ffb4..e2938b608a24 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_AVMEDIA_MEDIAWINDOW_HXX -#define INCLUDED_AVMEDIA_MEDIAWINDOW_HXX +#pragma once #include <vector> #include <tools/gen.hxx> @@ -153,6 +152,4 @@ namespace avmedia } -#endif // INCLUDED_AVMEDIA_MEDIAWINDOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
