diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 09:59:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 12:05:38 +0200 |
| commit | c9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch) | |
| tree | 2cb864a67b556f807ba175507296f7dfc5254944 /desktop | |
| parent | 8c4a1663f5d93380268365d35a5581d8065df897 (diff) | |
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.hxx | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 976481251c19..7978b440688a 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -1089,7 +1089,7 @@ IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) } -IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl) +IMPL_LINK_NOARG_TYPED(ExtMgrDialog, TimeOutHdl, Idle *, void) { if ( m_bStopProgress ) { @@ -1122,8 +1122,6 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl) m_aIdle.Start(); } - - return 1; } @@ -1433,7 +1431,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) } -IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl) +IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, TimeOutHdl, Idle *, void) { if ( m_bStopProgress ) { @@ -1466,8 +1464,6 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl) m_aIdle.Start(); } - - return 1; } // VCL::Dialog diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 8a130ff8ee8d..75e52f0c1f9c 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -135,7 +135,7 @@ class ExtMgrDialog : public ModelessDialog, DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * ); DECL_DLLPRIVATE_LINK( HandleExtTypeCbx, void * ); DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * ); - DECL_DLLPRIVATE_LINK(TimeOutHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); DECL_DLLPRIVATE_LINK( startProgress, void * ); public: @@ -201,7 +201,7 @@ class UpdateRequiredDialog : public ModalDialog, DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * ); DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * ); - DECL_DLLPRIVATE_LINK(TimeOutHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); DECL_DLLPRIVATE_LINK( startProgress, void * ); DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * ); |