include/vcl/toolkit/button.hxx | 1 + include/vcl/toolkit/combobox.hxx | 5 +---- include/vcl/toolkit/controllayout.hxx | 5 +---- include/vcl/toolkit/dialog.hxx | 5 +---- include/vcl/toolkit/fixed.hxx | 1 + include/vcl/toolkit/fixedhyper.hxx | 5 +---- include/vcl/toolkit/imgctrl.hxx | 5 +---- include/vcl/toolkit/lstbox.hxx | 5 +---- include/vcl/toolkit/prgsbar.hxx | 5 +---- include/vcl/toolkit/roadmap.hxx | 6 ++---- include/vcl/toolkit/spin.hxx | 5 +---- include/vcl/toolkit/svtabbx.hxx | 1 + include/vcl/toolkit/tabdlg.hxx | 5 +---- include/vcl/toolkit/throbber.hxx | 5 +---- include/vcl/toolkit/unowrap.hxx | 5 +---- 15 files changed, 16 insertions(+), 48 deletions(-)
New commits: commit 38fc438a3d43eb3cc34f7f1e97b6f6d5806ec97e Author: Caolán McNamara <[email protected]> AuthorDate: Tue Mar 2 09:57:59 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Mar 3 15:55:35 2021 +0100 make all these headers pragma once Change-Id: Ic7968abf807c080636ef37a690990a962f702d35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111815 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx index 5ce55286e395..a470ea28d7c1 100644 --- a/include/vcl/toolkit/button.hxx +++ b/include/vcl/toolkit/button.hxx @@ -16,6 +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 . */ + #pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx index f31d0a83152e..97e5ef18dad7 100644 --- a/include/vcl/toolkit/combobox.hxx +++ b/include/vcl/toolkit/combobox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_COMBOBOX_HXX -#define INCLUDED_VCL_COMBOBOX_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -191,6 +190,4 @@ public: virtual void DumpAsPropertyTree(tools::JsonWriter&) override; }; -#endif // _COMBOBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/controllayout.hxx b/include/vcl/toolkit/controllayout.hxx index 00a39f25c5a0..d47514460fe9 100644 --- a/include/vcl/toolkit/controllayout.hxx +++ b/include/vcl/toolkit/controllayout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_CONTROLLAYOUT_HXX -#define INCLUDED_VCL_CONTROLLAYOUT_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -76,6 +75,4 @@ struct VCL_DLLPUBLIC ControlLayoutData } // namespace vcl -#endif // INCLUDED_VCL_CONTROLLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx index 6d72044f4c2f..e249487b1b50 100644 --- a/include/vcl/toolkit/dialog.hxx +++ b/include/vcl/toolkit/dialog.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_DIALOG_HXX -#define INCLUDED_VCL_DIALOG_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -163,6 +162,4 @@ public: void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) override; }; -#endif // INCLUDED_VCL_DIALOG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 6fbf0c640ec1..8d82039f1f56 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -16,6 +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 . */ + #pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) diff --git a/include/vcl/toolkit/fixedhyper.hxx b/include/vcl/toolkit/fixedhyper.hxx index 1a7ec8fada7d..084a508a427b 100644 --- a/include/vcl/toolkit/fixedhyper.hxx +++ b/include/vcl/toolkit/fixedhyper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_FIXEDHYPER_HXX -#define INCLUDED_VCL_FIXEDHYPER_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -116,6 +115,4 @@ public: virtual void SetText(const OUString& rNewDescription) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/imgctrl.hxx b/include/vcl/toolkit/imgctrl.hxx index 3e2b9c5bbd89..9dea3430d237 100644 --- a/include/vcl/toolkit/imgctrl.hxx +++ b/include/vcl/toolkit/imgctrl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_IMGCTRL_HXX -#define INCLUDED_VCL_IMGCTRL_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -50,6 +49,4 @@ protected: void ImplDraw( OutputDevice& rDev, const Point& rPos, const Size& rSize ) const; }; -#endif // INCLUDED_VCL_IMGCTRL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/lstbox.hxx b/include/vcl/toolkit/lstbox.hxx index 56e76f42ad82..7cba7c132b1e 100644 --- a/include/vcl/toolkit/lstbox.hxx +++ b/include/vcl/toolkit/lstbox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_LSTBOX_HXX -#define INCLUDED_VCL_LSTBOX_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -264,6 +263,4 @@ public: }; -#endif // INCLUDED_VCL_LSTBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/prgsbar.hxx b/include/vcl/toolkit/prgsbar.hxx index 3c0e121b0b0e..dd9423178dda 100644 --- a/include/vcl/toolkit/prgsbar.hxx +++ b/include/vcl/toolkit/prgsbar.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_PRGSBAR_HXX -#define INCLUDED_VCL_PRGSBAR_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -78,6 +77,4 @@ public: void SetValue( sal_uInt16 nNewPercent ); }; -#endif // INCLUDED_VCL_PRGSBAR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx index 7cfd6d7bd290..2568c682fa90 100644 --- a/include/vcl/toolkit/roadmap.hxx +++ b/include/vcl/toolkit/roadmap.hxx @@ -16,8 +16,8 @@ * 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_INC_ROADMAP_HXX -#define INCLUDED_VCL_INC_ROADMAP_HXX + +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -113,6 +113,4 @@ private: } // namespace vcl -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/spin.hxx b/include/vcl/toolkit/spin.hxx index 6b152bbc16f8..ad9162073cc7 100644 --- a/include/vcl/toolkit/spin.hxx +++ b/include/vcl/toolkit/spin.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_SPIN_HXX -#define INCLUDED_VCL_SPIN_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -96,6 +95,4 @@ private: } }; -#endif // INCLUDED_VCL_SPIN_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx index 38c1b18d50d1..480221ce0b09 100644 --- a/include/vcl/toolkit/svtabbx.hxx +++ b/include/vcl/toolkit/svtabbx.hxx @@ -16,6 +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 . */ + #pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) diff --git a/include/vcl/toolkit/tabdlg.hxx b/include/vcl/toolkit/tabdlg.hxx index dc2e370c1016..48fab3174ec0 100644 --- a/include/vcl/toolkit/tabdlg.hxx +++ b/include/vcl/toolkit/tabdlg.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_TABDLG_HXX -#define INCLUDED_VCL_TABDLG_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -47,6 +46,4 @@ public: virtual void StateChanged( StateChangedType nStateChange ) override; }; -#endif // INCLUDED_VCL_TABDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/throbber.hxx b/include/vcl/toolkit/throbber.hxx index 2159e3d14f1b..bdbbb020889c 100644 --- a/include/vcl/toolkit/throbber.hxx +++ b/include/vcl/toolkit/throbber.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_THROBBER_HXX -#define INCLUDED_VCL_THROBBER_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -83,6 +82,4 @@ private: DECL_LINK( TimeOutHdl, Timer*, void ); }; -#endif // INCLUDED_VCL_THROBBER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx index c646dbccc882..5aea57d3aad7 100644 --- a/include/vcl/toolkit/unowrap.hxx +++ b/include/vcl/toolkit/unowrap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_UNOWRAP_HXX -#define INCLUDED_VCL_UNOWRAP_HXX +#pragma once #if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) #error "don't use this in new code" @@ -91,6 +90,4 @@ protected: ~UnoWrapperBase() {} }; -#endif // INCLUDED_VCL_UNOWRAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
