fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

7 files changed, 10 insertions, 10 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index 7fad609d60b3..a10356fe276f 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -47,7 +47,7 @@
 
 
 
-class Window;
+namespace vcl { class Window; }
 
 namespace utl {
     class AccessibleStateSetHelper;
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index 904ddec28d43..93b4da974f31 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -43,7 +43,7 @@
 
 
 
-class Window;
+namespace vcl { class Window; }
 
 namespace utl {
     class AccessibleStateSetHelper;
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 2655b8950e76..bd0dbd1324a0 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -92,14 +92,14 @@ public:
     inline ~WindowListenerGuard() { endListening(); }
 
     // Not thread safe:
-    void startListening(::Window & rNotifier);
+    void startListening(vcl::Window & rNotifier);
 
     // Not thread safe:
     void endListening();
 
 private:
     ::Link m_aListener;
-    ::Window * m_pNotifier;
+    vcl::Window * m_pNotifier;
 };
 
 class ParagraphInfo
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index dc3c93e54d24..c218d0e59ee2 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp
 
 class Point;
 class Rectangle;
-class Window;
+namespace vcl { class Window; }
 namespace accessibility
 {
     class IComboListBoxHelper
@@ -41,7 +41,7 @@ namespace accessibility
         virtual OUString        GetEntry( sal_Int32  nPos ) const = 0;
         virtual Rectangle       GetDropDownPosSizePixel( ) const = 0;
         virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
-        virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
+        virtual Rectangle       GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) = 0;
         virtual bool            IsActive() const = 0;
         virtual bool            IsEnabled() const = 0;
         virtual bool            IsEntryVisible( sal_Int32  nPos ) const = 0;
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index 96a45909e7e4..98ee64ddcfde 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -76,7 +76,7 @@ public:
         return aRect;
     }
 
-    virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) SAL_OVERRIDE
+    virtual Rectangle       GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) SAL_OVERRIDE
     {
         return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
     }
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
index 7861dc397e0c..a792d51cccad 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
@@ -24,7 +24,7 @@
 
 class VclSimpleEvent;
 class VclWindowEvent;
-class Window;
+namespace vcl { class Window; }
 
 
 
@@ -34,7 +34,7 @@ class Window;
 class VCLXAccessibleMenuBar :   public OAccessibleMenuComponent
 {
 protected:
-    Window*                 m_pWindow;
+    vcl::Window*                 m_pWindow;
 
     virtual bool            IsFocused() SAL_OVERRIDE;
 
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
index 2a4defcbfad2..213a570b853c 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
@@ -49,7 +49,7 @@ private:
     void                        UpdateAllItems_Impl();
     void                        UpdateItemName_Impl( sal_Int32 _nPos );
     void                        UpdateItemEnabled_Impl( sal_Int32 _nPos );
-    void                        UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen );
+    void                        UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen );
     void                        HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow );
     void                        ReleaseSubToolBox( ToolBox* _pSubToolBox );