From c2034f3993ab0e6f4550f3059b3229bc319b6b56 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 3 Jun 2014 11:20:22 +0200 Subject: fixincludeguards: fix include guards Change-Id: Ie6e8d4272b0b1d0d2ce93bcbc2e818a9eac1a56b Reviewed-on: https://gerrit.libreoffice.org/9629 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- vcl/inc/PhysicalFontCollection.hxx | 6 +++++- vcl/inc/PhysicalFontFace.hxx | 6 +++++- vcl/inc/PhysicalFontFamily.hxx | 7 ++++++- vcl/inc/magic.h | 6 +++++- vcl/inc/unx/x11/xlimits.hxx | 6 +++--- 5 files changed, 24 insertions(+), 7 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index fd9eb157ae51..e91124a1ea1f 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -16,7 +16,9 @@ * 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 + +#ifndef INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX +#define INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX #include @@ -87,4 +89,6 @@ private: mutable int mnFallbackCount; }; +#endif // INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index 5544252d70dc..f36b6a76f67f 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -16,7 +16,9 @@ * 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 + +#ifndef INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX +#define INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX #include @@ -80,5 +82,7 @@ friend class PhysicalFontFamily; PhysicalFontFace* mpNext; }; +#endif // INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx index b1f56dece2db..71861e98a9d6 100644 --- a/vcl/inc/PhysicalFontFamily.hxx +++ b/vcl/inc/PhysicalFontFamily.hxx @@ -16,7 +16,9 @@ * 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 + +#ifndef INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX +#define INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX #include @@ -82,3 +84,6 @@ private: int mnMinQuality; // quality of the worst font face }; +#endif // INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/magic.h b/vcl/inc/magic.h index 7da1d09b9b50..8f32567f7767 100644 --- a/vcl/inc/magic.h +++ b/vcl/inc/magic.h @@ -16,8 +16,12 @@ * 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 + +#ifndef INCLUDED_VCL_INC_MAGIC_H +#define INCLUDED_VCL_INC_MAGIC_H #define MAX_FALLBACK 16 +#endif // INCLUDED_VCL_INC_MAGIC_H + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/x11/xlimits.hxx b/vcl/inc/unx/x11/xlimits.hxx index b97499c0baed..a60584ad417c 100644 --- a/vcl/inc/unx/x11/xlimits.hxx +++ b/vcl/inc/unx/x11/xlimits.hxx @@ -7,14 +7,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef VCL_X11LIMITS -#define VCL_X11LIMITS +#ifndef INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX +#define INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX #include #include VCLPLUG_GEN_PUBLIC Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsigned int height, unsigned int depth); -#endif +#endif // INCLUDED_VCL_INC_UNX_X11_XLIMITS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit