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

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 7b99b224ed6c..a35d62dead31 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -213,7 +213,7 @@ private:
     bool            mbHelpText;
 
 public:
-                    DbgInfoDialog( Window* pParent, bool bHelpText = false );
+                    DbgInfoDialog( vcl::Window* pParent, bool bHelpText = false );
 
     void            SetInfoText( const OUString& rStr );
 };
@@ -378,7 +378,7 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt )
     }
 }
 
-DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) :
+DbgInfoDialog::DbgInfoDialog( vcl::Window* pParent, bool bHelpText ) :
     ModalDialog( pParent, WB_STDMODAL ),
     maListBox( this, WB_BORDER | WB_AUTOHSCROLL ),
     maOKButton( this, WB_DEFBUTTON )
@@ -449,12 +449,12 @@ void DbgInfoDialog::SetInfoText( const OUString& rStr )
     maListBox.SetUpdateMode( true );
 }
 
-void DbgDialogTest( Window* pWindow )
+void DbgDialogTest( vcl::Window* pWindow )
 {
     bool        aAccelBuf[65536] = {false};
     sal_uInt16      nChildCount = pWindow->GetChildCount();
-    Window*     pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
-    Window*     pChild;
+    vcl::Window*     pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD );
+    vcl::Window*     pChild;
     Point       aTabPos;
 
     if ( !pGetChild )
@@ -613,7 +613,7 @@ void DbgDialogTest( Window* pWindow )
 
                 if ( (i+1 < nChildCount) && !aText.isEmpty() )
                 {
-                    Window* pTempChild = pGetChild->GetWindow( WINDOW_NEXT )->ImplGetWindow();
+                    vcl::Window* pTempChild = pGetChild->GetWindow( WINDOW_NEXT )->ImplGetWindow();
                     if ( (pTempChild->GetType() == WINDOW_EDIT) ||
                          (pTempChild->GetType() == WINDOW_MULTILINEEDIT) ||
                          (pTempChild->GetType() == WINDOW_SPINFIELD) ||
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 3180bee56f9a..5a475e77213e 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -53,7 +53,7 @@ Help::~Help()
 {
 }
 
-bool Help::Start( const OUString&, const Window* )
+bool Help::Start( const OUString&, const vcl::Window* )
 {
     return false;
 }
@@ -63,7 +63,7 @@ bool Help::SearchKeyword( const OUString& )
     return false;
 }
 
-OUString Help::GetHelpText( const OUString&, const Window* )
+OUString Help::GetHelpText( const OUString&, const vcl::Window* )
 {
     return OUString();
 }
@@ -146,7 +146,7 @@ bool Help::IsBalloonHelpEnabled()
     return ImplGetSVData()->maHelpData.mbBalloonHelp;
 }
 
-bool Help::ShowBalloon( Window* pParent,
+bool Help::ShowBalloon( vcl::Window* pParent,
                         const Point& rScreenPos,
                         const OUString& rHelpText )
 {
@@ -156,7 +156,7 @@ bool Help::ShowBalloon( Window* pParent,
     return true;
 }
 
-bool Help::ShowBalloon( Window* pParent,
+bool Help::ShowBalloon( vcl::Window* pParent,
                         const Point& rScreenPos, const Rectangle& rRect,
                         const OUString& rHelpText )
 {
@@ -181,7 +181,7 @@ bool Help::IsQuickHelpEnabled()
     return ImplGetSVData()->maHelpData.mbQuickHelp;
 }
 
-bool Help::ShowQuickHelp( Window* pParent,
+bool Help::ShowQuickHelp( vcl::Window* pParent,
                           const Rectangle& rScreenRect,
                           const OUString& rHelpText,
                           const OUString& rLongHelpText,
@@ -200,7 +200,7 @@ void Help::HideBalloonAndQuickHelp()
     ImplDestroyHelpWindow( bIsVisible );
 }
 
-sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect,
+sal_uIntPtr Help::ShowTip( vcl::Window* pParent, const Rectangle& rScreenRect,
                      const OUString& rText, sal_uInt16 nStyle )
 {
     sal_uInt16 nHelpWinStyle = ( ( nStyle & QUICKHELP_TIP_STYLE_BALLOON ) != 0 ) ? HELPWINSTYLE_BALLOON : HELPWINSTYLE_QUICK;
@@ -213,7 +213,7 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect,
     return nId;
 }
 
-void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const OUString& rText )
+void Help::UpdateTip( sal_uIntPtr nId, vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText )
 {
     HelpTextWindow* pHelpWin = reinterpret_cast< HelpTextWindow* >( nId );
     ENSURE_OR_RETURN_VOID( pHelpWin != NULL, "Help::UpdateTip: invalid ID!" );
@@ -230,7 +230,7 @@ void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreen
 void Help::HideTip( sal_uLong nId )
 {
     HelpTextWindow* pHelpWin = (HelpTextWindow*)nId;
-    Window* pFrameWindow = pHelpWin->ImplGetFrameWindow();
+    vcl::Window* pFrameWindow = pHelpWin->ImplGetFrameWindow();
     pHelpWin->Hide();
     // trigger update, so that a Paint is instantly triggered since we do not save the background
     pFrameWindow->ImplUpdateAll();
@@ -238,7 +238,7 @@ void Help::HideTip( sal_uLong nId )
     ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks();
 }
 
-HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) :
+HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) :
     FloatingWindow( pParent, WB_SYSTEMWINDOW|WB_TOOLTIPWIN ), // #105827# if we change the parent, mirroring will not work correctly when positioning this window
     maHelpText( rText )
 {
@@ -464,7 +464,7 @@ OUString HelpTextWindow::GetText() const
     return FloatingWindow::CreateAccessible();
 }
 
-void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
+void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
                          const OUString& rHelpText, const OUString& rStatusText,
                          const Point& rScreenPos, const Rectangle* pHelpArea )
 {
@@ -501,7 +501,7 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n
             bool const bTextChanged = rHelpText != pHelpWin->GetHelpText();
             if ( bTextChanged || ( ( nStyle & QUICKHELP_FORCE_REPOSITION ) != 0 ) )
             {
-                Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
+                vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
                 Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) );
                 if( pHelpWin->IsVisible() )
                     pWindow->Invalidate( aInvRect );
@@ -547,7 +547,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime )
     HelpTextWindow* pHelpWin = pSVData->maHelpData.mpHelpWin;
     if ( pHelpWin )
     {
-        Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
+        vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
         // find out screen area covered by system help window
         Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) );
         if( pHelpWin->IsVisible() )
@@ -561,7 +561,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime )
     }
 }
 
-void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
+void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
                            const Point& rPos, const Rectangle* pHelpArea )
 {
     Point       aPos = rPos;
@@ -665,7 +665,7 @@ void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt1
         }
     }
 
-    Window* pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
+    vcl::Window* pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
     aPos = pWindow->AbsoluteScreenToOutputPixel( aPos );
     pHelpWin->SetPosPixel( aPos );
 }
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index 226d09fb345c..7c5e9939c97a 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -24,7 +24,7 @@
 #include <salframe.hxx>
 #include <svdata.hxx>
 
-void Sound::Beep( Window* pWindow )
+void Sound::Beep( vcl::Window* pWindow )
 {
     // #i91990#
     if ( Application::IsHeadlessModeEnabled() )
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index 2327639aa6fe..8093a6fe6900 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -34,7 +34,7 @@ OUString GetStandardText( sal_uInt16 nStdText )
     return OUString();
 }
 
-void ShowServiceNotAvailableError(Window* pParent,
+void ShowServiceNotAvailableError(vcl::Window* pParent,
     const OUString& rServiceName, bool bError)
 {
     OUString aText  = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE).
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e2dc111ae65c..e5640c7a7f94 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -156,28 +156,28 @@ struct ImplEventHook
 struct ImplPostEventData
 {
     sal_uLong           mnEvent;
-    const Window*   mpWin;
+    const vcl::Window*   mpWin;
     ImplSVEvent *   mnEventId;
     KeyEvent        maKeyEvent;
     MouseEvent      maMouseEvent;
     ZoomEvent       maZoomEvent;
     ScrollEvent     maScrollEvent;
 
-       ImplPostEventData( sal_uLong nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) :
+       ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const KeyEvent& rKeyEvent ) :
         mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {}
-       ImplPostEventData( sal_uLong nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) :
+       ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const MouseEvent& rMouseEvent ) :
         mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maMouseEvent( rMouseEvent ) {}
 #if !HAVE_FEATURE_DESKTOP
-       ImplPostEventData( sal_uLong nEvent, const Window* pWin, const ZoomEvent& rZoomEvent ) :
+       ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const ZoomEvent& rZoomEvent ) :
         mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maZoomEvent( rZoomEvent ) {}
-       ImplPostEventData( sal_uLong nEvent, const Window* pWin, const ScrollEvent& rScrollEvent ) :
+       ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const ScrollEvent& rScrollEvent ) :
         mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maScrollEvent( rScrollEvent ) {}
 #endif
 
     ~ImplPostEventData() {}
 };
 
-typedef ::std::pair< Window*, ImplPostEventData* > ImplPostEventPair;
+typedef ::std::pair< vcl::Window*, ImplPostEventData* > ImplPostEventPair;
 
 static ::std::list< ImplPostEventPair > aPostedEventList;
 
@@ -478,7 +478,7 @@ void Application::OverrideSystemSettings( AllSettings& /*rSettings*/ )
 
 void Application::MergeSystemSettings( AllSettings& rSettings )
 {
-    Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame;
+    vcl::Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame;
     if( ! pWindow )
         pWindow = ImplGetDefaultWindow();
     if( pWindow )
@@ -497,7 +497,7 @@ void Application::MergeSystemSettings( AllSettings& rSettings )
 
 bool Application::ValidateSystemFont()
 {
-    Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame;
+    vcl::Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame;
     if( ! pWindow )
         pWindow = ImplGetDefaultWindow();
 
@@ -542,7 +542,7 @@ void Application::SetSettings( const AllSettings& rSettings )
             ImplCallEventListeners( VCLEVENT_APPLICATION_DATACHANGED, NULL, &aDCEvt);
 
             // Update all windows
-            Window* pFirstFrame = pSVData->maWinData.mpFirstFrame;
+            vcl::Window* pFirstFrame = pSVData->maWinData.mpFirstFrame;
             // Reset data that needs to be re-calculated
             long nOldDPIX = 0;
             long nOldDPIY = 0;
@@ -550,21 +550,21 @@ void Application::SetSettings( const AllSettings& rSettings )
             {
                 nOldDPIX = pFirstFrame->mnDPIX;
                 nOldDPIY = pFirstFrame->mnDPIY;
-                Window::ImplInitAppFontData(pFirstFrame);
+                vcl::Window::ImplInitAppFontData(pFirstFrame);
             }
-            Window* pFrame = pFirstFrame;
+            vcl::Window* pFrame = pFirstFrame;
             while ( pFrame )
             {
                 // restore AppFont cache data
                 pFrame->mpWindowImpl->mpFrameData->meMapUnit = MAP_PIXEL;
 
                 // call UpdateSettings from ClientWindow in order to prevent updating data twice
-                Window* pClientWin = pFrame;
+                vcl::Window* pClientWin = pFrame;
                 while ( pClientWin->ImplGetClientWindow() )
                     pClientWin = pClientWin->ImplGetClientWindow();
                 pClientWin->UpdateSettings( rSettings, true );
 
-                Window* pTempWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap;
+                vcl::Window* pTempWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap;
                 while ( pTempWin )
                 {
                     // call UpdateSettings from ClientWindow in order to prevent updating data twice
@@ -636,12 +636,12 @@ void Application::InitSettings()
 void Application::NotifyAllWindows( DataChangedEvent& rDCEvt )
 {
     ImplSVData* pSVData = ImplGetSVData();
-    Window*     pFrame = pSVData->maWinData.mpFirstFrame;
+    vcl::Window*     pFrame = pSVData->maWinData.mpFirstFrame;
     while ( pFrame )
     {
         pFrame->NotifyAllChildren( rDCEvt );
 
-        Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap;
+        vcl::Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap;
         while ( pSysWin )
         {
             pSysWin->NotifyAllChildren( rDCEvt );
@@ -652,7 +652,7 @@ void Application::NotifyAllWindows( DataChangedEvent& rDCEvt )
     }
 }
 
-void Application::ImplCallEventListeners( sal_uLong nEvent, Window *pWin, void* pData )
+void Application::ImplCallEventListeners( sal_uLong nEvent, vcl::Window *pWin, void* pData )
 {
     ImplSVData* pSVData = ImplGetSVData();
     VclWindowEvent aEvent( pWin, nEvent, pData );
@@ -699,7 +699,7 @@ void Application::RemoveKeyListener( const Link& rKeyListener )
         pSVData->maAppData.mpKeyListeners->removeListener( rKeyListener );
 }
 
-bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent )
+bool Application::HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent )
 {
     // let listeners process the key event
     VclWindowEvent aEvent( pWin, nEvent, (void *) pKeyEvent );
@@ -713,7 +713,7 @@ bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent
     return bProcessed;
 }
 
-ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent )
+ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent )
 {
     const SolarMutexGuard aGuard;
     ImplSVEvent * nEventId = 0;
@@ -738,7 +738,7 @@ ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEven
     return nEventId;
 }
 
-ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent )
+ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent )
 {
     const SolarMutexGuard aGuard;
     ImplSVEvent * nEventId = 0;
@@ -773,7 +773,7 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, Mouse
 
 #if !HAVE_FEATURE_DESKTOP
 
-ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent )
+ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent )
 {
     const SolarMutexGuard aGuard;
     ImplSVEvent * nEventId = 0;
@@ -805,7 +805,7 @@ ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEv
     return nEventId;
 }
 
-ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent )
+ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent )
 {
     const SolarMutexGuard aGuard;
     ImplSVEvent * nEventId = 0;
@@ -903,7 +903,7 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData )
     return 0;
 }
 
-void Application::RemoveMouseAndKeyEvents( Window* pWin )
+void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin )
 {
     const SolarMutexGuard aGuard;
 
@@ -932,7 +932,7 @@ ImplSVEvent * Application::PostUserEvent( const Link& rLink, void* pCaller )
     pSVEvent->mpLink    = new Link( rLink );
     pSVEvent->mpWindow  = NULL;
     pSVEvent->mbCall    = true;
-    Window* pDefWindow = ImplGetDefaultWindow();
+    vcl::Window* pDefWindow = ImplGetDefaultWindow();
     if ( pDefWindow == 0 || !pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) )
     {
         delete pSVEvent->mpLink;
@@ -1013,7 +1013,7 @@ WorkWindow* Application::GetAppWindow()
     return ImplGetSVData()->maWinData.mpAppWin;
 }
 
-Window* Application::GetFocusWindow()
+vcl::Window* Application::GetFocusWindow()
 {
     return ImplGetSVData()->maWinData.mpFocusWin;
 }
@@ -1023,13 +1023,13 @@ OutputDevice* Application::GetDefaultDevice()
     return ImplGetDefaultWindow();
 }
 
-Window* Application::GetFirstTopLevelWindow()
+vcl::Window* Application::GetFirstTopLevelWindow()
 {
     ImplSVData* pSVData = ImplGetSVData();
     return pSVData->maWinData.mpFirstFrame;
 }
 
-Window* Application::GetNextTopLevelWindow( Window* pWindow )
+vcl::Window* Application::GetNextTopLevelWindow( vcl::Window* pWindow )
 {
     return pWindow->mpWindowImpl->mpFrameData->mpNextFrame;
 }
