diff --git a/src/sp-defs.cpp b/src/sp-defs.cpp
index ad6cfc578e8358e0b67d8f3f0f0eb8e8f0abdb0d..aa0cb0be7643f285f71af3c052fa78cb4596c24e 100644 (file)
--- a/src/sp-defs.cpp
+++ b/src/sp-defs.cpp
#include "sp-defs.h"
#include "xml/repr.h"
+#include "document.h"
static void sp_defs_class_init(SPDefsClass *dc);
static void sp_defs_init(SPDefs *defs);
static void sp_defs_release(SPObject *object);
static void sp_defs_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_defs_modified(SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static SPObjectClass *parent_class;
GType sp_defs_get_type(void)
{
static GType defs_type = 0;
-
+
if (!defs_type) {
GTypeInfo defs_info = {
sizeof(SPDefsClass),
};
defs_type = g_type_register_static(SP_TYPE_OBJECT, "SPDefs", &defs_info, (GTypeFlags) 0);
}
-
+
return defs_type;
}
{
parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
SPObjectClass *sp_object_class = (SPObjectClass *) dc;
-
+
sp_object_class->release = sp_defs_release;
sp_object_class->update = sp_defs_update;
sp_object_class->modified = sp_defs_modified;
sp_object_class->write = sp_defs_write;
}
-static void sp_defs_init(SPDefs *defs)
+static void sp_defs_init(SPDefs */*defs*/)
{
-
+
}
static void sp_defs_release(SPObject *object)
flags &= SP_OBJECT_MODIFIED_CASCADE;
- GSList *l = NULL;
- for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- g_object_ref(G_OBJECT(child));
- l = g_slist_prepend(l, child);
- }
-
- l = g_slist_reverse(l);
-
+ GSList *l = g_slist_reverse(object->childList(true));
while (l) {
SPObject *child = SP_OBJECT(l->data);
l = g_slist_remove(l, child);
- if (flags || (child->uflags & SP_OBJECT_MODIFIED_FLAG)) {
+ if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
child->updateDisplay(ctx, flags);
}
- g_object_unref(G_OBJECT(child));
+ g_object_unref (G_OBJECT (child));
}
}
if (flags & SP_OBJECT_MODIFIED_FLAG) {
flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
}
-
+
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
GSList *l = NULL;
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
g_object_ref(G_OBJECT(child));
l = g_slist_prepend(l, child);
}
-
+
l = g_slist_reverse(l);
-
+
while (l) {
SPObject *child = SP_OBJECT(l->data);
l = g_slist_remove(l, child);
}
}
-static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if (flags & SP_OBJECT_WRITE_BUILD) {
-
+
if (!repr) {
- repr = sp_repr_new("svg:defs");
+ repr = xml_doc->createElement("svg:defs");
}
-
+
GSList *l = NULL;
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
- Inkscape::XML::Node *crepr = child->updateRepr(NULL, flags);
+ Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
if (crepr) l = g_slist_prepend(l, crepr);
}
-
+
while (l) {
repr->addChild((Inkscape::XML::Node *) l->data, NULL);
Inkscape::GC::release((Inkscape::XML::Node *) l->data);
l = g_slist_remove(l, l->data);
}
-
+
} else {
for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
child->updateRepr(flags);
}
if (((SPObjectClass *) (parent_class))->write) {
- (* ((SPObjectClass *) (parent_class))->write)(object, repr, flags);
+ (* ((SPObjectClass *) (parent_class))->write)(object, xml_doc, repr, flags);
}
return repr;