summaryrefslogtreecommitdiff
path: root/include/vcl/timer.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/timer.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/timer.hxx')
-rw-r--r--include/vcl/timer.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 8ab238a293bd..c1779ce04294 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -26,7 +26,7 @@
class VCL_DLLPUBLIC Timer : public Scheduler
{
protected:
- Link maTimeoutHdl; // Callback Link
+ Link<> maTimeoutHdl; // Callback Link
sal_uInt64 mnTimeout;
bool mbAuto;
@@ -43,8 +43,8 @@ public:
/// Make it possible to associate a callback with this timer handler
/// of course, you can also sub-class and override 'Invoke'
- void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; }
- const Link& GetTimeoutHdl() const { return maTimeoutHdl; }
+ void SetTimeoutHdl( const Link<>& rLink ) { maTimeoutHdl = rLink; }
+ const Link<>& GetTimeoutHdl() const { return maTimeoutHdl; }
void SetTimeout( sal_uInt64 nTimeoutMs );
sal_uInt64 GetTimeout() const { return mnTimeout; }
virtual void Invoke() SAL_OVERRIDE;