fixincludeguards.sh: canvas

Change-Id: I5b17411c58e5c5ae7b473d263fa5e4ee97ff35c8

canvas/source/cairo/cairo_cachedbitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CACHEDBITMAP_HXX
-#define _CAIROCANVAS_CACHEDBITMAP_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
@@ -56,6 +56,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_CACHEDBITMAP_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CACHEDBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_cairo.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CAIRO_HXX
-#define _CAIROCANVAS_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CAIRO_HXX
 
 #include <sal/config.h>
 #include <boost/shared_ptr.hpp>

canvas/source/cairo/cairo_canvas.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVAS_HXX_
-#define _CAIROCANVAS_CANVAS_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVAS_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 

canvas/source/cairo/cairo_canvasbitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASBITMAP_HXX
-#define _CAIROCANVAS_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -127,6 +127,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_CANVASBITMAP_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_canvascustomsprite.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX
-#define _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -145,6 +145,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_CANVASCUSTOMSPRITE_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_canvasfont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASFONT_HXX
-#define _CAIROCANVAS_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -85,6 +85,6 @@ namespace cairocanvas
 
 }
 
-#endif /* _CAIROCANVAS_CANVASFONT_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_canvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_CANVASHELPER_HXX_
-#define _CAIROCANVAS_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -321,6 +321,6 @@ namespace cairocanvas
                                       ::com::sun::star::rendering::FillRule eFillrule );
 }
 
-#endif /* _CAIROCANVAS_CANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_CANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_devicehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_DEVICEHELPER_HXX
-#define _CAIROCANVAS_DEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>

canvas/source/cairo/cairo_quartz_cairo.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_QUARTZ_CAIRO_HXX
-#define _CAIROCANVAS_QUARTZ_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_QUARTZ_CAIRO_HXX
 
 #include "cairo_cairo.hxx"
 

canvas/source/cairo/cairo_repainttarget.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_REPAINTTARGET_HXX
-#define _CAIROCANVAS_REPAINTTARGET_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 
 #include <rtl/ref.hxx>
 
@@ -47,6 +47,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_REPAINTTARGET_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_sprite.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITE_HXX
-#define _CAIROCANVAS_SPRITE_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -63,6 +63,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_SPRITE_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_spritecanvas.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITECANVAS_HXX_
-#define _CAIROCANVAS_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

canvas/source/cairo/cairo_spritecanvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITECANVASHELPER_HXX_
-#define _CAIROCANVAS_SPRITECANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -141,6 +141,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_SPRITECANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_spritedevicehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITEDEVICEHELPER_HXX
-#define _CAIROCANVAS_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>

canvas/source/cairo/cairo_spritehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SPRITEHELPER_HXX
-#define _CAIROCANVAS_SPRITEHELPER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -104,6 +104,6 @@ namespace cairocanvas
     };
 }
 
-#endif /* _CAIROCANVAS_SPRITEHELPER_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_surfaceprovider.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_SURFACEPROVIDER_HXX
-#define _CAIROCANVAS_SURFACEPROVIDER_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/XInterface.hpp>

canvas/source/cairo/cairo_textlayout.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_TEXTLAYOUT_HXX
-#define _CAIROCANVAS_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -107,6 +107,6 @@ namespace cairocanvas
 
 }
 
-#endif /* _CAIROCANVAS_TEXTLAYOUT_HXX */
+#endif // INCLUDED_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/cairo/cairo_win32_cairo.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_WIN32_CAIRO_HXX
-#define _CAIROCANVAS_WIN32_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_WIN32_CAIRO_HXX
 
 #include "cairo_cairo.hxx"
 #include <prewin.h>

canvas/source/cairo/cairo_xlib_cairo.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAIROCANVAS_XLIB_CAIRO_HXX
-#define _CAIROCANVAS_XLIB_CAIRO_HXX
+#ifndef INCLUDED_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
+#define INCLUDED_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX
 
 #include "cairo_cairo.hxx"
 

canvas/source/directx/dx_bitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXBITMAP_HXX
-#define _DXCANVAS_DXBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_BITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_BITMAP_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>

canvas/source/directx/dx_bitmapcanvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_BITMAPCANVASHELPER_HXX_
-#define _DXCANVAS_BITMAPCANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -126,6 +126,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_BITMAPCANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_bitmapprovider.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_BITMAPPROVIDER_HXX_
-#define _DXCANVAS_BITMAPPROVIDER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX
 
 #include "dx_ibitmap.hxx"
 #include <boost/shared_ptr.hpp>

