summaryrefslogtreecommitdiffstats
path: root/src/xml/simple-node.h
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:55:01 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-05-09 19:42:10 +0000
commit61cbbcbe02f11d67e4fe9f3c4f452442d2e9f778 (patch)
tree3ed5e5b78b00cf25892a3a18e118eee41cbc15ec /src/xml/simple-node.h
parentFix typo (diff)
downloadinkscape-61cbbcbe02f11d67e4fe9f3c4f452442d2e9f778.tar.gz
inkscape-61cbbcbe02f11d67e4fe9f3c4f452442d2e9f778.zip
Start migrating 0.92 patch to master
Diffstat (limited to 'src/xml/simple-node.h')
-rw-r--r--src/xml/simple-node.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index f2cfa953c..fd41e53a8 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -91,7 +91,9 @@ public:
char const *content() const;
void setContent(char const *value);
- void mergeFrom(Node const *src, char const *key);
+ void cleanOriginal(Node *src, gchar const *key);
+ bool equal(Node const *other, bool recursive);
+ void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false);
Inkscape::Util::List<AttributeRecord const> attributeList() const {
return _attributes;