include/registry/reader.hxx | 5 +---- include/registry/refltype.hxx | 5 +---- include/registry/regdllapi.h | 5 +---- include/registry/regtype.h | 5 +---- include/registry/typereg_reader.hxx | 5 +---- include/registry/types.hxx | 5 +---- include/registry/version.h | 5 +---- registry/source/reflcnst.hxx | 6 +----- registry/source/regimpl.hxx | 5 +---- registry/source/regkey.hxx | 5 +---- 10 files changed, 10 insertions(+), 41 deletions(-)
New commits: commit 6952be913510c63716940648a06163c19622187e Author: Chris Sherlock <[email protected]> AuthorDate: Sun Jan 9 06:34:39 2022 +1100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Jul 4 10:07:17 2022 +0200 tdf#143148 registry: Use pragma once instead of include guards Change-Id: I8598034598d6911b784a1550c78552f6ac87bc22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128172 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx index b804ba3ed559..27b3cb50e8d7 100644 --- a/include/registry/reader.hxx +++ b/include/registry/reader.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_READER_HXX -#define INCLUDED_REGISTRY_READER_HXX +#pragma once #include <registry/typereg_reader.hxx> #include <registry/refltype.hxx> @@ -601,6 +600,4 @@ private: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx index 5278e37c01b5..14fc81fe88a7 100644 --- a/include/registry/refltype.hxx +++ b/include/registry/refltype.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_REFLTYPE_HXX -#define INCLUDED_REGISTRY_REFLTYPE_HXX +#pragma once #include <registry/types.hxx> #include <sal/types.h> @@ -47,6 +46,4 @@ public: /// specifies the calling convention for type reader/writer api #define TYPEREG_CALLTYPE SAL_CALL -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/regdllapi.h b/include/registry/regdllapi.h index 603eea11dba8..4a324e93cb04 100644 --- a/include/registry/regdllapi.h +++ b/include/registry/regdllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_REGDLLAPI_H -#define INCLUDED_REGISTRY_REGDLLAPI_H +#pragma once #include <sal/types.h> @@ -28,6 +27,4 @@ #define REG_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif // INCLUDED_REGISTRY_REGDLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/regtype.h b/include/registry/regtype.h index 89fdcc940aaf..8b72931d3847 100644 --- a/include/registry/regtype.h +++ b/include/registry/regtype.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_REGTYPE_H -#define INCLUDED_REGISTRY_REGTYPE_H +#pragma once #include <sal/types.h> #include <o3tl/typed_flags_set.hxx> @@ -136,6 +135,4 @@ enum class SAL_DLLPUBLIC_RTTI RegError /// specify the calling convention for the registry API #define REGISTRY_CALLTYPE SAL_CALL -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/typereg_reader.hxx b/include/registry/typereg_reader.hxx index a0af800f0527..88d683c7dd34 100644 --- a/include/registry/typereg_reader.hxx +++ b/include/registry/typereg_reader.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_READER_H -#define INCLUDED_REGISTRY_READER_H +#pragma once #include <registry/regdllapi.h> #include <registry/types.hxx> @@ -560,6 +559,4 @@ REG_DLLPUBLIC RTReferenceType typereg_reader_getReferenceSort( REG_DLLPUBLIC void typereg_reader_getReferenceTypeName( void * handle, rtl_uString ** result, sal_uInt16 index); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/types.hxx b/include/registry/types.hxx index a9763f5ea6bb..820e342a7323 100644 --- a/include/registry/types.hxx +++ b/include/registry/types.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_TYPES_H -#define INCLUDED_REGISTRY_TYPES_H +#pragma once #include <sal/types.h> #include <o3tl/typed_flags_set.hxx> @@ -334,6 +333,4 @@ enum class RTReferenceType TYPE_PARAMETER }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/registry/version.h b/include/registry/version.h index b7c066d4177f..59988d7cdcdb 100644 --- a/include/registry/version.h +++ b/include/registry/version.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_VERSION_H -#define INCLUDED_REGISTRY_VERSION_H +#pragma once #include <sal/types.h> @@ -64,6 +63,4 @@ enum typereg_Version { } #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index 529d02f9d68a..2c93a9cd22f2 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_SOURCE_REFLCNST_HXX -#define INCLUDED_REGISTRY_SOURCE_REFLCNST_HXX +#pragma once #include <registry/types.hxx> @@ -186,7 +185,4 @@ sal_uInt32 readString(const sal_uInt8* buffer, sal_Unicode* v, sal_uInt32 maxSiz sal_uInt32 UINT16StringLen(const sal_uInt8* wstring); -#endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index ecc7d1a9551d..25f9d50e7695 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX -#define INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX +#pragma once #include <sal/config.h> @@ -121,6 +120,4 @@ private: static constexpr OUStringLiteral ROOT { u"/" }; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/source/regkey.hxx b/registry/source/regkey.hxx index 76e8c2993c18..51114e5ccceb 100644 --- a/registry/source/regkey.hxx +++ b/registry/source/regkey.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_REGISTRY_SOURCE_REGKEY_HXX -#define INCLUDED_REGISTRY_SOURCE_REGKEY_HXX +#pragma once #include <sal/config.h> #include <registry/regtype.h> @@ -64,6 +63,4 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString**, sal_uInt32); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
