summaryrefslogtreecommitdiff
path: root/canvas/source/opengl
diff options
context:
space:
mode:
authorGeorge Bateman <george.bateman16@gmail.com>2020-08-04 21:36:11 +0000
committerJulien Nabet <serval2412@yahoo.fr>2020-09-04 08:55:42 +0200
commitdf9ff47f984bfb8ce265cb73ec10a3dd5837bd10 (patch)
tree3add658814387dfeebf529df5f730de4b8904bbc /canvas/source/opengl
parent24491636d36a1d92a4bb9f3f1f1b2e65b81d8429 (diff)
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 <serval2412@yahoo.fr>
Diffstat (limited to 'canvas/source/opengl')
-rw-r--r--canvas/source/opengl/ogl_bitmapcanvashelper.hxx5
-rw-r--r--canvas/source/opengl/ogl_buffercontext.hxx5
-rw-r--r--canvas/source/opengl/ogl_canvasbitmap.hxx5
-rw-r--r--canvas/source/opengl/ogl_canvascustomsprite.hxx5
-rw-r--r--canvas/source/opengl/ogl_canvasfont.hxx5
-rw-r--r--canvas/source/opengl/ogl_canvashelper.hxx5
-rw-r--r--canvas/source/opengl/ogl_canvastools.hxx5
-rw-r--r--canvas/source/opengl/ogl_spritecanvas.hxx5
-rw-r--r--canvas/source/opengl/ogl_spritedevicehelper.hxx5
-rw-r--r--canvas/source/opengl/ogl_textlayout.hxx5
-rw-r--r--canvas/source/opengl/ogl_texturecache.hxx5
-rw-r--r--canvas/source/opengl/ogl_tools.hxx5
12 files changed, 12 insertions, 48 deletions
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 <com/sun/star/geometry/IntegerPoint2D.hpp>
#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
@@ -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 <epoxy/gl.h>
@@ -33,6 +32,4 @@ namespace oglcanvas
typedef std::shared_ptr<IBufferContext> 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 <cppuhelper/compbase.hxx>
@@ -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 <cppuhelper/compbase.hxx>
@@ -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 <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -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 <com/sun/star/rendering/XCanvas.hpp>
@@ -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 <sal/config.h>
#include <vector>
@@ -35,6 +34,4 @@ namespace oglcanvas
void renderOSD( const std::vector<double>& 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 <rtl/ref.hxx>
@@ -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 <vcl/opengl/OpenGLContext.hxx>
@@ -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 <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -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 <sal/types.h>
#include <unordered_map>
@@ -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 <sal/config.h>
#include <epoxy/gl.h>
@@ -25,6 +24,4 @@ namespace oglcanvas
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */