From 07385d97cee03e7d0913c4817a65fd65581c9505 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 30 Sep 2014 11:06:42 +0200
Subject: Removed obsolete Region/QtXRegion nameclash workaround

Change-Id: Iccc59319ff2a7f5612017f4a146928afbac674ee
---
 include/shell/kde_headers.h        | 5 -----
 vcl/unx/kde4/KDE4FilePicker.cxx    | 3 ---
 vcl/unx/kde4/KDEData.cxx           | 2 --
 vcl/unx/kde4/KDESalFrame.cxx       | 2 --
 vcl/unx/kde4/KDESalGraphics.cxx    | 2 --
 vcl/unx/kde4/KDESalGraphics.hxx    | 2 --
 vcl/unx/kde4/KDEXLib.cxx           | 2 --
 vcl/unx/kde4/VCLKDEApplication.hxx | 2 --
 vcl/unx/kde4/main.cxx              | 2 --
 9 files changed, 22 deletions(-)

diff --git a/include/shell/kde_headers.h b/include/shell/kde_headers.h
index 8a1131f806cf..9b4eeac8d151 100644
--- a/include/shell/kde_headers.h
+++ b/include/shell/kde_headers.h
@@ -37,11 +37,6 @@
 #pragma GCC system_header
 #endif
 
-
-/* ********* Hack, but needed because of conflicting types... */
-#define vcl::Region QtXRegion
-
-
 /* ********* Qt headers */
 #include <qaccessible.h>
 #include <qcheckbox.h>
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 04d6239656b5..af3e3eeadb0f 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -40,9 +40,6 @@
 #include "FPServiceInfo.hxx"
 #include "VCLKDEApplication.hxx"
 
-/* ********* Hack, but needed because of conflicting types... */
-#define vcl::Region QtXRegion
-
 #include <kfiledialog.h>
 #include <kwindowsystem.h>
 #include <kapplication.h>
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index 32c5b1f366f5..b1806956d1a3 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define vcl::Region QtXRegion
-
 #include <QStyle>
 #include <kapplication.h>
 
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index ad4cb7ccaeb5..cf525fff583c 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define vcl::Region QtXRegion
-
 #include <QColor>
 #include <QStyle>
 
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 98f5280609fc..6ced2f03734e 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define vcl::Region QtXRegion
-
 #include <QStyle>
 #include <QStyleOption>
 #include <QPainter>
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index d6e9a763bbeb..daa911198408 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -23,9 +23,7 @@
 #include <unx/saldisp.hxx>
 #include <unx/salgdi.h>
 
-#define vcl::Region QtXRegion
 #include <QImage>
-#undef Region
 
 /** handles graphics drawings requests and performs the needed drawing operations */
 class KDESalGraphics : public X11SalGraphics
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index cf2bf2df4dab..a915fd499884 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -420,9 +420,7 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker(
 #endif
 }
 
-#define vcl::Region QtXRegion
 #include <qframe.h>
-#undef Region
 
 int KDEXLib::getFrameWidth()
 {
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index 6db63217b81b..07e2aed0511d 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -23,8 +23,6 @@
 
 #include <sal/types.h>
 
-#define vcl::Region QtXRegion
-
 #include <kapplication.h>
 
 #undef Region
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index a20180013709..8c13180e2cef 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define vcl::Region QtXRegion
 #include <QApplication>
-#undef Region
 
 #include "KDEData.hxx"
 #include "KDESalInstance.hxx"
-- 
cgit