omg, fat commit

[chaz/openbox] / src / bbwindow.hh

diff --git a/src/bbwindow.hh b/src/bbwindow.hh
index 29818b4387413daf7f5001bc25618307193286de..b7472323d1cdaf7eed6432c7a0a00744cbd4c7dc 100644 (file)
--- a/src/bbwindow.hh
+++ b/src/bbwindow.hh
@@ -13,8 +13,11 @@ extern "C" {
 #include <string>
 
 #include "otk/timer.hh"
+#include "otk/property.hh"
+#include "otk/rect.hh"
+#include "otk/strut.hh"
 #include "blackbox.hh"
-#include "util.hh"
+#include "otk/util.hh"
 
 #define MwmHintsFunctions     (1l << 0)
 #define MwmHintsDecorations   (1l << 1)
@@ -104,7 +107,7 @@ public:
 private:
   Blackbox *blackbox;
   BScreen *screen;
-  XAtom *xatom;
+  otk::OBProperty *xatom;
   otk::OBTimer *timer;
   BlackboxAttributes blackbox_attrib;
 
@@ -147,7 +150,7 @@ private:
     std::string title, icon_title;
 
     otk::Rect rect;
-    Strut strut;
+    otk::Strut strut;
 
     int old_bw;                       // client's borderwidth
 
@@ -218,7 +221,7 @@ private:
     otk::Rect changing;
 
     otk::Rect rect;                  // frame geometry
-    Strut margin;               // margins between the frame and client
+    otk::Strut margin;               // margins between the frame and client
 
     int grab_x, grab_y;         // where was the window when it was grabbed?