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/vclmedit.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/vclmedit.hxx')
-rw-r--r-- | include/vcl/vclmedit.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 034c25412969..441edcd45bf4 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -36,10 +36,10 @@ private: ImpVclMEdit* pImpVclMEdit; OUString aSaveValue; - Link aModifyHdlLink; + Link<> aModifyHdlLink; Timer* pUpdateDataTimer; - Link aUpdateDataHdlLink; + Link<> aUpdateDataHdlLink; protected: @@ -109,10 +109,10 @@ public: const OUString& GetSavedValue() const { return aSaveValue; } bool IsValueChangedFromSaved() const { return aSaveValue != GetText(); } - void SetModifyHdl( const Link& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } - const Link& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } + void SetModifyHdl( const Link<>& rLink ) SAL_OVERRIDE { aModifyHdlLink = rLink; } + const Link<>& GetModifyHdl() const SAL_OVERRIDE { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link<>& rLink ) SAL_OVERRIDE { aUpdateDataHdlLink = rLink; } virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; |