replace Util::SharedCStringPtr with the more general Util::shared_ptr<>

(bzr r87)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/jabber_whiteboard/serializer.cpp b/src/jabber_whiteboard/serializer.cpp
index ddba47299..aae3e1378 100644
--- a/src/jabber_whiteboard/serializer.cpp
+++ b/src/jabber_whiteboard/serializer.cpp
@@ -14,7 +14,7 @@
 #include "jabber_whiteboard/serializer.h"
 
 #include "util/list.h"
-#include "util/shared-c-string-ptr.h"
+#include "util/share.h"
 
 #include "jabber_whiteboard/message-utilities.h"
 #include "jabber_whiteboard/message-tags.h"
@@ -91,11 +91,11 @@ Serializer::_newObjectEventHelper(XML::Node& node, XML::Node& child, XML::Node*
 	Inkscape::Util::List<Inkscape::XML::AttributeRecord const> attrlist = child.attributeList();
 
 	for(; attrlist; attrlist++) {
-		this->notifyAttributeChanged(child, attrlist->key, Util::SharedCStringPtr(), attrlist->value);
+		this->notifyAttributeChanged(child, attrlist->key, Util::shared_ptr<char>(), attrlist->value);
 	}
 	
 	if (child.content()) {
-		this->notifyContentChanged(child, Util::SharedCStringPtr(), Util::SharedCStringPtr::copy(child.content()));
+		this->notifyContentChanged(child, Util::shared_ptr<char>(), Util::share_string(child.content()));
 	}
 
 	this->_attributes_scanned.insert(childid);
@@ -188,7 +188,7 @@ Serializer::notifyChildOrderChanged(XML::Node& node, XML::Node& child, XML::Node
 }
 
 void
-Serializer::notifyContentChanged(XML::Node& node, Util::SharedCStringPtr old_content, Util::SharedCStringPtr new_content)
+Serializer::notifyContentChanged(XML::Node& node, Util::shared_ptr<char> old_content, Util::shared_ptr<char> new_content)
 {
 	// 1.  Find the ID of the node, or generate it if it does not exist.
 	std::string nodeid = this->_findOrGenerateNodeID(node);
@@ -221,7 +221,7 @@ Serializer::notifyContentChanged(XML::Node& node, Util::SharedCStringPtr old_con
 }
 
 void
-Serializer::notifyAttributeChanged(XML::Node& node, GQuark name, Util::SharedCStringPtr old_value, Util::SharedCStringPtr new_value)
+Serializer::notifyAttributeChanged(XML::Node& node, GQuark name, Util::shared_ptr<char> old_value, Util::shared_ptr<char> new_value)
 {
 	// 1.  Find the ID of the node that has had an attribute modified, or generate it if it
 	// does not exist.