fdo#82577: Handle Region

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

Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291

8 files changed, 12 insertions, 12 deletions

diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 17ae41c76f09..04d6239656b5 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -41,7 +41,7 @@
 #include "VCLKDEApplication.hxx"
 
 /* ********* Hack, but needed because of conflicting types... */
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 
 #include <kfiledialog.h>
 #include <kwindowsystem.h>
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index fbf1d8e7d844..32c5b1f366f5 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 
 #include <QStyle>
 #include <kapplication.h>
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index b67b3eda0850..ad4cb7ccaeb5 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 
 #include <QColor>
 #include <QStyle>
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 05b08a1da386..98f5280609fc 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 
 #include <QStyle>
 #include <QStyleOption>
@@ -198,7 +198,7 @@ namespace
 
 #ifdef IMAGE_BASED_PAINTING
 // There is a small catch with this function, although hopefully only philosophical.
-// Officially Xlib's Region is an opaque data type, with only functions for manipulating it.
+// Officially Xlib's vcl::Region is an opaque data type, with only functions for manipulating it.
 // However, whoever designed it apparently didn't give it that much thought, as it's impossible
 // to find out what exactly a region actually is (except for really weird ways like XClipBox()
 // and repeated XPointInRegion(), which would be awfully slow). Fortunately, the header file
@@ -209,7 +209,7 @@ namespace
 // without IMAGE_BASED_PAINTING (in which case QApplication::setGraphicsSystem( "native" ) may
 // be needed too).
 #include <X11/Xregion.h>
-static QRegion XRegionToQRegion( XLIB_Region xr )
+static QRegion XRegionToQRegion( Region xr )
 {
     QRegion qr;
     for( int i = 0;
@@ -615,7 +615,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
         GC gc = GetFontGC();
         if( gc )
         {
-            XLIB_Region pTempClipRegion = NULL;
+            Region pTempClipRegion = NULL;
             if( clipRegion )
             {
                 pTempClipRegion = XCreateRegion();
@@ -933,7 +933,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
         Size aBSize( boundingRect.width(), boundingRect.height() );
         nativeBoundingRegion = Rectangle( aBPoint, aBSize );
 
-        // Region of the content
+        // vcl::Region of the content
         Point aPoint( contentRect.x(), contentRect.y() );
         Size  aSize( contentRect.width(), contentRect.height() );
         nativeContentRegion = Rectangle( aPoint, aSize );
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 768b133dbc72..d6e9a763bbeb 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -23,7 +23,7 @@
 #include <unx/saldisp.hxx>
 #include <unx/salgdi.h>
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 #include <QImage>
 #undef Region
 
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 1ee9a67d618c..cf2bf2df4dab 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -420,7 +420,7 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker(
 #endif
 }
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 #include <qframe.h>
 #undef Region
 
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index f1fddfca00ea..6db63217b81b 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -23,7 +23,7 @@
 
 #include <sal/types.h>
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 
 #include <kapplication.h>
 
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index f4f9775dfdac..a20180013709 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define Region QtXRegion
+#define vcl::Region QtXRegion
 #include <QApplication>
 #undef Region