Commit a merge to trunk, with probabal errors

(bzr r11073.1.36)

1 files changed, 70 insertions, 121 deletions

diff --git a/src/sp-missing-glyph.cpp b/src/sp-missing-glyph.cpp
index fdf75253e..06b741165 100644
--- a/src/sp-missing-glyph.cpp
+++ b/src/sp-missing-glyph.cpp
@@ -2,8 +2,6 @@
 # include <config.h>
 #endif
 
-#ifdef ENABLE_SVG_FONTS
-
 /*
  * SVG <missing-glyph> element implementation
  *
@@ -21,138 +19,93 @@
 #include "sp-missing-glyph.h"
 #include "document.h"
 
-static void sp_missing_glyph_class_init(SPMissingGlyphClass *gc);
-static void sp_missing_glyph_init(SPMissingGlyph *glyph);
-
-static void sp_missing_glyph_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
-static void sp_missing_glyph_release(SPObject *object);
-static void sp_missing_glyph_set(SPObject *object, unsigned int key, const gchar *value);
-static Inkscape::XML::Node *sp_missing_glyph_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-static SPObjectClass *parent_class;
-
-GType sp_missing_glyph_get_type(void)
-{
-    static GType type = 0;
-
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPMissingGlyphClass),
-            NULL,	/* base_init */
-            NULL,	/* base_finalize */
-            (GClassInitFunc) sp_missing_glyph_class_init,
-            NULL,	/* class_finalize */
-            NULL,	/* class_data */
-            sizeof(SPMissingGlyph),
-            16,	/* n_preallocs */
-            (GInstanceInitFunc) sp_missing_glyph_init,
-            NULL,	/* value_table */
-        };
-        type = g_type_register_static(SP_TYPE_OBJECT, "SPMissingGlyph", &info, (GTypeFlags) 0);
-    }
-
-    return type;
-}
-
-static void sp_missing_glyph_class_init(SPMissingGlyphClass *gc)
-{
-    SPObjectClass *sp_object_class = (SPObjectClass *) gc;
+#include "sp-factory.h"
 
-    parent_class = (SPObjectClass*)g_type_class_peek_parent(gc);
+namespace {
+	SPObject* createMissingGlyph() {
+		return new SPMissingGlyph();
+	}
 
-    sp_object_class->build = sp_missing_glyph_build;
-    sp_object_class->release = sp_missing_glyph_release;
-    sp_object_class->set = sp_missing_glyph_set;
-    sp_object_class->write = sp_missing_glyph_write;
+	bool missingGlyphRegistered = SPFactory::instance().registerObject("svg:missing-glyph", createMissingGlyph);
 }
 
-static void sp_missing_glyph_init(SPMissingGlyph *glyph)
-{
+SPMissingGlyph::SPMissingGlyph() : SPObject() {
 //TODO: correct these values:
-    glyph->d = NULL;
-    glyph->horiz_adv_x = 0;
-    glyph->vert_origin_x = 0;
-    glyph->vert_origin_y = 0;
-    glyph->vert_adv_y = 0;
+    this->d = NULL;
+    this->horiz_adv_x = 0;
+    this->vert_origin_x = 0;
+    this->vert_origin_y = 0;
+    this->vert_adv_y = 0;
 }
 
-static void sp_missing_glyph_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
-{
-    if (((SPObjectClass *) (parent_class))->build) {
-        ((SPObjectClass *) (parent_class))->build(object, document, repr);
-    }
-
-    object->readAttr( "d" );
-    object->readAttr( "horiz-adv-x" );
-    object->readAttr( "vert-origin-x" );
-    object->readAttr( "vert-origin-y" );
-    object->readAttr( "vert-adv-y" );
+SPMissingGlyph::~SPMissingGlyph() {
 }
 
-static void sp_missing_glyph_release(SPObject *object)
-{
-    //SPMissingGlyph *glyph = SP_MISSING_GLYPH(object);
+void SPMissingGlyph::build(SPDocument* doc, Inkscape::XML::Node* repr) {
+    SPObject::build(doc, repr);
 
-    if (((SPObjectClass *) parent_class)->release) {
-        ((SPObjectClass *) parent_class)->release(object);
-    }
+    this->readAttr( "d" );
+    this->readAttr( "horiz-adv-x" );
+    this->readAttr( "vert-origin-x" );
+    this->readAttr( "vert-origin-y" );
+    this->readAttr( "vert-adv-y" );
+}
+
+void SPMissingGlyph::release() {
+	SPObject::release();
 }
 
-static void sp_missing_glyph_set(SPObject *object, unsigned int key, const gchar *value)
-{
-    SPMissingGlyph *glyph = SP_MISSING_GLYPH(object);
 
+void SPMissingGlyph::set(unsigned int key, const gchar* value) {
     switch (key) {
         case SP_ATTR_D:
         {
-            if (glyph->d) {
-                g_free(glyph->d);
+            if (this->d) {
+                g_free(this->d);
             }
-            glyph->d = g_strdup(value);
-            object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            this->d = g_strdup(value);
+            this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
         }
         case SP_ATTR_HORIZ_ADV_X:
         {
             double number = value ? g_ascii_strtod(value, 0) : 0;
-            if (number != glyph->horiz_adv_x){
-                glyph->horiz_adv_x = number;
-                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            if (number != this->horiz_adv_x){
+                this->horiz_adv_x = number;
+                this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         }
         case SP_ATTR_VERT_ORIGIN_X:
         {
             double number = value ? g_ascii_strtod(value, 0) : 0;
-            if (number != glyph->vert_origin_x){
-                glyph->vert_origin_x = number;
-                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            if (number != this->vert_origin_x){
+                this->vert_origin_x = number;
+                this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         }
         case SP_ATTR_VERT_ORIGIN_Y:
         {
             double number = value ? g_ascii_strtod(value, 0) : 0;
-            if (number != glyph->vert_origin_y){
-                glyph->vert_origin_y = number;
-                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            if (number != this->vert_origin_y){
+                this->vert_origin_y = number;
+                this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         }
         case SP_ATTR_VERT_ADV_Y:
         {
             double number = value ? g_ascii_strtod(value, 0) : 0;
-            if (number != glyph->vert_adv_y){
-                glyph->vert_adv_y = number;
-                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            if (number != this->vert_adv_y){
+                this->vert_adv_y = number;
+                this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
             break;
         }
         default:
         {
-            if (((SPObjectClass *) (parent_class))->set) {
-                ((SPObjectClass *) (parent_class))->set(object, key, value);
-            }
+            SPObject::set(key, value);
             break;
         }
     }
@@ -160,39 +113,35 @@ static void sp_missing_glyph_set(SPObject *object, unsigned int key, const gchar
 
 #define COPY_ATTR(rd,rs,key) (rd)->setAttribute((key), rs->attribute(key));
 
-static Inkscape::XML::Node *sp_missing_glyph_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
-{
-//    SPMissingGlyph *glyph = SP_MISSING_GLYPH(object);
-
-    if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
-        repr = xml_doc->createElement("svg:glyph");
-    }
-
-/* I am commenting out this part because I am not certain how does it work. I will have to study it later. Juca
-    repr->setAttribute("d", glyph->d);
-    sp_repr_set_svg_double(repr, "horiz-adv-x", glyph->horiz_adv_x);
-    sp_repr_set_svg_double(repr, "vert-origin-x", glyph->vert_origin_x);
-    sp_repr_set_svg_double(repr, "vert-origin-y", glyph->vert_origin_y);
-    sp_repr_set_svg_double(repr, "vert-adv-y", glyph->vert_adv_y);
-*/
-    if (repr != object->getRepr()) {
-
-        // All the COPY_ATTR functions below use
-        //  XML Tree directly while they shouldn't.
-        COPY_ATTR(repr, object->getRepr(), "d");
-        COPY_ATTR(repr, object->getRepr(), "horiz-adv-x");
-        COPY_ATTR(repr, object->getRepr(), "vert-origin-x");
-        COPY_ATTR(repr, object->getRepr(), "vert-origin-y");
-        COPY_ATTR(repr, object->getRepr(), "vert-adv-y");
-    }
-
-    if (((SPObjectClass *) (parent_class))->write) {
-        ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
-    }
-
-    return repr;
+Inkscape::XML::Node* SPMissingGlyph::write(Inkscape::XML::Document* xml_doc, Inkscape::XML::Node* repr, guint flags) {
+	    if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
+	        repr = xml_doc->createElement("svg:glyph");
+	    }
+
+	/* I am commenting out this part because I am not certain how does it work. I will have to study it later. Juca
+	    repr->setAttribute("d", glyph->d);
+	    sp_repr_set_svg_double(repr, "horiz-adv-x", glyph->horiz_adv_x);
+	    sp_repr_set_svg_double(repr, "vert-origin-x", glyph->vert_origin_x);
+	    sp_repr_set_svg_double(repr, "vert-origin-y", glyph->vert_origin_y);
+	    sp_repr_set_svg_double(repr, "vert-adv-y", glyph->vert_adv_y);
+	*/
+	    if (repr != this->getRepr()) {
+
+	    	// TODO
+	        // All the COPY_ATTR functions below use
+	        //  XML Tree directly while they shouldn't.
+	        COPY_ATTR(repr, this->getRepr(), "d");
+	        COPY_ATTR(repr, this->getRepr(), "horiz-adv-x");
+	        COPY_ATTR(repr, this->getRepr(), "vert-origin-x");
+	        COPY_ATTR(repr, this->getRepr(), "vert-origin-y");
+	        COPY_ATTR(repr, this->getRepr(), "vert-adv-y");
+	    }
+
+	    SPObject::write(xml_doc, repr, flags);
+
+	    return repr;
 }
-#endif //#ifdef ENABLE_SVG_FONTS
+
 /*
   Local Variables:
   mode:c++