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 /include/vcl/combobox.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 'include/vcl/combobox.hxx')
-rw-r--r-- | include/vcl/combobox.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index a835a40d215f..83e4a1812d4a 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -45,8 +45,8 @@ private: bool mbSyntheticModify : 1; bool mbMatchCase : 1; sal_Int32 m_nMaxWidthChars; - Link maSelectHdl; - Link maDoubleClickHdl; + Link<> maSelectHdl; + Link<> maDoubleClickHdl; boost::signals2::scoped_connection mAutocompleteConnection; struct ComboBoxBounds @@ -163,10 +163,10 @@ public: void SetMultiSelectionSeparator( sal_Unicode cSep ) { mcMultiSep = cSep; } sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } + const Link<>& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } + const Link<>& GetDoubleClickHdl() const { return maDoubleClickHdl; } Size CalcMinimumSize() const SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; |