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/scrbar.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/scrbar.hxx')
-rw-r--r-- | include/vcl/scrbar.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 3a16f9e4359e..71bda7168c3b 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -65,8 +65,8 @@ private: ScrollType meDDScrollType; bool mbCalcSize; bool mbFullDrag; - Link maScrollHdl; - Link maEndScrollHdl; + Link<> maScrollHdl; + Link<> maEndScrollHdl; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; @@ -134,10 +134,10 @@ public: long GetDelta() const { return mnDelta; } ScrollType GetType() const { return meScrollType; } - void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } - const Link& GetScrollHdl() const { return maScrollHdl; } - void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; } - const Link& GetEndScrollHdl() const { return maEndScrollHdl; } + void SetScrollHdl( const Link<>& rLink ) { maScrollHdl = rLink; } + const Link<>& GetScrollHdl() const { return maScrollHdl; } + void SetEndScrollHdl( const Link<>& rLink ) { maEndScrollHdl = rLink; } + const Link<>& GetEndScrollHdl() const { return maEndScrollHdl; } virtual Size GetOptimalSize() const SAL_OVERRIDE; }; |