fdo#82577: Handle Window

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

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

3 files changed, 12 insertions, 12 deletions

diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index b8e26962de97..884600d6ed2a 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -44,12 +44,12 @@ class SvRTLInputBox : public ModalDialog
     DECL_LINK( CancelHdl, Button * );
 
 public:
-    SvRTLInputBox( Window* pParent, const OUString& rPrompt, const OUString& rTitle,
+    SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle,
         const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 );
     OUString GetText() const SAL_OVERRIDE { return aText; }
 };
 
-SvRTLInputBox::SvRTLInputBox( Window* pParent, const OUString& rPrompt,
+SvRTLInputBox::SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt,
         const OUString& rTitle, const OUString& rDefault,
         long nXTwips, long nYTwips ) :
     ModalDialog( pParent,WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ),
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 865f01908761..4465743a6581 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -70,14 +70,14 @@ class SbiInputDialog : public ModalDialog {
     OKButton aOk;
     CancelButton aCancel;
     OUString aText;
-    DECL_LINK( Ok, Window * );
-    DECL_LINK( Cancel, Window * );
+    DECL_LINK( Ok, vcl::Window * );
+    DECL_LINK( Cancel, vcl::Window * );
 public:
-    SbiInputDialog( Window*, const OUString& );
+    SbiInputDialog( vcl::Window*, const OUString& );
     const OUString& GetInput() { return aText; }
 };
 
-SbiInputDialog::SbiInputDialog( Window* pParent, const OUString& rPrompt )
+SbiInputDialog::SbiInputDialog( vcl::Window* pParent, const OUString& rPrompt )
             :ModalDialog( pParent, WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ),
              aInput( this, WB_3DLOOK | WB_LEFT | WB_BORDER ),
              aOk( this ), aCancel( this )
@@ -105,7 +105,7 @@ SbiInputDialog::SbiInputDialog( Window* pParent, const OUString& rPrompt )
     aCancel.Show();
 }
 
-IMPL_LINK_INLINE_START( SbiInputDialog, Ok, Window *, pWindow )
+IMPL_LINK_INLINE_START( SbiInputDialog, Ok, vcl::Window *, pWindow )
 {
     (void)pWindow;
 
@@ -113,16 +113,16 @@ IMPL_LINK_INLINE_START( SbiInputDialog, Ok, Window *, pWindow )
     EndDialog( 1 );
     return 0;
 }
-IMPL_LINK_INLINE_END( SbiInputDialog, Ok, Window *, pWindow )
+IMPL_LINK_INLINE_END( SbiInputDialog, Ok, vcl::Window *, pWindow )
 
-IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, Window *, pWindow )
+IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, vcl::Window *, pWindow )
 {
     (void)pWindow;
 
     EndDialog( 0 );
     return 0;
 }
-IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, Window *, pWindow )
+IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, vcl::Window *, pWindow )
 
 
 SbiStream::SbiStream()
@@ -851,7 +851,7 @@ void SbiIoSystem::Shutdown()
     if( !aOut.isEmpty() )
     {
 #if defined __GNUC__
-        Window* pParent = Application::GetDefDialogParent();
+        vcl::Window* pParent = Application::GetDefDialogParent();
         MessBox( pParent, WinBits( WB_OK ), OUString(), aOut ).Execute();
 #else
         MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut ).Execute();
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d6fcad2d509a..0d8ff6426158 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4601,7 +4601,7 @@ RTLFUNC(MsgBox)
 
     SolarMutexGuard aSolarGuard;
 
-    Window* pParent = Application::GetDefDialogParent();
+    vcl::Window* pParent = Application::GetDefDialogParent();
     switch( nType )
     {
     case 16: