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, 18 insertions, 18 deletions

diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 86be3cbc7c66..0f2c93f2d590 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -57,7 +57,7 @@ namespace toolkit
         ScrollBarVisibility maScrollVis;
         void    lcl_Scroll( long nX, long nY );
     public:
-        ScrollableWrapper( Window* pParent, WinBits nStyle = WB_STDDIALOG );
+        ScrollableWrapper( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG );
         virtual ~ScrollableWrapper();
         virtual void    SetScrollWidth( long nWidth ) SAL_OVERRIDE;
         virtual long    GetScrollWidth() SAL_OVERRIDE { return maScrollArea.Width(); }
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 9faf70655f11..d27228c8a09a 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -34,7 +34,7 @@
 
 #include <tools/link.hxx>
 
-class Window;
+namespace vcl { class Window; }
 class VCLXWindow;
 class VclSimpleEvent;
 class VclWindowEvent;
@@ -83,7 +83,7 @@ public:
     virtual ~VCLXAccessibleComponent();
 
     VCLXWindow*    GetVCLXWindow() const { return mpVCLXindow; }
-    Window*        GetWindow() const;
+    vcl::Window*        GetWindow() const;
 
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index d0839302829f..a8b5e2b0b472 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -46,7 +46,7 @@ protected:
 
     bool isSystemDependentWindowPeer() const { return m_bWHWND; }
 
-    virtual Window* GetWindowImpl() = 0;
+    virtual vcl::Window* GetWindowImpl() = 0;
     virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0;
 
     VCLXTopWindow_Base( const bool _bSupportSystemWindowPeer );
@@ -86,7 +86,7 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base,
                      public VCLXContainer
 {
 protected:
-    virtual Window* GetWindowImpl() SAL_OVERRIDE;
+    virtual vcl::Window* GetWindowImpl() SAL_OVERRIDE;
     virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() SAL_OVERRIDE;
 
 public:
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 7970959412be..f3f1e133bd53 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -46,7 +46,7 @@
 #include <list>
 #include <boost/function.hpp>
 
-class Window;
+namespace vcl { class Window; }
 class VclSimpleEvent;
 class VclWindowEvent;
 struct SystemParentData;
@@ -128,13 +128,13 @@ public:
     VCLXWindow( bool bWithDefaultProps = false );
     virtual ~VCLXWindow();
 
-    virtual void    SetWindow( Window* pWindow );
-    Window*         GetWindow() const                                   { return (Window*)GetOutputDevice(); }
+    virtual void    SetWindow( vcl::Window* pWindow );
+    vcl::Window*    GetWindow() const                                   { return (vcl::Window*)GetOutputDevice(); }
 
     void    suspendVclEventListening( );
     void    resumeVclEventListening( );
 
-    void    notifyWindowRemoved( Window& _rWindow );
+    void    notifyWindowRemoved( vcl::Window& _rWindow );
 
     // ::com::sun::star::lang::XUnoTunnel
     static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 7fcf873354d2..1985154b0f6e 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -674,7 +674,7 @@ public:
 
     // ::com::sun::star::awt::XLayoutConstrains
     ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( Window* p ) throw(::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException);
 
     static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); }
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index a1c9ea92c4c9..928c37bdf914 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 
-class Window;
+namespace vcl { class Window; }
 
 namespace toolkit
 {
@@ -117,7 +117,7 @@ namespace toolkit
         // stops listening at the control model
         void stopModelListening( );
 
-        Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
+        vcl::Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
     };
 
 
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index 42e7856842d7..08f5a89cb78a 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace awt {
 #include <tools/fldunit.hxx>
 #include <tools/poly.hxx>
 
-class Window;
+namespace vcl { class Window; }
 class OutputDevice;
 class MouseEvent;
 class KeyEvent;
@@ -79,10 +79,10 @@ public:
     static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>    CreateBitmap( const BitmapEx& rBitmap );
 
     // Window
-    static Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow );
-    static Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 );
-    static Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer );
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>    GetInterface( Window* pWindow );
+    static vcl::Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow );
+    static vcl::Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 );
+    static vcl::Window*                                                          GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>    GetInterface( vcl::Window* pWindow );
 
     // OutputDevice
     static OutputDevice*                            GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice );
@@ -112,7 +112,7 @@ public:
     // Rectangle
     static bool                                 IsZero( ::com::sun::star::awt::Rectangle rRect );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>  CreateControlContainer( Window* pWindow );
+    static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>  CreateControlContainer( vcl::Window* pWindow );
 
     // MapUnits
     static MapUnit                                  UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit );