diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/vcl/edit.hxx | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'include/vcl/edit.hxx')
-rw-r--r-- | include/vcl/edit.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index dde925f47051..3eb655ccd09b 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -94,8 +94,8 @@ private: mbIsSubEdit:1, mbInMBDown:1, mbActivePopup:1; - Link maModifyHdl; - Link maUpdateDataHdl; + Link<> maModifyHdl; + Link<> maUpdateDataHdl; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; @@ -233,9 +233,9 @@ public: const OUString& GetSavedValue() const { return maSaveValue; } bool IsValueChangedFromSaved() const { return maSaveValue != GetText(); } - virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; } - virtual const Link& GetModifyHdl() const { return maModifyHdl; } - virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; } + virtual void SetModifyHdl( const Link<>& rLink ) { maModifyHdl = rLink; } + virtual const Link<>& GetModifyHdl() const { return maModifyHdl; } + virtual void SetUpdateDataHdl( const Link<>& rLink ) { maUpdateDataHdl = rLink; } void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } |