diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
| commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
| tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a /include/shell | |
| parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) | |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'include/shell')
| -rw-r--r-- | include/shell/kde_headers.h | 2 | ||||
| -rw-r--r-- | include/shell/tde_headers.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/shell/kde_headers.h b/include/shell/kde_headers.h index 74053e4a356d..8a1131f806cf 100644 --- a/include/shell/kde_headers.h +++ b/include/shell/kde_headers.h @@ -39,7 +39,7 @@ /* ********* Hack, but needed because of conflicting types... */ -#define Region QtXRegion +#define vcl::Region QtXRegion /* ********* Qt headers */ diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h index c537ea381988..8ffe6b0f6dca 100644 --- a/include/shell/tde_headers.h +++ b/include/shell/tde_headers.h @@ -24,7 +24,7 @@ /* ********* Hack, but needed because of conflicting types... */ -#define Region TQtXRegion +#define vcl::Region TQtXRegion /* ********* TQt headers */ |