X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fxatom.hh;h=df9bdf4f59248ebe39fb2fa81a4aa7ca54a9d9b1;hb=ace8c8896aa13a6fc4e489277cf9c96f49175322;hp=3c3821140cb2a74084c2a317273a1b3c47eaab2c;hpb=37e56007680a6664967e0e71ac52981654def6a6;p=chaz%2Fopenbox

diff --git a/src/xatom.hh b/src/xatom.hh
index 3c382114..df9bdf4f 100644
--- a/src/xatom.hh
+++ b/src/xatom.hh
@@ -2,16 +2,19 @@
 #ifndef   __XAtom_h
 #define   __XAtom_h
 
+extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
 #include <assert.h>
+}
 
 #include <vector>
 #include <string>
 
-class Blackbox;
-class ScreenInfo;
+#include "otk/screeninfo.hh"
+
+namespace ob {
 
 class XAtom {
 public:
@@ -170,7 +173,7 @@ public:
 
   // setup support on a screen, each screen should call this once in its
   // constructor.
-  void setSupported(const ScreenInfo *screen);
+  void setSupported(const otk::ScreenInfo *screen);
   
   void setValue(Window win, Atoms atom, Atoms type, unsigned long value) const;
   void setValue(Window win, Atoms atom, Atoms type,
@@ -207,4 +210,6 @@ public:
     assert(ret != 0); return ret; }
 };
 
+}
+
 #endif // __XAtom_h