canvas/source/directx/dx_canvas.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVAS_HXX_
-#define _DXCANVAS_CANVAS_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVAS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 

canvas/source/directx/dx_canvasbitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASBITMAP_HXX
-#define _DXCANVAS_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -93,6 +93,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_CANVASBITMAP_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_canvascustomsprite.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASCUSTOMSPRITE_HXX
-#define _DXCANVAS_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -128,6 +128,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_CANVASCUSTOMSPRITE_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_canvasfont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASFONT_HXX
-#define _DXCANVAS_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -91,6 +91,6 @@ namespace dxcanvas
 
 }
 
-#endif /* _DXCANVAS_CANVASFONT_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_canvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_CANVASHELPER_HXX_
-#define _DXCANVAS_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -248,6 +248,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_CANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_config.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXCONFIG_HXX
-#define _DXCANVAS_DXCONFIG_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
 
 #include <unotools/configitem.hxx>
 #include <boost/optional.hpp>
@@ -78,6 +78,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* #ifndef _DXCANVAS_DXCONFIG_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_CONFIG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_devicehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DEVICEHELPER_HXX
-#define _DXCANVAS_DEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
@@ -110,6 +110,6 @@ namespace dxcanvas
     typedef ::rtl::Reference< com::sun::star::rendering::XGraphicDevice > DeviceRef;
 }
 
-#endif /* _DXCANVAS_DEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_gdiplususer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_GDIPLUSUSER_HXX
-#define _DXCANVAS_GDIPLUSUSER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
 
 #include <sal/config.h>
 
@@ -44,6 +44,6 @@ namespace dxcanvas
 
 }
 
-#endif /* _DXCANVAS_GDIPLUSUSER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_graphicsprovider.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_GRAPHICSPROVIDER_HXX
-#define _DXCANVAS_GRAPHICSPROVIDER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 #include "dx_winstuff.hxx"
 
@@ -42,6 +42,6 @@ namespace dxcanvas
     typedef ::boost::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr;
 }
 
-#endif /* _DXCANVAS_GRAPHICSPROVIDER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_ibitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXIBITMAP_HXX
-#define _DXCANVAS_DXIBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_IBITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_IBITMAP_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>

canvas/source/directx/dx_impltools.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_IMPLTOOLS_HXX
-#define _DXCANVAS_IMPLTOOLS_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -128,6 +128,6 @@ namespace dxcanvas
     }
 }
 
-#endif /* _DXCANVAS_IMPLTOOLS_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_linepolypolygon.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_LINEPOLYPOLYGON_HXX_
-#define _DXCANVAS_LINEPOLYPOLYGON_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
 
 #include <canvas/canvastools.hxx>
 #include <basegfx/tools/unopolypolygon.hxx>
@@ -45,6 +45,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_LINEPOLYPOLYGON_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_rendermodule.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_RENDERMODULE_HXX
-#define _DXCANVAS_RENDERMODULE_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_RENDERMODULE_HXX
 
 #include <basegfx/vector/b2ivector.hxx>
 #include <basegfx/range/b2irectangle.hxx>

canvas/source/directx/dx_sprite.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DXCANVAS_SPRITE_HXX
-#define INCLUDED_DXCANVAS_SPRITE_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -40,6 +40,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* INCLUDED_DXCANVAS_SPRITE_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_spritecanvas.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITECANVAS_HXX_
-#define _DXCANVAS_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 

canvas/source/directx/dx_spritecanvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITECANVASHELPER_HXX_
-#define _DXCANVAS_SPRITECANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -150,6 +150,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_SPRITECANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_spritedevicehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITEDEVICEHELPER_HXX
-#define _DXCANVAS_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/rendering/XGraphicDevice.hpp>
@@ -102,6 +102,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_SPRITEDEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_spritehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SPRITEHELPER_HXX
-#define _DXCANVAS_SPRITEHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -100,6 +100,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _DXCANVAS_SPRITEHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_surfacebitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_DXSURFACEBITMAP_HXX
-#define _DXCANVAS_DXSURFACEBITMAP_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX
 
 #include <canvas/rendering/isurfaceproxy.hxx>
 #include <canvas/rendering/isurfaceproxymanager.hxx>

canvas/source/directx/dx_surfacegraphics.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_SURFACEGRAPHICS_HXX
-#define _DXCANVAS_SURFACEGRAPHICS_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
 
 #include "dx_graphicsprovider.hxx"
 
