X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fworkspace.hh;h=98acd384918779535e989def9161f7bbcbf236bb;hb=889df8a74da733c849cb52c3a76ae59956755882;hp=6c59a3b87222468f613c8eea99c8aeb93f474aea;hpb=86bef745b9e974f664752c6cc56f7e6ec5642efc;p=chaz%2Fopenbox

diff --git a/src/workspace.hh b/src/workspace.hh
index 6c59a3b8..98acd384 100644
--- a/src/workspace.hh
+++ b/src/workspace.hh
@@ -10,7 +10,9 @@ extern "C" {
 #include <string>
 #include <vector>
 
-#include "xatom.hh"
+#include "otk/property.hh"
+
+namespace ob {
 
 class BScreen;
 class Workspace;
@@ -23,7 +25,7 @@ class Workspace {
 private:
   BScreen *screen;
   BlackboxWindow *lastfocus;
-  XAtom *xatom;
+  otk::OBProperty *xatom;
 
   BlackboxWindowList stackingList, windowList;
 
@@ -42,13 +44,13 @@ private:
   void lowerTransients(const BlackboxWindow * const win,
                        StackVector::iterator &stack);
 
-  typedef std::vector<Rect> rectList;
-  rectList calcSpace(const Rect &win, const rectList &spaces) const;
+  typedef std::vector<otk::Rect> rectList;
+  rectList calcSpace(const otk::Rect &win, const rectList &spaces) const;
 
   void placeWindow(BlackboxWindow *win);
-  bool cascadePlacement(Rect& win, const int offset);
-  bool smartPlacement(Rect& win);
-  bool underMousePlacement(Rect& win);
+  bool cascadePlacement(otk::Rect& win, const int offset);
+  bool smartPlacement(otk::Rect& win);
+  bool underMousePlacement(otk::Rect& win);
 
 public:
   Workspace(BScreen *scrn, unsigned int i = 0);
@@ -91,6 +93,7 @@ public:
   void setName(const std::string& new_name);
 };
 
+}
 
 #endif // __Workspace_hh