X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fxatom.hh;h=df9bdf4f59248ebe39fb2fa81a4aa7ca54a9d9b1;hb=6f8b36ff823e0eeabc439d15255353516745e23f;hp=d92b01f0f0b3265d69423c03ffb7f8427ce8c26b;hpb=db451d95bf97b8a8e995f031ac98da50606fd3a0;p=chaz%2Fopenbox

diff --git a/src/xatom.hh b/src/xatom.hh
index d92b01f0..df9bdf4f 100644
--- a/src/xatom.hh
+++ b/src/xatom.hh
@@ -1,37 +1,20 @@
 // XAtom.h for Openbox
-// Copyright (c) 2002 - 2002 Ben Janens (ben at orodu.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
 #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:
@@ -190,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,
@@ -227,4 +210,6 @@ public:
     assert(ret != 0); return ret; }
 };
 
+}
+
 #endif // __XAtom_h