@@ -34,6 +34,6 @@ namespace dxcanvas
     GraphicsSharedPtr createSurfaceGraphics(const COMReference<surface_type>& rSurface );
 }
 
-#endif /* _DXCANVAS_SURFACEGRAPHICS_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_textlayout.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_TEXTLAYOUT_HXX
-#define _DXCANVAS_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -102,6 +102,6 @@ namespace dxcanvas
 
 }
 
-#endif /* _DXCANVAS_TEXTLAYOUT_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_textlayout_drawhelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TEXTLAYOUT_DRAWHELPER_HXX
-#define _TEXTLAYOUT_DRAWHELPER_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 
 #include <boost/shared_ptr.hpp>
 
@@ -74,6 +74,6 @@ namespace dxcanvas
     };
 }
 
-#endif /* _TEXTLAYOUT_DRAWHELPER_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_vcltools.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_VCLTOOLS_HXX
-#define _DXCANVAS_VCLTOOLS_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/TriState.hpp>
@@ -48,6 +48,6 @@ namespace dxcanvas
     }
 }
 
-#endif /* _DXCANVAS_VCLTOOLS_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_VCLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/directx/dx_winstuff.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DXCANVAS_WINSTUFF_HXX
-#define _DXCANVAS_WINSTUFF_HXX
+#ifndef INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
+#define INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
 #include <algorithm>
 
@@ -214,6 +214,6 @@ namespace dxcanvas
 #undef DELETE
 #undef PolyPolygon
 
-#endif /* _DXCANVAS_WINSTUFF_HXX */
+#endif // INCLUDED_SOURCE_DIRECTX_DX_WINSTUFF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/opengl/ogl_bitmapcanvashelper.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_BITMAPCANVASHELPER_HXX_
-#define OGL_BITMAPCANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>

canvas/source/opengl/ogl_buffercontext.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_BUFFERCONTEXT_HXX_
-#define OGL_BUFFERCONTEXT_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX
 
 #include <sal/config.h>
 #include <boost/shared_ptr.hpp>

canvas/source/opengl/ogl_canvasbitmap.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASBITMAP_HXX
-#define OGL_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase2.hxx>
 

canvas/source/opengl/ogl_canvascustomsprite.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASCUSTOMSPRITE_HXX
-#define OGL_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/uno3.hxx>

canvas/source/opengl/ogl_canvasfont.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASFONT_HXX
-#define OGL_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 

canvas/source/opengl/ogl_canvashelper.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASHELPER_HXX_
-#define OGL_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 

canvas/source/opengl/ogl_canvastools.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVASTOOLS_HXX
-#define OGL_CANVASTOOLS_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX
 
 #include <sal/config.h>
 #include <vector>

canvas/source/opengl/ogl_spritecanvas.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_SPRITECANVAS_HXX_
-#define OGL_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 

canvas/source/opengl/ogl_spritedevicehelper.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_SPRITEDEVICEHELPER_HXX
-#define OGL_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX
 
 #include <rtl/ref.hxx>
 #include <canvas/elapsedtime.hxx>

canvas/source/opengl/ogl_textlayout.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_TEXTLAYOUT_HXX
-#define OGL_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>

canvas/source/opengl/ogl_texturecache.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_TEXTURECACHE_HXX
-#define OGL_TEXTURECACHE_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX
 
 #include <sal/types.h>
 #include <boost/unordered_map.hpp>

canvas/source/opengl/ogl_tools.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OGL_CANVAS_TOOLS_HXX
-#define OGL_CANVAS_TOOLS_HXX
+#ifndef INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
+#define INCLUDED_SOURCE_OPENGL_OGL_TOOLS_HXX
 
 #include <sal/config.h>
 #include <GL/gl.h>

canvas/source/tools/page.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_PAGE_HXX
-#define INCLUDED_CANVAS_PAGE_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_PAGE_HXX
+#define INCLUDED_SOURCE_TOOLS_PAGE_HXX
 
 #include <basegfx/vector/b2isize.hxx>
 #include <basegfx/range/b2irectangle.hxx>

canvas/source/tools/pagemanager.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_PAGEMANAGER_HXX
-#define INCLUDED_CANVAS_PAGEMANAGER_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_PAGEMANAGER_HXX
+#define INCLUDED_SOURCE_TOOLS_PAGEMANAGER_HXX
 
 #include <basegfx/vector/b2isize.hxx>
 #include <canvas/rendering/irendermodule.hxx>

