diff options
Diffstat (limited to 'src/sp-desc.cpp')
| -rw-r--r-- | src/sp-desc.cpp | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/sp-desc.cpp b/src/sp-desc.cpp index bbc47ecbb..9b27c4d17 100644 --- a/src/sp-desc.cpp +++ b/src/sp-desc.cpp @@ -16,36 +16,13 @@ #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); -static SPObjectClass *desc_parent_class; - -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; -} +G_DEFINE_TYPE(SPDesc, sp_desc, SP_TYPE_OBJECT); 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; } @@ -63,8 +40,8 @@ static Inkscape::XML::Node *sp_desc_write(SPObject *object, Inkscape::XML::Docum repr = object->getRepr()->duplicate(doc); } - if ((static_cast<SPObjectClass *>(desc_parent_class))->write) { - (static_cast<SPObjectClass *>(desc_parent_class))->write(object, doc, repr, flags); + if ((static_cast<SPObjectClass *>(sp_desc_parent_class))->write) { + (static_cast<SPObjectClass *>(sp_desc_parent_class))->write(object, doc, repr, flags); } return repr; |
