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

(bzr r87)

7 files changed, 31 insertions, 31 deletions

diff --git a/src/jabber_whiteboard/deserializer.cpp b/src/jabber_whiteboard/deserializer.cpp
index 40047051e..8a6a464b4 100644
--- a/src/jabber_whiteboard/deserializer.cpp
+++ b/src/jabber_whiteboard/deserializer.cpp
@@ -14,7 +14,7 @@
 #include "xml/node.h"
 #include "xml/repr.h"
 
-#include "util/shared-c-string-ptr.h"
+#include "util/share.h"
 
 #include "gc-anchored.h"
 
@@ -284,7 +284,7 @@ Deserializer::deserializeEventChgContent(Glib::ustring const& msg)
 {
 	// 1.  Extract required attributes: node ID.  If we do not know these, return.
 	std::string id;
-	Util::SharedCStringPtr oldval, newval;
+	Util::shared_ptr<char> oldval, newval;
 	Node buf;
 
 	buf.tag = MESSAGE_ID;
@@ -297,16 +297,16 @@ Deserializer::deserializeEventChgContent(Glib::ustring const& msg)
 	// 2.  Extract optional attributes: old value, new value.
 	buf.tag = MESSAGE_OLDVAL;
 	if (MessageUtilities::findTag(buf, msg)) {
-		oldval = Util::SharedCStringPtr::copy(buf.data.c_str());
+		oldval = Util::share_string(buf.data.c_str());
 	} else {
-		oldval = Util::SharedCStringPtr::copy("");
+		oldval = Util::share_static("");
 	}
 
 	buf.tag = MESSAGE_NEWVAL;
 	if (MessageUtilities::findTag(buf, msg)) {
-		newval = Util::SharedCStringPtr::copy(buf.data.c_str());
+		newval = Util::share_string(buf.data.c_str());
 	} else {
-		newval = Util::SharedCStringPtr::copy("");
+		newval = Util::share_static("");
 	}
 
 	// 3.  Find the node identified by the ID.  If we cannot find it, return.
@@ -344,21 +344,21 @@ Deserializer::deserializeEventChgAttr(Glib::ustring const& msg)
 	// 2.  Extract optional attributes: new value.  If we do not find it in the message,
 	// assume there is no new value.
 	buf.tag = MESSAGE_NEWVAL;
-	Util::SharedCStringPtr newval;
+	Util::shared_ptr<char> newval;
 	if (MessageUtilities::findTag(buf, msg)) {
-		newval = Util::SharedCStringPtr::copy(buf.data.c_str());
+		newval = Util::share_string(buf.data.c_str());
 	} else {
-		newval = Util::SharedCStringPtr::copy("");
+		newval = Util::share_static("");
 	}
 
 	// 3.  Extract optional attributes: old value.  If we do not find it in the message,
 	// assume that there is no old value.
 	buf.tag = MESSAGE_OLDVAL;
-	Util::SharedCStringPtr oldval;
+	Util::shared_ptr<char> oldval;
 	if (MessageUtilities::findTag(buf, msg)) {
-		oldval = Util::SharedCStringPtr::copy(buf.data.c_str());
+		oldval = Util::share_string(buf.data.c_str());
 	} else {
-		oldval = Util::SharedCStringPtr::copy("");
+		oldval = Util::share_static("");
 	}
 
 	// 4.  Look up this node in the local node database and external tracker.
diff --git a/src/jabber_whiteboard/message-utilities.cpp b/src/jabber_whiteboard/message-utilities.cpp
index 431545ac0..8843b6f45 100644
--- a/src/jabber_whiteboard/message-utilities.cpp
+++ b/src/jabber_whiteboard/message-utilities.cpp
@@ -12,7 +12,7 @@
 
 #include <glibmm/i18n.h>
 
-#include "util/shared-c-string-ptr.h"
+#include "util/share.h"
 #include "util/list.h"
 
 #include "xml/node.h"
@@ -297,7 +297,7 @@ MessageUtilities::objectDeleteMessage(Glib::ustring* msgbuf, XMLNodeTracker* xmt
 }
 
 void
-MessageUtilities::contentChangeMessage(Glib::ustring& msgbuf, std::string const nodeid, Util::SharedCStringPtr old_value, Util::SharedCStringPtr new_value)
+MessageUtilities::contentChangeMessage(Glib::ustring& msgbuf, std::string const nodeid, Util::shared_ptr<char> old_value, Util::shared_ptr<char> new_value)
 {
 	if (!nodeid.empty()) {
 		// <MESSAGE_NODECONTENT>
diff --git a/src/jabber_whiteboard/message-utilities.h b/src/jabber_whiteboard/message-utilities.h
index 11acb1a95..5595f435c 100644
--- a/src/jabber_whiteboard/message-utilities.h
+++ b/src/jabber_whiteboard/message-utilities.h
@@ -26,7 +26,7 @@ namespace Inkscape {
 
 namespace Util {
 
-class SharedCStringPtr;
+class shared_ptr<char>;
 
 }
 
@@ -46,7 +46,7 @@ public:
 	static void newObjectMessage(ustring* msgbuf, KeyToNodeMap& newidsbuf, NodeToKeyMap& newnodesbuf, NewChildObjectMessageList& childmsgbuf, XMLNodeTracker* xmt, Inkscape::XML::Node const* node, bool only_collect_nodes = false, bool collect_children = true);	
 	static void objectChangeMessage(ustring* msgbuf, XMLNodeTracker* xmt, std::string const id, gchar const* key, gchar const* oldval, gchar const* newval, bool is_interactive);
 	static void objectDeleteMessage(ustring* msgbuf, XMLNodeTracker* xmt, Inkscape::XML::Node const& parent, Inkscape::XML::Node const& child, Inkscape::XML::Node const* prev);
-	static void contentChangeMessage(ustring& msgbuf, std::string const nodeid, Util::SharedCStringPtr old_value, Util::SharedCStringPtr new_value);
+	static void contentChangeMessage(ustring& msgbuf, std::string const nodeid, Util::shared_ptr<char> old_value, Util::shared_ptr<char> new_value);
 	static void childOrderChangeMessage(ustring& msgbuf, std::string const childid, std::string const oldprevid, std::string const newprevid);
 
 	// Message parsing utilities
diff --git a/src/jabber_whiteboard/node-tracker-observer.h b/src/jabber_whiteboard/node-tracker-observer.h
index 600500c70..a3260d8a0 100644
--- a/src/jabber_whiteboard/node-tracker-observer.h
+++ b/src/jabber_whiteboard/node-tracker-observer.h
@@ -45,12 +45,12 @@ public:
                                          XML::Node *old_prev, XML::Node *new_prev)=0;
 
     virtual void notifyContentChanged(XML::Node &node,
-                                      Util::SharedCStringPtr old_content,
-                                      Util::SharedCStringPtr new_content)=0;
+                                      Util::shared_ptr<char> old_content,
+                                      Util::shared_ptr<char> new_content)=0;
 
     virtual void notifyAttributeChanged(XML::Node &node, GQuark name,
-                                        Util::SharedCStringPtr old_value,
-                                        Util::SharedCStringPtr new_value)=0;
+                                        Util::shared_ptr<char> old_value,
+                                        Util::shared_ptr<char> new_value)=0;
 
 
 	// ...but we do provide node tracking facilities
diff --git a/src/jabber_whiteboard/node-utilities.cpp b/src/jabber_whiteboard/node-utilities.cpp
index 35b2772a1..f0cbacddc 100644
--- a/src/jabber_whiteboard/node-utilities.cpp
+++ b/src/jabber_whiteboard/node-utilities.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "util/shared-c-string-ptr.h"
+#include "util/share.h"
 #include "util/list.h"
 
 #include "xml/node-observer.h"
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.
diff --git a/src/jabber_whiteboard/serializer.h b/src/jabber_whiteboard/serializer.h
index cc0aa97b6..16889c571 100644
--- a/src/jabber_whiteboard/serializer.h
+++ b/src/jabber_whiteboard/serializer.h
@@ -14,7 +14,7 @@
 
 #include "xml/node-observer.h"
 
-#include "util/shared-c-string-ptr.h"
+#include "util/share.h"
 
 #include "jabber_whiteboard/node-tracker.h"
 #include "jabber_whiteboard/typedefs.h"
@@ -39,12 +39,12 @@ public:
                                          XML::Node *old_prev, XML::Node *new_prev);
 
     void notifyContentChanged(XML::Node &node,
-                                      Util::SharedCStringPtr old_content,
-                                      Util::SharedCStringPtr new_content);
+                                      Util::shared_ptr<char> old_content,
+                                      Util::shared_ptr<char> new_content);
 
     void notifyAttributeChanged(XML::Node &node, GQuark name,
-                                        Util::SharedCStringPtr old_value,
-                                        Util::SharedCStringPtr new_value);
+                                        Util::shared_ptr<char> old_value,
+                                        Util::shared_ptr<char> new_value);
 
 	void synthesizeChildNodeAddEvents();