new timer infrastructure. takes a function pointer for the timeout, with a void* parameter (useful for holding a class instance!)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/openbox.hh b/src/openbox.hh
index 4649f7a9..76a7d973 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -10,7 +10,7 @@ extern "C" {
 #include <vector>
 
 #include "otk/screeninfo.hh"
-#include "timer.hh"
+#include "otk/timer.hh"
 
 namespace ob {
 
@@ -35,8 +35,8 @@ private:
   char *_displayreq;         // display requested by the user
   char *_argv0;              // argv[0], how the program was called
 
-  OBTimerQueueManager _timermanager; // manages timers, so that they fire when
-                                     // their time elapses
+  otk::OBTimerQueueManager _timermanager; // manages timers, so that they fire
+                                          // when their time elapses
 
   RunState _state;           // the state of the window manager
 
@@ -62,7 +62,7 @@ public:
   //! Returns the state of the window manager (starting, exiting, etc).
   inline RunState state() const { return _state; }
 
-  inline OBTimerQueueManager *timerManager() { return &_timermanager; }
+  inline otk::OBTimerQueueManager *timerManager() { return &_timermanager; }
 
   void eventLoop();