canvas/source/tools/surface.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SURFACE_HXX
-#define INCLUDED_CANVAS_SURFACE_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_SURFACE_HXX
+#define INCLUDED_SOURCE_TOOLS_SURFACE_HXX
 
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/point/b2dpoint.hxx>

canvas/source/tools/surfaceproxy.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SURFACEPROXY_HXX
-#define INCLUDED_CANVAS_SURFACEPROXY_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_SURFACEPROXY_HXX
+#define INCLUDED_SOURCE_TOOLS_SURFACEPROXY_HXX
 
 #include <canvas/rendering/isurfaceproxy.hxx>
 #include <canvas/rendering/icolorbuffer.hxx>

canvas/source/tools/surfacerect.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CANVAS_SURFACERECT_HXX
-#define INCLUDED_CANVAS_SURFACERECT_HXX
+#ifndef INCLUDED_SOURCE_TOOLS_SURFACERECT_HXX
+#define INCLUDED_SOURCE_TOOLS_SURFACERECT_HXX
 
 #include <basegfx/point/b2ipoint.hxx>
 #include <basegfx/vector/b2isize.hxx>

canvas/source/vcl/backbuffer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_BACKBUFFER_HXX_
-#define _VCLCANVAS_BACKBUFFER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
+#define INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
 
 #include <vcl/virdev.hxx>
 
@@ -56,6 +56,6 @@ namespace vclcanvas
     typedef ::boost::shared_ptr< BackBuffer > BackBufferSharedPtr;
 }
 
-#endif /* #ifndef _VCLCANVAS_BACKBUFFER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_BACKBUFFER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/bitmapbackbuffer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_BITMAPBACKBUFFER_HXX_
-#define _VCLCANVAS_BITMAPBACKBUFFER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
+#define INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
 
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
@@ -92,6 +92,6 @@ namespace vclcanvas
 
 }
 
-#endif /* #ifndef _VCLCANVAS_BITMAPBACKBUFFER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_BITMAPBACKBUFFER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/cachedbitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CACHEDBITMAP_HXX
-#define _VCLCANVAS_CACHEDBITMAP_HXX
+#ifndef INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
+#define INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
@@ -67,6 +67,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CACHEDBITMAP_HXX */
+#endif // INCLUDED_SOURCE_VCL_CACHEDBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/canvas.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVAS_HXX_
-#define _VCLCANVAS_CANVAS_HXX_
+#ifndef INCLUDED_SOURCE_VCL_CANVAS_HXX
+#define INCLUDED_SOURCE_VCL_CANVAS_HXX
 
 #include <rtl/ref.hxx>
 

canvas/source/vcl/canvasbitmap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASBITMAP_HXX
-#define _VCLCANVAS_CANVASBITMAP_HXX
+#ifndef INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
+#define INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
 
 #include <cppuhelper/compbase4.hxx>
 
@@ -115,6 +115,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASBITMAP_HXX */
+#endif // INCLUDED_SOURCE_VCL_CANVASBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/canvasbitmaphelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASBITMAPHELPER_HXX_
-#define _VCLCANVAS_CANVASBITMAPHELPER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
+#define INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 #include <canvashelper.hxx>
 #include <canvas/vclwrapper.hxx>
@@ -118,6 +118,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASBITMAPHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_CANVASBITMAPHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/canvascustomsprite.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASCUSTOMSPRITE_HXX
-#define _VCLCANVAS_CANVASCUSTOMSPRITE_HXX
+#ifndef INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
+#define INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 
 #include <cppuhelper/compbase4.hxx>
 #include <comphelper/uno3.hxx>
@@ -120,6 +120,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASCUSTOMSPRITE_HXX */
+#endif // INCLUDED_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/canvasfont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASFONT_HXX
-#define _VCLCANVAS_CANVASFONT_HXX
+#ifndef INCLUDED_SOURCE_VCL_CANVASFONT_HXX
+#define INCLUDED_SOURCE_VCL_CANVASFONT_HXX
 
 #include <comphelper/implementationreference.hxx>
 
@@ -89,6 +89,6 @@ namespace vclcanvas
 
 }
 
