Start migrating 0.92 patch to master

1 files changed, 18 insertions, 1 deletions

diff --git a/src/xml/node.h b/src/xml/node.h
index 29cfdab46..8d9fc19e4 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -384,6 +384,20 @@ public:
      */
     virtual void changeOrder(Node *child, Node *after)=0;
 
+     /**
+     * @brief Remove all elements that not in src node
+     * @param src The node to check for elemments into this node
+     * @param key The attribute to use as the identity attribute
+     */
+    virtual void cleanOriginal(Node *src, gchar const *key)=0;
+
+
+     /**
+     * @brief Compare 2 nodes equality
+     * @param other The other node to compare
+     * @param recursive Recursive mode check
+     */
+    virtual bool equal(Node const *other, bool recursive)=0; 
     /**
      * @brief Merge all children of another node with the current
      *
@@ -397,8 +411,11 @@ public:
      *
      * @param src The node to merge into this node
      * @param key The attribute to use as the identity attribute
+     * @param noid If true process noid items
+     * @param key If clean callback to cleanOriginal
      */
-    virtual void mergeFrom(Node const *src, char const *key)=0;
+
+    virtual void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false)=0;
     
     /*@}*/