X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fbbwindow.hh;h=b7472323d1cdaf7eed6432c7a0a00744cbd4c7dc;hb=37be3ef9249b452b8edec25a441aefff80c2d4b8;hp=628728e10670563a674bb8d3f3d4724718eda803;hpb=641bc819d1b399d2313e3328d111dd70777ecfea;p=chaz%2Fopenbox

diff --git a/src/bbwindow.hh b/src/bbwindow.hh
index 628728e1..b7472323 100644
--- 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;
-  OBAtom *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?