fdo#82577: Handle Region

Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

10 files changed, 24 insertions, 24 deletions

diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index 0f8531d52b7e..e28e51169af7 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -40,8 +40,8 @@ namespace unotools
     {
     private:
         BitmapEx                                       m_aBmpEx;
-        Bitmap                                         m_aBitmap;
-        Bitmap                                         m_aAlpha;
+        ::Bitmap                                       m_aBitmap;
+        ::Bitmap                                       m_aAlpha;
         BitmapReadAccess*                              m_pBmpAcc;
         BitmapReadAccess*                              m_pAlphaAcc;
         com::sun::star::uno::Sequence<sal_Int8>        m_aComponentTags;
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 5eb34770d016..ec54d5bd66eb 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -76,7 +76,7 @@ public:
     virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
 
     virtual void            ResetClipRegion() SAL_OVERRIDE;
-    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
 
     virtual void            SetLineColor() SAL_OVERRIDE;
     virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 57e3ce87d434..65a8fc2a15bf 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -120,7 +120,7 @@ public:
 #endif
 
 protected:
-    Region                               m_aClipRegion;
+    vcl::Region                               m_aClipRegion;
 
 protected:
     virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE;
@@ -141,7 +141,7 @@ public:
     virtual long            GetGraphicsWidth() const SAL_OVERRIDE;
 
     virtual void            ResetClipRegion() SAL_OVERRIDE;
-    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
 
     virtual void            SetLineColor() SAL_OVERRIDE;
     virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index deafb418ad4c..5cd5d2a543e3 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -88,7 +88,7 @@ private:
 
 class ImplFontMetric
 {
-    friend class OutputDevice;
+    friend class ::OutputDevice;
 
 private:
     long    mnAscent;      // Ascent
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 73e57c697df9..222a08fba7eb 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -225,7 +225,7 @@ public:
     // InvalidateContext does an UnsetState and sets mrContext to 0
     void                    InvalidateContext();
 
-    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void            drawPixel( long nX, long nY ) SAL_OVERRIDE;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 82222aca8c39..bed847472fc6 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -91,7 +91,7 @@ public:
     virtual ~SalGraphics();
 
 protected:
-    virtual bool            setClipRegion( const Region& ) = 0;
+    virtual bool            setClipRegion( const vcl::Region& ) = 0;
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void            drawPixel( long nX, long nY ) = 0;
@@ -317,7 +317,7 @@ public:
     void                    mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const;
     bool                mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const;
     void                    mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const;
-    void                    mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const;
+    void                    mirror( vcl::Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const;
     void                    mirror( ImplControlValue&, const OutputDevice*, bool bBack = false ) const;
     basegfx::B2DPoint       mirror( const basegfx::B2DPoint& i_rPoint, const OutputDevice *pOutDev, bool bBack = false ) const;
     basegfx::B2DPolygon     mirror( const basegfx::B2DPolygon& i_rPoly, const OutputDevice *pOutDev, bool bBack = false ) const;
@@ -325,7 +325,7 @@ public:
 
     // non virtual methods; these do possible coordinate mirroring and
     // then delegate to protected virtual methods
-    bool                    SetClipRegion( const Region&, const OutputDevice *pOutDev );
+    bool                    SetClipRegion( const vcl::Region&, const OutputDevice *pOutDev );
 
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     void                    DrawPixel( long nX, long nY, const OutputDevice *pOutDev );
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 8bd45b0148df..b8b145b218d0 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -117,7 +117,7 @@ private:
 class GtkSalGraphics : public X11SalGraphics
 {
     GtkWidget           *m_pWindow;
-    Region               m_aClipRegion;
+    vcl::Region               m_aClipRegion;
 
 public:
                         GtkSalGraphics( GtkSalFrame *, GtkWidget *window );
@@ -149,7 +149,7 @@ public:
     static void refreshFontconfig( GtkSettings *pSettings );
     static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer );
 
-    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
     virtual void            ResetClipRegion() SAL_OVERRIDE;
 
     // some themes set the background pixmap of our window EVERY time
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 500b277ae731..978e51421834 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -98,8 +98,8 @@ protected:
     XID             m_aXRenderPicture;
     CairoFontsCache m_aCairoFontsCache;
 
-    XLIB_Region     pPaintRegion_;
-    XLIB_Region     mpClipRegion;
+    Region          pPaintRegion_;
+    Region          mpClipRegion;
 
     GC              pPenGC_;        // Pen attributes
     SalColor        nPenColor_;
@@ -143,7 +143,7 @@ protected:
 
     using SalGraphics::SetClipRegion;
     void            SetClipRegion( GC          pGC,
-                                   XLIB_Region pXReg = NULL ) const;
+                                   Region      pXReg = NULL ) const;
 
     GC              GetTrackingGC();
     GC              GetInvertGC();
@@ -213,7 +213,7 @@ public:
     virtual long            GetGraphicsHeight() const;
 
     virtual void            ResetClipRegion() SAL_OVERRIDE;
-    virtual bool            setClipRegion( const Region& ) SAL_OVERRIDE;
+    virtual bool            setClipRegion( const vcl::Region& ) SAL_OVERRIDE;
 
     virtual void            SetLineColor() SAL_OVERRIDE;
     virtual void            SetLineColor( SalColor nSalColor ) SAL_OVERRIDE;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 7b05d24c5668..957db9103215 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -159,7 +159,7 @@ public:
     float                   mfCurrentFontScale;
     HPEN                    mhPen;              // Pen
     HBRUSH                  mhBrush;            // Brush
-    HRGN                    mhRegion;           // Region Handle
+    HRGN                    mhRegion;           // vcl::Region Handle
     HPEN                    mhDefPen;           // DefaultPen
     HBRUSH                  mhDefBrush;         // DefaultBrush
     HFONT                   mhDefFont;          // DefaultFont
@@ -200,7 +200,7 @@ public:
     virtual ~WinSalGraphics();
 
 protected:
-    virtual bool        setClipRegion( const Region& );
+    virtual bool        setClipRegion( const vcl::Region& );
     // draw --> LineColor and FillColor and RasterOp and ClipRegion
     virtual void        drawPixel( long nX, long nY );
     virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 983c3613cc66..53d077f200e8 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -118,7 +118,7 @@ struct ImplWinData
 struct ImplOverlapData
 {
     VirtualDevice*      mpSaveBackDev;          //< saved background bitmap
-    Region*             mpSaveBackRgn;          //< saved region, which must be invalidated
+    vcl::Region*             mpSaveBackRgn;          //< saved region, which must be invalidated
     vcl::Window*        mpNextBackWin;          //< next window with saved background
     sal_uIntPtr         mnSaveBackSize;         //< bitmap size of saved background
     bool                mbSaveBack;             //< true: save background
@@ -259,11 +259,11 @@ public:
     ::std::vector< FixedText* > m_aMnemonicLabels;
     ImplAccessibleInfos* mpAccessibleInfos;
     VCLXWindow*         mpVCLXWindow;
-    Region              maWinRegion;            //< region to 'shape' the VCL window (frame coordinates)
-    Region              maWinClipRegion;        //< the (clipping) region that finally corresponds to the VCL window (frame coordinates)
-    Region              maInvalidateRegion;     //< region that has to be redrawn (frame coordinates)
-    Region*             mpChildClipRegion;      //< child clip region if CLIPCHILDREN is set (frame coordinates)
-    Region*             mpPaintRegion;          //< only set during Paint() method call (window coordinates)
+    vcl::Region              maWinRegion;            //< region to 'shape' the VCL window (frame coordinates)
+    vcl::Region              maWinClipRegion;        //< the (clipping) region that finally corresponds to the VCL window (frame coordinates)
+    vcl::Region              maInvalidateRegion;     //< region that has to be redrawn (frame coordinates)
+    vcl::Region*             mpChildClipRegion;      //< child clip region if CLIPCHILDREN is set (frame coordinates)
+    vcl::Region*             mpPaintRegion;          //< only set during Paint() method call (window coordinates)
     WinBits             mnStyle;
     WinBits             mnPrevStyle;
     WinBits             mnExtendedStyle;