diff --git a/src/sp-defs.cpp b/src/sp-defs.cpp
index b523322e136eba709d3878078327a4a4592182a2..2737b3f5c1a2bf8b4c3a333d7b3b9d9ea609df2b 100644 (file)
--- a/src/sp-defs.cpp
+++ b/src/sp-defs.cpp
-#define __SP_DEFS_C__
-
/*
* SVG <defs> implementation
*
* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
+ * Jon A. Cruz <jon@joncruz.org>
+ * Abhishek Sharma
*
* Copyright (C) 2000-2002 authors
*
#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::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-static SPObjectClass *parent_class;*/
SPObjectClass * SPDefsClass::static_parent_class = 0;
GType SPDefs::sp_defs_get_type(void)
if (!defs_type) {
GTypeInfo defs_info = {
sizeof(SPDefsClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
+ NULL, /* base_init */
+ NULL, /* base_finalize */
(GClassInitFunc) SPDefsClass::sp_defs_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
sizeof(SPDefs),
- 16, /* n_preallocs */
- (GInstanceInitFunc) sp_defs_init,
- NULL, /* value_table */
+ 16, /* n_preallocs */
+ (GInstanceInitFunc) init,
+ NULL, /* value_table */
};
defs_type = g_type_register_static(SP_TYPE_OBJECT, "SPDefs", &defs_info, (GTypeFlags) 0);
}
static_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
SPObjectClass *sp_object_class = (SPObjectClass *) dc;
- sp_object_class->release = SPDefs::sp_defs_release;
- sp_object_class->update = SPDefs::sp_defs_update;
- sp_object_class->modified = SPDefs::sp_defs_modified;
- sp_object_class->write = SPDefs::sp_defs_write;
+ sp_object_class->release = SPDefs::release;
+ sp_object_class->update = SPDefs::update;
+ sp_object_class->modified = SPDefs::modified;
+ sp_object_class->write = SPDefs::write;
}
-void SPDefs::sp_defs_init(SPDefs */*defs*/)
+void SPDefs::init(SPDefs */*defs*/)
{
}
-void SPDefs::sp_defs_release(SPObject *object)
+void SPDefs::release(SPObject *object)
{
if (((SPObjectClass *) (SPDefsClass::static_parent_class))->release) {
((SPObjectClass *) (SPDefsClass::static_parent_class))->release(object);
}
}
-void SPDefs::sp_defs_update(SPObject *object, SPCtx *ctx, guint flags)
+void SPDefs::update(SPObject *object, SPCtx *ctx, guint flags)
{
if (flags & SP_OBJECT_MODIFIED_FLAG) {
flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
}
}
-void SPDefs::sp_defs_modified(SPObject *object, guint flags)
+void SPDefs::modified(SPObject *object, guint flags)
{
if (flags & SP_OBJECT_MODIFIED_FLAG) {
flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
GSList *l = NULL;
- for ( SPObject *child = object->first_child() ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
g_object_ref(G_OBJECT(child));
l = g_slist_prepend(l, child);
}
if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
child->emitModified(flags);
}
- g_object_unref(G_OBJECT (child));
+ g_object_unref( G_OBJECT(child) );
}
}
-Inkscape::XML::Node * SPDefs::sp_defs_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
+Inkscape::XML::Node * SPDefs::write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if (flags & SP_OBJECT_WRITE_BUILD) {
@@ -131,9 +122,11 @@ Inkscape::XML::Node * SPDefs::sp_defs_write(SPObject *object, Inkscape::XML::Doc
}
GSList *l = NULL;
- for ( SPObject *child = object->first_child() ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
- if (crepr) l = g_slist_prepend(l, crepr);
+ if (crepr) {
+ l = g_slist_prepend(l, crepr);
+ }
}
while (l) {
@@ -143,7 +136,7 @@ Inkscape::XML::Node * SPDefs::sp_defs_write(SPObject *object, Inkscape::XML::Doc
}
} else {
- for ( SPObject *child = object->first_child() ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+ for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
child->updateRepr(flags);
}
}