From df9ff47f984bfb8ce265cb73ec10a3dd5837bd10 Mon Sep 17 00:00:00 2001 From: George Bateman Date: Tue, 4 Aug 2020 21:36:11 +0000 Subject: tdf#124176 Use #pragma once in canvas This commit was carried out by a Python script, source of which is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97. Change-Id: Icd712adf20fa2dbaaea2fc33a0fd870c8595b7e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100147 Tested-by: Jenkins Reviewed-by: Julien Nabet --- canvas/source/opengl/ogl_bitmapcanvashelper.hxx | 5 +---- canvas/source/opengl/ogl_buffercontext.hxx | 5 +---- canvas/source/opengl/ogl_canvasbitmap.hxx | 5 +---- canvas/source/opengl/ogl_canvascustomsprite.hxx | 5 +---- canvas/source/opengl/ogl_canvasfont.hxx | 5 +---- canvas/source/opengl/ogl_canvashelper.hxx | 5 +---- canvas/source/opengl/ogl_canvastools.hxx | 5 +---- canvas/source/opengl/ogl_spritecanvas.hxx | 5 +---- canvas/source/opengl/ogl_spritedevicehelper.hxx | 5 +---- canvas/source/opengl/ogl_textlayout.hxx | 5 +---- canvas/source/opengl/ogl_texturecache.hxx | 5 +---- canvas/source/opengl/ogl_tools.hxx | 5 +---- 12 files changed, 12 insertions(+), 48 deletions(-) (limited to 'canvas/source/opengl') diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx index 08258174b923..5bdb9713d211 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX +#pragma once #include #include @@ -69,6 +68,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index 717adb1d6f56..d4262d35679c 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX +#pragma once #include @@ -33,6 +32,4 @@ namespace oglcanvas typedef std::shared_ptr IBufferContextSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index 72ac619c5b60..55564c66d018 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX +#pragma once #include @@ -70,6 +69,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index 0f0a7693c00b..3cd43cf4f17e 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX +#pragma once #include @@ -90,6 +89,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index c7d44b8637b7..75eda6b0fb31 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX +#pragma once #include #include @@ -59,6 +58,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx index 26ec3f71eb63..49513983d157 100644 --- a/canvas/source/opengl/ogl_canvashelper.hxx +++ b/canvas/source/opengl/ogl_canvashelper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASHELPER_HXX +#pragma once #include @@ -217,6 +216,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx index 1ee15a9ba989..8e7029fbe5f4 100644 --- a/canvas/source/opengl/ogl_canvastools.hxx +++ b/canvas/source/opengl/ogl_canvastools.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX +#pragma once #include #include @@ -35,6 +34,4 @@ namespace oglcanvas void renderOSD( const std::vector& rNumbers, double scale ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 245575b863e7..33948b2d0cd2 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX +#pragma once #include @@ -112,6 +111,4 @@ namespace oglcanvas typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index d5f3cb714548..3b9a26262509 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX +#pragma once #include @@ -133,6 +132,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index 8c7a289d6ab9..f2e6869c466d 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX +#pragma once #include #include @@ -68,6 +67,4 @@ namespace oglcanvas } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx index 848b2e900abf..8d0a425ced17 100644 --- a/canvas/source/opengl/ogl_texturecache.hxx +++ b/canvas/source/opengl/ogl_texturecache.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX +#pragma once #include #include @@ -58,6 +57,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_tools.hxx b/canvas/source/opengl/ogl_tools.hxx index 469a5be7874b..8f42f734e68b 100644 --- a/canvas/source/opengl/ogl_tools.hxx +++ b/canvas/source/opengl/ogl_tools.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX +#pragma once #include #include @@ -25,6 +24,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit