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 /vcl/inc | |
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 'vcl/inc')
-rw-r--r-- | vcl/inc/dndeventdispatcher.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/helpwin.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/listbox.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/printdlg.hxx | 20 | ||||
-rw-r--r-- | vcl/inc/svdata.hxx | 12 | ||||
-rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salframe.h | 2 | ||||
-rw-r--r-- | vcl/inc/unx/sm.hxx | 8 |
9 files changed, 28 insertions, 28 deletions
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(); |