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 /accessibility | |
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 'accessibility')
12 files changed, 12 insertions, 12 deletions
diff --git a/accessibility/inc/extended/accessibletabbarbase.hxx b/accessibility/inc/extended/accessibletabbarbase.hxx index d0d9b6de0d5f..78162bf8f43e 100644 --- a/accessibility/inc/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/extended/accessibletabbarbase.hxx @@ -40,7 +40,7 @@ public: virtual ~AccessibleTabBarBase() override; protected: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx index 6f27b4efdc9e..5a41660d518f 100644 --- a/accessibility/inc/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/extended/accessibletablistboxtable.hxx @@ -41,7 +41,7 @@ private: css::uno::Reference< css::accessibility::XAccessible > m_xCurChild; void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); // helpers ---------------------------------------------------------------- diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx index ef673d93f4fe..7c84e19f8ec7 100644 --- a/accessibility/inc/extended/listboxaccessible.hxx +++ b/accessibility/inc/extended/listboxaccessible.hxx @@ -68,7 +68,7 @@ namespace accessibility void disposing(); private: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); private: ListBoxAccessibleBase( const ListBoxAccessibleBase& ) = delete; diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index fbb7f9b810a2..6cb2d6a30243 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -579,7 +579,7 @@ private: // Assuming that this will only be called with the external (Solar) mutex // locked. // init will already have been called. - DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void); + DECL_LINK(WindowEventHandler, VclWindowEvent&, void); // Must be called with both the external (Solar) and internal mutex // locked. diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index ace8ad33717f..417e7a6bcf12 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -110,7 +110,7 @@ protected: virtual void Click(); virtual bool IsPopupMenuOpen(); - DECL_LINK_TYPED( MenuEventListener, VclMenuEvent&, void ); + DECL_LINK( MenuEventListener, VclMenuEvent&, void ); void ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ); diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx index 530640103507..a4ecc4097335 100644 --- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx @@ -38,7 +38,7 @@ protected: virtual bool IsFocused() override; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index 11a26f8aa637..f75d4572a789 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.cxx @@ -43,7 +43,7 @@ AccessibleTabBarBase::~AccessibleTabBarBase() DELETEZ( m_pExternalLock ); } -IMPL_LINK_TYPED( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, void ) { vcl::Window* pEventWindow = rEvent.GetWindow(); OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" ); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index f13ad1619032..1e25ee8837ea 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -251,7 +251,7 @@ namespace accessibility } } - IMPL_LINK_TYPED( AccessibleTabListBoxTable, WindowEventListener, VclWindowEvent&, rEvent, void ) + IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow() && m_pTabListBox, "no event window" ); ProcessWindowEvent( rEvent ); diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 533b3e208e66..db388f3a5732 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.cxx @@ -41,7 +41,7 @@ namespace accessibility } } - IMPL_LINK_TYPED( ListBoxAccessibleBase, WindowEventListener, VclWindowEvent&, rEvent, void ) + IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow() , "ListBoxAccessibleBase::WindowEventListener: no event window!" ); OSL_ENSURE( rEvent.GetWindow() == m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come from?" ); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index f2aae5084506..5fd378821197 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1625,7 +1625,7 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint) } } -IMPL_LINK_TYPED(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) +IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 4c4ecc7d624a..957e82490558 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -529,7 +529,7 @@ bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() } -IMPL_LINK_TYPED( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void ) +IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetMenu(), "OAccessibleMenuBaseComponent - Menu?" ); ProcessMenuEvent( rEvent ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index ae0c21cbd4b3..ca917152d313 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -69,7 +69,7 @@ bool VCLXAccessibleMenuBar::IsFocused() } -IMPL_LINK_TYPED( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" ); if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) ) |