From 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 30 Apr 2015 10:20:00 +0200 Subject: 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 --- include/vcl/floatwin.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/vcl/floatwin.hxx') diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index a9033a22670b..fb542ddffb06 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -89,7 +89,7 @@ private: bool mbOldSaveBackMode; bool mbGrabFocus; // act as key input window, although focus is not set bool mbInCleanUp; - Link maPopupModeEndHdl; + Link<> maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); @@ -144,8 +144,8 @@ public: bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } - void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } - const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } + void SetPopupModeEndHdl( const Link<>& rLink ) { maPopupModeEndHdl = rLink; } + const Link<>& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } bool GrabsFocus() const { return mbGrabFocus; } -- cgit