summaryrefslogtreecommitdiff
path: root/include/vcl/floatwin.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/floatwin.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/floatwin.hxx')
-rw-r--r--include/vcl/floatwin.hxx6
1 files changed, 3 insertions, 3 deletions
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; }