diff options
Diffstat (limited to 'vcl')
66 files changed, 191 insertions, 191 deletions
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index 6e2bb2fec703..bd3d4bfcf736 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -132,7 +132,7 @@ public: disposeOnce(); } - DECL_LINK_TYPED(updateHdl, Timer*, void); + DECL_LINK(updateHdl, Timer*, void); virtual void dispose() override { @@ -504,7 +504,7 @@ public: } }; -IMPL_LINK_NOARG_TYPED(VisualBackendTestWindow, updateHdl, Timer *, void) +IMPL_LINK_NOARG(VisualBackendTestWindow, updateHdl, Timer *, void) { if (mbAnimate) { diff --git a/vcl/inc/dndeventdispatcher.hxx b/vcl/inc/dndeventdispatcher.hxx index 5cb29bd2105c..79851892c144 100644 --- a/vcl/inc/dndeventdispatcher.hxx +++ b/vcl/inc/dndeventdispatcher.hxx @@ -36,7 +36,7 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper< VclPtr<vcl::Window> m_pCurrentWindow; void designate_currentwindow(vcl::Window *pWindow); - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); ::osl::Mutex m_aMutex; css::uno::Sequence< css::datatransfer::DataFlavor > m_aDataFlavorList; diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 3f1606d504a8..beb72460024d 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -42,7 +42,7 @@ private: QuickHelpFlags mnStyle; private: - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index abddd4eed0b9..a237e346bd2d 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -380,9 +380,9 @@ protected: void ImplCheckScrollBars(); void ImplInitScrollBars(); - DECL_LINK_TYPED( ScrollBarHdl, ScrollBar*, void ); - DECL_LINK_TYPED( LBWindowScrolled, ImplListBoxWindow*, void ); - DECL_LINK_TYPED( MRUChanged, LinkParamNone*, void ); + DECL_LINK( ScrollBarHdl, ScrollBar*, void ); + DECL_LINK( LBWindowScrolled, ImplListBoxWindow*, void ); + DECL_LINK( MRUChanged, LinkParamNone*, void ); public: ImplListBox( vcl::Window* pParent, WinBits nWinStyle ); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 0409130a2c4f..69d6771ed751 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -231,16 +231,16 @@ namespace vcl virtual void Command( const CommandEvent& ) override; virtual void DataChanged( const DataChangedEvent& ) override; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( ToggleHdl, CheckBox&, void ); - DECL_LINK_TYPED( ToggleRadioHdl, RadioButton&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( ToggleHdl, CheckBox&, void ); + DECL_LINK( ToggleRadioHdl, RadioButton&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( UIOption_CheckHdl, CheckBox&, void ); - DECL_LINK_TYPED( UIOption_RadioHdl, RadioButton&, void ); - DECL_LINK_TYPED( UIOption_SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( UIOption_ModifyHdl, Edit&, void ); + DECL_LINK( UIOption_CheckHdl, CheckBox&, void ); + DECL_LINK( UIOption_RadioHdl, RadioButton&, void ); + DECL_LINK( UIOption_SelectHdl, ListBox&, void ); + DECL_LINK( UIOption_ModifyHdl, Edit&, void ); public: PrintDialog( vcl::Window*, const std::shared_ptr< PrinterController >& ); @@ -266,7 +266,7 @@ namespace vcl sal_Int32 mnCur; sal_Int32 mnMax; - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); public: PrintProgressDialog(vcl::Window* i_pParent, int i_nMax); diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 128cebf2cdd6..7a04037a045e 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -141,12 +141,12 @@ struct ImplSVAppData Idle* mpEventTestingIdle; int mnEventTestLimit; - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplQuitMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplPrepareExitMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplEndAllDialogsMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplEndAllPopupsMsg, void*, void); - DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplVclEventTestingHdl, void*, void); - DECL_LINK_TYPED(VclEventTestingHdl, Idle*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplQuitMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplPrepareExitMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplEndAllDialogsMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplEndAllPopupsMsg, void*, void); + DECL_STATIC_LINK(ImplSVAppData, ImplVclEventTestingHdl, void*, void); + DECL_LINK(VclEventTestingHdl, Idle*, void); }; struct ImplSVGDIData diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 76ab0644c29a..057436a5d6a8 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -322,7 +322,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager Timer m_aFontInstallerTimer; #if ENABLE_DBUS - DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void ); + DECL_LINK( autoInstallFontLangSupport, Timer*, void ); #endif PrintFontManager(); ~PrintFontManager(); diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index cbb7d2cae936..368ff74c8c60 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -64,7 +64,7 @@ private: void ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries); void ActivateAllSubmenus(Menu* pMenuBar); - DECL_LINK_TYPED(MenuBarHierarchyChangeHandler, Idle*, void); + DECL_LINK(MenuBarHierarchyChangeHandler, Idle*, void); public: GtkSalMenu( bool bMenuBar ); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 07a285353460..2c0be07f4b82 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -148,7 +148,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl long HandleReparentEvent ( XReparentEvent *pEvent ); long HandleClientMessage ( XClientMessageEvent*pEvent ); - DECL_LINK_TYPED( HandleAlwaysOnTopRaise, Timer*, void ); + DECL_LINK( HandleAlwaysOnTopRaise, Timer*, void ); void createNewWindow( ::Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) ); void updateScreenNumber(); diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx index 203c372f3fc8..f754547da76a 100644 --- a/vcl/inc/unx/sm.hxx +++ b/vcl/inc/unx/sm.hxx @@ -57,10 +57,10 @@ class SessionManagerClient static OString getPreviousSessionID(); - DECL_STATIC_LINK_TYPED( SessionManagerClient, ShutDownHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, void ); - DECL_STATIC_LINK_TYPED( SessionManagerClient, InteractionHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, ShutDownHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, ShutDownCancelHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, void ); + DECL_STATIC_LINK( SessionManagerClient, InteractionHdl, void*, void ); public: static void open(SalSession * pSession); static void close(); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index a5e72b32541e..d63011b4cb2e 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -448,7 +448,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) maShowTimer.Start(); } -IMPL_LINK_TYPED( HelpTextWindow, TimerHdl, Timer*, pTimer, void) +IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer == &maShowTimer ) { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index bd6bccba70be..98dfacdb2d48 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -332,14 +332,14 @@ const vcl::KeyCode* Application::GetReservedKeyCode( sal_uLong i ) return &ImplReservedKeys::get()->first[i].mKeyCode; } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplEndAllPopupsMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplEndAllPopupsMsg, void*, void ) { ImplSVData* pSVData = ImplGetSVData(); while (pSVData->maWinData.mpFirstFloat) pSVData->maWinData.mpFirstFloat->EndPopupMode(FloatWinPopupEndFlags::Cancel); } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplEndAllDialogsMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplEndAllDialogsMsg, void*, void ) { vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow(); while (pAppWindow) @@ -411,7 +411,7 @@ namespace } } -IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void) +IMPL_LINK_NOARG(ImplSVAppData, VclEventTestingHdl, Idle *, void) { if (Application::AnyInput()) { @@ -423,7 +423,7 @@ IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void) } } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplVclEventTestingHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplVclEventTestingHdl, void*, void ) { ImplSVData* pSVData = ImplGetSVData(); SAL_INFO("vcl.eventtesting", "EventTestLimit is " << pSVData->maAppData.mnEventTestLimit); @@ -446,7 +446,7 @@ IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplVclEventTestingHdl, void*, void } } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplPrepareExitMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplPrepareExitMsg, void*, void ) { //now close top level frames (void)GetpApp()->QueryExit(); @@ -575,7 +575,7 @@ void Application::ReAcquireSolarMutex(sal_uLong const nReleased) #endif } -IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplQuitMsg, void*, void ) +IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg, void*, void ) { ImplGetSVData()->maAppData.mbAppQuit = true; } @@ -960,7 +960,7 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, } -IMPL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, pCallData, void ) +IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData, void ) { const SolarMutexGuard aGuard; ImplPostEventData* pData = static_cast< ImplPostEventData * >( pCallData ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 37a6dbc69ae9..658a8b0d19c1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -626,7 +626,7 @@ FactoryFunction Button::GetUITestFactory() const return ButtonUIObject::create; } -IMPL_STATIC_LINK_TYPED( Button, dispatchCommandHandler, Button*, pButton, void ) +IMPL_STATIC_LINK( Button, dispatchCommandHandler, Button*, pButton, void ) { if (pButton == nullptr) return; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 4eceb395eb8c..c64e05d317fc 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -77,15 +77,15 @@ struct ComboBox::Impl ComboBoxBounds calcComboBoxDropDownComponentBounds( const Size &rOutSize, const Size &rBorderOutSize) const; - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplCancelHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplClickBtnHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplUserDrawHdl, UserDrawEvent*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplAutocompleteHdl, Edit&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl , LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplCancelHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplClickBtnHdl, void*, void ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void ); + DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit&, void ); + DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , LinkParamNone*, void ); }; @@ -298,7 +298,7 @@ bool ComboBox::IsAutocompleteEnabled() const return m_pImpl->m_pSubEdit->GetAutocompleteHdl().IsSet(); } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplClickBtnHdl, void*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplClickBtnHdl, void*, void) { m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); m_pSubEdit->GrabFocus(); @@ -316,7 +316,7 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplClickBtnHdl, void*, void) m_pImplLB->GetMainWindow()->ImplClearLayoutData(); } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void) { if (m_pFloatWin->IsPopupModeCanceled()) { @@ -339,7 +339,7 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); } -IMPL_LINK_TYPED(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) +IMPL_LINK(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) { Selection aSel = rEdit.GetSelection(); @@ -377,7 +377,7 @@ IMPL_LINK_TYPED(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) } } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) { bool bPopup = m_rThis.IsInDropDown(); bool bCallSelect = false; @@ -465,18 +465,18 @@ IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) } } -IMPL_LINK_NOARG_TYPED( ComboBox::Impl, ImplListItemSelectHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( ComboBox::Impl, ImplListItemSelectHdl, LinkParamNone*, void ) { m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplCancelHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplCancelHdl, LinkParamNone*, void) { if (m_rThis.IsInDropDown()) m_pFloatWin->EndPopupMode(); } -IMPL_LINK_TYPED( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) +IMPL_LINK( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) { if (!m_pImplLB->IsTrackingSelect()) { @@ -485,7 +485,7 @@ IMPL_LINK_TYPED( ComboBox::Impl, ImplSelectionChangedHdl, sal_Int32, nChanged, v } } -IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplDoubleClickHdl, ImplListBoxWindow*, void) +IMPL_LINK_NOARG(ComboBox::Impl, ImplDoubleClickHdl, ImplListBoxWindow*, void) { m_rThis.DoubleClick(); } @@ -1282,7 +1282,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, D } -IMPL_LINK_TYPED(ComboBox::Impl, ImplUserDrawHdl, UserDrawEvent*, pEvent, void) +IMPL_LINK(ComboBox::Impl, ImplUserDrawHdl, UserDrawEvent*, pEvent, void) { m_rThis.UserDraw(*pEvent); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index fd1ab81fab22..ef7b9c2ee9d1 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2389,7 +2389,7 @@ void Edit::UpdateData() maUpdateDataHdl.Call( *this ); } -IMPL_LINK_NOARG_TYPED(Edit, ImplUpdateDataHdl, Timer *, void) +IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl, Timer *, void) { UpdateData(); } diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index 304494e98068..56a7aa105bff 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -2225,12 +2225,12 @@ void ImplListBox::Resize() ImplCheckScrollBars(); } -IMPL_LINK_NOARG_TYPED(ImplListBox, MRUChanged, LinkParamNone*, void) +IMPL_LINK_NOARG(ImplListBox, MRUChanged, LinkParamNone*, void) { CompatStateChanged( StateChangedType::Data ); } -IMPL_LINK_NOARG_TYPED(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void) +IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void) { long nSet = GetTopEntry(); if( nSet > mpVScrollBar->GetRangeMax() ) @@ -2242,7 +2242,7 @@ IMPL_LINK_NOARG_TYPED(ImplListBox, LBWindowScrolled, ImplListBoxWindow*, void) maScrollHdl.Call( this ); } -IMPL_LINK_TYPED( ImplListBox, ScrollBarHdl, ScrollBar*, pSB, void ) +IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB, void ) { sal_uInt16 nPos = (sal_uInt16) pSB->GetThumbPos(); if( pSB == mpVScrollBar ) diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index b95c1dcf855c..fa696faf8768 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -211,7 +211,7 @@ void ListBox::ImplLoadRes( const ResId& rResId ) SelectEntryPos( nSelPos ); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplSelectHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) { bool bPopup = IsInDropDown(); if( IsDropDownBox() ) @@ -236,28 +236,28 @@ IMPL_LINK_NOARG_TYPED(ListBox, ImplSelectHdl, LinkParamNone*, void) Select(); } -IMPL_LINK_TYPED( ListBox, ImplFocusHdl, sal_Int32, nPos, void ) +IMPL_LINK( ListBox, ImplFocusHdl, sal_Int32, nPos, void ) { CallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos) ); } -IMPL_LINK_NOARG_TYPED( ListBox, ImplListItemSelectHdl, LinkParamNone*, void ) +IMPL_LINK_NOARG( ListBox, ImplListItemSelectHdl, LinkParamNone*, void ) { CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplScrollHdl, ImplListBox*, void) +IMPL_LINK_NOARG(ListBox, ImplScrollHdl, ImplListBox*, void) { CallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplCancelHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(ListBox, ImplCancelHdl, LinkParamNone*, void) { if( IsInDropDown() ) mpFloatWin->EndPopupMode(); } -IMPL_LINK_TYPED( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) +IMPL_LINK( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) { if ( !mpImplLB->IsTrackingSelect() ) { @@ -286,12 +286,12 @@ IMPL_LINK_TYPED( ListBox, ImplSelectionChangedHdl, sal_Int32, nChanged, void ) } } -IMPL_LINK_NOARG_TYPED(ListBox, ImplDoubleClickHdl, ImplListBoxWindow*, void) +IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl, ImplListBoxWindow*, void) { DoubleClick(); } -IMPL_LINK_NOARG_TYPED(ListBox, ImplClickBtnHdl, void*, void) +IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl, void*, void) { if( !mpFloatWin->IsInPopupMode() ) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG_TYPED(ListBox, ImplClickBtnHdl, void*, void) } } -IMPL_LINK_NOARG_TYPED(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void) { if( mpFloatWin->IsPopupModeCanceled() ) { @@ -1365,7 +1365,7 @@ void ListBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines } } -IMPL_LINK_TYPED( ListBox, ImplUserDrawHdl, UserDrawEvent*, pEvent, void ) +IMPL_LINK( ListBox, ImplUserDrawHdl, UserDrawEvent*, pEvent, void ) { UserDraw( *pEvent ); } diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 28f5ffcba8ec..c2c099cf80b9 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -91,7 +91,7 @@ void MenuButton::dispose() PushButton::dispose(); } -IMPL_LINK_NOARG_TYPED(MenuButton, ImplMenuTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl, Timer *, void) { // See if Button Tracking is still active, as it could've been cancelled earlier if ( IsTracking() ) diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 1e2e251dd383..e4769505c128 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -51,7 +51,7 @@ namespace vcl aSearchTimeout.Stop(); } - DECL_LINK_TYPED( SearchStringTimeout, Timer*, void ); + DECL_LINK( SearchStringTimeout, Timer*, void ); }; namespace @@ -64,7 +64,7 @@ namespace vcl } } - IMPL_LINK_NOARG_TYPED( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, void ) + IMPL_LINK_NOARG( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, void ) { lcl_reset( *this ); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 79f8c6bdef31..7d2a23923599 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1126,7 +1126,7 @@ void ScrollBar::Resize() Invalidate(); } -IMPL_LINK_NOARG_TYPED(ScrollBar, ImplAutoTimerHdl, Timer *, void) +IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl, Timer *, void) { if( mpData && mpData->mbHide ) return; diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 1c38fbe65e3a..0f2ef5e4e662 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -846,17 +846,17 @@ void Slider::SetLinkedField(VclPtr<NumericField> const & pField) } } -IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldSpinnerHdl, SpinField&, void) +IMPL_LINK_NOARG(Slider, LinkedFieldSpinnerHdl, SpinField&, void) { if (mpLinkedField) SetThumbPos(mpLinkedField->GetValue()); } -IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(Slider, LinkedFieldLoseFocusHdl, Control&, void) { if (mpLinkedField) SetThumbPos(mpLinkedField->GetValue()); } -IMPL_LINK_NOARG_TYPED(Slider, LinkedFieldModifyHdl, Edit&, void) +IMPL_LINK_NOARG(Slider, LinkedFieldModifyHdl, Edit&, void) { if (mpLinkedField) SetThumbPos(mpLinkedField->GetValue()); diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index e7d62bedb48e..4c1a7085eb2b 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -56,7 +56,7 @@ SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle ) ImplInit(pParent, nStyle); } -IMPL_LINK_TYPED(SpinButton, ImplTimeout, Timer*, pTimer, void) +IMPL_LINK(SpinButton, ImplTimeout, Timer*, pTimer, void) { if (pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat()) { diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 26c9887afd93..a0c1a0352f20 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -962,7 +962,7 @@ Size SpinField::CalcSize(sal_Int32 nChars) const return aSz; } -IMPL_LINK_TYPED( SpinField, ImplTimeout, Timer*, pTimer, void ) +IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer, void ) { if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() ) { diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index af2a0d0317ca..dc4998262784 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -989,12 +989,12 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) return bRet; } -IMPL_LINK_NOARG_TYPED(TabControl, ImplListBoxSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl, ListBox&, void) { SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); } -IMPL_LINK_TYPED( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT ) { diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index a2630932e01a..e6a8d91814ba 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -227,7 +227,7 @@ void Throbber::setImageList( ::std::vector< Image > const& i_images ) return aImageURLs; } -IMPL_LINK_NOARG_TYPED(Throbber, TimeOutHdl, Timer *, void) +IMPL_LINK_NOARG(Throbber, TimeOutHdl, Timer *, void) { SolarMutexGuard aGuard; if ( maImageList.empty() ) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 7fa7b1a2f1e4..20969d26e8bd 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1478,7 +1478,7 @@ void TextEngine::UpdateViews( TextView* pCurView ) maInvalidRect = Rectangle(); } -IMPL_LINK_NOARG_TYPED(TextEngine, IdleFormatHdl, Idle *, void) +IMPL_LINK_NOARG(TextEngine, IdleFormatHdl, Idle *, void) { FormatAndUpdate( mpIdleFormatter->GetView() ); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 1ee606a08b90..744abc2bee6d 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -91,7 +91,7 @@ protected: void ImpInitScrollBars(); void ImpSetScrollBarRanges(); void ImpSetHScrollBarThumbPos(); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); public: ImpVclMEdit( VclMultiLineEdit* pVclMultiLineEdit, WinBits nWinStyle ); @@ -317,7 +317,7 @@ void ImpVclMEdit::ImpSetHScrollBarThumbPos() } -IMPL_LINK_TYPED( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar, void ) +IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar, void ) { long nDiffX = 0, nDiffY = 0; @@ -1086,7 +1086,7 @@ void VclMultiLineEdit::CaretChanged() CallEventListeners(VCLEVENT_EDIT_CARETCHANGED); } -IMPL_LINK_NOARG_TYPED(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) +IMPL_LINK_NOARG(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) { UpdateData(); } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index a95819fd8ccb..dba350de110a 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2164,7 +2164,7 @@ const Link<ConvertData&,bool> GraphicFilter::GetFilterCallback() const return aLink; } -IMPL_LINK_TYPED( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) +IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool ) { bool bRet = false; diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index c585e0ac8104..181ad8a9e972 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -340,7 +340,7 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout ) maTimer.Start(); } -IMPL_LINK_NOARG_TYPED(Animation, ImplTimeoutHdl, Timer *, void) +IMPL_LINK_NOARG(Animation, ImplTimeoutHdl, Timer *, void) { const size_t nAnimCount = maList.size(); std::vector< AInfo* > aAInfoList; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index bfaab261502f..741038d77b6c 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -266,10 +266,10 @@ struct PrintJobAsync : mxController( i_xController ), maInitSetup( i_rInitSetup ) {} - DECL_LINK_TYPED( ExecJob, void*, void ); + DECL_LINK( ExecJob, void*, void ); }; -IMPL_LINK_NOARG_TYPED(PrintJobAsync, ExecJob, void*, void) +IMPL_LINK_NOARG(PrintJobAsync, ExecJob, void*, void) { Printer::ImplPrintJob(mxController, maInitSetup); diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx index cccb8443057a..710ac0ce197c 100644 --- a/vcl/source/helper/evntpost.cxx +++ b/vcl/source/helper/evntpost.cxx @@ -45,7 +45,7 @@ void EventPoster::Post() m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ) ); } -IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, /*p*/, void ) +IMPL_LINK( EventPoster, DoEvent_Impl, void*, /*p*/, void ) { DBG_TESTSOLARMUTEX(); m_nId = nullptr; diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index 0117d0e0f1a5..f09f2f43f313 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -36,7 +36,7 @@ SolarThreadExecutor::~SolarThreadExecutor() osl_destroyCondition( m_aFinish ); } -IMPL_LINK_NOARG_TYPED(SolarThreadExecutor, worker, void*, void) +IMPL_LINK_NOARG(SolarThreadExecutor, worker, void*, void) { if ( !m_bTimeout ) { diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 94e701ed6a41..70d3d45031ef 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -213,7 +213,7 @@ void ButtonDialog::ImplPosControls() mbFormat = false; } -IMPL_LINK_TYPED( ButtonDialog, ImplClickHdl, Button*, pBtn, void ) +IMPL_LINK( ButtonDialog, ImplClickHdl, Button*, pBtn, void ) { for (auto & it : m_ItemList) { diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 1318d535d6d8..7d76f19dee9e 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -258,7 +258,7 @@ void vcl::Cursor::ImplNew() } } -IMPL_LINK_NOARG_TYPED(vcl::Cursor, ImplTimerHdl, Timer *, void) +IMPL_LINK_NOARG(vcl::Cursor, ImplTimerHdl, Timer *, void) { if ( mpData->mbCurVisible ) ImplRestore(); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 30ba461b7e60..9b60717c6228 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -591,7 +591,7 @@ void Dialog::dispose() SystemWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(Dialog, ImplAsyncCloseHdl, void*, void) +IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl, void*, void) { Close(); } diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx index 1fcf74d60db2..2772c02a0d6c 100644 --- a/vcl/source/window/dndeventdispatcher.cxx +++ b/vcl/source/window/dndeventdispatcher.cxx @@ -68,7 +68,7 @@ vcl::Window* DNDEventDispatcher::findTopLevelWindow(Point location) return pChildWindow; } -IMPL_LINK_TYPED(DNDEventDispatcher, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(DNDEventDispatcher, WindowEventListener, VclWindowEvent&, rEvent, void) { if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index d01b055cf04e..984e5af8332e 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -50,9 +50,9 @@ private: bool mbInMove; ImplSVEvent * mnLastUserEvent; - DECL_LINK_TYPED(DockingHdl, void *, void); - DECL_LINK_TYPED(DockTimerHdl, Idle *, void); - DECL_LINK_TYPED(EndDockTimerHdl, Idle *, void); + DECL_LINK(DockingHdl, void *, void); + DECL_LINK(DockTimerHdl, Idle *, void); + DECL_LINK(EndDockTimerHdl, Idle *, void); public: ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); @@ -107,7 +107,7 @@ void ImplDockFloatWin2::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Idle *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but not floating" ); @@ -133,7 +133,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "enddocktimer called but not floating" ); @@ -150,7 +150,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, EndDockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin2, DockingHdl, void*, void) +IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, void) { // called during move of a floating window mnLastUserEvent = nullptr; @@ -1131,7 +1131,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin } } -IMPL_LINK_NOARG_TYPED(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void) +IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void) { GetWindow()->Show( false, ShowFlags::NoFocusChange ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index af564e6d5df0..f069b5583241 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -67,8 +67,8 @@ private: bool mbInMove; ImplSVEvent * mnLastUserEvent; - DECL_LINK_TYPED(DockingHdl, void *, void); - DECL_LINK_TYPED(DockTimerHdl, Idle *, void); + DECL_LINK(DockingHdl, void *, void); + DECL_LINK(DockTimerHdl, Idle *, void); public: ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); @@ -125,7 +125,7 @@ void ImplDockFloatWin::dispose() FloatingWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockTimerHdl, Idle *, void) +IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl, Idle *, void) { SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but not floating" ); @@ -152,7 +152,7 @@ IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockTimerHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(ImplDockFloatWin, DockingHdl, void*, void) +IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl, void*, void) { PointerState aState = mpDockWin->GetParent()->GetPointerState(); @@ -1117,7 +1117,7 @@ void DockingWindow::queue_resize(StateChangedType eReason) vcl::Window::queue_resize(eReason); } -IMPL_LINK_NOARG_TYPED(DockingWindow, ImplHandleLayoutTimerHdl, Idle*, void) +IMPL_LINK_NOARG(DockingWindow, ImplHandleLayoutTimerHdl, Idle*, void) { if (!isLayoutEnabled()) { diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 137944ebcbd3..f9c4513d32a8 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -561,7 +561,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ) return false; } -IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void) +IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl, void*, void) { VclPtr<FloatingWindow> pThis(this); mnPostId = nullptr; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 5324558a02d5..7b4d12a91d46 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1534,7 +1534,7 @@ void VclFrame::setAllocation(const Size &rAllocation) setLayoutAllocation(*pChild, aChildPos, aAllocation); } -IMPL_LINK_TYPED(VclFrame, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(VclFrame, WindowEventListener, VclWindowEvent&, rEvent, void) { if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) designate_label(nullptr); @@ -1791,7 +1791,7 @@ void VclExpander::StateChanged(StateChangedType nType) } } -IMPL_LINK_TYPED( VclExpander, ClickHdl, CheckBox&, rBtn, void ) +IMPL_LINK( VclExpander, ClickHdl, CheckBox&, rBtn, void ) { vcl::Window *pChild = get_child(); if (pChild) @@ -1827,7 +1827,7 @@ void VclScrolledWindow::dispose() VclBin::dispose(); } -IMPL_LINK_NOARG_TYPED(VclScrolledWindow, ScrollBarHdl, ScrollBar*, void) +IMPL_LINK_NOARG(VclScrolledWindow, ScrollBarHdl, ScrollBar*, void) { vcl::Window *pChild = get_child(); if (!pChild) @@ -2232,7 +2232,7 @@ void MessageDialog::response(short nResponseId) EndDialog(nResponseId); } -IMPL_LINK_TYPED(MessageDialog, ButtonHdl, Button *, pButton, void) +IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton, void) { response(get_response(pButton)); } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 7b99f2a4597e..120ff9ff9426 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2172,7 +2172,7 @@ void Menu::ImplCallHighlight(sal_uInt16 nItem) nSelectedId = 0; } -IMPL_LINK_NOARG_TYPED(Menu, ImplCallSelect, void*, void) +IMPL_LINK_NOARG(Menu, ImplCallSelect, void*, void) { nEventId = nullptr; Select(); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 6ab3f8b5b84a..a0167833edc4 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -222,7 +222,7 @@ Size MenuBarWindow::MinCloseButtonSize() return aCloseBtn->getMinSize(); } -IMPL_LINK_NOARG_TYPED(MenuBarWindow, CloseHdl, ToolBox *, void) +IMPL_LINK_NOARG(MenuBarWindow, CloseHdl, ToolBox *, void) { if( ! pMenu ) return; @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED(MenuBarWindow, CloseHdl, ToolBox *, void) } } -IMPL_LINK_TYPED( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) { if( ! pMenu ) return; @@ -271,7 +271,7 @@ IMPL_LINK_TYPED( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) } } -IMPL_LINK_TYPED( MenuBarWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) { if( ! pMenu ) return; diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index e7fec20b4a80..188219c1957b 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -99,9 +99,9 @@ private: virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; - DECL_LINK_TYPED( CloseHdl, ToolBox*, void ); - DECL_LINK_TYPED( ToolboxEventHdl, VclWindowEvent&, void ); - DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); + DECL_LINK( CloseHdl, ToolBox*, void ); + DECL_LINK( ToolboxEventHdl, VclWindowEvent&, void ); + DECL_LINK( ShowHideListener, VclWindowEvent&, void ); void StateChanged( StateChangedType nType ) override; void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index aeb97dc32524..643aeb786ff3 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -266,7 +266,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow } } -IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, PopupEnd, FloatingWindow*, void) +IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd, FloatingWindow*, void) { // "this" will be deleted before the end of this method! Menu* pM = pMenu; @@ -293,12 +293,12 @@ IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, PopupEnd, FloatingWindow*, void) pM->pStartedFrom = nullptr; } -IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, AutoScroll, Timer *, void) +IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll, Timer *, void) { ImplScroll( GetPointerPosPixel() ); } -IMPL_LINK_TYPED( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) +IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) { if( ! pMenu ) return; @@ -359,7 +359,7 @@ IMPL_LINK_TYPED( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) } } -IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, SubmenuClose, Timer *, void) +IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose, Timer *, void) { if( pMenu && pMenu->pStartedFrom ) { @@ -369,7 +369,7 @@ IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, SubmenuClose, Timer *, void) } } -IMPL_LINK_TYPED( MenuFloatingWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) { if( ! pMenu ) return; diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index cbbabad7b2e2..97d676e2f6bb 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -56,11 +56,11 @@ private: bool bIgnoreFirstMove : 1; bool bKeyInput : 1; - DECL_LINK_TYPED( PopupEnd, FloatingWindow*, void ); - DECL_LINK_TYPED( HighlightChanged, Timer*, void ); - DECL_LINK_TYPED( SubmenuClose, Timer *, void ); - DECL_LINK_TYPED( AutoScroll, Timer *, void ); - DECL_LINK_TYPED( ShowHideListener, VclWindowEvent&, void ); + DECL_LINK( PopupEnd, FloatingWindow*, void ); + DECL_LINK( HighlightChanged, Timer*, void ); + DECL_LINK( SubmenuClose, Timer *, void ); + DECL_LINK( AutoScroll, Timer *, void ); + DECL_LINK( ShowHideListener, VclWindowEvent&, void ); virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 516db21ed49f..adea785a8a38 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -164,7 +164,7 @@ void Window::ImplGenerateMouseMove() mpWindowImpl->mpFrameData->mnMouseMoveId = Application::PostUserEvent( LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ), nullptr, true ); } -IMPL_LINK_NOARG_TYPED(Window, ImplGenerateMouseMoveHdl, void*, void) +IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl, void*, void) { mpWindowImpl->mpFrameData->mnMouseMoveId = nullptr; vcl::Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 2c2c943c547d..96054a2b37ae 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -644,7 +644,7 @@ void Window::ImplPostPaint() mpWindowImpl->mpFrameData->maPaintIdle.Start(); } -IMPL_LINK_NOARG_TYPED(Window, ImplHandlePaintHdl, Idle *, void) +IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Idle *, void) { // save paint events until layout is done if (IsSystemWindow() && static_cast<const SystemWindow*>(this)->hasPendingLayout()) @@ -665,7 +665,7 @@ IMPL_LINK_NOARG_TYPED(Window, ImplHandlePaintHdl, Idle *, void) } } -IMPL_LINK_NOARG_TYPED(Window, ImplHandleResizeTimerHdl, Idle *, void) +IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Idle *, void) { if( mpWindowImpl->mbReallyVisible ) { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 0ddf2f6c4570..19d292c68c1e 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1520,7 +1520,7 @@ void PrintDialog::updateNup() preparePreview( true, true ); } -IMPL_LINK_TYPED( PrintDialog, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void ) { if( &rBox == maJobPage.mpPrinters ) { @@ -1557,17 +1557,17 @@ IMPL_LINK_TYPED( PrintDialog, SelectHdl, ListBox&, rBox, void ) } } -IMPL_LINK_TYPED( PrintDialog, ToggleRadioHdl, RadioButton&, rButton, void ) +IMPL_LINK( PrintDialog, ToggleRadioHdl, RadioButton&, rButton, void ) { ClickHdl(static_cast<Button*>(&rButton)); } -IMPL_LINK_TYPED( PrintDialog, ToggleHdl, CheckBox&, rButton, void ) +IMPL_LINK( PrintDialog, ToggleHdl, CheckBox&, rButton, void ) { ClickHdl(&rButton); } -IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void ) +IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton, void ) { if( pButton == mpOKButton || pButton == mpCancelButton ) { @@ -1656,7 +1656,7 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK_TYPED( PrintDialog, ModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( PrintDialog, ModifyHdl, Edit&, rEdit, void ) { checkControlDependencies(); if( &rEdit == maNUpPage.mpNupRowsEdt || &rEdit == maNUpPage.mpNupColEdt || @@ -1758,7 +1758,7 @@ void PrintDialog::makeEnabled( vcl::Window* i_pWindow ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -1775,7 +1775,7 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) +IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) { // this handler gets called for all radiobuttons that get unchecked, too // however we only want one notificaction for the new value (that is for @@ -1803,7 +1803,7 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -1828,7 +1828,7 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) } } -IMPL_LINK_TYPED( PrintDialog, UIOption_ModifyHdl, Edit&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -1935,7 +1935,7 @@ void PrintProgressDialog::dispose() ModelessDialog::dispose(); } -IMPL_LINK_TYPED( PrintProgressDialog, ClickHdl, Button*, pButton, void ) +IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton, void ) { if( pButton == mpButton ) mbCanceled = true; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 528659ec9162..07a762f93328 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -359,7 +359,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) FloatingWindow::MouseButtonUp( rMEvt ); } -IMPL_LINK_NOARG_TYPED(ImplWheelWindow, ImplScrollHdl, Timer *, void) +IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl, Timer *, void) { if ( mnActDeltaX || mnActDeltaY ) { diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 3509312eccff..ae233075c7b6 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -62,7 +62,7 @@ private: void ImplDrawWheel(vcl::RenderContext& rRenderContext); void ImplRecalcScrollValues(); - DECL_LINK_TYPED(ImplScrollHdl, Timer *, void); + DECL_LINK(ImplScrollHdl, Timer *, void); protected: diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index b9f09fc30088..27075d431c3e 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -51,7 +51,7 @@ SelectionEngine::~SelectionEngine() aWTimer.Stop(); } -IMPL_LINK_NOARG_TYPED(SelectionEngine, ImpWatchDog, Timer *, void) +IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog, Timer *, void) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 7526fa914baf..dca00fd98f27 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1110,7 +1110,7 @@ void SystemWindow::setPosSizeOnContainee(Size aSize, Window &rBox) VclContainer::setLayoutAllocation(rBox, aPos, aSize); } -IMPL_LINK_NOARG_TYPED( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) { if (!isLayoutEnabled()) { diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index effb2fb84b58..440de8c47ae3 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -135,7 +135,7 @@ public: void EndDragging( bool bOK = true ); void HideDragRect() { if ( mbShowDragRect ) mpDragBox->HideTracking(); } void UpdateDragRect(); - DECL_LINK_TYPED( SelectHdl, Accelerator&, void ); + DECL_LINK( SelectHdl, Accelerator&, void ); }; @@ -1322,7 +1322,7 @@ void ImplTBDragMgr::UpdateDragRect() mpDragBox->ShowTracking( maRect ); } -IMPL_LINK_TYPED( ImplTBDragMgr, SelectHdl, Accelerator&, rAccel, void ) +IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator&, rAccel, void ) { if ( rAccel.GetCurItemId() == KEY_ESCAPE ) EndDragging( false ); @@ -2719,7 +2719,7 @@ void ToolBox::ImplFormat( bool bResize ) mbFormat = false; } -IMPL_LINK_NOARG_TYPED(ToolBox, ImplDropdownLongClickHdl, Timer *, void) +IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl, Timer *, void) { if (mnCurPos != TOOLBOX_ITEM_NOTFOUND && (mpData->m_aItems[ mnCurPos ].mnBits & ToolBoxItemBits::DROPDOWN)) @@ -2745,7 +2745,7 @@ IMPL_LINK_NOARG_TYPED(ToolBox, ImplDropdownLongClickHdl, Timer *, void) } } -IMPL_LINK_NOARG_TYPED(ToolBox, ImplUpdateHdl, Idle *, void) +IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl, Idle *, void) { if( mbFormat && mpData ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index fedc41c7ccfa..f35f2cd82146 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1787,7 +1787,7 @@ void ToolBox::UpdateCustomMenu() } } -IMPL_LINK_TYPED( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) +IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) { if( rEvent.GetMenu() == GetMenu() && rEvent.GetId() == VCLEVENT_MENU_SELECT ) { @@ -1797,7 +1797,7 @@ IMPL_LINK_TYPED( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) } } -IMPL_LINK_NOARG_TYPED(ToolBox, ImplCallExecuteCustomMenu, void*, void) +IMPL_LINK_NOARG(ToolBox, ImplCallExecuteCustomMenu, void*, void) { mpData->mnEventId = nullptr; ImplExecuteCustomMenu(); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 91498636fa77..1c71a6497a1d 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -277,7 +277,7 @@ void Window::InvertTracking( const tools::Polygon& rPoly, ShowTrackFlags nFlags pGraphics->Invert( nPoints, pPtAry, SalInvert::TrackFrame, this ); } -IMPL_LINK_TYPED( Window, ImplTrackTimerHdl, Timer*, pTimer, void ) +IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer, void ) { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 04dd36043f7d..43e5692c396b 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1717,7 +1717,7 @@ static void ImplActivateFloatingWindows( vcl::Window* pWindow, bool bActive ) } } -IMPL_LINK_NOARG_TYPED(vcl::Window, ImplAsyncFocusHdl, void*, void) +IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl, void*, void) { ImplGetWindowImpl()->mpFrameData->mnFocusId = nullptr; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index eb0d833077c5..1b1ae8e61941 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -91,7 +91,7 @@ class XIMStatusWindow : public StatusWindow void layout(); bool checkLastParent() const; - DECL_LINK_TYPED( DelayedShowHdl, void*, void ); + DECL_LINK( DelayedShowHdl, void*, void ); public: explicit XIMStatusWindow( bool bOn ); virtual ~XIMStatusWindow() override; @@ -257,7 +257,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) } } -IMPL_LINK_NOARG_TYPED(XIMStatusWindow, DelayedShowHdl, void*, void) +IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl, void*, void) { m_nDelayedEvent = nullptr; const SystemEnvData* pData = GetSystemData(); @@ -304,7 +304,7 @@ class IIIMPStatusWindow : public StatusWindow bool m_bShow; bool m_bOn; - DECL_LINK_TYPED( SelectHdl, MenuButton*, void ); + DECL_LINK( SelectHdl, MenuButton*, void ); void show(); @@ -458,7 +458,7 @@ void IIIMPStatusWindow::GetFocus() } } -IMPL_LINK_TYPED( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) +IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) { if( pBtn == m_aStatusBtn ) { diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index d05d6af54329..5dea963552d3 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -237,7 +237,7 @@ bool SessionManagerClient::checkDocumentsSaved() return m_bDocSaveDone; } -IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) +IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) { // Decode argument smuggled in as void*: sal_uIntPtr nStateVal = reinterpret_cast< sal_uIntPtr >(pStateVal); @@ -278,7 +278,7 @@ IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, saveDone(); } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl, void*, void ) { SAL_INFO("vcl.sm", "interaction link"); if( m_pSession ) @@ -288,7 +288,7 @@ IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void } } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl, void*, void ) { SAL_INFO("vcl.sm", "shutdown cancel"); if( m_pSession ) @@ -336,7 +336,7 @@ void SessionManagerClient::SaveYourselfProc( SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl, void*, void ) { if( m_pSession ) { diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index b0b1b16d7c62..cbdbd3302e4e 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -887,7 +887,7 @@ namespace } #if ENABLE_DBUS -IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) +IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 76a615c63249..17ca9cddae49 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -97,7 +97,7 @@ namespace VclPtr<Edit> m_pEdit; OUString& m_rReturnValue; - DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); + DECL_LINK( ClickBtnHdl, Button*, void ); public: // parent window, Query text, initial value @@ -130,7 +130,7 @@ namespace SetText(rQuery); } - IMPL_LINK_TYPED( QueryString, ClickBtnHdl, Button*, pButton, void ) + IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton, void ) { if (pButton == m_pOKButton) { @@ -1283,7 +1283,7 @@ class PrinterUpdate static int nActiveJobs; static void doUpdate(); - DECL_STATIC_LINK_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ); + DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Idle*, void ); public: static void update(SalGenericInstance &rInstance); static void jobStarted() { nActiveJobs++; } @@ -1301,7 +1301,7 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } -IMPL_STATIC_LINK_NOARG_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ) +IMPL_STATIC_LINK_NOARG( PrinterUpdate, UpdateTimerHdl, Idle*, void ) { if( nActiveJobs < 1 ) { diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 0bea78b66c8f..02684af1e765 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -107,7 +107,7 @@ void RTSDialog::dispose() TabDialog::dispose(); } -IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) +IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) { if( pTabCtrl != m_pTabControl ) return; @@ -131,7 +131,7 @@ IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) } } -IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void ) +IMPL_LINK( RTSDialog, ClickButton, Button*, pButton, void ) { if( pButton == m_pOKButton ) { @@ -262,7 +262,7 @@ void RTSPaperPage::update() } } -IMPL_LINK_TYPED( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) { const PPDKey* pKey = nullptr; if( &rBox == m_pPaperBox ) @@ -448,7 +448,7 @@ sal_uLong RTSDevicePage::getPDFDevice() return -1; //explicitly PS } -IMPL_LINK_TYPED(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) { if (m_pCustomValue) { @@ -456,7 +456,7 @@ IMPL_LINK_TYPED(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) } } -IMPL_LINK_TYPED( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) { if( &rBox == m_pPPDKeyBox ) { diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 6de4bf7a66de..fa22a4417ab3 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -58,8 +58,8 @@ class RTSDialog : public TabDialog bool mbDataModified; - DECL_LINK_TYPED( ActivatePage, TabControl*, void ); - DECL_LINK_TYPED( ClickButton, Button*, void ); + DECL_LINK( ActivatePage, TabControl*, void ); + DECL_LINK( ClickButton, Button*, void ); // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); @@ -89,7 +89,7 @@ class RTSPaperPage : public TabPage VclPtr<FixedText> m_pSlotText; VclPtr<ListBox> m_pSlotBox; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: explicit RTSPaperPage( RTSDialog* ); virtual ~RTSPaperPage() override; @@ -115,8 +115,8 @@ class RTSDevicePage : public TabPage void FillValueBox( const ::psp::PPDKey* ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: explicit RTSDevicePage( RTSDialog* ); virtual ~RTSDevicePage() override; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 29f0b4e89887..3f4b5e887b69 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3541,7 +3541,7 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } -IMPL_LINK_NOARG_TYPED(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) +IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) { if( bMapped_ ) ToTop( SalFrameToTop::NONE ); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 6a9ac73175af..041e9c22f50b 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -439,7 +439,7 @@ GtkSalMenu::GtkSalMenu( bool bMenuBar ) : maUpdateMenuBarIdle.SetDebugName("Native Gtk Menu Update Idle"); } -IMPL_LINK_NOARG_TYPED(GtkSalMenu, MenuBarHierarchyChangeHandler, Idle *, void) +IMPL_LINK_NOARG(GtkSalMenu, MenuBarHierarchyChangeHandler, Idle *, void) { SAL_WARN_IF(!mpFrame, "vcl.gtk", "MenuBar layout changed, but no frame for some reason!"); if (!mpFrame) diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 1fe64da78e64..c3db7ecb45a0 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -114,9 +114,9 @@ public: void parseList( const OString& rList ); static OString processCommand( const OString& rCommand ); - DECL_LINK_TYPED( ListHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_STATIC_LINK_TYPED( MyWin, QuitHdl, Button*, void ); + DECL_LINK( ListHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_STATIC_LINK( MyWin, QuitHdl, Button*, void ); }; void Main() @@ -245,17 +245,17 @@ OString MyWin::processCommand( const OString& rCommand ) return aAnswer.makeStringAndClear(); } -IMPL_LINK_NOARG_TYPED( MyWin, ListHdl, Button*, void) +IMPL_LINK_NOARG( MyWin, ListHdl, Button*, void) { parseList( processCommand( "list" ) ); } -IMPL_STATIC_LINK_NOARG_TYPED( MyWin, QuitHdl, Button*, void) +IMPL_STATIC_LINK_NOARG( MyWin, QuitHdl, Button*, void) { processCommand( "quit" ); } -IMPL_LINK_NOARG_TYPED( MyWin, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void) { OUString aEntry = m_aSvpBitmaps->GetSelectEntry(); sal_Int32 nPos = aEntry.indexOf( ": " ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 368e30bb0114..e1b65851edcf 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -168,7 +168,7 @@ public: FloatingWindow *mpButtonWin; AutoTimer maBounce; int mnBounceX, mnBounceY; - DECL_LINK_TYPED(BounceTimerCb, Timer*, void); + DECL_LINK(BounceTimerCb, Timer*, void); #endif bool MouseButtonDown(const MouseEvent& rMEvt); @@ -1511,7 +1511,7 @@ public: }; #if FIXME_BOUNCE_BUTTON -IMPL_LINK_NOARG_TYPED(DemoRenderer,BounceTimerCb,Timer*,void) +IMPL_LINK_NOARG(DemoRenderer,BounceTimerCb,Timer*,void) { mpButton->Check(mnBounceX>0); mpButton->SetPressed(mnBounceY>0); @@ -1823,7 +1823,7 @@ class DemoWidgets : public WorkWindow VclPtr<ComboBox> mpGLCombo; VclPtr<PushButton> mpGLButton; - DECL_LINK_TYPED(GLTestClick, Button*, void); + DECL_LINK(GLTestClick, Button*, void); public: DemoWidgets() : @@ -1923,7 +1923,7 @@ public: static void leave() { OpenGLZone::leave(); } }; -IMPL_LINK_NOARG_TYPED(DemoWidgets, GLTestClick, Button*, void) +IMPL_LINK_NOARG(DemoWidgets, GLTestClick, Button*, void) { sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos(); |