summaryrefslogtreecommitdiff
path: root/include/vcl/layout.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/layout.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/layout.hxx')
-rw-r--r--include/vcl/layout.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index bec9976a7317..85c613919020 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -544,15 +544,15 @@ public:
return m_pDisclosureButton->GetText();
}
virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE;
- void SetExpandedHdl( const Link& rLink ) { maExpandedHdl = rLink; }
- const Link& GetExpandedHdl() const { return maExpandedHdl; }
+ void SetExpandedHdl( const Link<>& rLink ) { maExpandedHdl = rLink; }
+ const Link<>& GetExpandedHdl() const { return maExpandedHdl; }
protected:
virtual Size calculateRequisition() const SAL_OVERRIDE;
virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE;
private:
bool m_bResizeTopLevel;
VclPtr<DisclosureButton> m_pDisclosureButton;
- Link maExpandedHdl;
+ Link<> maExpandedHdl;
DECL_DLLPRIVATE_LINK(ClickHdl, DisclosureButton* pBtn);
};