include/sfx2/linkmgr.hxx | 5 +---- include/sfx2/linksrc.hxx | 4 +--- include/sfx2/lokcomponenthelpers.hxx | 5 +---- include/sfx2/mailmodelapi.hxx | 5 +---- include/sfx2/mieclip.hxx | 5 +---- include/sfx2/module.hxx | 5 +---- include/sfx2/msg.hxx | 5 +---- include/sfx2/new.hxx | 5 +---- include/sfx2/objface.hxx | 5 +---- include/sfx2/opengrf.hxx | 5 +---- include/sfx2/passwd.hxx | 5 +---- include/sfx2/printopt.hxx | 5 +---- include/sfx2/sfxhtml.hxx | 6 +----- include/sfx2/sfxuno.hxx | 5 +---- include/sfx2/viewfac.hxx | 5 +---- include/svl/filenotation.hxx | 6 +----- include/test/sheet/xsheetlinkable.hxx | 5 +---- include/test/sheet/xsheetpagebreak.hxx | 5 +---- include/test/table/xcell.hxx | 5 +---- include/tools/zcodec.hxx | 5 +---- include/vcl/imapobj.hxx | 5 +---- include/vcl/imappoly.hxx | 5 +---- include/vcl/imaprect.hxx | 5 +---- include/vcl/inputctx.hxx | 5 +---- include/vcl/introwin.hxx | 5 +---- include/vcl/jobset.hxx | 5 +---- include/vcl/keycod.hxx | 5 +---- include/vcl/keycodes.hxx | 5 +---- include/vcl/layout.hxx | 5 +---- include/vcl/lazydelete.hxx | 4 +--- 30 files changed, 30 insertions(+), 120 deletions(-)
New commits: commit 405e3f8815d9117d3f6d93ac4d0031e308a284f0 Author: Keldin Maldonado (KNM) <kemaldon...@csumb.edu> AuthorDate: Sun Jan 28 21:12:54 2024 -0800 Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> CommitDate: Mon Jan 29 10:30:01 2024 +0100 tdf#143148 use pragma once instead of include guards Change-Id: I42c39d991d243191f410ebb8f91940d5922a6fc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162678 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org> diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index dddd8a54e288..af6be44f58b1 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.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_SFX2_LINKMGR_HXX -#define INCLUDED_SFX2_LINKMGR_HXX +#pragma once #include <rtl/ustring.hxx> #include <sal/config.h> @@ -182,6 +181,4 @@ SFX2_DLLPUBLIC void MakeLnkName( OUString& rName, } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index bac48b18589e..7fc3eaf42415 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.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_SFX2_LINKSRC_HXX -#define INCLUDED_SFX2_LINKSRC_HXX +#pragma once #include <sal/config.h> #include <sfx2/dllapi.h> @@ -114,6 +113,5 @@ public: typedef tools::SvRef<SvLinkSource> SvLinkSourceRef; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/lokcomponenthelpers.hxx b/include/sfx2/lokcomponenthelpers.hxx index c76067bc1330..6a8c05fcfd70 100644 --- a/include/sfx2/lokcomponenthelpers.hxx +++ b/include/sfx2/lokcomponenthelpers.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SFX2_LOKCHARTHELPER_HXX -#define INCLUDED_SFX2_LOKCHARTHELPER_HXX +#pragma once #include <sfx2/dllapi.h> #include <tools/gen.hxx> @@ -94,6 +93,4 @@ private: VclPtr<vcl::Window> mpWidgetWindow; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx index 47d5b408659f..78438ff22483 100644 --- a/include/sfx2/mailmodelapi.hxx +++ b/include/sfx2/mailmodelapi.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_SFX2_MAILMODELAPI_HXX -#define INCLUDED_SFX2_MAILMODELAPI_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> @@ -99,6 +98,4 @@ public: bool CreateFromAddress_Impl( OUString& rFrom ); -#endif // INCLUDED_SFX2_MAILMODELAPI_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx index bc2a431b3a24..4d1256ba6da2 100644 --- a/include/sfx2/mieclip.hxx +++ b/include/sfx2/mieclip.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_MIECLIP_HXX -#define INCLUDED_SFX2_MIECLIP_HXX +#pragma once #include <memory> #include <rtl/ustring.hxx> @@ -38,6 +37,4 @@ public: SvStream* IsValid(SvStream&); }; -#endif // INCLUDED_SFX2_MIECLIP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 099222c1aa3a..38f136ec6def 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.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_SFX2_MODULE_HXX -#define INCLUDED_SFX2_MODULE_HXX +#pragma once #include <memory> #include <optional> @@ -98,6 +97,4 @@ public: SAL_DLLPRIVATE SfxChildWinFactory* GetChildWinFactoryById(sal_uInt16 nId) const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index c8d343b04bcf..4d6f1a060e50 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.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_SFX2_MSG_HXX -#define INCLUDED_SFX2_MSG_HXX +#pragma once #include <sfx2/shell.hxx> #include <rtl/ustring.hxx> @@ -278,6 +277,4 @@ inline SfxGroupId SfxSlot::GetGroupId() const } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 8cb2bd9b4ea4..f76bb8ebab05 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.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_SFX2_NEW_HXX -#define INCLUDED_SFX2_NEW_HXX +#pragma once #include <memory> #include <sal/config.h> @@ -103,6 +102,4 @@ public: void SetTemplateFlags(SfxTemplateFlags nSet); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index fadf510ca997..d537069ca0f3 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.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_SFX2_OBJFACE_HXX -#define INCLUDED_SFX2_OBJFACE_HXX +#pragma once #include <memory> #include <rtl/ustring.hxx> @@ -116,6 +115,4 @@ inline sal_uInt16 SfxInterface::Count() const return nCount; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx index c23e10989bb0..4546fbabc726 100644 --- a/include/sfx2/opengrf.hxx +++ b/include/sfx2/opengrf.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_SFX2_OPENGRF_HXX -#define INCLUDED_SFX2_OPENGRF_HXX +#pragma once #include <memory> #include <sfx2/dllapi.h> @@ -67,6 +66,4 @@ private: const std::unique_ptr< SvxOpenGrf_Impl > mpImpl; }; -#endif // _SVX_OPENGRF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 3ddffed196d0..602e8d122f05 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.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_SFX2_PASSWD_HXX -#define INCLUDED_SFX2_PASSWD_HXX +#pragma once #include <sal/config.h> #include <sfx2/dllapi.h> @@ -136,6 +135,4 @@ public: ~SfxPasswordDialog(); }; -#endif // INCLUDED_SFX2_PASSWD_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index e01991dad347..ee105f86c730 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_PRINTOPT_HXX -#define INCLUDED_SFX2_PRINTOPT_HXX +#pragma once #include <sal/config.h> #include <sfx2/dllapi.h> @@ -94,6 +93,4 @@ public: static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*); }; -#endif // INCLUDED_SFX2_PRINTOPT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 9f5a03f5b250..418501c8e65d 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SFXHTML_HXX -#define INCLUDED_SFX2_SFXHTML_HXX +#pragma once #include <sal/config.h> #include <sfx2/dllapi.h> @@ -107,7 +106,4 @@ inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, std::u16string nEventMouseOver, nEventMouseOut ); } - -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index 6c6253f37f76..22c7e53666f3 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SFX2_SFXUNO_HXX -#define INCLUDED_SFX2_SFXUNO_HXX +#pragma once #include <sal/config.h> #include <sfx2/dllapi.h> @@ -45,6 +44,4 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be typedef sal_Int32 FrameSearchFlags; -#endif // INCLUDED_SFX2_SFXUNO_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index c09791216f0e..325cb85799d1 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.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_SFX2_VIEWFAC_HXX -#define INCLUDED_SFX2_VIEWFAC_HXX +#pragma once #include <rtl/ustring.hxx> #include <sal/config.h> @@ -55,6 +54,4 @@ private: const OUString m_sViewName; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx index d33e442b9396..b66c2d56f394 100644 --- a/include/svl/filenotation.hxx +++ b/include/svl/filenotation.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVL_FILENOTATION_HXX -#define INCLUDED_SVL_FILENOTATION_HXX +#pragma once #include <svl/svldllapi.h> #include <rtl/ustring.hxx> @@ -56,7 +55,4 @@ namespace svt } // namespace svt - -#endif // INCLUDED_SVL_FILENOTATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/sheet/xsheetlinkable.hxx b/include/test/sheet/xsheetlinkable.hxx index fc239fb7b75c..5c82e1e4f05d 100644 --- a/include/test/sheet/xsheetlinkable.hxx +++ b/include/test/sheet/xsheetlinkable.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_TEST_SHEET_XSHEETLINKABLE_HXX -#define INCLUDED_TEST_SHEET_XSHEETLINKABLE_HXX +#pragma once #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> @@ -30,6 +29,4 @@ protected: }; } -#endif // INCLUDED_TEST_SHEET_XSHEETLINKABLE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/sheet/xsheetpagebreak.hxx b/include/test/sheet/xsheetpagebreak.hxx index e7a47628d0d6..8f0460a9adb4 100644 --- a/include/test/sheet/xsheetpagebreak.hxx +++ b/include/test/sheet/xsheetpagebreak.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_TEST_SHEET_XSHEETPAGEBREAK_HXX -#define INCLUDED_TEST_SHEET_XSHEETPAGEBREAK_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> @@ -29,6 +28,4 @@ protected: }; } -#endif // INCLUDED_TEST_SHEET_XSHEETPAGEBREAK_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/test/table/xcell.hxx b/include/test/table/xcell.hxx index a0249aac9163..71c324e09ef0 100644 --- a/include/test/table/xcell.hxx +++ b/include/test/table/xcell.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_TEST_TABLE_XCELL_HXX -#define INCLUDED_TEST_TABLE_XCELL_HXX +#pragma once #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> @@ -32,6 +31,4 @@ protected: }; } -#endif // INCLUDED_TEST_TABLE_XCELL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index a86dbec70b62..6d664cd35468 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLS_ZCODEC_HXX -#define INCLUDED_TOOLS_ZCODEC_HXX +#pragma once #include <tools/toolsdllapi.h> #include <tools/long.hxx> @@ -91,6 +90,4 @@ public: tools::Long Read( SvStream& rIStm, sal_uInt8* pData, sal_uInt32 nSize ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx index 6e517fddb88a..3c3e864954e5 100644 --- a/include/vcl/imapobj.hxx +++ b/include/vcl/imapobj.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_IMAPOBJ_HXX -#define INCLUDED_VCL_IMAPOBJ_HXX +#pragma once #include <svl/macitem.hxx> #include <rtl/strbuf.hxx> @@ -124,6 +123,4 @@ public: void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/imappoly.hxx b/include/vcl/imappoly.hxx index 5a9e80c27a69..d2fa123f3406 100644 --- a/include/vcl/imappoly.hxx +++ b/include/vcl/imappoly.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_IMAPPOLY_HXX -#define INCLUDED_VCL_IMAPPOLY_HXX +#pragma once #include <vcl/dllapi.h> #include <vcl/imapobj.hxx> @@ -68,6 +67,4 @@ public: void WriteNCSA( SvStream& rOStm ) const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/imaprect.hxx b/include/vcl/imaprect.hxx index 6637bb771935..9e1b99833d2c 100644 --- a/include/vcl/imaprect.hxx +++ b/include/vcl/imaprect.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_VCL_IMAPRECT_HXX -#define INCLUDED_VCL_IMAPRECT_HXX +#pragma once #include <vcl/dllapi.h> #include <vcl/imapobj.hxx> @@ -62,6 +61,4 @@ public: void WriteNCSA( SvStream& rOStm ) const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index 3d2f620ed0c6..aa9c45b34b3c 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INPUTCTX_HXX -#define INCLUDED_VCL_INPUTCTX_HXX +#pragma once #include <vcl/dllapi.h> #include <utility> @@ -77,6 +76,4 @@ inline bool InputContext::operator==( const InputContext& rInputContext ) const (maFont == rInputContext.maFont)); } -#endif // INCLUDED_VCL_INPUTCTX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx index 8d7d709e457b..d53d4e019093 100644 --- a/include/vcl/introwin.hxx +++ b/include/vcl/introwin.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INTROWIN_HXX -#define INCLUDED_VCL_INTROWIN_HXX +#pragma once #include <config_options.h> #include <vcl/dllapi.h> @@ -35,6 +34,4 @@ public: virtual void dispose() override; }; -#endif // INCLUDED_VCL_INTROWIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx index ff7b5dfb65a6..3f0e1efc68cd 100644 --- a/include/vcl/jobset.hxx +++ b/include/vcl/jobset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_JOBSET_HXX -#define INCLUDED_VCL_JOBSET_HXX +#pragma once #include <rtl/ustring.hxx> #include <vcl/dllapi.h> @@ -58,6 +57,4 @@ private: ImplType mpData; }; -#endif // INCLUDED_VCL_JOBSET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 68841ef85cac..43eb872efc12 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_KEYCOD_HXX -#define INCLUDED_VCL_KEYCOD_HXX +#pragma once #include <rtl/ustring.hxx> #include <vcl/dllapi.h> @@ -111,6 +110,4 @@ inline bool vcl::KeyCode::operator !=( const vcl::KeyCode& rKeyCode ) const return (GetFunction() != rKeyCode.GetFunction()); } -#endif // INCLUDED_VCL_KEYCOD_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index 8eb1a0ec8c2c..458e02488ea9 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_KEYCODES_HXX -#define INCLUDED_VCL_KEYCODES_HXX +#pragma once #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -200,6 +199,4 @@ template <> struct typed_flags<KeyIndicatorState> : is_typed_flags<KeyIndicatorS }; } -#endif // INCLUDED_VCL_KEYCODES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index c14776f26217..5f1c63049486 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_LAYOUT_HXX -#define INCLUDED_VCL_LAYOUT_HXX +#pragma once #include <config_options.h> #include <vcl/dllapi.h> @@ -838,6 +837,4 @@ vcl::Window* getNonLayoutParent(vcl::Window *pParent); //Sort ok/cancel etc buttons in platform order void sort_native_button_order(const VclBox& rContainer); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 427ff8373911..4a524d99fa4d 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_LAZYDELETE_HXX -#define INCLUDED_VCL_LAZYDELETE_HXX +#pragma once #include <vcl/dllapi.h> @@ -134,5 +133,4 @@ namespace vcl }; } -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */