summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc/WindowUpdater.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /sd/source/ui/inc/WindowUpdater.hxx
parent7cbbefae224ab85343accb42b03f9431ec693a83 (diff)
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sd/source/ui/inc/WindowUpdater.hxx')
-rw-r--r--sd/source/ui/inc/WindowUpdater.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx
index aa6c95a48e7d..d768be7fb92e 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -26,7 +26,7 @@
#include <vector>
-class Window;
+namespace vcl { class Window; }
class OutputDevice;
class SdDrawDocument;
@@ -62,7 +62,7 @@ public:
This device is added to the device list if it is not <null/> and
when it is not already a member of that list.
*/
- void RegisterWindow (::Window* pWindow);
+ void RegisterWindow (vcl::Window* pWindow);
/** Remove the given device from the list of devices which will be updated
when one of the monitored values changes.
@@ -70,7 +70,7 @@ public:
This device is removed from the device list when it is a member
of that list.
*/
- void UnregisterWindow (::Window* pWindow);
+ void UnregisterWindow (vcl::Window* pWindow);
/** Set the view shell whose output devices shall be kept up to date.
It is used to clear the master page cache so that a redraw affects
@@ -122,7 +122,7 @@ private:
/** Type and data member for a list of devices that have to be kept
up-to-date.
*/
- typedef ::std::vector< ::Window*> tWindowList;
+ typedef ::std::vector< vcl::Window*> tWindowList;
tWindowList maWindowList;
/** The central method of this class. Update the given output device.