vcl/source/treelist/iconviewimpl.hxx | 5 +----
vcl/source/uitest/uno/uiobject_uno.hxx | 5 +----
vcl/source/window/bufferdevice.hxx | 5 +----
vcl/source/window/dlgctrl.hxx | 5 +----
vcl/source/window/menubarwindow.hxx | 4 +---
vcl/source/window/menufloatingwindow.hxx | 4 +---
vcl/source/window/menuwindow.hxx | 4 +---
vcl/unx/generic/dtrans/X11_clipboard.hxx | 5 +----
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 5 +----
vcl/unx/generic/dtrans/X11_selection.hxx | 5 +----
vcl/unx/generic/dtrans/X11_transferable.hxx | 5 +----
vcl/unx/generic/dtrans/bmp.hxx | 5 +----
vcl/unx/generic/gdi/cairo_xlib_cairo.hxx | 5 +----
vcl/unx/generic/gdi/gdiimpl.hxx | 5 +----
vcl/unx/generic/print/glyphset.hxx | 5 +----
vcl/unx/generic/print/prtsetup.hxx | 5 +----
vcl/unx/generic/print/psputil.hxx | 5 +----
vcl/unx/gtk3/a11y/atkfactory.hxx | 5 +----
vcl/unx/gtk3/a11y/atklistener.hxx | 5 +----
vcl/unx/gtk3/a11y/atkregistry.hxx | 5 +----
vcl/unx/gtk3/a11y/atktextattributes.hxx | 5 +----
vcl/unx/gtk3/a11y/atkutil.hxx | 5 +----
vcl/unx/gtk3/a11y/atkwrapper.hxx | 5 +----
vcl/unx/gtk3/cairo_gtk3_cairo.hxx | 5 +----
vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx | 5 +----
vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx | 5 +----
vcl/unx/gtk3/fpicker/eventnotification.hxx | 5 +----
vcl/win/gdi/gdiimpl.hxx | 5 +----
28 files changed, 28 insertions(+), 109 deletions(-)
New commits:
commit 77419c6f3aba1fd5b1660795923c22a39bdb1bad
Author: sarynasser <sarynass...@gmail.com>
AuthorDate: Tue Apr 13 15:25:50 2021 +0200
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Tue Apr 13 21:04:34 2021 +0200
tdf#124176 Use pragma once in vcl
Change-Id: I30834d8686763d8972cb1579341eefb43ae300c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114052
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/vcl/source/treelist/iconviewimpl.hxx
b/vcl/source/treelist/iconviewimpl.hxx
index 9436324bc566..be038eee587d 100644
--- a/vcl/source/treelist/iconviewimpl.hxx
+++ b/vcl/source/treelist/iconviewimpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX
-#define INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX
+#pragma once
#include <svimpbox.hxx>
@@ -63,6 +62,4 @@ protected:
void AdjustScrollBars(Size& rSize) override;
};
-#endif // INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/uitest/uno/uiobject_uno.hxx
b/vcl/source/uitest/uno/uiobject_uno.hxx
index 426f9d0476b8..f52cdeffe95d 100644
--- a/vcl/source/uitest/uno/uiobject_uno.hxx
+++ b/vcl/source/uitest/uno/uiobject_uno.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_SOURCE_UITEST_UNO_UIOBJECT_UNO_HXX
-#define INCLUDED_VCL_SOURCE_UITEST_UNO_UIOBJECT_UNO_HXX
+#pragma once
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
@@ -70,6 +69,4 @@ private:
css::uno::Sequence<css::beans::PropertyValue> mPropValues;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/bufferdevice.hxx
b/vcl/source/window/bufferdevice.hxx
index f785b6bdcbee..eafc829e5910 100644
--- a/vcl/source/window/bufferdevice.hxx
+++ b/vcl/source/window/bufferdevice.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_SOURCE_WINDOW_BUFFERDEVICE_HXX
-#define INCLUDED_VCL_SOURCE_WINDOW_BUFFERDEVICE_HXX
+#pragma once
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
@@ -33,6 +32,4 @@ public:
};
}
-#endif // INCLUDED_VCL_SOURCE_WINDOW_BUFFERDEVICE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/dlgctrl.hxx b/vcl/source/window/dlgctrl.hxx
index d14f8e32672f..805099b69bac 100644
--- a/vcl/source/window/dlgctrl.hxx
+++ b/vcl/source/window/dlgctrl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SOURCE_WINDOW_DLGCTRL_HXX
-#define INCLUDED_VCL_SOURCE_WINDOW_DLGCTRL_HXX
+#pragma once
#include <vcl/window.hxx>
@@ -32,6 +31,4 @@ vcl::Window* ImplFindAccelWindow( vcl::Window* pParent,
sal_uInt16& rIndex, sal_
sal_Unicode getAccel( const OUString& rStr );
-#endif // INCLUDED_VCL_SOURCE_WINDOW_DLGCTRL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/menubarwindow.hxx
b/vcl/source/window/menubarwindow.hxx
index 01b26b020b5d..570ffc5d20ca 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SOURCE_WINDOW_MENUBARWINDOW_HXX
-#define INCLUDED_VCL_SOURCE_WINDOW_MENUBARWINDOW_HXX
+#pragma once
#include "menuwindow.hxx"
@@ -146,5 +145,4 @@ public:
bool CanGetFocus() const;
};
-#endif // INCLUDED_VCL_SOURCE_WINDOW_MENUBARWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/menufloatingwindow.hxx
b/vcl/source/window/menufloatingwindow.hxx
index e41dac5f2767..2fbc19f2d4d3 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SOURCE_WINDOW_MENUFLOATINGWINDOW_HXX
-#define INCLUDED_VCL_SOURCE_WINDOW_MENUFLOATINGWINDOW_HXX
+#pragma once
#include "menuwindow.hxx"
@@ -126,5 +125,4 @@ public:
virtual css::uno::Reference<css::accessibility::XAccessible>
CreateAccessible() override;
};
-#endif // INCLUDED_VCL_SOURCE_WINDOW_MENUFLOATINGWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/menuwindow.hxx b/vcl/source/window/menuwindow.hxx
index dcd81dea2e18..df0606b88897 100644
--- a/vcl/source/window/menuwindow.hxx
+++ b/vcl/source/window/menuwindow.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SOURCE_WINDOW_MENUWINDOW_HXX
-#define INCLUDED_VCL_SOURCE_WINDOW_MENUWINDOW_HXX
+#pragma once
#include <sal/types.h>
#include <vcl/event.hxx>
@@ -54,5 +53,4 @@ protected:
const HelpEvent& rHEvt, const tools::Rectangle &rHighlightRect);
};
-#endif // INCLUDED_VCL_SOURCE_WINDOW_MENUWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx
b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index c7e8b59391cd..d2fe1cd1a481 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_CLIPBOARD_HXX
-#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_CLIPBOARD_HXX
+#pragma once
#include "X11_selection.hxx"
@@ -109,6 +108,4 @@ namespace x11 {
} // namespace
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index 18c33666b8d5..71283ea64187 100644
--- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_DNDCONTEXT_HXX
-#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_DNDCONTEXT_HXX
+#pragma once
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
@@ -78,6 +77,4 @@ namespace x11 {
};
} // namespace
-#endif // INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_DNDCONTEXT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx
b/vcl/unx/generic/dtrans/X11_selection.hxx
index 2b49b15fb356..f002440f00bc 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_SELECTION_HXX
-#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_SELECTION_HXX
+#pragma once
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
@@ -494,6 +493,4 @@ namespace x11 {
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx
b/vcl/unx/generic/dtrans/X11_transferable.hxx
index 0de101f6d354..23cb9dd373a6 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_TRANSFERABLE_HXX
-#define INCLUDED_VCL_UNX_GENERIC_DTRANS_X11_TRANSFERABLE_HXX
+#pragma once
#include "X11_selection.hxx"
#include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -48,6 +47,4 @@ namespace x11 {
} // namespace
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx
index e4dc3ee30f9b..0f7de01fe7ef 100644
--- a/vcl/unx/generic/dtrans/bmp.hxx
+++ b/vcl/unx/generic/dtrans/bmp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GENERIC_DTRANS_BMP_HXX
-#define INCLUDED_VCL_UNX_GENERIC_DTRANS_BMP_HXX
+#pragma once
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -73,6 +72,4 @@ css::uno::Sequence<sal_Int8> convertBitmapDepth(
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 9b0dfb01b759..c44fde437a32 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
-#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
+#pragma once
#include <sal/config.h>
#include <vcl/cairo.hxx>
@@ -94,6 +93,4 @@ namespace cairo {
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 99499e08b444..6257b47d613d 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
-#define INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX
+#pragma once
#include <X11/Xlib.h>
@@ -295,6 +294,4 @@ public:
void Init() override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/print/glyphset.hxx
b/vcl/unx/generic/print/glyphset.hxx
index e733846c58b5..bf652c9a6448 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
-#define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
+#pragma once
#include <osl/file.hxx>
@@ -78,6 +77,4 @@ public:
} /* namespace psp */
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/print/prtsetup.hxx
b/vcl/unx/generic/print/prtsetup.hxx
index cb1919a15da7..262ba903b79a 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_GENERIC_PRINT_PRTSETUP_HXX
-#define INCLUDED_VCL_GENERIC_PRINT_PRTSETUP_HXX
+#pragma once
#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
@@ -136,6 +135,4 @@ public:
int SetupPrinterDriver(weld::Window* pParent, ::psp::PrinterInfo& rJobData);
-#endif // _PAD_PRTSETUP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/print/psputil.hxx
b/vcl/unx/generic/print/psputil.hxx
index a401b04db511..e5ae18071f83 100644
--- a/vcl/unx/generic/print/psputil.hxx
+++ b/vcl/unx/generic/print/psputil.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
-#define INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
+#pragma once
#include <sal/config.h>
@@ -53,6 +52,4 @@ bool WritePS (osl::File* pFile, std::u16string_view
rString);
} /* namespace psp */
-#endif // INCLUDED_VCL_GENERIC_PRINT_PSPUTIL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/atkfactory.hxx b/vcl/unx/gtk3/a11y/atkfactory.hxx
index ac72b5897813..66c52eab76c3 100644
--- a/vcl/unx/gtk3/a11y/atkfactory.hxx
+++ b/vcl/unx/gtk3/a11y/atkfactory.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKFACTORY_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKFACTORY_HXX
+#pragma once
#include <atk/atk.h>
@@ -28,6 +27,4 @@ GType wrapper_factory_get_type();
} // extern "C"
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/atklistener.hxx
b/vcl/unx/gtk3/a11y/atklistener.hxx
index 58798d4439fb..7dcd78509b38 100644
--- a/vcl/unx/gtk3/a11y/atklistener.hxx
+++ b/vcl/unx/gtk3/a11y/atklistener.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
+#pragma once
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <cppuhelper/implbase.hxx>
@@ -66,6 +65,4 @@ private:
const css::uno::Reference< css::accessibility::XAccessibleContext >&
rxParent);
};
-#endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/atkregistry.hxx
b/vcl/unx/gtk3/a11y/atkregistry.hxx
index 6534c2840005..b26b83840710 100644
--- a/vcl/unx/gtk3/a11y/atkregistry.hxx
+++ b/vcl/unx/gtk3/a11y/atkregistry.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKREGISTRY_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKREGISTRY_HXX
+#pragma once
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <atk/atk.h>
@@ -32,6 +31,4 @@ void ooo_wrapper_registry_add(
void ooo_wrapper_registry_remove(
css::uno::Reference<css::accessibility::XAccessible> const& pAccessible);
-#endif // __ATK_REGISTRY_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/atktextattributes.hxx
b/vcl/unx/gtk3/a11y/atktextattributes.hxx
index 35dc661a6096..716ec45bd35e 100644
--- a/vcl/unx/gtk3/a11y/atktextattributes.hxx
+++ b/vcl/unx/gtk3/a11y/atktextattributes.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKTEXTATTRIBUTES_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKTEXTATTRIBUTES_HXX
+#pragma once
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -43,6 +42,4 @@ AtkAttributeSet*
attribute_set_prepend_tracked_change_insertion(AtkAttributeSet*
AtkAttributeSet*
attribute_set_prepend_tracked_change_deletion(AtkAttributeSet* attribute_set);
AtkAttributeSet*
attribute_set_prepend_tracked_change_formatchange(AtkAttributeSet*
attribute_set);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/atkutil.hxx b/vcl/unx/gtk3/a11y/atkutil.hxx
index 3df45c1cadfb..bc3d9d73b936 100644
--- a/vcl/unx/gtk3/a11y/atkutil.hxx
+++ b/vcl/unx/gtk3/a11y/atkutil.hxx
@@ -17,13 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKUTIL_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKUTIL_HXX
+#pragma once
#include <atk/atk.h>
void ooo_atk_util_ensure_event_listener();
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index b892b8979d8e..0b5f64726bba 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
-#define INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
+#pragma once
#include <sal/config.h>
@@ -125,6 +124,4 @@ OUStringToGChar(std::u16string_view rString )
#define OUStringToConstGChar( string ) OUStringToOString( string,
RTL_TEXTENCODING_UTF8 ).getStr()
-#endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
index 59ed1437f1b6..1b4ed6d32c01 100644
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_GTK3_CAIRO_HXX
-#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_GTK3_CAIRO_HXX
+#pragma once
#include <sal/config.h>
@@ -44,6 +43,4 @@ namespace cairo {
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
index 7cfe6a6199ee..5797a7a04e19 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
-#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
+#pragma once
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -234,6 +233,4 @@ class SalGtkFilePicker : public SalGtkPicker, public
SalGtkFilePicker_Base
};
-#endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFILEPICKER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx
b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx
index 53286f395d43..a7425d683f64 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
-#define INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
+#pragma once
#include <memory>
#include <rtl/ustring.hxx>
@@ -60,6 +59,4 @@ class SalGtkFolderPicker :
SalGtkFolderPicker& operator=( const SalGtkFolderPicker& ) = delete;
};
-#endif // INCLUDED_VCL_UNX_GTK_FPICKER_SALGTKFOLDERPICKER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/fpicker/eventnotification.hxx
b/vcl/unx/gtk3/fpicker/eventnotification.hxx
index 4a46ef0933c6..214da6da9b3b 100644
--- a/vcl/unx/gtk3/fpicker/eventnotification.hxx
+++ b/vcl/unx/gtk3/fpicker/eventnotification.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_EVENTNOTIFICATION_HXX
-#define INCLUDED_VCL_UNX_GTK_FPICKER_EVENTNOTIFICATION_HXX
+#pragma once
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -39,6 +38,4 @@ public:
= 0;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 3f4d13f1c517..86342533fc6c 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX
-#define INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX
+#pragma once
#include <salgdiimpl.hxx>
#include <tools/long.hxx>
@@ -251,6 +250,4 @@ public:
virtual bool supportsOperation(OutDevSupportType eType) const override;
};
-#endif // INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
