omg, fat commit

[chaz/openbox] / src / blackbox.hh

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 7f07e94680e36a2eb031668cc0dac5b4a1e820b9..42ddeabbd2778d9129d319c498aa0c63bddfc624 100644 (file)
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -26,10 +26,10 @@ extern "C" {
 #include <string>
 
 #include "otk/timer.hh"
+#include "otk/property.hh"
 #include "openbox.hh"
-#include "configuration.hh"
+#include "otk/configuration.hh"
 #include "timer.hh"
-#include "atom.hh"
 
 #define AttribShaded      (1l << 0)
 #define AttribMaxHoriz    (1l << 1)
@@ -111,8 +111,8 @@ private:
   BScreen *active_screen;
   BlackboxWindow *focused_window, *changing_window;
   otk::OBTimer *timer;
-  Configuration config;
-  OBAtom *xatom;
+  otk::Configuration config;
+  otk::OBProperty *xatom;
 
   bool no_focus, reconfigure_wait;
   Time last_time;
@@ -158,12 +158,12 @@ public:
   void removeWindowSearch(Window window);
   void removeGroupSearch(Window window);
 
-  inline OBAtom *getXAtom(void) { return xatom; }
+  inline otk::OBProperty *getXAtom(void) { return xatom; }
 
   inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
   inline BlackboxWindow *getChangingWindow(void) { return changing_window; }
 
-  inline Configuration *getConfig() { return &config; }
+  inline otk::Configuration *getConfig() { return &config; }
   inline const Time &getDoubleClickInterval(void) const
   { return resource.double_click_interval; }
   inline const Time &getLastTime(void) const { return last_time; }