summaryrefslogtreecommitdiff
path: root/include/vcl/slider.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/vcl/slider.hxx
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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/slider.hxx')
-rw-r--r--include/vcl/slider.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index a2900309abe6..4f3677677e3b 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -50,8 +50,8 @@ private:
ScrollType meScrollType;
bool mbCalcSize;
bool mbFullDrag;
- Link maSlideHdl;
- Link maEndSlideHdl;
+ Link<> maSlideHdl;
+ Link<> maEndSlideHdl;
using Control::ImplInitSettings;
using Window::ImplInit;
@@ -107,10 +107,10 @@ public:
Size CalcWindowSizePixel();
- void SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; }
- const Link& GetSlideHdl() const { return maSlideHdl; }
- void SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; }
- const Link& GetEndSlideHdl() const { return maEndSlideHdl; }
+ void SetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; }
+ const Link<>& GetSlideHdl() const { return maSlideHdl; }
+ void SetEndSlideHdl( const Link<>& rLink ) { maEndSlideHdl = rLink; }
+ const Link<>& GetEndSlideHdl() const { return maEndSlideHdl; }
};
#endif // INCLUDED_VCL_SLIDER_HXX