X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftime%2Ftimer.cpp;h=c15cd28eaed1752f6cc3c904ba57d2171dd030c5;hb=817e584903996a041692640720a5a272d847a3c7;hp=be1d1ed3291482b453ab03d228f5961eb80b8cab;hpb=108f2e7de1c2427e39cdf55efbcd0ca3914e451a;p=libs%2Fcore.git diff --git a/source/time/timer.cpp b/source/time/timer.cpp index be1d1ed..c15cd28 100644 --- a/source/time/timer.cpp +++ b/source/time/timer.cpp @@ -54,14 +54,6 @@ void Timer::cancel(Slot &slot) } } -void Timer::tick(bool block) -{ - if(block) - tick(); - else - tick(zero); -} - void Timer::tick() { do_tick(-sec); @@ -69,6 +61,9 @@ void Timer::tick() void Timer::tick(const TimeDelta &timeout) { + if(timeout