summaryrefslogtreecommitdiff
path: root/include/vcl/status.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/status.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/status.hxx')
-rw-r--r--include/vcl/status.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 50b52f981a91..f0fdbf653f25 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -93,8 +93,8 @@ private:
bool mbProgressMode;
bool mbInUserDraw;
bool mbAdjustHiDPI;
- Link maClickHdl;
- Link maDoubleClickHdl;
+ Link<> maClickHdl;
+ Link<> maDoubleClickHdl;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
@@ -198,10 +198,10 @@ public:
Size CalcWindowSizePixel() const;
- void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
- const Link& GetClickHdl() const { return maClickHdl; }
- void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
- const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; }
+ void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+ const Link<>& GetClickHdl() const { return maClickHdl; }
+ void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+ const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
using Window::SetAccessibleName;
void SetAccessibleName( sal_uInt16 nItemId, const OUString& rName );