diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-17 14:54:33 +1000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-20 16:56:54 +0200 |
commit | 88b72d85ef82a5a6ca019ef9b88f5389db067c83 (patch) | |
tree | 6250617a894d1a1eb92d115bc4230d42ddc27d62 | |
parent | 8e2fb3b88a5ee00cb70fa7f8440b8f0b98ae4bc8 (diff) |
tdf#124176 - Use pragma once instead of include guards
This patch is created in preparation of a patch I have queued to test
and move PhysicalFontFace to vcl::font namespace.
Change-Id: I805a8bd1fa881fc4bc6d2f26f1051b9247587701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122226
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
-rw-r--r-- | include/vcl/vcllayout.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/fontinstance.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/fontselect.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/impfont.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/impfontcache.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/impfontmetricdata.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/pdf/pdfbuildin_fonts.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/pdf/pdffontcache.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/quartz/salgdi.h | 6 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/skia/win/font.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/freetype_glyphcache.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/freetypetextrender.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/genpspgraphics.h | 5 | ||||
-rw-r--r-- | vcl/inc/unx/glyphcache.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 5 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 5 | ||||
-rw-r--r-- | vcl/inc/win/winlayout.hxx | 5 |
19 files changed, 20 insertions, 78 deletions
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 2546b5f72c09..7ca5d3f31c78 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_VCLLAYOUT_HXX -#define INCLUDED_VCL_VCLLAYOUT_HXX +#pragma once #include <basegfx/polygon/b2dpolypolygon.hxx> #include <tools/gen.hxx> @@ -117,6 +116,4 @@ protected: Point maDrawBase; }; -#endif // INCLUDED_VCL_VCLLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 4918d612c5cf..20f9b626474f 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_FONTINSTANCE_HXX -#define INCLUDED_VCL_INC_FONTINSTANCE_HXX +#pragma once #include "fontselect.hxx" #include "impfontmetricdata.hxx" @@ -122,6 +121,4 @@ inline void LogicalFontInstance::DecodeOpenTypeTag(const uint32_t nTableTag, cha pTagName[4] = 0; } -#endif // INCLUDED_VCL_INC_FONTINSTANCE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/fontselect.hxx b/vcl/inc/fontselect.hxx index c517268763d4..5a334ed75366 100644 --- a/vcl/inc/fontselect.hxx +++ b/vcl/inc/fontselect.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_FONTSELECT_HXX -#define INCLUDED_VCL_INC_FONTSELECT_HXX +#pragma once #include <i18nlangtag/lang.h> #include <tools/degree.hxx> @@ -79,6 +78,4 @@ inline std::basic_ostream<charT, traits> & operator <<( return stream; } -#endif // INCLUDED_VCL_INC_FONTSELECT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index e21a61c49c07..b0cebef83240 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_IMPFONT_HXX -#define INCLUDED_VCL_INC_IMPFONT_HXX +#pragma once #include <rtl/ustring.hxx> #include <tools/color.hxx> @@ -145,6 +144,4 @@ private: tools::Long mnCalculatedAverageFontWidth; }; -#endif // INCLUDED_VCL_INC_IMPFONT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx index 09aa33ca906b..ab6ae3af5c04 100644 --- a/vcl/inc/impfontcache.hxx +++ b/vcl/inc/impfontcache.hxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_IMPFONTCACHE_HXX -#define INCLUDED_VCL_INC_IMPFONTCACHE_HXX - +#pragma once #include <rtl/ref.hxx> #include <o3tl/lru_map.hxx> @@ -92,6 +90,4 @@ public: void Invalidate(); }; -#endif // INCLUDED_VCL_INC_IMPFONTCACHE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index 2a49726608d7..0c523dc2c88d 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX -#define INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX +#pragma once #include <vcl/dllapi.h> #include <tools/long.hxx> @@ -145,6 +144,4 @@ private: }; -#endif // INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/pdf/pdfbuildin_fonts.hxx b/vcl/inc/pdf/pdfbuildin_fonts.hxx index 6c3c03ffc7ea..9369c058072b 100644 --- a/vcl/inc/pdf/pdfbuildin_fonts.hxx +++ b/vcl/inc/pdf/pdfbuildin_fonts.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_SOURCE_PDF_BUILDIN_FONTS_HXX -#define INCLUDED_VCL_SOURCE_PDF_BUILDIN_FONTS_HXX + +#pragma once #include <PhysicalFontFace.hxx> #include <fontinstance.hxx> @@ -76,6 +76,4 @@ public: } // namespace vcl::pdf -#endif // INCLUDED_VCL_SOURCE_PDF_BUILDIN_FONTS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/pdf/pdffontcache.hxx b/vcl/inc/pdf/pdffontcache.hxx index 6eb8e782329d..b3eca45d4002 100644 --- a/vcl/inc/pdf/pdffontcache.hxx +++ b/vcl/inc/pdf/pdffontcache.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_SOURCE_GDI_PDFFONTCACHE_HXX -#define INCLUDED_VCL_SOURCE_GDI_PDFFONTCACHE_HXX +#pragma once #include <typeinfo> @@ -67,6 +66,4 @@ namespace vcl }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 211708dfd576..c97d814267e5 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDI_H -#define INCLUDED_VCL_INC_QUARTZ_SALGDI_H +#pragma once #include <vector> @@ -586,7 +585,4 @@ private: bool* pJustCFF ); }; - -#endif // INCLUDED_VCL_INC_QUARTZ_SALGDI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 65e56367d2f2..4e55b6737c86 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_SALGDI_HXX -#define INCLUDED_VCL_INC_SALGDI_HXX +#pragma once #include <vcl/outdev.hxx> @@ -924,6 +923,4 @@ public: } }; -#endif // INCLUDED_VCL_INC_SALGDI_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/skia/win/font.hxx b/vcl/inc/skia/win/font.hxx index 4dc0bdf047d5..ea19535adb74 100644 --- a/vcl/inc/skia/win/font.hxx +++ b/vcl/inc/skia/win/font.hxx @@ -8,8 +8,7 @@ * */ -#ifndef INCLUDED_VCL_INC_SKIA_WIN_FONT_HXX -#define INCLUDED_VCL_INC_SKIA_WIN_FONT_HXX +#pragma once #include <win/winlayout.hxx> @@ -36,6 +35,4 @@ private: bool m_skiaDWrite; }; -#endif // INCLUDED_VCL_INC_SKIA_WIN_FONT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 0e2fa772183f..e9839320497a 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX -#define INCLUDED_VCL_INC_FONTMANAGER_HXX +#pragma once #include <config_options.h> #include <tools/fontenum.hxx> @@ -325,6 +324,4 @@ public: } // namespace -#endif // INCLUDED_VCL_INC_FONTMANAGER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index 16da3b75b941..b13945b349a6 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX -#define INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX +#pragma once #include <unx/glyphcache.hxx> #include <PhysicalFontFace.hxx> @@ -130,6 +129,4 @@ public: virtual bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const override; }; -#endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/freetypetextrender.hxx b/vcl/inc/unx/freetypetextrender.hxx index 2ac558eafaed..fd5048a8b6e3 100644 --- a/vcl/inc/unx/freetypetextrender.hxx +++ b/vcl/inc/unx/freetypetextrender.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_FREETYPETEXTRENDER_HXX -#define INCLUDED_VCL_INC_UNX_FREETYPETEXTRENDER_HXX +#pragma once #include <textrender.hxx> @@ -67,6 +66,4 @@ public: GetTextLayout(int nFallbackLevel) override; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index 1185ed9abb21..1a3c42657d75 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H -#define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H +#pragma once #include <vcl/vclenum.hxx> #include <config_cairo_canvas.h> @@ -119,6 +118,4 @@ public: #endif // ENABLE_CAIRO_CANVAS }; -#endif // INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index b41076844df2..dff4235e82fe 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX -#define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX +#pragma once #include <memory> #include <freetype/config/ftheader.h> @@ -166,6 +165,4 @@ private: bool mbArtBold; }; -#endif // INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 41e0f57598c8..9571c634d659 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_UNX_SALGDI_H -#define INCLUDED_VCL_INC_UNX_SALGDI_H +#pragma once #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -331,6 +330,4 @@ inline Display *X11SalGraphics::GetXDisplay() const inline Pixel X11SalGraphics::GetPixel( Color nColor ) const { return GetColormap().GetPixel( nColor ); } -#endif // INCLUDED_VCL_INC_UNX_SALGDI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 959d8abc0301..b44fe42ca5e1 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_WIN_SALGDI_H -#define INCLUDED_VCL_INC_WIN_SALGDI_H +#pragma once #include <sallayout.hxx> #include <salgeom.hxx> @@ -412,6 +411,4 @@ inline bool WinFontFace::HasChar( sal_uInt32 cChar ) const return mxUnicodeMap->HasChar( cChar ); } -#endif // INCLUDED_VCL_INC_WIN_SALGDI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index b4e51d8dc4bb..c6460a1c92ef 100644 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_WIN_WINLAYOUT_HXX -#define INCLUDED_VCL_INC_WIN_WINLAYOUT_HXX +#pragma once #include <rtl/ustring.hxx> @@ -94,6 +93,4 @@ public: HDC hDC) override; }; -#endif // INCLUDED_VCL_INC_WIN_WINLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |