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 /avmedia/source/framework | |
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 'avmedia/source/framework')
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 12 | ||||
-rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/framework/soundhandler.hxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index b2c12c0a2dda..872abab92f1f 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -255,7 +255,7 @@ void MediaControl::setState( const MediaItem& rItem ) } } -IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void ) +IMPL_LINK( MediaControl, implTimeHdl, Slider*, p, void ) { mbLocked = true; maIdle.Stop(); @@ -263,7 +263,7 @@ IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void ) +IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p, void ) { MediaItem aExecItem; @@ -275,7 +275,7 @@ IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void ) +IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p, void ) { MediaItem aExecItem; @@ -285,7 +285,7 @@ IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) +IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void ) { if( p ) { @@ -321,7 +321,7 @@ IMPL_LINK_TYPED( MediaControl, implSelectHdl, ToolBox*, p, void ) } -IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void ) +IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void ) { MediaItem aExecItem; css::media::ZoomLevel eLevel; @@ -343,7 +343,7 @@ IMPL_LINK_TYPED( MediaControl, implZoomSelectHdl, ListBox&, p, void ) } -IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(MediaControl, implTimeoutHdl, Idle *, void) { update(); } diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 785f6ced9964..753fddca4b52 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -298,7 +298,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property @return 0 every time... it doesn't matter for us. @threadsafe yes *//*-*************************************************************************************************************/ -IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void) +IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Idle *, void) { // SAFE { ::osl::ClearableMutexGuard aLock( m_aLock ); diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index b9f041445c22..de718d5b9897 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -110,7 +110,7 @@ class SoundHandler : // interfaces // private methods private: - DECL_LINK_TYPED( implts_PlayerNotify, Idle*, void ); + DECL_LINK( implts_PlayerNotify, Idle*, void ); // variables // (should be private everyway!) |