From 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 5 Oct 2016 07:56:12 +0200 Subject: 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 --- avmedia/source/framework/mediacontrol.cxx | 12 ++++++------ avmedia/source/framework/soundhandler.cxx | 2 +- avmedia/source/framework/soundhandler.hxx | 2 +- avmedia/source/gstreamer/gstplayer.cxx | 4 ++-- avmedia/source/opengl/oglplayer.cxx | 2 +- avmedia/source/opengl/oglplayer.hxx | 2 +- avmedia/source/opengl/oglwindow.cxx | 4 ++-- avmedia/source/opengl/oglwindow.hxx | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'avmedia/source') 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!) diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index a849a585f1da..37b76626315b 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -102,7 +102,7 @@ public: private: void processQueue(); - DECL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void*, void); + DECL_STATIC_LINK(MissingPluginInstaller, launchUi, void*, void); osl::Mutex mutex_; std::set reported_; @@ -235,7 +235,7 @@ void MissingPluginInstaller::processQueue() { } -IMPL_STATIC_LINK_TYPED(MissingPluginInstaller, launchUi, void *, p, void) +IMPL_STATIC_LINK(MissingPluginInstaller, launchUi, void *, p, void) { MissingPluginInstallerThread* thread = static_cast(p); rtl::Reference ref(thread, SAL_NO_ACQUIRE); diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 4077e3b014d0..50fdf4c2a1be 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -358,7 +358,7 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames() return { "com.sun.star.media.Player_OpenGL" }; } -IMPL_LINK_TYPED(OGLPlayer,TimerHandler,Timer*,pTimer,void) +IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer,void) { if (pTimer == &m_aTimer) { diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 8a43fc7e28c3..05716ad33b5f 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -61,7 +61,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; private: - DECL_LINK_TYPED( TimerHandler, Timer*, void ); + DECL_LINK( TimerHandler, Timer*, void ); OUString m_sURL; diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 5c08d74df4d2..15ec0f7a52db 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -199,7 +199,7 @@ void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintL { } -IMPL_LINK_TYPED(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) +IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) { if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) { @@ -225,7 +225,7 @@ IMPL_LINK_TYPED(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) } } -IMPL_LINK_TYPED(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) { if( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT ) { diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index c6bd9cd857b1..d89f2735fccb 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -62,8 +62,8 @@ public: virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; private: - DECL_LINK_TYPED( FocusGrabber, VclWindowEvent&, void ); - DECL_LINK_TYPED( CameraHandler, VclWindowEvent&, void ); + DECL_LINK( FocusGrabber, VclWindowEvent&, void ); + DECL_LINK( CameraHandler, VclWindowEvent&, void ); libgltf::glTFHandle& m_rHandle; rtl::Reference m_xContext; -- cgit