X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftimer.cc;h=3fe8c7035196229ef77a12a4a6bf67565c84cb2a;hb=cc86c196a2c2793403396bb1d2335b63e1413067;hp=2e2205f78fa0d960f58675fadb7fe1ed2e59a2eb;hpb=1d897f432e54400cb2a0e1499712782b336fd728;p=chaz%2Fopenbox

diff --git a/otk/timer.cc b/otk/timer.cc
index 2e2205f7..3fe8c703 100644
--- a/otk/timer.cc
+++ b/otk/timer.cc
@@ -33,7 +33,7 @@ static timeval normalizeTimeval(const timeval &tm)
 }
 
 
-OBTimer::OBTimer(OBTimerQueueManager *m, OBTimeoutHandler h, OBTimeoutData d)
+Timer::Timer(TimerQueueManager *m, TimeoutHandler h, TimeoutData d)
 {
   _manager = m;
   _handler = h;
@@ -43,13 +43,13 @@ OBTimer::OBTimer(OBTimerQueueManager *m, OBTimeoutHandler h, OBTimeoutData d)
 }
 
 
-OBTimer::~OBTimer(void)
+Timer::~Timer(void)
 {
   if (_timing) stop();
 }
 
 
-void OBTimer::setTimeout(long t)
+void Timer::setTimeout(long t)
 {
   _timeout.tv_sec = t / 1000;
   _timeout.tv_usec = t % 1000;
@@ -57,14 +57,14 @@ void OBTimer::setTimeout(long t)
 }
 
 
-void OBTimer::setTimeout(const timeval &t)
+void Timer::setTimeout(const timeval &t)
 {
   _timeout.tv_sec = t.tv_sec;
   _timeout.tv_usec = t.tv_usec;
 }
 
 
-void OBTimer::start(void)
+void Timer::start(void)
 {
   gettimeofday(&_start, 0);
 
@@ -75,7 +75,7 @@ void OBTimer::start(void)
 }
 
 
-void OBTimer::stop(void)
+void Timer::stop(void)
 {
   if (_timing) {
     _timing = false;
@@ -85,14 +85,14 @@ void OBTimer::stop(void)
 }
 
 
-void OBTimer::fire(void)
+void Timer::fire(void)
 {
   if (_handler)
     _handler(_data);
 }
 
 
-timeval OBTimer::remainingTime(const timeval &tm) const
+timeval Timer::remainingTime(const timeval &tm) const
 {
   timeval ret = endTime();
 
@@ -103,7 +103,7 @@ timeval OBTimer::remainingTime(const timeval &tm) const
 }
 
 
-timeval OBTimer::endTime(void) const
+timeval Timer::endTime(void) const
 {
   timeval ret;
 
@@ -114,7 +114,7 @@ timeval OBTimer::endTime(void) const
 }
 
 
-bool OBTimer::shouldFire(const timeval &tm) const
+bool Timer::shouldFire(const timeval &tm) const
 {
   timeval end = endTime();