Use typed Timer::SetTimeoutHdl Link

Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100

19 files changed, 29 insertions, 58 deletions

diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 68bb91ed5c7b..1180100ba9a4 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -424,7 +424,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode )
     maShowTimer.Start();
 }
 
-IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer)
+IMPL_LINK_TYPED( HelpTextWindow, TimerHdl, Timer*, pTimer, void)
 {
     if ( pTimer == &maShowTimer )
     {
@@ -442,8 +442,6 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer)
         DBG_ASSERT( pTimer == &maHideTimer, "HelpTextWindow::TimerHdl with bad Timer" );
           ImplDestroyHelpWindow( true );
     }
-
-    return 1;
 }
 
 Size HelpTextWindow::CalcOutSize() const
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index 5fa5bef1c340..9463acd5b021 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -104,7 +104,7 @@ void ImplIdleMgr::RemoveIdleHdl( const Link<>& rLink )
         maTimer.Stop();
 }
 
-IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl)
+IMPL_LINK_NOARG_TYPED(ImplIdleMgr, TimeoutHdl, Timer *, void)
 {
     for ( size_t i = 0; i < mpIdleList->size(); ++i ) {
         ImplIdleData* pIdleData = (*mpIdleList)[ i ];
@@ -120,8 +120,6 @@ IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl)
             }
         }
     }
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6b89146dd231..0e2dba38ead4 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2419,10 +2419,9 @@ void Edit::UpdateData()
     maUpdateDataHdl.Call( this );
 }
 
-IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl)
+IMPL_LINK_NOARG_TYPED(Edit, ImplUpdateDataHdl, Timer *, void)
 {
     UpdateData();
-    return 0;
 }
 
 void Edit::EnableUpdateData( sal_uLong nTimeout )
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 314c41ab7f9f..74c94c23f550 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -92,7 +92,7 @@ void MenuButton::dispose()
     PushButton::dispose();
 }
 
-IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl)
+IMPL_LINK_NOARG_TYPED(MenuButton, ImplMenuTimeoutHdl, Timer *, void)
 {
     // See if Button Tracking is still active, as it could've been cancelled earler
     if ( IsTracking() )
@@ -101,8 +101,6 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl)
             GrabFocus();
         ExecuteMenu();
     }
-
-    return 0;
 }
 
 void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 0d24683137f2..f9acf5bab956 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -51,7 +51,7 @@ namespace vcl
             aSearchTimeout.Stop();
         }
 
-        DECL_LINK( SearchStringTimeout, Timer* );
+        DECL_LINK_TYPED( SearchStringTimeout, Timer*, void );
     };
 
     namespace
@@ -64,10 +64,9 @@ namespace vcl
         }
     }
 
-    IMPL_LINK( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, /*EMPTYARG*/ )
+    IMPL_LINK_NOARG_TYPED( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, void )
     {
         lcl_reset( *this );
-        return 1;
     }
 
     static StringEntryIdentifier findMatchingEntry( const OUString& _searchString, QuickSelectionEngine_Data& _engineData )
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 0d717833c3fb..0f4e8316f56e 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1134,12 +1134,11 @@ void ScrollBar::Resize()
     Invalidate();
 }
 
-IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl)
+IMPL_LINK_NOARG_TYPED(ScrollBar, ImplAutoTimerHdl, Timer *, void)
 {
     if( mpData && mpData->mbHide )
-        return 0;
+        return;
     ImplInvert();
-    return 0;
 }
 
 void ScrollBar::ImplInvert()
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 4689ee84e7e8..509b520c66f3 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -55,7 +55,7 @@ SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle )
     ImplInit( pParent, nStyle );
 }
 
-IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
+IMPL_LINK_TYPED( SpinButton, ImplTimeout, Timer*, pTimer, void )
 {
     if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() )
     {
@@ -69,8 +69,6 @@ IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
         else
             Down();
     }
-
-    return 0;
 }
 
 void SpinButton::Up()
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index c9131b71c6d6..d73eb50786c1 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -970,7 +970,7 @@ Size SpinField::CalcSize(sal_Int32 nChars) const
     return aSz;
 }
 
-IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer )
+IMPL_LINK_TYPED( SpinField, ImplTimeout, Timer*, pTimer, void )
 {
     if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() )
     {
@@ -984,7 +984,6 @@ IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer )
         else
             Down();
     }
-    return 0;
 }
 
 void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index eedadc4e5637..f71aee55361f 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -239,11 +239,11 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList
     return aImageURLs;
 }
 
-IMPL_LINK_NOARG(Throbber, TimeOutHdl)
+IMPL_LINK_NOARG_TYPED(Throbber, TimeOutHdl, Timer *, void)
 {
     SolarMutexGuard aGuard;
     if ( maImageList.empty() )
-        return 0;
+        return;
 
     if ( mnCurStep < mnStepCount - 1 )
         mnCurStep += 1;
@@ -261,8 +261,6 @@ IMPL_LINK_NOARG(Throbber, TimeOutHdl)
     }
 
     SetImage( maImageList[ mnCurStep ] );
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index faf72fb04a67..1ac2ee5ce0ea 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1046,10 +1046,9 @@ void VclMultiLineEdit::CaretChanged()
     CallEventListeners(VCLEVENT_EDIT_CARETCHANGED);
 }
 
-IMPL_LINK_NOARG(VclMultiLineEdit, ImpUpdateDataHdl)
+IMPL_LINK_NOARG_TYPED(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void)
 {
     UpdateData();
-    return 0;
 }
 
 void VclMultiLineEdit::UpdateData()
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index e0ce99a20959..6371d660ce08 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -353,7 +353,7 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout )
 
 typedef ::std::vector< AInfo* > AInfoList_impl;
 
-IMPL_LINK_NOARG(Animation, ImplTimeoutHdl)
+IMPL_LINK_NOARG_TYPED(Animation, ImplTimeoutHdl, Timer *, void)
 {
     const size_t nAnimCount = maList.size();
     AInfoList_impl aAInfoList;
@@ -432,7 +432,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl)
                     mbLoopTerminated = true;
                     mnPos = nAnimCount - 1UL;
                     maBitmapEx = maList[ mnPos ]->aBmpEx;
-                    return 0L;
+                    return;
                 }
                 else
                 {
@@ -471,8 +471,6 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl)
     }
     else
         Stop();
-
-    return 0L;
 }
 
 bool Animation::Insert( const AnimationBitmap& rStepBmp )
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 )