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 /cui/source/inc/dlgname.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 'cui/source/inc/dlgname.hxx')
-rw-r--r-- | cui/source/inc/dlgname.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 8615477f6618..644b441db613 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -34,7 +34,7 @@ private: VclPtr<Edit> pEdtName; VclPtr<OKButton> pBtnOK; - Link aCheckNameHdl; + Link<> aCheckNameHdl; DECL_LINK(ModifyHdl, void *); @@ -60,7 +60,7 @@ public: @todo Remove the parameter bCheckImmediately and incorporate the 'true' behaviour as default. */ - void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) + void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) { aCheckNameHdl = rLink; if ( bCheckImmediately ) @@ -83,7 +83,7 @@ private: VclPtr<OKButton> pBtnOK; // callback link for name uniqueness - Link aCheckNameHdl; + Link<> aCheckNameHdl; DECL_LINK(ModifyHdl, void *); @@ -97,7 +97,7 @@ public: void GetName(OUString& rName) {rName = pEdtName->GetText(); } // set handler - void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false) + void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false) { aCheckNameHdl = rLink; |