-#endif /* _VCLCANVAS_CANVASFONT_HXX */
+#endif // INCLUDED_SOURCE_VCL_CANVASFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/canvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_CANVASHELPER_HXX_
-#define _VCLCANVAS_CANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
+#define INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -334,6 +334,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_CANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_CANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/devicehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_DEVICEHELPER_HXX
-#define _VCLCANVAS_DEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
+#define INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
@@ -90,6 +90,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_DEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_VCL_DEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/impltools.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_TOOLS_HXX
-#define _VCLCANVAS_TOOLS_HXX
+#ifndef INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
+#define INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
 
 #include <osl/mutex.hxx>
 
@@ -186,6 +186,6 @@ namespace vclcanvas
     }
 }
 
-#endif /* _VCLCANVAS_TOOLS_HXX */
+#endif // INCLUDED_SOURCE_VCL_IMPLTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/outdevprovider.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_OUTDEVPROVIDER_HXX
-#define _VCLCANVAS_OUTDEVPROVIDER_HXX
+#ifndef INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
+#define INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
 #include <sal/types.h>
 #include <boost/shared_ptr.hpp>
@@ -50,6 +50,6 @@ namespace vclcanvas
     typedef ::boost::shared_ptr< OutDevProvider > OutDevProviderSharedPtr;
 }
 
-#endif /* _VCLCANVAS_OUTDEVPROVIDER_HXX */
+#endif // INCLUDED_SOURCE_VCL_OUTDEVPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/repainttarget.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_REPAINTTARGET_HXX
-#define _VCLCANVAS_REPAINTTARGET_HXX
+#ifndef INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
+#define INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
 
 #include <rtl/ref.hxx>
 
@@ -52,6 +52,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_REPAINTTARGET_HXX */
+#endif // INCLUDED_SOURCE_VCL_REPAINTTARGET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/sprite.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCLCANVAS_SPRITE_HXX
-#define INCLUDED_VCLCANVAS_SPRITE_HXX
+#ifndef INCLUDED_SOURCE_VCL_SPRITE_HXX
+#define INCLUDED_SOURCE_VCL_SPRITE_HXX
 
 #include <canvas/base/sprite.hxx>
 
@@ -63,6 +63,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* INCLUDED_VCLCANVAS_SPRITE_HXX */
+#endif // INCLUDED_SOURCE_VCL_SPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/spritecanvas.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITECANVAS_HXX_
-#define _VCLCANVAS_SPRITECANVAS_HXX_
+#ifndef INCLUDED_SOURCE_VCL_SPRITECANVAS_HXX
+#define INCLUDED_SOURCE_VCL_SPRITECANVAS_HXX
 
 #include <rtl/ref.hxx>
 

canvas/source/vcl/spritecanvashelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITECANVASHELPER_HXX_
-#define _VCLCANVAS_SPRITECANVASHELPER_HXX_
+#ifndef INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
+#define INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -166,6 +166,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_SPRITECANVASHELPER_HXX_ */
+#endif // INCLUDED_SOURCE_VCL_SPRITECANVASHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/spritedevicehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITEDEVICEHELPER_HXX
-#define _VCLCANVAS_SPRITEDEVICEHELPER_HXX
+#ifndef INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
+#define INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
@@ -68,6 +68,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_SPRITEDEVICEHELPER_HXX */
+#endif // INCLUDED_SOURCE_VCL_SPRITEDEVICEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/spritehelper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_SPRITEHELPER_HXX
-#define _VCLCANVAS_SPRITEHELPER_HXX
+#ifndef INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
+#define INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
 
 #include <com/sun/star/rendering/XCustomSprite.hpp>
 
@@ -110,6 +110,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_SPRITEHELPER_HXX */
+#endif // INCLUDED_SOURCE_VCL_SPRITEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/textlayout.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_TEXTLAYOUT_HXX
-#define _VCLCANVAS_TEXTLAYOUT_HXX
+#ifndef INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
+#define INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -104,6 +104,6 @@ namespace vclcanvas
 
 }
 
-#endif /* _VCLCANVAS_TEXTLAYOUT_HXX */
+#endif // INCLUDED_SOURCE_VCL_TEXTLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

canvas/source/vcl/windowoutdevholder.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCLCANVAS_WINDOWOUTDEVHOLDER_HXX
-#define _VCLCANVAS_WINDOWOUTDEVHOLDER_HXX
+#ifndef INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
+#define INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -55,6 +55,6 @@ namespace vclcanvas
     };
 }
 
-#endif /* _VCLCANVAS_WINDOWOUTDEVHOLDER_HXX */
+#endif // INCLUDED_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */