Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

8 files changed, 14 insertions, 26 deletions

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index e61d82b1b5d6..c313001aec9b 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -246,13 +246,12 @@ void vcl::Cursor::ImplNew()
     }
 }
 
-IMPL_LINK_NOARG(vcl::Cursor, ImplTimerHdl)
+IMPL_LINK_NOARG_TYPED(vcl::Cursor, ImplTimerHdl, Timer *, void)
 {
     if ( mpData->mbCurVisible )
         ImplRestore();
     else
         ImplDraw();
-    return 0;
 }
 
 vcl::Cursor::Cursor()
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index a48152eeffc7..e28cfff00c7a 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -267,16 +267,15 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd)
     return 0;
 }
 
-IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll)
+IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, AutoScroll, Timer *, void)
 {
     ImplScroll( GetPointerPosPixel() );
-    return 1;
 }
 
-IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer )
+IMPL_LINK_TYPED( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void )
 {
     if( ! pMenu )
-        return 0;
+        return;
 
     MenuItemData* pItemData = pMenu->pItemList->GetDataFromPos( nHighlightedItem );
     if ( pItemData )
@@ -332,11 +331,9 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer )
                 pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow( this );
         }
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose)
+IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, SubmenuClose, Timer *, void)
 {
     if( pMenu && pMenu->pStartedFrom )
     {
@@ -344,7 +341,6 @@ IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose)
         if( pWin )
             pWin->KillActivePopup();
     }
-    return 0;
 }
 
 IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent*, pEvent )
diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx
index 021247af51a5..030fde0ba427 100644
--- a/vcl/source/window/menufloatingwindow.hxx
+++ b/vcl/source/window/menufloatingwindow.hxx
@@ -57,9 +57,9 @@ private:
     bool            bKeyInput;
 
                     DECL_LINK(PopupEnd, void *);
-                    DECL_LINK( HighlightChanged, Timer* );
-                    DECL_LINK(SubmenuClose, void *);
-                    DECL_LINK(AutoScroll, void *);
+                    DECL_LINK_TYPED( HighlightChanged, Timer*, void );
+                    DECL_LINK_TYPED(SubmenuClose, Timer *, void);
+                    DECL_LINK_TYPED(AutoScroll, Timer *, void);
                     DECL_LINK( ShowHideListener, VclWindowEvent* );
 
     virtual void    StateChanged( StateChangedType nType ) SAL_OVERRIDE;
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 009dc14422bc..972e1fd4d1d3 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -345,7 +345,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt )
         FloatingWindow::MouseButtonUp( rMEvt );
 }
 
-IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl)
+IMPL_LINK_NOARG_TYPED(ImplWheelWindow, ImplScrollHdl, Timer *, void)
 {
     if ( mnActDeltaX || mnActDeltaY )
     {
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl)
             ImplDelData aDel( this );
             pWindow->Command( aCEvt );
             if( aDel.IsDead() )
-                return 0;
+                return;
             mnRepaintTime = std::max( tools::Time::GetSystemTicks() - nTime, (sal_uInt64)1 );
             ImplRecalcScrollValues();
         }
@@ -371,8 +371,6 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl)
     if ( mnTimeout != mpTimer->GetTimeout() )
         mpTimer->SetTimeout( mnTimeout );
     mpTimer->Start();
-
-    return 0L;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index 82ba04f29e51..65e0b7e3ab9b 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.hxx
@@ -59,7 +59,7 @@ private:
     void                ImplDrawWheel();
     void                ImplRecalcScrollValues();
 
-                        DECL_LINK(ImplScrollHdl, void *);
+                        DECL_LINK_TYPED(ImplScrollHdl, Timer *, void);
 
 protected:
 
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 60567209e81f..5ed8c960715e 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -51,11 +51,10 @@ SelectionEngine::~SelectionEngine()
     aWTimer.Stop();
 }
 
-IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog)
+IMPL_LINK_NOARG_TYPED(SelectionEngine, ImpWatchDog, Timer *, void)
 {
     if ( !aArea.IsInside( aLastMove.GetPosPixel() ) )
         SelMouseMove( aLastMove );
-    return 0;
 }
 
 void SelectionEngine::SetSelectionMode( SelectionMode eMode )
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index bffd15ae8f2f..28806d8bb6ff 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2632,7 +2632,7 @@ void ToolBox::ImplFormat( bool bResize )
     mbFormat = false;
 }
 
-IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
+IMPL_LINK_NOARG_TYPED(ToolBox, ImplDropdownLongClickHdl, Timer *, void)
 {
     if( mnCurPos != TOOLBOX_ITEM_NOTFOUND &&
         (mpData->m_aItems[ mnCurPos ].mnBits & ToolBoxItemBits::DROPDOWN)
@@ -2657,8 +2657,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
             mnHighItemId     = 0;
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl)
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e10eb93f504b..3e14d44ad657 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -345,7 +345,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
     pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this );
 }
 
-IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
+IMPL_LINK_TYPED( Window, ImplTrackTimerHdl, Timer*, pTimer, void )
 {
     ImplSVData* pSVData = ImplGetSVData();
 
@@ -367,8 +367,6 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
                            mpWindowImpl->mpFrameData->mnMouseCode );
     TrackingEvent   aTEvt( aMEvt, TRACKING_REPEAT );
     Tracking( aTEvt );
-
-    return 0;
 }
 
 void Window::StartTracking( sal_uInt16 nFlags )