nls from bb-cvs

[chaz/openbox] / src / XAtom.h

diff --git a/src/XAtom.h b/src/XAtom.h
index 87afe2e44316354ed483d936766ec605207ac78c..03292b5de0dbc008b53ffa5d73335c66690a5fa1 100644 (file)
--- a/src/XAtom.h
+++ b/src/XAtom.h
@@ -27,9 +27,10 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <vector>
+#include <string>
 
-class XDisplay;
-class XScreen;
+class Openbox;
+class ScreenInfo;
 
 class XAtom {
   typedef std::vector<Window> SupportWindows;
@@ -102,7 +103,7 @@ class XAtom {
     net_wm_ping;
 
   Atom getAtom(const char *name) const;
-  void setSupported(const XScreen *screen);
+  void setSupported(const ScreenInfo *screen);
 
   void setValue(Window win, Atom atom, Atom type, unsigned char *data,
                 int size, int nelements, bool append) const;
@@ -114,20 +115,20 @@ class XAtom {
   XAtom& operator=(const XAtom&);
 
 public:
-  XAtom(const XDisplay *display);
+  XAtom(Openbox &ob);
   virtual ~XAtom();
 
   void setCardValue(Window win, Atom atom, long value) const; // 32-bit CARDINAL
   void setAtomValue(Window win, Atom atom, Atom value) const;
   void setWindowValue(Window win, Atom atom, Window value) const;
   void setPixmapValue(Window win, Atom atom, Pixmap value) const;
-  void setStringValue(Window win, Atom atom, std::string &value) const;
+  void setStringValue(Window win, Atom atom, const std::string &value) const;
   
   void addCardValue(Window win, Atom atom, long value) const; // 32-bit CARDINAL
   void addAtomValue(Window win, Atom atom, Atom value) const;
   void addWindowValue(Window win, Atom atom, Window value) const;
   void addPixmapValue(Window win, Atom atom, Pixmap value) const;
-  void addStringValue(Window win, Atom atom, std::string &value) const;
+  void addStringValue(Window win, Atom atom, const std::string &value) const;
 
   // the 'value' is allocated inside the function and
   // delete [] value needs to be called when you are done with it.
@@ -141,8 +142,7 @@ public:
                 Window **value) const;
   bool getPixmapValue(Window win, Atom atom, unsigned long *nelements,
                 Pixmap **value) const;
-  bool getStringValue(Window win, Atom atom, unsigned long *nelements,
-                std::string &value) const; 
+  bool getStringValue(Window win, Atom atom, std::string &value) const;
   
   void eraseValue(Window win, Atom atom) const;