include/toolkit/awt/vclxdevice.hxx | 5 +---- include/toolkit/awt/vclxmenu.hxx | 5 +---- include/toolkit/controls/unocontrol.hxx | 5 +---- include/toolkit/controls/unocontrolbase.hxx | 5 +---- include/toolkit/controls/unocontrolmodel.hxx | 5 +---- include/toolkit/controls/unocontrols.hxx | 5 +---- include/toolkit/dllapi.h | 5 +---- include/toolkit/helper/listenermultiplexer.hxx | 5 +---- include/toolkit/helper/macros.hxx | 5 +---- include/toolkit/helper/vclunohelper.hxx | 5 +---- 10 files changed, 10 insertions(+), 40 deletions(-)
New commits: commit 18034109ea2e80ccfa0f811db3ff54ca393b2441 Author: Simon Chenery <[email protected]> AuthorDate: Sun Aug 17 23:17:31 2025 +0200 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Mon Aug 25 20:46:59 2025 +0200 tdf#143148 replace include guards with pragma once in dir include/toolkit Change-Id: I3d17e4db89c1299aabdc633da769ecb8ff646434 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189834 Tested-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 4538eb9d8733..61243e6c8c5b 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX +#pragma once #include <toolkit/dllapi.h> #include <com/sun/star/awt/XDevice.hpp> @@ -77,6 +76,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 05275f7e1ab6..c36983d969a7 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX +#pragma once #include <config_options.h> #include <toolkit/dllapi.h> @@ -153,6 +152,4 @@ public: ~VCLXPopupMenu() override; }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index 999a5ed7852d..a51c69b9abba 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX +#pragma once #include <toolkit/dllapi.h> #include <com/sun/star/awt/XControl.hpp> @@ -226,6 +225,4 @@ protected: }; -#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index 06e57067d8fd..d8d14ab2c3c1 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX -#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX +#pragma once #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/util/Date.hpp> @@ -61,6 +60,4 @@ protected: }; -#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index 01a63ba57698..dcdbadff88e2 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX +#pragma once #include <toolkit/dllapi.h> @@ -171,6 +170,4 @@ protected: void setPropertyValuesImpl( std::unique_lock<std::mutex>& rGuard, const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ); }; -#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 559fd689beb9..cece6f457f44 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX -#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX +#pragma once #include <config_options.h> #include <toolkit/dllapi.h> @@ -1486,6 +1485,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/dllapi.h b/include/toolkit/dllapi.h index 3b61a68c565d..10cc44749f3d 100644 --- a/include/toolkit/dllapi.h +++ b/include/toolkit/dllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_DLLAPI_H -#define INCLUDED_TOOLKIT_DLLAPI_H +#pragma once #include <sal/config.h> #include <sal/types.h> @@ -29,6 +28,4 @@ #define TOOLKIT_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index b7113c17ee64..741deed70bdd 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX -#define INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX +#pragma once #include <config_options.h> #include <toolkit/dllapi.h> @@ -305,6 +304,4 @@ DECL_LISTENERMULTIPLEXER_START( TabPageListenerMultiplexer, css::awt::tab::XTabP void SAL_CALL tabPageActivated( const css::awt::tab::TabPageActivatedEvent& aEvent ) override; DECL_LISTENERMULTIPLEXER_END -#endif // INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index fd0cdabca58e..e25906abb350 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_HELPER_MACROS_HXX -#define INCLUDED_TOOLKIT_HELPER_MACROS_HXX +#pragma once #include <sal/log.hxx> #include <osl/diagnose.h> @@ -161,6 +160,4 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa return aNames; \ } \ -#endif // INCLUDED_TOOLKIT_HELPER_MACROS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 017e751b6506..205ae15a1098 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX -#define INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX +#pragma once #include <toolkit/dllapi.h> #include <com/sun/star/uno/Reference.h> @@ -141,6 +140,4 @@ public: static void setMousePointer(const css::uno::Reference<css::awt::XWindowPeer>& rWindowPeer, ::PointerStyle mousepointer); }; -#endif // INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
