Commit a merge to trunk, with probabal errors

(bzr r11073.1.36)

1 files changed, 11 insertions, 36 deletions

diff --git a/src/sp-desc.cpp b/src/sp-desc.cpp
index bbc47ecbb..199ae0176 100644
--- a/src/sp-desc.cpp
+++ b/src/sp-desc.cpp
@@ -16,56 +16,31 @@
 #include "sp-desc.h"
 #include "xml/repr.h"
 
-static void sp_desc_class_init(SPDescClass *klass);
-static void sp_desc_init(SPDesc *rect);
-static Inkscape::XML::Node *sp_desc_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+#include "sp-factory.h"
 
-static SPObjectClass *desc_parent_class;
+namespace {
+	SPObject* createDesc() {
+		return new SPDesc();
+	}
 
-GType sp_desc_get_type (void)
-{
-    static GType desc_type = 0;
-
-    if (!desc_type) {
-        GTypeInfo desc_info = {
-            sizeof (SPDescClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_desc_class_init,
-            NULL, NULL,
-            sizeof (SPDesc),
-            16,
-            (GInstanceInitFunc) sp_desc_init,
-            NULL,    /* value_table */
-        };
-        desc_type = g_type_register_static (SP_TYPE_OBJECT, "SPDesc", &desc_info, (GTypeFlags)0);
-    }
-    return desc_type;
+	bool descRegistered = SPFactory::instance().registerObject("svg:desc", createDesc);
 }
 
-static void sp_desc_class_init(SPDescClass *klass)
-{
-    SPObjectClass *sp_object_class = (SPObjectClass *)(klass);
-    desc_parent_class = (SPObjectClass *)(g_type_class_ref(SP_TYPE_OBJECT));
-
-    sp_object_class->write = sp_desc_write;
+SPDesc::SPDesc() : SPObject() {
 }
 
-static void sp_desc_init(SPDesc */*desc*/)
-{
+SPDesc::~SPDesc() {
 }
 
 /**
  * Writes it's settings to an incoming repr object, if any.
  */
-static Inkscape::XML::Node *sp_desc_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags)
-{
+Inkscape::XML::Node* SPDesc::write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) {
     if (!repr) {
-        repr = object->getRepr()->duplicate(doc);
+        repr = this->getRepr()->duplicate(doc);
     }
 
-    if ((static_cast<SPObjectClass *>(desc_parent_class))->write) {
-        (static_cast<SPObjectClass *>(desc_parent_class))->write(object, doc, repr, flags);
-    }
+    SPObject::write(doc, repr, flags);
 
     return repr;
 }