new nls from bb-cvs

[chaz/openbox] / src / XAtom.h

diff --git a/src/XAtom.h b/src/XAtom.h
index 9e6a6aedda8cbfc6809c42854fd87977baadb6e6..03292b5de0dbc008b53ffa5d73335c66690a5fa1 100644 (file)
--- a/src/XAtom.h
+++ b/src/XAtom.h
@@ -27,6 +27,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <vector>
+#include <string>
 
 class Openbox;
 class ScreenInfo;
@@ -121,13 +122,13 @@ public:
   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;