diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 13:38:12 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-18 15:48:31 +0000 |
commit | 548c2274c9ba7542d6bcae5fefd1400ee4e22fc3 (patch) | |
tree | 7963bec49ed00b89090bd213a7db36a85bc88f87 /include | |
parent | 423b79e7366203db3f57dea75b8cb9eb852b5614 (diff) |
move from boost::signal to typed Link
it doesn't really gain us much to have a handful of
boost::signal use in a sea of Links
This also fixes a regression in
commit 051b29e1025253f35f87a04e297760aa8b40611f
Author: Luboš Luňák <l.lunak@collabora.com>
Date: Sun Sep 14 15:45:02 2014 +0200
convert Edit autocomplete Hdl to boost signals2
where the conversion was...
- if ( maAutocompleteHdl.IsSet() )
+ if ( autocompleteSignal.empty() )
instead of the correct
+ if ( !autocompleteSignal.empty() )
Change-Id: I27270d94c782485c0a7e929bc4980af4527fe82b
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/autocmpledit.hxx | 2 | ||||
-rw-r--r-- | include/svtools/inettbc.hxx | 3 | ||||
-rw-r--r-- | include/vcl/edit.hxx | 11 | ||||
-rw-r--r-- | include/vcl/lstbox.hxx | 4 |
4 files changed, 7 insertions, 13 deletions
diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx index 56df6e03e14c..79e36016380e 100644 --- a/include/svtools/autocmpledit.hxx +++ b/include/svtools/autocmpledit.hxx @@ -23,7 +23,7 @@ private: std::vector< OUString > m_aMatching; std::vector< OUString >::size_type m_nCurrent; - void AutoCompleteHandler( Edit* ); + DECL_DLLPRIVATE_LINK_TYPED(AutoCompleteHdl_Impl, Edit&, void); bool Match( const OUString& rText ); bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index daef69bec7a3..e6435f1a2ce6 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -48,10 +48,9 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE bool ProcessKey( const vcl::KeyCode& rCode ); SVT_DLLPRIVATE void TryAutoComplete(); SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl(); + DECL_DLLPRIVATE_LINK_TYPED( AutoCompleteHdl_Impl, Edit&, void ); SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); - SAL_DLLPRIVATE void AutoCompleteHandler( Edit* ); - protected: virtual bool Notify( NotifyEvent& rNEvt ) override; virtual void Select() override; diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 30741d517d33..628ada5870b4 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -32,9 +32,6 @@ #include <vcl/vclptr.hxx> #include <com/sun/star/uno/Reference.h> -// forward declare signals stuff - those headers are staggeringly expensive -namespace boost { namespace signals2 { class connection; } } - namespace com { namespace sun { namespace star { @@ -72,9 +69,6 @@ class Timer; class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient { private: - struct Impl; - ::std::unique_ptr<Impl> m_pImpl; - VclPtr<Edit> mpSubEdit; Timer* mpUpdateDataTimer; TextFilter* mpFilterText; @@ -102,6 +96,7 @@ private: mbActivePopup:1; Link<Edit&,void> maModifyHdl; Link<Edit&,void> maUpdateDataHdl; + Link<Edit&,void> maAutocompleteHdl; css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC; @@ -253,8 +248,8 @@ public: void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } - void SignalConnectAutocomplete(::boost::signals2::connection * pConnection, - ::std::function<void (Edit *)>); + void SetAutocompleteHdl( const Link<Edit&,void>& rLink ) { maAutocompleteHdl = rLink; } + const Link<Edit&,void>& GetAutocompleteHdl() const { return maAutocompleteHdl; } AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; } virtual Size CalcMinimumSize() const; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index e2050cf7ef47..5a5bc4dadd2c 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -98,11 +98,11 @@ private: DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void ); + DECL_DLLPRIVATE_LINK_TYPED( ImplUserDrawHdl, UserDrawEvent*, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplFocusHdl, sal_Int32, void ); DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl, LinkParamNone*, void ); - SAL_DLLPRIVATE void ImplClickButtonHandler( Control* ); - SAL_DLLPRIVATE void ImplUserDrawHandler( UserDrawEvent* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplClickBtnHdl, void*, void ); protected: using Window::ImplInit; |