diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /extensions/source/update | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'extensions/source/update')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 7fb23d197b44..6973b657781f 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -139,13 +139,13 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper sal_uInt16 mnIconID; private: - DECL_LINK_TYPED(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK_TYPED(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); - DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void); - DECL_LINK_TYPED(TimeOutHdl, Timer *, void); - DECL_LINK_TYPED(UserEventHdl, void *, void); - DECL_LINK_TYPED(WindowEventHdl, VclWindowEvent&, void); - DECL_LINK_TYPED(ApplicationEventHdl, VclSimpleEvent&, void); + DECL_LINK(ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_LINK(HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, bool); + DECL_LINK(WaitTimeOutHdl, Idle *, void); + DECL_LINK(TimeOutHdl, Timer *, void); + DECL_LINK(UserEventHdl, void *, void); + DECL_LINK(WindowEventHdl, VclWindowEvent&, void); + DECL_LINK(ApplicationEventHdl, VclSimpleEvent&, void); BubbleWindow* GetBubbleWindow(); void RemoveBubbleWindow( bool bRemoveIcon ); @@ -571,7 +571,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool) +IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, bool) { SolarMutexGuard aGuard; @@ -594,7 +594,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg } -IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) +IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg&, rData, bool ) { if ( rData.bHighlight ) maWaitIdle.Start(); @@ -605,7 +605,7 @@ IMPL_LINK_TYPED( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg& } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) +IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) { SolarMutexGuard aGuard; @@ -618,13 +618,13 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, WaitTimeOutHdl, Idle *, void) } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void) +IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl, Timer *, void) { RemoveBubbleWindow( false ); } -IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) +IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl, void*, void) { SolarMutexGuard aGuard; @@ -655,7 +655,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void) } -IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) { sal_uLong nEventID = rEvent.GetId(); @@ -705,7 +705,7 @@ IMPL_LINK_TYPED( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) } -IMPL_LINK_TYPED( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) +IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { |