vcl/inc/unx/gtk/atkbridge.hxx | 5 +---- vcl/inc/unx/gtk/gtkbackend.hxx | 5 +---- vcl/inc/unx/gtk/gtkdata.hxx | 4 +--- vcl/inc/unx/gtk/gtkframe.hxx | 4 +--- vcl/inc/unx/gtk/gtkgdi.hxx | 4 +--- 5 files changed, 5 insertions(+), 17 deletions(-)
New commits: commit 3297c1912f40450f92b67ad592ac255e1cd21749 Author: Deepika Goyal <deepika.goya...@gmail.com> AuthorDate: Thu Aug 17 18:06:43 2023 +0400 Commit: Julien Nabet <serval2...@yahoo.fr> CommitDate: Tue Aug 22 14:13:49 2023 +0200 tdf#143148 Use pragma once in vcl Change-Id: I99ef7d219a427989397d7d7dc75e1e0ebc8e22d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155812 Reviewed-by: Julien Nabet <serval2...@yahoo.fr> Tested-by: Jenkins diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx index 49c422dacfbd..19e37baab5cf 100644 --- a/vcl/inc/unx/gtk/atkbridge.hxx +++ b/vcl/inc/unx/gtk/atkbridge.hxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX -#define INCLUDED_VCL_INC_UNX_GTK_ATKBRIDGE_HXX +#pragma once #include <vclpluginapi.h> bool InitAtkBridge(); void DeInitAtkBridge(); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkbackend.hxx b/vcl/inc/unx/gtk/gtkbackend.hxx index 03b2e021313b..1317ad6f72b1 100644 --- a/vcl/inc/unx/gtk/gtkbackend.hxx +++ b/vcl/inc/unx/gtk/gtkbackend.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKBACKEND_HXX -#define INCLUDED_VCL_INC_UNX_GTK_GTKBACKEND_HXX +#pragma once #include <gtk/gtk.h> #if defined(GDK_WINDOWING_X11) @@ -28,6 +27,4 @@ bool DLSYM_GDK_IS_X11_DISPLAY(GdkDisplay* pDisplay); bool DLSYM_GDK_IS_WAYLAND_DISPLAY(GdkDisplay* pDisplay); #endif -#endif // INCLUDED_VCL_INC_UNX_GTK_GTKBACKEND_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 04c1485963f5..704490e821d4 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX -#define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX +#pragma once #define GLIB_DISABLE_DEPRECATION_WARNINGS #include <gtk/gtk.h> @@ -364,6 +363,5 @@ GtkSalDisplay *GtkSalData::GetGtkDisplay() const return static_cast<GtkSalDisplay *>(GetDisplay()); } -#endif // INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index be9a6a2dda83..abbe36807bbc 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX -#define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX +#pragma once #include <cairo.h> #include <gdk/gdk.h> @@ -691,6 +690,5 @@ enum GdkAnchorHints }; #endif -#endif // INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 2fc66ace5ece..9d8bb26ce787 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX -#define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX +#pragma once #include <config_cairo_canvas.h> @@ -242,6 +241,5 @@ private: static bool style_loaded; }; -#endif // INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */