From 52dc015ef64f95a72440a91c67b990d20a2b7d93 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 26 Mar 2013 10:05:44 +0100 Subject: Unused Region macro definitions In other files in vcl/unx/kde4/, those defines are apparently needed to resolve a clash between class Region from vcl/region.hxx and typedef Region from /usr/include/QtGui/qwindowdefs.h. But in these two files those two clashing headers appear not to be included both, so the define would be flagged by -Wunused-macros. Change-Id: Ib5bb62867dd3b3ea4c0a9f4b461efcecd92bc4b7 --- vcl/unx/kde4/KDEXLib.cxx | 4 ---- vcl/unx/kde4/VCLKDEApplication.cxx | 2 -- 2 files changed, 6 deletions(-) (limited to 'vcl/unx') diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index ee5735bd4c82..1917df9771b4 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -19,8 +19,6 @@ #include "VCLKDEApplication.hxx" -#define Region QtXRegion - #include #include #include @@ -30,8 +28,6 @@ #include #include -#undef Region - #include "KDEXLib.hxx" #include diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index 70c160d179e9..e196ff3d903a 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -19,9 +19,7 @@ #include "VCLKDEApplication.hxx" -#define Region QtXRegion #include -#undef Region #include "KDESalDisplay.hxx" -- cgit v1.2.3