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/spin.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/spin.hxx')
-rw-r--r-- | include/vcl/spin.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index a78f3b292b1f..1e40c6d6f017 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -43,8 +43,8 @@ private: bool mbInitialDown : 1; bool mbHorz : 1; bool mbUpperIsFocused : 1; - Link maUpHdlLink; - Link maDownHdlLink; + Link<> maUpHdlLink; + Link<> maDownHdlLink; long mnMinRange; long mnMaxRange; long mnValue; @@ -84,10 +84,10 @@ public: long GetValueStep() const { return mnValueStep; } virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } - const Link& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } - const Link& GetDownHdl() const { return maDownHdlLink; } + void SetUpHdl( const Link<>& rLink ) { maUpHdlLink = rLink; } + const Link<>& GetUpHdl() const { return maUpHdlLink; } + void SetDownHdl( const Link<>& rLink ) { maDownHdlLink = rLink; } + const Link<>& GetDownHdl() const { return maDownHdlLink; } private: // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. |