more conversion to ustring. added more members

[chaz/openbox] / otk / property.hh

diff --git a/otk/property.hh b/otk/property.hh
index e942bfd2189978efc5d29707cd090be5c623da10..9681b9c311be125c2568c6a16a7175c95ce03d8e 100644 (file)
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -6,6 +6,9 @@
   @brief Provides access to window properties
 */
 
+#include "ustring.hh"
+#include "screeninfo.hh"
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -15,9 +18,6 @@ extern "C" {
 
 #include <vector>
 
-#include "userstring.hh"
-#include "screeninfo.hh"
-
 namespace otk {
 
 //! Provides easy access to window properties.
@@ -175,6 +175,9 @@ private:
            int size) const;
 
 public:
+  //! A list of strings
+  typedef std::vector<ustring> StringVect;
+
   //! Constructs a new Atom object
   /*!
     CAUTION: This constructor uses Display::display, so ensure that it is
@@ -217,7 +220,7 @@ public:
     @param value The string to set the property to
   */
   void set(Window win, Atoms atom, StringType type,
-           const userstring &value) const;
+           const ustring &value) const;
   //! Sets a string-array property on a window to a new value
   /*!
     @param win The window id of the window on which to set the property's value
@@ -228,7 +231,7 @@ public:
     @param strings A list of strings to set the property to
   */
   void set(Window win, Atoms atom, StringType type,
-           const userstring::vector &strings) const;
+           const StringVect &strings) const;
 
   //! Gets the value of a property on a window
   /*!
@@ -281,7 +284,7 @@ public:
     @return true if retrieval of the specified property with the specified
             type was successful; otherwise, false
   */
-  bool get(Window win, Atoms atom, StringType type, userstring *value) const;
+  bool get(Window win, Atoms atom, StringType type, ustring *value) const;
   //! Gets strings from the value of a property on a window
   /*!
     @param win The window id of the window to get the property value from
@@ -300,7 +303,7 @@ public:
             type was successful; otherwise, false
   */
   bool get(Window win, Atoms atom, StringType type,
-           unsigned long *nelements, userstring::vector *strings) const;
+           unsigned long *nelements, StringVect *strings) const;
 
   //! Removes a property from a window
   /*!