From 18bdbfaad269fe7ab688194739391695b874bbd1 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 24 May 2002 18:19:22 +0000 Subject: better string get/set --- src/XAtom.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/XAtom.cc') diff --git a/src/XAtom.cc b/src/XAtom.cc index 0f36ef9b..9e590126 100644 --- a/src/XAtom.cc +++ b/src/XAtom.cc @@ -182,7 +182,8 @@ void XAtom::setPixmapValue(Window win, Atom atom, Pixmap value) const { /* * Set a string property value on a window. */ -void XAtom::setStringValue(Window win, Atom atom, std::string &value) const { +void XAtom::setStringValue(Window win, Atom atom, + const std::string &value) const { setValue(win, atom, XA_STRING, const_cast (reinterpret_cast(value.c_str())), @@ -229,7 +230,8 @@ void XAtom::addPixmapValue(Window win, Atom atom, Pixmap value) const { /* * Add characters to a string property value on a window. */ -void XAtom::addStringValue(Window win, Atom atom, std::string &value) const { +void XAtom::addStringValue(Window win, Atom atom, + const std::string &value) const { setValue(win, atom, XA_STRING, const_cast (reinterpret_cast @@ -328,10 +330,10 @@ bool XAtom::getPixmapValue(Window win, Atom atom, unsigned long *nelements, /* * Gets an string property's value from a window. */ -bool XAtom::getStringValue(Window win, Atom atom, unsigned long *nelements, - std::string &value) const { +bool XAtom::getStringValue(Window win, Atom atom, std::string &value) const { unsigned char *data; - bool ret = XAtom::getValue(win, atom, XA_STRING, nelements, &data, 8); + unsigned long nelements; + bool ret = XAtom::getValue(win, atom, XA_STRING, &nelements, &data, 8); if (ret) value = reinterpret_cast(data); return ret; -- cgit v1.2.3