diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:05:44 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:49 +0100 |
| commit | 52dc015ef64f95a72440a91c67b990d20a2b7d93 (patch) | |
| tree | 6b8c44ad4fdb203ae834d52030d5e84f790979dc /vcl | |
| parent | d684a3cad91a81480b8856a1bffc24577e986866 (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/kde4/VCLKDEApplication.cxx | 2 |
2 files changed, 0 insertions, 6 deletions
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 <kapplication.h> #include <klocale.h> #include <kaboutdata.h> @@ -30,8 +28,6 @@ #include <qclipboard.h> #include <qthread.h> -#undef Region - #include "KDEXLib.hxx" #include <unx/i18n_im.hxx> 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 <QEvent> -#undef Region #include "KDESalDisplay.hxx" |