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/unx/generic | |
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/unx/generic')
-rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/app/sm.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.hxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 |
7 files changed, 24 insertions, 24 deletions
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index eb0d833077c5..1b1ae8e61941 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -91,7 +91,7 @@ class XIMStatusWindow : public StatusWindow void layout(); bool checkLastParent() const; - DECL_LINK_TYPED( DelayedShowHdl, void*, void ); + DECL_LINK( DelayedShowHdl, void*, void ); public: explicit XIMStatusWindow( bool bOn ); virtual ~XIMStatusWindow() override; @@ -257,7 +257,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) } } -IMPL_LINK_NOARG_TYPED(XIMStatusWindow, DelayedShowHdl, void*, void) +IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl, void*, void) { m_nDelayedEvent = nullptr; const SystemEnvData* pData = GetSystemData(); @@ -304,7 +304,7 @@ class IIIMPStatusWindow : public StatusWindow bool m_bShow; bool m_bOn; - DECL_LINK_TYPED( SelectHdl, MenuButton*, void ); + DECL_LINK( SelectHdl, MenuButton*, void ); void show(); @@ -458,7 +458,7 @@ void IIIMPStatusWindow::GetFocus() } } -IMPL_LINK_TYPED( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) +IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) { if( pBtn == m_aStatusBtn ) { diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index d05d6af54329..5dea963552d3 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -237,7 +237,7 @@ bool SessionManagerClient::checkDocumentsSaved() return m_bDocSaveDone; } -IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) +IMPL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, void ) { // Decode argument smuggled in as void*: sal_uIntPtr nStateVal = reinterpret_cast< sal_uIntPtr >(pStateVal); @@ -278,7 +278,7 @@ IMPL_STATIC_LINK_TYPED( SessionManagerClient, SaveYourselfHdl, void*, pStateVal, saveDone(); } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, InteractionHdl, void*, void ) { SAL_INFO("vcl.sm", "interaction link"); if( m_pSession ) @@ -288,7 +288,7 @@ IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, InteractionHdl, void*, void } } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownCancelHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownCancelHdl, void*, void ) { SAL_INFO("vcl.sm", "shutdown cancel"); if( m_pSession ) @@ -336,7 +336,7 @@ void SessionManagerClient::SaveYourselfProc( SAL_INFO("vcl.sm", "waiting for save yourself event to be processed" ); } -IMPL_STATIC_LINK_NOARG_TYPED( SessionManagerClient, ShutDownHdl, void*, void ) +IMPL_STATIC_LINK_NOARG( SessionManagerClient, ShutDownHdl, void*, void ) { if( m_pSession ) { diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index b0b1b16d7c62..cbdbd3302e4e 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -887,7 +887,7 @@ namespace } #if ENABLE_DBUS -IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) +IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 76a615c63249..17ca9cddae49 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -97,7 +97,7 @@ namespace VclPtr<Edit> m_pEdit; OUString& m_rReturnValue; - DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); + DECL_LINK( ClickBtnHdl, Button*, void ); public: // parent window, Query text, initial value @@ -130,7 +130,7 @@ namespace SetText(rQuery); } - IMPL_LINK_TYPED( QueryString, ClickBtnHdl, Button*, pButton, void ) + IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton, void ) { if (pButton == m_pOKButton) { @@ -1283,7 +1283,7 @@ class PrinterUpdate static int nActiveJobs; static void doUpdate(); - DECL_STATIC_LINK_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ); + DECL_STATIC_LINK( PrinterUpdate, UpdateTimerHdl, Idle*, void ); public: static void update(SalGenericInstance &rInstance); static void jobStarted() { nActiveJobs++; } @@ -1301,7 +1301,7 @@ void PrinterUpdate::doUpdate() pInst->PostPrintersChanged(); } -IMPL_STATIC_LINK_NOARG_TYPED( PrinterUpdate, UpdateTimerHdl, Idle*, void ) +IMPL_STATIC_LINK_NOARG( PrinterUpdate, UpdateTimerHdl, Idle*, void ) { if( nActiveJobs < 1 ) { diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 0bea78b66c8f..02684af1e765 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -107,7 +107,7 @@ void RTSDialog::dispose() TabDialog::dispose(); } -IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) +IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) { if( pTabCtrl != m_pTabControl ) return; @@ -131,7 +131,7 @@ IMPL_LINK_TYPED( RTSDialog, ActivatePage, TabControl*, pTabCtrl, void ) } } -IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void ) +IMPL_LINK( RTSDialog, ClickButton, Button*, pButton, void ) { if( pButton == m_pOKButton ) { @@ -262,7 +262,7 @@ void RTSPaperPage::update() } } -IMPL_LINK_TYPED( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) { const PPDKey* pKey = nullptr; if( &rBox == m_pPaperBox ) @@ -448,7 +448,7 @@ sal_uLong RTSDevicePage::getPDFDevice() return -1; //explicitly PS } -IMPL_LINK_TYPED(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) +IMPL_LINK(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) { if (m_pCustomValue) { @@ -456,7 +456,7 @@ IMPL_LINK_TYPED(RTSDevicePage, ModifyHdl, Edit&, rEdit, void) } } -IMPL_LINK_TYPED( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) { if( &rBox == m_pPPDKeyBox ) { diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 6de4bf7a66de..fa22a4417ab3 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -58,8 +58,8 @@ class RTSDialog : public TabDialog bool mbDataModified; - DECL_LINK_TYPED( ActivatePage, TabControl*, void ); - DECL_LINK_TYPED( ClickButton, Button*, void ); + DECL_LINK( ActivatePage, TabControl*, void ); + DECL_LINK( ClickButton, Button*, void ); // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); @@ -89,7 +89,7 @@ class RTSPaperPage : public TabPage VclPtr<FixedText> m_pSlotText; VclPtr<ListBox> m_pSlotBox; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: explicit RTSPaperPage( RTSDialog* ); virtual ~RTSPaperPage() override; @@ -115,8 +115,8 @@ class RTSDevicePage : public TabPage void FillValueBox( const ::psp::PPDKey* ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: explicit RTSDevicePage( RTSDialog* ); virtual ~RTSDevicePage() override; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 29f0b4e89887..3f4b5e887b69 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3541,7 +3541,7 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } -IMPL_LINK_NOARG_TYPED(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) +IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) { if( bMapped_ ) ToTop( SalFrameToTop::NONE ); |