handling recieved messages

[inkscape.git] / src / jabber_whiteboard / message-utilities.h

diff --git a/src/jabber_whiteboard/message-utilities.h b/src/jabber_whiteboard/message-utilities.h
index c6d464f0861b57490450d916b52e379631445b2d..2ea65acb85af84bca56ff23ec9cf733332899d2d 100644 (file)
--- a/src/jabber_whiteboard/message-utilities.h
+++ b/src/jabber_whiteboard/message-utilities.h
@@ -18,7 +18,7 @@
 #include "xml/repr.h"
 
 #include "xml/node.h"
-#include "jabber_whiteboard/typedefs.h"
+#include "jabber_whiteboard/defines.h"
 
 using Glib::ustring;
 
@@ -26,7 +26,7 @@ namespace Inkscape {
 
 namespace Util {
 
-template <typename T>
+template< typename T >
 class ptr_shared;
 
 }
@@ -43,24 +43,49 @@ class XMLNodeTracker;
 
 class MessageUtilities {
 public:
-       // Message generation utilities
-       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::ptr_shared<char> old_value, Util::ptr_shared<char> new_value);
-       static void childOrderChangeMessage(ustring& msgbuf, std::string const childid, std::string const oldprevid, std::string const newprevid);
-
-       // Message parsing utilities
-       static bool getFirstMessageTag(struct Node& buf, ustring const& msg);
-       static bool findTag(struct Node& buf, ustring const& msg);
-
-       // Message tag generation utilities
-       static Glib::ustring makeTagWithContent(Glib::ustring tagname, Glib::ustring content);
+    // Message generation utilities
+    static void newObjectMessage(Glib::ustring &msgbuf, 
+                           KeyNodeTable& newnodesbuf, 
+                           NewChildObjectMessageList& childmsgbuf, 
+                           XMLNodeTracker* xmt,
+                           Inkscape::XML::Node const* node, 
+                           bool only_collect_nodes = false,
+                           bool collect_children = true); 
+    static void objectChangeMessage(Glib::ustring &msgbuf, 
+                           XMLNodeTracker* xmt,
+                           const Glib::ustring &id, 
+                           gchar const* key,
+                           gchar const* oldval, 
+                           gchar const* newval,
+                           bool is_interactive);
+    static void objectDeleteMessage(Glib::ustring &msgbuf,
+                           XMLNodeTracker* xmt, 
+                           Inkscape::XML::Node const& parent,
+                           Inkscape::XML::Node const& child,
+                           Inkscape::XML::Node const* prev);
+    static void contentChangeMessage(Glib::ustring &msgbuf,
+                           const Glib::ustring &nodeid,
+                           Util::ptr_shared<char> old_value,
+                           Util::ptr_shared<char> new_value);
+    static void childOrderChangeMessage(Glib::ustring &msgbuf,
+                           const Glib::ustring &childid,
+                           const Glib::ustring &oldprevid,
+                           const Glib::ustring &newprevid);
+
+    // Message parsing utilities
+    static bool getFirstMessageTag(struct Node& buf,
+                          const Glib::ustring &msg);
+    static bool findTag(struct Node& buf, 
+                          const Glib::ustring &msg);
+
+    // Message tag generation utilities
+    static Glib::ustring makeTagWithContent(const Glib::ustring &tagname,
+                                            const Glib::ustring &content);
 
 private:
-       // noncopyable, nonassignable
-       MessageUtilities(MessageUtilities const&);
-       MessageUtilities& operator=(MessageUtilities const&);
+    // noncopyable, nonassignable
+    MessageUtilities(MessageUtilities const&);
+    MessageUtilities& operator=(MessageUtilities const&);
 
 };
 
@@ -81,5 +106,5 @@ private:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
 #endif