X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=d53bce0b43172f3853da424e04a5cbf5c08d40be;hb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;hp=9001db60285bd5c6b92c19be305db56dff0420d2;hpb=9e77a88d269bfafb78e56a646bfacebdd6ff4c5a;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 9001db60..d53bce0b 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -14,8 +14,8 @@ extern "C" {
 #include <vector>
 #include <map>
 
+#include "otk/display.hh"
 #include "otk/screeninfo.hh"
-#include "otk/timerqueuemanager.hh"
 #include "otk/property.hh"
 #include "otk/configuration.hh"
 #include "otk/eventdispatcher.hh"
@@ -74,6 +74,9 @@ public:
   typedef std::vector<Screen *> ScreenList;
   
 private:
+  //! The display on which Openbox is running
+  otk::Display _display;
+  
   // stuff that can be passed on the command line
   //! Path to the config file to use/in use
   /*!
@@ -105,13 +108,6 @@ private:
   //! A list of all the managed screens
   ScreenList _screens;
   
-  //! Manages all timers for the application
-  /*!
-    Use of the otk::TimerQueueManager::fire funtion in this object ensures
-    that all timers fire when their times elapse.
-  */
-  otk::TimerQueueManager _timermanager;
-
   //! Cached atoms on the display
   /*!
     This is a pointer because the Property class uses otk::Display::display
@@ -181,13 +177,6 @@ public:
   //! Returns the state of the window manager (starting, exiting, etc)
   inline RunState state() const { return _state; }
 
-  //! Returns the otk::TimerQueueManager for the application
-  /*!
-    All otk::Timer objects used in the application should be made to use this
-    otk::TimerQueueManager.
-  */
-  inline otk::TimerQueueManager *timerManager() { return &_timermanager; }
-
   //! Returns the otk::Property instance for the window manager
   inline const otk::Property *property() const { return _property; }