summaryrefslogtreecommitdiff
path: root/include/vcl/split.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/split.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/split.hxx')
-rw-r--r--include/vcl/split.hxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index 91a1c0df99c5..a9a185bb67eb 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -39,9 +39,9 @@ private:
bool mbKbdSplitting;
long mbInKeyEvent;
long mnKeyboardStepSize;
- Link maStartSplitHdl;
- Link maSplitHdl;
- Link maEndSplitHdl;
+ Link<> maStartSplitHdl;
+ Link<> maSplitHdl;
+ Link<> maEndSplitHdl;
SAL_DLLPRIVATE void ImplInitSplitterData();
SAL_DLLPRIVATE void ImplDrawSplitter();
@@ -99,12 +99,12 @@ public:
// the default is 10% of the reference window's width/height
void SetKeyboardStepSize( long nStepSize );
- void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; }
- const Link& GetStartSplitHdl() const { return maStartSplitHdl; }
- void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; }
- void SetEndSplitHdl( const Link& rLink ) { maEndSplitHdl = rLink; }
- const Link& GetEndSplitHdl() const { return maEndSplitHdl; }
- const Link& GetSplitHdl() const { return maSplitHdl; }
+ void SetStartSplitHdl( const Link<>& rLink ) { maStartSplitHdl = rLink; }
+ const Link<>& GetStartSplitHdl() const { return maStartSplitHdl; }
+ void SetSplitHdl( const Link<>& rLink ) { maSplitHdl = rLink; }
+ void SetEndSplitHdl( const Link<>& rLink ) { maEndSplitHdl = rLink; }
+ const Link<>& GetEndSplitHdl() const { return maEndSplitHdl; }
+ const Link<>& GetSplitHdl() const { return maSplitHdl; }
};
#endif // INCLUDED_VCL_SPLIT_HXX