include/vcl/outdev.hxx | 5 +----
vcl/inc/PhysicalFontCollection.hxx | 5 +----
vcl/inc/PhysicalFontFamily.hxx | 5 +----
vcl/inc/outdev.h | 5 +----
4 files changed, 4 insertions(+), 16 deletions(-)
New commits:
commit 83070c694c742ef1e86e017a5e684e72b23bf3c9
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Thu Sep 16 12:46:23 2021 +1000
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Sep 18 05:51:17 2021 +0200
tdf#124176 - Use pragma once instead of include guards
I have a patch queued to rename ImplDeviceFontList to
PhysicalFontFaceCollection, which I am adding a test to. Submitting
patch to update the include guards to pragma once
Change-Id: I091817905599089edec1138eeee06ba3dacd6964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122225
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6e357b077a14..0890da948a0b 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_OUTDEV_HXX
-#define INCLUDED_VCL_OUTDEV_HXX
+#pragma once
#include <tools/gen.hxx>
#include <tools/ref.hxx>
@@ -1907,6 +1906,4 @@ protected:
};
-#endif // INCLUDED_VCL_OUTDEV_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/inc/PhysicalFontCollection.hxx
b/vcl/inc/PhysicalFontCollection.hxx
index 8af07e2883cf..89d6fdf222e8 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX
-#define INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX
+#pragma once
#include <vcl/dllapi.h>
@@ -91,6 +90,4 @@ private:
};
-#endif // INCLUDED_VCL_INC_PHYSICALFONTCOLLECTION_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index 5c2ae12f24c8..f883d383be54 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX
-#define INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX
+#pragma once
#include <vcl/dllapi.h>
#include <vcl/outdev.hxx>
@@ -96,6 +95,4 @@ private:
FontWidth meMatchWidth; // MATCH - Width
};
-#endif // INCLUDED_VCL_INC_PHYSICALFONTFAMILY_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 8746d790eb62..16871789bb22 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OUTDEV_H
-#define INCLUDED_VCL_INC_OUTDEV_H
+#pragma once
#include <set>
#include <vector>
@@ -139,6 +138,4 @@ struct ImplOutDevData
void ImplFontSubstitute( OUString& rFontName );
-#endif // INCLUDED_VCL_INC_OUTDEV_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
