aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Timer.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-09 22:10:48 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-07-10 12:16:35 (GMT)
commit5c83dee70a1e089b23a5c901455f61e99e30f0dd (patch)
treec501ce4f1980d5c099872632bb6e045fb51f462c /src/FbTk/Timer.cc
parent2f075e186901ddff068f13da22a09cca68bd54d9 (diff)
downloadfluxbox_pavel-5c83dee70a1e089b23a5c901455f61e99e30f0dd.zip
fluxbox_pavel-5c83dee70a1e089b23a5c901455f61e99e30f0dd.tar.bz2
FbTk::Timer accepts Slots instead of Commands as the former are more general
Diffstat (limited to 'src/FbTk/Timer.cc')
-rw-r--r--src/FbTk/Timer.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index cb9ac59..13bfc05 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -59,7 +59,7 @@ Timer::Timer():m_timing(false), m_once(false), m_interval(0) {
59 59
60} 60}
61 61
62Timer::Timer(RefCount<Command<void> > &handler): 62Timer::Timer(const RefCount<Slot<void> > &handler):
63 m_handler(handler), 63 m_handler(handler),
64 m_timing(false), 64 m_timing(false),
65 m_once(false), 65 m_once(false),
@@ -90,7 +90,7 @@ void Timer::setTimeout(unsigned int secs, unsigned int usecs) {
90 m_timeout.tv_usec = usecs; 90 m_timeout.tv_usec = usecs;
91} 91}
92 92
93void Timer::setCommand(RefCount<Command<void> > &cmd) { 93void Timer::setCommand(const RefCount<Slot<void> > &cmd) {
94 m_handler = cmd; 94 m_handler = cmd;
95} 95}
96 96
@@ -122,7 +122,7 @@ void Timer::makeEndTime(timeval &tm) const {
122 122
123void Timer::fireTimeout() { 123void Timer::fireTimeout() {
124 if (m_handler) 124 if (m_handler)
125 m_handler->execute(); 125 (*m_handler)();
126} 126}
127 127
128void Timer::updateTimers(int fd) { 128void Timer::updateTimers(int fd) {
@@ -284,7 +284,7 @@ Command<void> *DelayedCmd::parse(const std::string &command,
284 284
285REGISTER_COMMAND_PARSER(delay, DelayedCmd::parse, void); 285REGISTER_COMMAND_PARSER(delay, DelayedCmd::parse, void);
286 286
287DelayedCmd::DelayedCmd(RefCount<Command<void> > &cmd, unsigned int timeout) { 287DelayedCmd::DelayedCmd(const RefCount<Slot<void> > &cmd, unsigned int timeout) {
288 timeval to; // defaults to 200ms 288 timeval to; // defaults to 200ms
289 to.tv_sec = timeout/1000000; 289 to.tv_sec = timeout/1000000;
290 to.tv_usec = timeout % 1000000; 290 to.tv_usec = timeout % 1000000;