summaryrefslogtreecommitdiff
path: root/vcl/unx/kde4
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/kde4')
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx3
-rw-r--r--vcl/unx/kde4/KDEData.cxx2
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx2
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx2
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx2
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx2
-rw-r--r--vcl/unx/kde4/VCLKDEApplication.hxx2
-rw-r--r--vcl/unx/kde4/main.cxx2
8 files changed, 0 insertions, 17 deletions
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"