[Libreoffice-commits] core.git: vcl/inc

Chris Sherlock (via logerrit) logerrit at kemper.freedesktop.org
Tue Oct 5 16:27:03 UTC 2021


 vcl/inc/headless/svpgdi.hxx |    5 +----
 vcl/inc/textrender.hxx      |    5 +----
 vcl/inc/unx/geninst.h       |    5 +----
 vcl/inc/window.h            |    5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 2c0ce0daa0a2eae87e6425793e0dfb39ac5a359e
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Wed Sep 22 05:27:41 2021 +1000
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Oct 5 18:26:29 2021 +0200

    tdf#143148 - Use pragma once instead of include guards
    
    Done in preparation for movement of PhysicalFontCollection to vcl::font
    namespace.
    
    Change-Id: I17f27afd3ff0763866f3b2c169f7ee100d7f26d4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122406
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index e7c0c884e20f..125d00c0d99c 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
+#pragma once
 
 #ifdef IOS
 #error This file is not for iOS
@@ -286,6 +285,4 @@ public:
     void                    clipRegion(cairo_t* cr);
 };
 
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index 7d9718b790a3..fc7b81d55f27 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX
-#define INCLUDED_VCL_INC_UNX_CAIROFONTIMPL_HXX
+#pragma once
 
 #include <sal/config.h>
 
@@ -65,6 +64,4 @@ public:
     virtual void                    DrawTextLayout(const GenericSalLayout&, const SalGraphics&) = 0;
 };
 
-#endif
-
 /* vim:set tabstop=4 shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index ab2a0b51d77d..5a4f037b548f 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_GENERIC_GENINST_H
-#define INCLUDED_VCL_INC_GENERIC_GENINST_H
+#pragma once
 
 #include <sal/config.h>
 
@@ -81,6 +80,4 @@ inline SalGenericInstance *GetGenericInstance()
     return static_cast<SalGenericInstance *>(GetSalData()->m_pInstance);
 }
 
-#endif // INCLUDED_VCL_INC_GENERIC_GENINST_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 2e4ebe07f676..8f61cce11a9d 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_WINDOW_H
-#define INCLUDED_VCL_INC_WINDOW_H
+#pragma once
 
 #include <sal/config.h>
 
@@ -427,6 +426,4 @@ VCL_DLLPUBLIC void ImplWindowStateFromStr(WindowStateData& rData, const OString&
 VCL_DLLPUBLIC css::uno::Reference<css::accessibility::XAccessibleEditableText>
 FindFocusedEditableText(css::uno::Reference<css::accessibility::XAccessibleContext> const&);
 
-#endif // INCLUDED_VCL_INC_WINDOW_H
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list