include/codemaker/codemaker.hxx | 5 +---- include/codemaker/commonjava.hxx | 5 +---- include/codemaker/exceptiontree.hxx | 5 +---- include/codemaker/generatedtypeset.hxx | 5 +---- include/codemaker/options.hxx | 5 +---- include/codemaker/typemanager.hxx | 5 +---- include/codemaker/unotype.hxx | 5 +---- include/cppcanvas/basegfxfactory.hxx | 5 +---- include/cppcanvas/bitmap.hxx | 5 +---- include/cppcanvas/bitmapcanvas.hxx | 5 +---- include/cppcanvas/canvas.hxx | 5 +---- include/cppcanvas/canvasgraphic.hxx | 5 +---- include/cppcanvas/color.hxx | 5 +---- include/cppcanvas/customsprite.hxx | 5 +---- include/cppcanvas/polypolygon.hxx | 5 +---- include/cppcanvas/renderer.hxx | 5 +---- include/cppcanvas/sprite.hxx | 5 +---- include/cppcanvas/spritecanvas.hxx | 5 +---- include/cppcanvas/vclfactory.hxx | 5 +---- 19 files changed, 19 insertions(+), 76 deletions(-)
New commits: commit b61ae38fe4794e0e0ae8fd067b19d1f33dc75fda Author: zdavis <[email protected]> AuthorDate: Fri Nov 15 06:07:30 2024 +0000 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Fri Nov 22 07:01:52 2024 +0100 tdf#143148 Use pragma once instead of include guards Change-Id: Ic6796c91318bc838804ec30790f52480734e9b7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176615 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/include/codemaker/codemaker.hxx b/include/codemaker/codemaker.hxx index cf22b8a1f47f..163840e06f60 100644 --- a/include/codemaker/codemaker.hxx +++ b/include/codemaker/codemaker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_CODEMAKER_HXX -#define INCLUDED_CODEMAKER_CODEMAKER_HXX +#pragma once #include <sal/config.h> @@ -33,6 +32,4 @@ namespace codemaker rtl::OString convertString(rtl::OUString const& string); } -#endif // INCLUDED_CODEMAKER_CODEMAKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx index daac32263cea..12a58e6da8b5 100644 --- a/include/codemaker/commonjava.hxx +++ b/include/codemaker/commonjava.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_COMMONJAVA_HXX -#define INCLUDED_CODEMAKER_COMMONJAVA_HXX +#pragma once #include <sal/config.h> @@ -39,6 +38,4 @@ rtl::OString translateUnoToJavaIdentifier( } -#endif // INCLUDED_CODEMAKER_COMMONJAVA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx index 46291e491746..13764714222f 100644 --- a/include/codemaker/exceptiontree.hxx +++ b/include/codemaker/exceptiontree.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX -#define INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX +#pragma once #include <rtl/ref.hxx> #include <rtl/string.hxx> @@ -114,6 +113,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index cc2827cb9aa7..9f64b6080855 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX -#define INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX +#pragma once #include <rtl/string.hxx> @@ -65,6 +64,4 @@ private: }; } -#endif // INCLUDED_CODEMAKER_GENERATEDTYPESET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index 803274901a4a..6107419636fe 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_OPTIONS_HXX -#define INCLUDED_CODEMAKER_OPTIONS_HXX +#pragma once #include <codemaker/global.hxx> #include <unordered_map> @@ -67,6 +66,4 @@ protected: OptionMap m_options; }; -#endif // INCLUDED_CODEMAKER_OPTIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/typemanager.hxx b/include/codemaker/typemanager.hxx index 7e312f3f8094..302e79e351d1 100644 --- a/include/codemaker/typemanager.hxx +++ b/include/codemaker/typemanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_TYPEMANAGER_HXX -#define INCLUDED_CODEMAKER_TYPEMANAGER_HXX +#pragma once #include <sal/config.h> @@ -77,6 +76,4 @@ inline OUString b2u(std::string_view s) { return OStringToOUString(s, RTL_TEXTENCODING_UTF8); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/codemaker/unotype.hxx b/include/codemaker/unotype.hxx index 606321873242..f7651cd95916 100644 --- a/include/codemaker/unotype.hxx +++ b/include/codemaker/unotype.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CODEMAKER_UNOTYPE_HXX -#define INCLUDED_CODEMAKER_UNOTYPE_HXX +#pragma once #include <sal/types.h> @@ -83,6 +82,4 @@ namespace codemaker::UnoType { } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/basegfxfactory.hxx b/include/cppcanvas/basegfxfactory.hxx index 611523066792..0bd75e4ed66d 100644 --- a/include/cppcanvas/basegfxfactory.hxx +++ b/include/cppcanvas/basegfxfactory.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX -#define INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX +#pragma once #include <cppcanvas/canvas.hxx> #include <cppcanvas/polypolygon.hxx> @@ -71,6 +70,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_BASEGFXFACTORY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx index 1b163b82d479..d5b34d9285ed 100644 --- a/include/cppcanvas/bitmap.hxx +++ b/include/cppcanvas/bitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_BITMAP_HXX -#define INCLUDED_CPPCANVAS_BITMAP_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <cppcanvas/canvasgraphic.hxx> @@ -65,6 +64,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr; } -#endif // INCLUDED_CPPCANVAS_BITMAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx index 9c3e7f843934..052092912ed1 100644 --- a/include/cppcanvas/bitmapcanvas.hxx +++ b/include/cppcanvas/bitmapcanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX -#define INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX +#pragma once #include <basegfx/vector/b2isize.hxx> #include <cppcanvas/canvas.hxx> @@ -44,6 +43,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_BITMAPCANVAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx index 2fce102824dd..c7fea3c63342 100644 --- a/include/cppcanvas/canvas.hxx +++ b/include/cppcanvas/canvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_CANVAS_HXX -#define INCLUDED_CPPCANVAS_CANVAS_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <memory> @@ -96,6 +95,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_CANVAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx index ebee831f0a3b..0a9c78ef2bef 100644 --- a/include/cppcanvas/canvasgraphic.hxx +++ b/include/cppcanvas/canvasgraphic.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX -#define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX +#pragma once #include <sal/types.h> #include <memory> @@ -75,6 +74,4 @@ namespace cppcanvas }; } -#endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx index 500e5953e7cc..3682832c3dd1 100644 --- a/include/cppcanvas/color.hxx +++ b/include/cppcanvas/color.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_COLOR_HXX -#define INCLUDED_CPPCANVAS_COLOR_HXX +#pragma once #include <sal/types.h> @@ -65,6 +64,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_COLOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx index abbd0c00bb05..52382c42b16d 100644 --- a/include/cppcanvas/customsprite.hxx +++ b/include/cppcanvas/customsprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX -#define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX +#pragma once #include <cppcanvas/sprite.hxx> #include <cppcanvas/canvas.hxx> @@ -39,6 +38,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr; } -#endif // INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx index 917ef4dafb04..04e3a61d3411 100644 --- a/include/cppcanvas/polypolygon.hxx +++ b/include/cppcanvas/polypolygon.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_POLYPOLYGON_HXX -#define INCLUDED_CPPCANVAS_POLYPOLYGON_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <cppcanvas/canvasgraphic.hxx> @@ -71,6 +70,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr; } -#endif // INCLUDED_CPPCANVAS_POLYPOLYGON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx index d71be2f09e89..036d974f4830 100644 --- a/include/cppcanvas/renderer.hxx +++ b/include/cppcanvas/renderer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_RENDERER_HXX -#define INCLUDED_CPPCANVAS_RENDERER_HXX +#pragma once #include <sal/types.h> #include <rtl/ustring.hxx> @@ -135,6 +134,4 @@ namespace cppcanvas typedef std::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr; } -#endif // INCLUDED_CPPCANVAS_RENDERER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx index 3321eb6a03a3..3c1b82d38a74 100644 --- a/include/cppcanvas/sprite.hxx +++ b/include/cppcanvas/sprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_SPRITE_HXX -#define INCLUDED_CPPCANVAS_SPRITE_HXX +#pragma once namespace basegfx { @@ -91,6 +90,4 @@ namespace cppcanvas }; } -#endif // INCLUDED_CPPCANVAS_SPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx index c4d100dbedb9..bb7d3d2f70aa 100644 --- a/include/cppcanvas/spritecanvas.hxx +++ b/include/cppcanvas/spritecanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_SPRITECANVAS_HXX -#define INCLUDED_CPPCANVAS_SPRITECANVAS_HXX +#pragma once #include <basegfx/vector/b2dsize.hxx> #include <cppcanvas/canvas.hxx> @@ -58,6 +57,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_SPRITECANVAS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index 73867626d3c0..3d6ab24482ee 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CPPCANVAS_VCLFACTORY_HXX -#define INCLUDED_CPPCANVAS_VCLFACTORY_HXX +#pragma once #include <cppcanvas/canvas.hxx> #include <cppcanvas/bitmapcanvas.hxx> @@ -82,6 +81,4 @@ namespace cppcanvas } -#endif // INCLUDED_CPPCANVAS_VCLFACTORY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
