![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-flowdiv.cpp b/src/sp-flowdiv.cpp
index 61a5ec430064d56d5fbbc74d0292d4259817a690..6d679701fdc098836244aa32d3a4be38644d7c79 100644 (file)
--- a/src/sp-flowdiv.cpp
+++ b/src/sp-flowdiv.cpp
#include "sp-flowdiv.h"
#include "sp-string.h"
+#include "document.h"
static void sp_flowdiv_class_init (SPFlowdivClass *klass);
static void sp_flowdiv_init (SPFlowdiv *group);
static void sp_flowdiv_release (SPObject *object);
-static Inkscape::XML::Node *sp_flowdiv_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowdiv_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_flowdiv_update (SPObject *object, SPCtx *ctx, unsigned int flags);
static void sp_flowdiv_modified (SPObject *object, guint flags);
static void sp_flowdiv_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr);
static void sp_flowtspan_class_init (SPFlowtspanClass *klass);
static void sp_flowtspan_init (SPFlowtspan *group);
static void sp_flowtspan_release (SPObject *object);
-static Inkscape::XML::Node *sp_flowtspan_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowtspan_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_flowtspan_update (SPObject *object, SPCtx *ctx, unsigned int flags);
static void sp_flowtspan_modified (SPObject *object, guint flags);
static void sp_flowtspan_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr);
static void sp_flowpara_class_init (SPFlowparaClass *klass);
static void sp_flowpara_init (SPFlowpara *group);
static void sp_flowpara_release (SPObject *object);
-static Inkscape::XML::Node *sp_flowpara_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowpara_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_flowpara_update (SPObject *object, SPCtx *ctx, unsigned int flags);
static void sp_flowpara_modified (SPObject *object, guint flags);
static void sp_flowpara_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr);
@@ -46,13 +47,13 @@ static void sp_flowpara_set (SPObject *object, unsigned int key, const gchar *va
static void sp_flowline_class_init (SPFlowlineClass *klass);
static void sp_flowline_release (SPObject *object);
static void sp_flowline_init (SPFlowline *group);
-static Inkscape::XML::Node *sp_flowline_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowline_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_flowline_modified (SPObject *object, guint flags);
static void sp_flowregionbreak_class_init (SPFlowregionbreakClass *klass);
static void sp_flowregionbreak_release (SPObject *object);
static void sp_flowregionbreak_init (SPFlowregionbreak *group);
-static Inkscape::XML::Node *sp_flowregionbreak_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowregionbreak_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_flowregionbreak_modified (SPObject *object, guint flags);
static SPItemClass * flowdiv_parent_class;
{
GObjectClass * object_class;
SPObjectClass * sp_object_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
-
+
flowdiv_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
-
+
sp_object_class->build = sp_flowdiv_build;
sp_object_class->set = sp_flowdiv_set;
sp_object_class->release = sp_flowdiv_release;
}
static void
-sp_flowdiv_init (SPFlowdiv *group)
+sp_flowdiv_init (SPFlowdiv */*group*/)
{
}
if (((SPObjectClass *) (flowdiv_parent_class))->update)
((SPObjectClass *) (flowdiv_parent_class))->update (object, ctx, flags);
-
+
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));
{
SPObject *child;
GSList *l;
-
+
if (((SPObjectClass *) (flowdiv_parent_class))->modified)
((SPObjectClass *) (flowdiv_parent_class))->modified (object, flags);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
}
static Inkscape::XML::Node *
-sp_flowdiv_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowdiv_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
// SPFlowdiv *group = SP_FLOWDIV (object);
-
+
if ( flags&SP_OBJECT_WRITE_BUILD ) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowDiv");
+ if ( repr == NULL ) repr = xml_doc->createElement("svg:flowDiv");
GSList *l = NULL;
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
Inkscape::XML::Node* c_repr=NULL;
if ( SP_IS_FLOWTSPAN (child) ) {
- c_repr = child->updateRepr(NULL, flags);
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
} else if ( SP_IS_FLOWPARA(child) ) {
- c_repr = child->updateRepr(NULL, flags);
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
} else if ( SP_IS_STRING(child) ) {
- c_repr = sp_repr_new_text(SP_STRING(child)->string.c_str());
+ c_repr = xml_doc->createTextNode(SP_STRING(child)->string.c_str());
}
if ( c_repr ) l = g_slist_prepend (l, c_repr);
}
}
}
}
-
+
if (((SPObjectClass *) (flowdiv_parent_class))->write)
- ((SPObjectClass *) (flowdiv_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowdiv_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}
{
GObjectClass * object_class;
SPObjectClass * sp_object_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
flowtspan_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
-
+
sp_object_class->build = sp_flowtspan_build;
sp_object_class->set = sp_flowtspan_set;
sp_object_class->release = sp_flowtspan_release;
}
static void
-sp_flowtspan_init (SPFlowtspan *group)
+sp_flowtspan_init (SPFlowtspan */*group*/)
{
}
// SPFlowtspan *group=SP_FLOWTSPAN (object);
SPItemCtx *ictx=(SPItemCtx *) ctx;
SPItemCtx cctx=*ictx;
-
+
if (((SPObjectClass *) (flowtspan_parent_class))->update)
((SPObjectClass *) (flowtspan_parent_class))->update (object, ctx, flags);
-
+
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));
{
SPObject *child;
GSList *l;
-
+
if (((SPObjectClass *) (flowtspan_parent_class))->modified)
((SPObjectClass *) (flowtspan_parent_class))->modified (object, flags);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
(((SPObjectClass *) flowtspan_parent_class)->set) (object, key, value);
}
static Inkscape::XML::Node *
-sp_flowtspan_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowtspan_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if ( flags&SP_OBJECT_WRITE_BUILD ) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowSpan");
+ if ( repr == NULL ) repr = xml_doc->createElement("svg:flowSpan");
GSList *l = NULL;
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
Inkscape::XML::Node* c_repr=NULL;
if ( SP_IS_FLOWTSPAN (child) ) {
- c_repr = child->updateRepr(NULL, flags);
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
} else if ( SP_IS_FLOWPARA (child) ) {
- c_repr = child->updateRepr(NULL, flags);
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
} else if ( SP_IS_STRING(child) ) {
- c_repr = sp_repr_new_text(SP_STRING(child)->string.c_str());
+ c_repr = xml_doc->createTextNode(SP_STRING(child)->string.c_str());
}
if ( c_repr ) l = g_slist_prepend (l, c_repr);
}
}
}
}
-
+
if (((SPObjectClass *) (flowtspan_parent_class))->write)
- ((SPObjectClass *) (flowtspan_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowtspan_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}
{
GObjectClass * object_class;
SPObjectClass * sp_object_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
-
+
flowpara_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
-
+
sp_object_class->build = sp_flowpara_build;
sp_object_class->set = sp_flowpara_set;
sp_object_class->release = sp_flowpara_release;
}
static void
-sp_flowpara_init (SPFlowpara *group)
+sp_flowpara_init (SPFlowpara */*group*/)
{
}
static void
{
SPItemCtx *ictx=(SPItemCtx *) ctx;
SPItemCtx cctx=*ictx;
-
+
if (((SPObjectClass *) (flowpara_parent_class))->update)
((SPObjectClass *) (flowpara_parent_class))->update (object, ctx, flags);
-
+
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));
{
SPObject *child;
GSList *l;
-
+
if (((SPObjectClass *) (flowpara_parent_class))->modified)
((SPObjectClass *) (flowpara_parent_class))->modified (object, flags);
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
-
+
l = NULL;
for (child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
g_object_ref (G_OBJECT (child));
(((SPObjectClass *) flowpara_parent_class)->set) (object, key, value);
}
static Inkscape::XML::Node *
-sp_flowpara_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowpara_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
// SPFlowpara *group = SP_FLOWPARA (object);
-
+
if ( flags&SP_OBJECT_WRITE_BUILD ) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowPara");
+ if ( repr == NULL ) repr = xml_doc->createElement("svg:flowPara");
GSList *l = NULL;
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
Inkscape::XML::Node* c_repr=NULL;
if ( SP_IS_FLOWTSPAN (child) ) {
- c_repr = child->updateRepr(NULL, flags);
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
} else if ( SP_IS_FLOWPARA (child) ) {
- c_repr = child->updateRepr(NULL, flags);
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
} else if ( SP_IS_STRING(child) ) {
- c_repr = sp_repr_new_text(SP_STRING(child)->string.c_str());
+ c_repr = xml_doc->createTextNode(SP_STRING(child)->string.c_str());
}
if ( c_repr ) l = g_slist_prepend (l, c_repr);
}
}
}
}
-
+
if (((SPObjectClass *) (flowpara_parent_class))->write)
- ((SPObjectClass *) (flowpara_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowpara_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}
{
GObjectClass * object_class;
SPObjectClass * sp_object_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
-
+
flowline_parent_class = (SPObjectClass *)g_type_class_ref (SP_TYPE_OBJECT);
-
+
sp_object_class->release = sp_flowline_release;
sp_object_class->write = sp_flowline_write;
sp_object_class->modified = sp_flowline_modified;
}
static void
-sp_flowline_init (SPFlowline *group)
+sp_flowline_init (SPFlowline */*group*/)
{
}
static void
{
if (((SPObjectClass *) (flowline_parent_class))->modified)
((SPObjectClass *) (flowline_parent_class))->modified (object, flags);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
}
static Inkscape::XML::Node *
-sp_flowline_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowline_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if ( flags&SP_OBJECT_WRITE_BUILD ) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowLine");
+ if ( repr == NULL ) repr = xml_doc->createElement("svg:flowLine");
} else {
}
-
+
if (((SPObjectClass *) (flowline_parent_class))->write)
- ((SPObjectClass *) (flowline_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowline_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}
{
GObjectClass * object_class;
SPObjectClass * sp_object_class;
-
+
object_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
-
+
flowregionbreak_parent_class = (SPObjectClass *)g_type_class_ref (SP_TYPE_OBJECT);
-
+
sp_object_class->release = sp_flowregionbreak_release;
sp_object_class->write = sp_flowregionbreak_write;
sp_object_class->modified = sp_flowregionbreak_modified;
}
static void
-sp_flowregionbreak_init (SPFlowregionbreak *group)
+sp_flowregionbreak_init (SPFlowregionbreak */*group*/)
{
}
static void
{
if (((SPObjectClass *) (flowregionbreak_parent_class))->modified)
((SPObjectClass *) (flowregionbreak_parent_class))->modified (object, flags);
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
}
static Inkscape::XML::Node *
-sp_flowregionbreak_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowregionbreak_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if ( flags&SP_OBJECT_WRITE_BUILD ) {
- if ( repr == NULL ) repr = sp_repr_new ("svg:flowLine");
+ if ( repr == NULL ) repr = xml_doc->createElement("svg:flowLine");
} else {
}
-
+
if (((SPObjectClass *) (flowregionbreak_parent_class))->write)
- ((SPObjectClass *) (flowregionbreak_parent_class))->write (object, repr, flags);
-
+ ((SPObjectClass *) (flowregionbreak_parent_class))->write (object, xml_doc, repr, flags);
+
return repr;
}