From cd0794c0d76a46a0ae47b6c450167015ee41bc35 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 17 Jan 2013 00:59:37 +0000 Subject: Cleanup more GObject type definitions (bzr r12034) --- src/sp-animation.cpp | 128 ++++++++------------------------------------------- 1 file changed, 20 insertions(+), 108 deletions(-) (limited to 'src/sp-animation.cpp') diff --git a/src/sp-animation.cpp b/src/sp-animation.cpp index 2951a76fd..e1dba552e 100644 --- a/src/sp-animation.cpp +++ b/src/sp-animation.cpp @@ -15,20 +15,7 @@ #include "sp-animation.h" -#if 0 -/* Feel free to remove this function and its calls. */ -static void log_set_attr(char const *const classname, unsigned int const key, char const *const value) -{ - unsigned char const *const attr_name = sp_attribute_name(key); - if (value) { - g_print("%s: Set %s=%s\n", classname, attr_name, value); - } else { - g_print("%s: unset %s.\n", classname, attr_name); - } -} -#else # define log_set_attr(_classname, _key, _value) static_cast(0) -#endif /* Animation base class */ @@ -39,49 +26,26 @@ static void sp_animation_build(SPObject *object, SPDocument *document, Inkscape: static void sp_animation_release(SPObject *object); static void sp_animation_set(SPObject *object, unsigned int key, gchar const *value); -static SPObjectClass *animation_parent_class; - -GType sp_animation_get_type(void) -{ - static GType animation_type = 0; - - if (!animation_type) { - GTypeInfo animation_info = { - sizeof(SPAnimationClass), - NULL, NULL, - (GClassInitFunc) sp_animation_class_init, - NULL, NULL, - sizeof(SPAnimation), - 16, - (GInstanceInitFunc) sp_animation_init, - NULL, /* value_table */ - }; - animation_type = g_type_register_static(SP_TYPE_OBJECT, "SPAnimation", &animation_info, (GTypeFlags)0); - } - return animation_type; -} +G_DEFINE_TYPE(SPAnimation, sp_animation, SP_TYPE_OBJECT); static void sp_animation_class_init(SPAnimationClass *klass) { - //GObjectClass *gobject_class = (GObjectClass *) klass; SPObjectClass *sp_object_class = (SPObjectClass *) klass; - animation_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_animation_build; sp_object_class->release = sp_animation_release; sp_object_class->set = sp_animation_set; } -static void sp_animation_init(SPAnimation */*animation*/) +static void sp_animation_init(SPAnimation * /*animation*/) { } static void sp_animation_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) animation_parent_class)->build) - ((SPObjectClass *) animation_parent_class)->build(object, document, repr); + if ((SP_OBJECT_CLASS(sp_animation_parent_class))->build) + (SP_OBJECT_CLASS(sp_animation_parent_class))->build(object, document, repr); object->readAttr( "xlink:href" ); object->readAttr( "attributeName" ); @@ -103,12 +67,10 @@ static void sp_animation_release(SPObject */*object*/) static void sp_animation_set(SPObject *object, unsigned int key, gchar const *value) { - //SPAnimation *animation = SP_ANIMATION(object); - log_set_attr("SPAnimation", key, value); - if (((SPObjectClass *) animation_parent_class)->set) - ((SPObjectClass *) animation_parent_class)->set(object, key, value); + if ((SP_OBJECT_CLASS(sp_animation_parent_class))->set) + (SP_OBJECT_CLASS(sp_animation_parent_class))->set(object, key, value); } /* Interpolated animation base class */ @@ -120,49 +82,26 @@ static void sp_ianimation_build(SPObject *object, SPDocument *document, Inkscape static void sp_ianimation_release(SPObject *object); static void sp_ianimation_set(SPObject *object, unsigned int key, gchar const *value); -static SPObjectClass *ianimation_parent_class; - -GType sp_ianimation_get_type(void) -{ - static GType type = 0; - - if (!type) { - GTypeInfo info = { - sizeof(SPIAnimationClass), - NULL, NULL, - (GClassInitFunc) sp_ianimation_class_init, - NULL, NULL, - sizeof(SPIAnimation), - 16, - (GInstanceInitFunc) sp_ianimation_init, - NULL, /* value_table */ - }; - type = g_type_register_static(SP_TYPE_OBJECT, "SPIAnimation", &info, (GTypeFlags)0); - } - return type; -} +G_DEFINE_TYPE(SPIanimationClass, sp_ianimation, SP_TYPE_OBJECT); static void sp_ianimation_class_init(SPIAnimationClass *klass) { - //GObjectClass *gobject_class = (GObjectClass *) klass; SPObjectClass *sp_object_class = (SPObjectClass *) klass; - ianimation_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_ianimation_build; sp_object_class->release = sp_ianimation_release; sp_object_class->set = sp_ianimation_set; } -static void sp_ianimation_init(SPIAnimation */*animation*/) +static void sp_ianimation_init(SPIAnimation * /*animation*/) { } static void sp_ianimation_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) ianimation_parent_class)->build) - ((SPObjectClass *) ianimation_parent_class)->build(object, document, repr); + if ((SP_OBJECT_CLASS(sp_ianimation_parent_class))->build) + (SP_OBJECT_CLASS(sp_ianimation_parent_class))->build(object, document, repr); object->readAttr( "calcMode" ); object->readAttr( "values" ); @@ -175,18 +114,16 @@ static void sp_ianimation_build(SPObject *object, SPDocument *document, Inkscape object->readAttr( "accumulate" ); } -static void sp_ianimation_release(SPObject */*object*/) +static void sp_ianimation_release(SPObject * /*object*/) { } static void sp_ianimation_set(SPObject *object, unsigned int key, gchar const *value) { - //SPIAnimation *ianimation = SP_IANIMATION(object); - log_set_attr("SPIAnimation", key, value); - if (((SPObjectClass *) ianimation_parent_class)->set) - ((SPObjectClass *) ianimation_parent_class)->set(object, key, value); + if ((SP_OBJECT_CLASS(sp_ianimation_parent_class))->set) + (SP_OBJECT_CLASS(sp_ianimation_parent_class))->set(object, key, value); } /* SVG */ @@ -198,63 +135,38 @@ static void sp_animate_build(SPObject *object, SPDocument *document, Inkscape::X static void sp_animate_release(SPObject *object); static void sp_animate_set(SPObject *object, unsigned int key, gchar const *value); -static SPIAnimationClass *animate_parent_class; - -GType sp_animate_get_type(void) -{ - static GType type = 0; - - if (!type) { - GTypeInfo info = { - sizeof(SPAnimateClass), - NULL, NULL, - (GClassInitFunc) sp_animate_class_init, - NULL, NULL, - sizeof(SPAnimate), - 16, - (GInstanceInitFunc) sp_animate_init, - NULL, /* value_table */ - }; - type = g_type_register_static(SP_TYPE_IANIMATION, "SPAnimate", &info, (GTypeFlags)0); - } - return type; -} +G_DEFINE_TYPE(SPAnimate, sp_animate, SP_TYPE_IANIMATION); static void sp_animate_class_init(SPAnimateClass *klass) { - //GObjectClass *gobject_class = (GObjectClass *) klass; SPObjectClass *sp_object_class = (SPObjectClass *) klass; - animate_parent_class = (SPIAnimationClass*)g_type_class_peek_parent(klass); - sp_object_class->build = sp_animate_build; sp_object_class->release = sp_animate_release; sp_object_class->set = sp_animate_set; } -static void sp_animate_init(SPAnimate */*animate*/) +static void sp_animate_init(SPAnimate * /*animate*/) { } static void sp_animate_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) animate_parent_class)->build) - ((SPObjectClass *) animate_parent_class)->build(object, document, repr); + if ((SP_OBJECT_CLASS(sp_animate_parent_class))->build) + (SP_OBJECT_CLASS(sp_animate_parent_class))->build(object, document, repr); } -static void sp_animate_release(SPObject */*object*/) +static void sp_animate_release(SPObject * /*object*/) { } static void sp_animate_set(SPObject *object, unsigned int key, gchar const *value) { - //SPAnimate *animate = SP_ANIMATE(object); - log_set_attr("SPAnimate", key, value); - if (((SPObjectClass *) animate_parent_class)->set) - ((SPObjectClass *) animate_parent_class)->set(object, key, value); + if ((SP_OBJECT_CLASS(sp_animate_parent_class))->set) + (SP_OBJECT_CLASS(sp_animate_parent_class))->set(object, key, value); } -- cgit v1.2.3