fixincludeguards.sh: include/c*

Change-Id: Icba422d99836518a1b662b15144bc9334bed1473

20 files changed, 59 insertions, 59 deletions

diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index 5c1376b0632b..307b78cf2078 100644
--- a/include/canvas/base/bitmapcanvasbase.hxx
+++ b/include/canvas/base/bitmapcanvasbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
-#define INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
+#define INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
 
 #include <canvas/base/canvasbase.hxx>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -123,6 +123,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_BITMAPCANVASBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_BITMAPCANVASBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx
index 2713e0ea11bb..09a1590972be 100644
--- a/include/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/include/canvas/base/bufferedgraphicdevicebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX
-#define INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
+#define INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
 
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
@@ -271,6 +271,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_BUFFEREDGRAPHICDEVICEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 8c7e1579f1e2..2a7407fc038f 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX
-#define INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_CACHEDPRIMITIVEBASE_HXX
+#define INCLUDED_CANVAS_BASE_CACHEDPRIMITIVEBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -112,6 +112,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CACHEDPRIMITIVEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_CACHEDPRIMITIVEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 8f134d23289a..c40e5c5afbc5 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CANVASBASE_HXX
-#define INCLUDED_CANVAS_CANVASBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_CANVASBASE_HXX
+#define INCLUDED_CANVAS_BASE_CANVASBASE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -469,6 +469,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CANVASBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_CANVASBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 7c1b5508bb4e..b6f6ac0c6c62 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX
-#define INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
+#define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XCustomSprite.hpp>
@@ -266,6 +266,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CANVASCUSTOMSPRITEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index 2b2fd2d774d8..87fc8ff27134 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX
-#define INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX
+#ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
+#define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
@@ -282,6 +282,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_CANVASCUSTOMSPRITEHELPER_HXX */
+#endif // INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx
index f12a61472cd4..2a19db1a9053 100644
--- a/include/canvas/base/disambiguationhelper.hxx
+++ b/include/canvas/base/disambiguationhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX
-#define INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX
+#ifndef INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
+#define INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
 
 #include <osl/mutex.hxx>
 
@@ -76,6 +76,6 @@ protected:
     };
 }
 
-#endif /* INCLUDED_CANVAS_DISAMBIGUATIONHELPER_HXX */
+#endif // INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index fd36b3de6ac8..df8551fcdc31 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX
-#define INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
+#define INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -378,6 +378,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_GRAPHICDEVICEBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 602e18a09eb0..ee396c2429b8 100644
--- a/include/canvas/base/integerbitmapbase.hxx
+++ b/include/canvas/base/integerbitmapbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX
-#define INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
+#define INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
 
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <canvas/base/bitmapcanvasbase.hxx>
@@ -140,6 +140,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_INTEGERBITMAPBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_INTEGERBITMAPBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/sprite.hxx b/include/canvas/base/sprite.hxx
index 4ebafd57f998..b3ed7dba2340 100644
--- a/include/canvas/base/sprite.hxx
+++ b/include/canvas/base/sprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SPRITE_HXX
-#define INCLUDED_CANVAS_SPRITE_HXX
+#ifndef INCLUDED_CANVAS_BASE_SPRITE_HXX
+#define INCLUDED_CANVAS_BASE_SPRITE_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -111,6 +111,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_SPRITE_HXX */
+#endif // INCLUDED_CANVAS_BASE_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index f892bf4170a7..f536a2383fda 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SPRITECANVASBASE_HXX
-#define INCLUDED_CANVAS_SPRITECANVASBASE_HXX
+#ifndef INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
+#define INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
@@ -188,6 +188,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_SPRITECANVASBASE_HXX */
+#endif // INCLUDED_CANVAS_BASE_SPRITECANVASBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/base/spritesurface.hxx b/include/canvas/base/spritesurface.hxx
index 47a0fb24a67d..40a8f799b5c4 100644
--- a/include/canvas/base/spritesurface.hxx
+++ b/include/canvas/base/spritesurface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SPRITESURFACE_HXX
-#define INCLUDED_CANVAS_SPRITESURFACE_HXX
+#ifndef INCLUDED_CANVAS_BASE_SPRITESURFACE_HXX
+#define INCLUDED_CANVAS_BASE_SPRITESURFACE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -65,6 +65,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_SPRITESURFACE_HXX */
+#endif // INCLUDED_CANVAS_BASE_SPRITESURFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/canvastoolsdllapi.h b/include/canvas/canvastoolsdllapi.h
index ad96dec3ea7c..f8a6ad6598a7 100644
--- a/include/canvas/canvastoolsdllapi.h
+++ b/include/canvas/canvastoolsdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CANVAS_DLLAPI_H
-#define _CANVAS_DLLAPI_H
+#ifndef INCLUDED_CANVAS_CANVASTOOLSDLLAPI_H
+#define INCLUDED_CANVAS_CANVASTOOLSDLLAPI_H
 
 #include "sal/config.h"
 #include "sal/types.h"
diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
index 295057bd832b..c31c0d826cd1 100644
--- a/include/canvas/rendering/bitmap.hxx
+++ b/include/canvas/rendering/bitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_BITMAP_HXX
-#define INCLUDED_CANVAS_BITMAP_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_BITMAP_HXX
+#define INCLUDED_CANVAS_RENDERING_BITMAP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XCanvas.hpp>
@@ -309,6 +309,6 @@ namespace canvas
     typedef ::boost::shared_ptr< Bitmap > BitmapSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_BITMAP_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
index f15fed3e72e8..8df4cc94a136 100644
--- a/include/canvas/rendering/icachedprimitive.hxx
+++ b/include/canvas/rendering/icachedprimitive.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ICACHEDPRIMITIVE_HXX
-#define INCLUDED_CANVAS_ICACHEDPRIMITIVE_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
+#define INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
 
 #include <sal/types.h>
 
@@ -55,6 +55,6 @@ namespace canvas
     typedef ::boost::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ICACHEDPRIMITIVE_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index 4226a9a6d759..a9922bead33e 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ICOLORBUFFER_HXX
-#define INCLUDED_CANVAS_ICOLORBUFFER_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
+#define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 #include <sal/types.h>
 
@@ -83,6 +83,6 @@ namespace canvas
     typedef ::boost::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ICOLORBUFFER_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index 413320eb85e9..6484d0b8c10c 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_IRENDERMODULE_HXX
-#define INCLUDED_CANVAS_IRENDERMODULE_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
+#define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
 #include <sal/types.h>
 
@@ -138,6 +138,6 @@ namespace canvas
     };
 }
 
-#endif /* INCLUDED_CANVAS_IRENDERMODULE_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index a79faf96a8c8..1e8e47a5578b 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ISURFACE_HXX
-#define INCLUDED_CANVAS_ISURFACE_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
+#define INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
 #include <sal/types.h>
 
@@ -77,6 +77,6 @@ namespace canvas
     typedef ::boost::shared_ptr< ISurface > ISurfaceSharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ISURFACE_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx
index f8db605a38d3..47a2e98b3d94 100644
--- a/include/canvas/rendering/isurfaceproxy.hxx
+++ b/include/canvas/rendering/isurfaceproxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ISURFACEPROXY_HXX
-#define INCLUDED_CANVAS_ISURFACEPROXY_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
+#define INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
 #include <canvas/rendering/irendermodule.hxx>
 
@@ -102,6 +102,6 @@ namespace canvas
     typedef ::boost::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr;
 }
 
-#endif /* INCLUDED_CANVAS_ISURFACEPROXY_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index 98c7795a293e..7172748f8531 100644
--- a/include/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX
-#define INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX
+#ifndef INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
+#define INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
 
 #include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>
@@ -69,6 +69,6 @@ namespace canvas
     CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
 }
 
-#endif /* INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX */
+#endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */