Cleanup of out-of-sync tests

[inkscape.git] / src / jabber_whiteboard / defines.h

diff --git a/src/jabber_whiteboard/defines.h b/src/jabber_whiteboard/defines.h
index 19b87624b527b1aa1d297ba3de79a59ea697f14e..a9bc80ca6b1072193d6fa60bfe98fe921551867b 100644 (file)
--- a/src/jabber_whiteboard/defines.h
+++ b/src/jabber_whiteboard/defines.h
@@ -13,6 +13,7 @@
 #ifndef __INKSCAPE_WHITEBOARD_DEFINES_H__
 #define __INKSCAPE_WHITEBOARD_DEFINES_H__
 
+#include "xml/node.h"
 #include "jabber_whiteboard/message-tags.h"
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include <glibmm.h>
 #include <sigc++/sigc++.h>
 
-#include "jabber_whiteboard/keynode.h"
-
 #include "gc-alloc.h"
 
 // Various specializations of std::less for XMLNodeTracker maps.
@@ -42,10 +41,10 @@ using Inkscape::XML::Node;
 template<>
 struct less< Node* > : public binary_function < Node*, Node*, bool >
 {
-       bool operator()(Node* _x, Node* _y) const
-       {
-               return _x < _y;
-       }
+    bool operator()(Node* _x, Node* _y) const
+    {
+        return _x < _y;
+    }
 
 };
 
@@ -68,7 +67,7 @@ namespace Whiteboard {
 namespace Message {
 
     typedef const std::string Wrapper;
-    typedef const std::string Message;
+    typedef std::string Message;
 
     extern Wrapper PROTOCOL;
     extern Wrapper NEW;
@@ -87,8 +86,18 @@ namespace Message {
 
 namespace Vars {
 
+    extern const std::string DOCUMENT_ROOT_NODE;
+
     extern const std::string INKBOARD_XMLNS; 
 
+    extern const std::string WHITEBOARD_MESSAGE; 
+    extern const std::string PROTOCOL_MESSAGE; 
+    extern const std::string NEW_MESSAGE; 
+    extern const std::string CONFIGURE_MESSAGE; 
+    extern const std::string CONFIGURE_TEXT_MESSAGE; 
+    extern const std::string MOVE_MESSAGE; 
+    extern const std::string REMOVE_MESSAGE; 
+
 }
 
 namespace State {
@@ -123,10 +132,10 @@ namespace Dialog {
 
 }
 
-// message types
-// explicitly numbered to aid protocol description later on
-
+class KeyNodePair;
+class KeyNodeTable;
 
+typedef std::pair<Glib::ustring, Glib::ustring> Configure;
 
 // Message handler modes
 enum HandlerMode {