@@ -1038,7 +1038,7 @@ long    Application::GetTopWindowCount()
 {
     long nRet = 0;
     ImplSVData* pSVData = ImplGetSVData();
-    Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL;
+    vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL;
     while( pWin )
     {
         if( pWin->ImplGetWindow()->IsTopWindow() )
@@ -1048,11 +1048,11 @@ long    Application::GetTopWindowCount()
     return nRet;
 }
 
-Window* Application::GetTopWindow( long nIndex )
+vcl::Window* Application::GetTopWindow( long nIndex )
 {
     long nIdx = 0;
     ImplSVData* pSVData = ImplGetSVData();
-    Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL;
+    vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL;
     while( pWin )
     {
         if( pWin->ImplGetWindow()->IsTopWindow() )
@@ -1067,9 +1067,9 @@ Window* Application::GetTopWindow( long nIndex )
     return NULL;
 }
 
-Window* Application::GetActiveTopWindow()
+vcl::Window* Application::GetActiveTopWindow()
 {
-    Window *pWin = ImplGetSVData()->maWinData.mpFocusWin;
+    vcl::Window *pWin = ImplGetSVData()->maWinData.mpFocusWin;
     while( pWin )
     {
         if( pWin->IsTopWindow() )
@@ -1285,12 +1285,12 @@ void Application::SetDialogScaleX( short nScale )
         pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*nScale)/100;
 }
 
-void Application::SetDefDialogParent( Window* pWindow )
+void Application::SetDefDialogParent( vcl::Window* pWindow )
 {
     ImplGetSVData()->maWinData.mpDefDialogParent = pWindow;
 }
 
-Window* Application::GetDefDialogParent()
+vcl::Window* Application::GetDefDialogParent()
 {
     ImplSVData* pSVData = ImplGetSVData();
     // #103442# find some useful dialog parent if there
@@ -1305,7 +1305,7 @@ Window* Application::GetDefDialogParent()
         // as DefDialogParent
 
         // current focus frame
-        Window *pWin = NULL;
+        vcl::Window *pWin = NULL;
         if( (pWin = pSVData->maWinData.mpFocusWin) != NULL )
         {
             while( pWin->mpWindowImpl && pWin->mpWindowImpl->mpParent )
@@ -1670,10 +1670,10 @@ void Application::setDeInitHook(Link const & hook) {
 }
 
 // helper method to allow inline constructor even for pWindow!=NULL case
-void ImplDelData::AttachToWindow( const Window* pWindow )
+void ImplDelData::AttachToWindow( const vcl::Window* pWindow )
 {
     if( pWindow )
-        const_cast<Window*>(pWindow)->ImplAddDel( this );
+        const_cast<vcl::Window*>(pWindow)->ImplAddDel( this );
 }
 
 // define dtor for ImplDelData
@@ -1684,7 +1684,7 @@ ImplDelData::~ImplDelData()
     if( !mbDel && mpWindow )
     {
         // the window still exists but we were not removed
-        const_cast<Window*>(mpWindow)->ImplRemoveDel( this );
+        const_cast<vcl::Window*>(mpWindow)->ImplRemoveDel( this );
         mpWindow = NULL;
     }
 }
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 6054d6968f18..0aaff4a14e05 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -109,7 +109,7 @@ void ImplDestroySVData()
     pImplSVData = NULL;
 }
 
-Window* ImplGetDefaultWindow()
+vcl::Window* ImplGetDefaultWindow()
 {
     ImplSVData* pSVData = ImplGetSVData();
     if ( pSVData->maWinData.mpAppWin )
@@ -272,15 +272,15 @@ bool ImplInitAccessBridge()
     return true;
 }
 
-Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
+vcl::Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
 {
     ImplSVData* pSVData = ImplGetSVData();
-    Window*     pFrameWindow = pSVData->maWinData.mpFirstFrame;
+    vcl::Window*     pFrameWindow = pSVData->maWinData.mpFirstFrame;
     while ( pFrameWindow )
     {
         if ( pFrameWindow->ImplGetFrame() == pFrame )
         {
-            Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos );
+            vcl::Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos );
             if ( !pWindow )
                 pWindow = pFrameWindow->ImplGetWindow();
             rSalFramePos = pWindow->ImplFrameToOutput( rSalFramePos );
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 6c287551da4f..bd3544bc125a 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -362,7 +362,7 @@ void DeInitVCL()
     long nBadTopWindows = nTopWindowCount;
     for( long i = 0; i < nTopWindowCount; i++ )
     {
-        Window* pWin = Application::GetTopWindow( i );
+        vcl::Window* pWin = Application::GetTopWindow( i );
         // default window will be destroyed further down
         // but may still be useful during deinit up to that point
         if( pWin == pSVData->mpDefaultWin )