Merge and cleanup of GSoC C++-ification project.

(bzr r9945.1.1)

1 files changed, 34 insertions, 40 deletions

diff --git a/src/sp-defs.cpp b/src/sp-defs.cpp
index aa0cb0be7..2737b3f5c 100644
--- a/src/sp-defs.cpp
+++ b/src/sp-defs.cpp
@@ -1,10 +1,10 @@
-#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
  *
@@ -20,32 +20,24 @@
 #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 sp_defs_get_type(void)
+GType SPDefs::sp_defs_get_type(void)
 {
     static GType defs_type = 0;
 
     if (!defs_type) {
         GTypeInfo defs_info = {
             sizeof(SPDefsClass),
-            NULL,	/* base_init */
-            NULL,	/* base_finalize */
-            (GClassInitFunc) sp_defs_class_init,
-            NULL,	/* class_finalize */
-            NULL,	/* class_data */
+            NULL,       /* base_init */
+            NULL,       /* base_finalize */
+            (GClassInitFunc) SPDefsClass::sp_defs_class_init,
+            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);
     }
@@ -53,30 +45,30 @@ GType sp_defs_get_type(void)
     return defs_type;
 }
 
-static void sp_defs_class_init(SPDefsClass *dc)
+void SPDefsClass::sp_defs_class_init(SPDefsClass *dc)
 {
-    parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
+    static_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;
+    sp_object_class->release = SPDefs::release;
+    sp_object_class->update = SPDefs::update;
+    sp_object_class->modified = SPDefs::modified;
+    sp_object_class->write = SPDefs::write;
 }
 
-static void sp_defs_init(SPDefs */*defs*/)
+void SPDefs::init(SPDefs */*defs*/)
 {
 
 }
 
-static void sp_defs_release(SPObject *object)
+void SPDefs::release(SPObject *object)
 {
-    if (((SPObjectClass *) (parent_class))->release) {
-        ((SPObjectClass *) (parent_class))->release(object);
+    if (((SPObjectClass *) (SPDefsClass::static_parent_class))->release) {
+        ((SPObjectClass *) (SPDefsClass::static_parent_class))->release(object);
     }
 }
 
-static void 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;
@@ -95,7 +87,7 @@ static void sp_defs_update(SPObject *object, SPCtx *ctx, guint flags)
     }
 }
 
-static void 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;
@@ -104,7 +96,7 @@ static void sp_defs_modified(SPObject *object, guint flags)
     flags &= SP_OBJECT_MODIFIED_CASCADE;
 
     GSList *l = NULL;
-    for ( SPObject *child = sp_object_first_child(object) ; 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);
     }
@@ -117,11 +109,11 @@ static void sp_defs_modified(SPObject *object, guint flags)
         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) );
     }
 }
 
-static Inkscape::XML::Node *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) {
 
@@ -130,9 +122,11 @@ static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Docum
         }
 
         GSList *l = NULL;
-        for ( SPObject *child = sp_object_first_child(object) ; 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) {
@@ -142,13 +136,13 @@ static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Docum
         }
 
     } else {
-        for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+        for ( SPObject *child = object->firstChild() ; child; child = child->getNext() ) {
             child->updateRepr(flags);
         }
     }
 
-    if (((SPObjectClass *) (parent_class))->write) {
-        (* ((SPObjectClass *) (parent_class))->write)(object, xml_doc, repr, flags);
+    if (((SPObjectClass *) (SPDefsClass::static_parent_class))->write) {
+        (* ((SPObjectClass *) (SPDefsClass::static_parent_class))->write)(object, xml_doc, repr, flags);
     }
 
     return repr;