1 files changed, 26 insertions, 13 deletions
diff --git a/src/String.cpp b/src/String.cpp
index 0965349..8daec0f 100644
--- a/src/String.cpp
+++ b/src/String.cpp
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdlib.h>
+#include <cstdlib>
+#include "plist.h"
 #include <plist/String.h>
 
 namespace PList
@@ -32,23 +33,42 @@ String::String(plist_t node, Node* parent) : Node(node, parent)
 {
 }
 
-String::String(const PList::String& s) : Node(PLIST_UINT)
+String::String(const PList::String& s) : Node(PLIST_INT)
 {
     plist_set_string_val(_node, s.GetValue().c_str());
 }
 
-String& String::operator=(PList::String& s)
+String& String::operator=(const PList::String& s)
 {
     plist_free(_node);
     _node = plist_copy(s.GetPlist());
     return *this;
 }
 
+String& String::operator=(const std::string& s)
+{
+    plist_free(_node);
+    _node = plist_new_string(s.c_str());
+    return *this;
+}
+
+String& String::operator=(const char* s)
+{
+    plist_free(_node);
+    _node = plist_new_string(s);
+    return *this;
+}
+
 String::String(const std::string& s) : Node(PLIST_STRING)
 {
     plist_set_string_val(_node, s.c_str());
 }
 
+String::String(const char *s) : Node(PLIST_STRING)
+{
+    plist_set_string_val(_node, s);
+}
+
 String::~String()
 {
 }
@@ -65,16 +85,9 @@ void String::SetValue(const std::string& s)
 
 std::string String::GetValue() const
 {
-    char* s = NULL;
-    plist_get_string_val(_node, &s);
-    std::string ret;
-    if (s) {
-        ret = s;
-        free(s);
-    } else {
-        ret = "";
-    }
+    const char* s = plist_get_string_ptr(_node, NULL);
+    std::string ret = s ? s : "";
     return ret;
 }
 
-};
+}  // namespace PList