Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

8 files changed, 24 insertions, 24 deletions

diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index f96074795f37..f2439da8966e 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_BITMAPACTION_HXX
-#define _CPPCANVAS_BITMAPACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
 
 #include <cppcanvas/canvas.hxx>
 #include <action.hxx>
@@ -70,6 +70,6 @@ namespace cppcanvas
     }
 }
 
-#endif /*_CPPCANVAS_BITMAPACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_BITMAPACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 5a86f5af804d..f6377d5645f0 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_CACHEDPRIMITIVEBASE_HXX
-#define _CPPCANVAS_CACHEDPRIMITIVEBASE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -84,6 +84,6 @@ namespace cppcanvas
     }
 }
 
-#endif /*_CPPCANVAS_CACHEDPRIMITIVEBASE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_CACHEDPRIMITIVEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index 101c598c32a1..a755c5964aed 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_LINEACTION_HXX
-#define _CPPCANVAS_LINEACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -62,6 +62,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_LINEACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_LINEACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 323b11e432e7..42e1db34128d 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_RENDERER_MTFTOOLS_HXX
-#define _CPPCANVAS_RENDERER_MTFTOOLS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -202,6 +202,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_RENDERER_MTFTOOLS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_MTFTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index 1487cfe65b9a..f71ea9eaf8bf 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_POINTACTION_HXX
-#define _CPPCANVAS_POINTACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -67,6 +67,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_POINTACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POINTACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 47c4e91c204c..a81e8738bb06 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_POLYPOLYACTION_HXX
-#define _CPPCANVAS_POLYPOLYACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
 
 #include <action.hxx>
 #include <cppcanvas/canvas.hxx>
@@ -90,6 +90,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_POLYPOLYACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_POLYPOLYACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index f40f03ee6787..7afe47aeba01 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_TEXTACTION_HXX
-#define _CPPCANVAS_TEXTACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -90,6 +90,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_TEXTACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TEXTACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index 221864dbb3f1..21937485dcd4 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_TRANSPARENCYGROUPACTION_HXX
-#define _CPPCANVAS_TRANSPARENCYGROUPACTION_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
 
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/renderer.hxx>
@@ -101,6 +101,6 @@ namespace cppcanvas
     }
 }
 
-#endif /*_CPPCANVAS_TRANSPARENCYGROUPACTION_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_MTFRENDERER_TRANSPARENCYGROUPACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */