From f95b94c4c7308bcbdcc2c12f31954a74c47b24de Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 15 Dec 2012 17:03:34 +0100 Subject: [PATCH] Replaced functions *_get_type with macro G_DEFINE_TYPE. --- src/atom.c | 58 ++++++++++++--------------------------------- src/atomcategory.c | 38 +++++------------------------ src/atomcommon.c | 40 ++++++------------------------- src/atomcontent.c | 40 +++++-------------------------- src/atomdate.c | 34 +++----------------------- src/atomentry.c | 54 ++++++++++------------------------------- src/atomgenerator.c | 40 +++++-------------------------- src/atomid.c | 34 +++----------------------- src/atomlink.c | 46 +++++++---------------------------- src/atomperson.c | 40 +++++-------------------------- src/atomsource.c | 52 ++++++++++------------------------------ src/atomtext.c | 34 +++----------------------- 12 files changed, 89 insertions(+), 421 deletions(-) diff --git a/src/atom.c b/src/atom.c index c008568..f72aea3 100644 --- a/src/atom.c +++ b/src/atom.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #ifdef HAVE_CONFIG_H @@ -70,48 +70,22 @@ static Atom *parse_xml (xmlDoc *xdoc); typedef struct _AtomPrivate AtomPrivate; struct _AtomPrivate { - GList *author, - *category, - *contributor, - *entry; + GList *author; + GList *category; + GList *contributor; + GList *entry; AtomGenerator *generator; - AtomID *icon, - *id, - *logo; + AtomID *icon; + AtomID *id; + AtomID *logo; AtomLink *link; - AtomText *title, - *rights, - *subtitle; + AtomText *title; + AtomText *rights; + AtomText *subtitle; AtomDate *updated; }; -GType -atom_get_type (void) -{ - static GType atom_type = 0; - - if (!atom_type) - { - static const GTypeInfo atom_info = - { - sizeof (AtomClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (Atom), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_init, - NULL - }; - - atom_type = g_type_register_static (TYPE_ATOM_COMMON, "Atom", - &atom_info, 0); - } - - return atom_type; -} +G_DEFINE_TYPE (Atom, atom, TYPE_ATOM_COMMON) static void atom_class_init (AtomClass *klass) @@ -340,7 +314,7 @@ xmlDoc { xnode = xmlNewNode (NULL, (const xmlChar *)"generator"); xmlAddChild (xroot, xnode); - atom_generator_get_xml (priv->generator, xnode); + atom_generator_get_xml (priv->generator, xnode); } if (priv->icon != NULL) @@ -448,7 +422,6 @@ atom_set_property (GObject *object, guint property_id, const GValue *value, GPar GObject *obj; Atom *atom = ATOM (object); - AtomPrivate *priv = ATOM_GET_PRIVATE (atom); switch (property_id) @@ -554,9 +527,8 @@ static void atom_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { Atom *atom = ATOM (object); - AtomPrivate *priv = ATOM_GET_PRIVATE (atom); - + switch (property_id) { case PROP_AUTHOR: diff --git a/src/atomcategory.c b/src/atomcategory.c index c986d0d..6d96297 100644 --- a/src/atomcategory.c +++ b/src/atomcategory.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomcategory.h" @@ -46,38 +46,12 @@ static void atom_category_get_property (GObject *object, typedef struct _AtomCategoryPrivate AtomCategoryPrivate; struct _AtomCategoryPrivate { - gchar *term, - *scheme, - *label; + gchar *term; + gchar *scheme; + gchar *label; }; -GType -atom_category_get_type (void) -{ - static GType atom_category_type = 0; - - if (!atom_category_type) - { - static const GTypeInfo atom_category_info = - { - sizeof (AtomCategoryClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_category_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomCategory), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_category_init, - NULL - }; - - atom_category_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomCategory", - &atom_category_info, 0); - } - - return atom_category_type; -} +G_DEFINE_TYPE (AtomCategory, atom_category, TYPE_ATOM_COMMON) static void atom_category_class_init (AtomCategoryClass *klass) diff --git a/src/atomcommon.c b/src/atomcommon.c index 8368a88..d906ba9 100644 --- a/src/atomcommon.c +++ b/src/atomcommon.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomcommon.h" @@ -45,37 +45,11 @@ static void atom_common_get_property (GObject *object, typedef struct _AtomCommonPrivate AtomCommonPrivate; struct _AtomCommonPrivate { - gchar *base, - *lang; + gchar *base; + gchar *lang; }; -GType -atom_common_get_type (void) -{ - static GType atom_common_type = 0; - - if (!atom_common_type) - { - static const GTypeInfo atom_common_info = - { - sizeof (AtomCommonClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_common_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomCommon), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_common_init, - NULL - }; - - atom_common_type = g_type_register_static (G_TYPE_OBJECT, "AtomCommon", - &atom_common_info, 0); - } - - return atom_common_type; -} +G_DEFINE_TYPE (AtomCommon, atom_common, G_TYPE_OBJECT) static void atom_common_class_init (AtomCommonClass *klass) @@ -149,19 +123,20 @@ atom_common_get_xml (AtomCommon *atom_common, xmlNode *xnode) { xmlSetProp (xnode, (const xmlChar *)"xml:base", prop); } + g_free (prop); prop = (xmlChar *)g_strstrip (priv->lang); if (!xmlStrEqual (prop, (const xmlChar *)"")) { xmlSetProp (xnode, (const xmlChar *)"xml:lang", prop); } + g_free (prop); } static void atom_common_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomCommon *atom_common = ATOM_COMMON (object); - AtomCommonPrivate *priv = ATOM_COMMON_GET_PRIVATE (atom_common); switch (property_id) @@ -206,7 +181,6 @@ static void atom_common_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomCommon *atom_common = ATOM_COMMON (object); - AtomCommonPrivate *priv = ATOM_COMMON_GET_PRIVATE (atom_common); switch (property_id) diff --git a/src/atomcontent.c b/src/atomcontent.c index deaa20a..cf0fa6f 100644 --- a/src/atomcontent.c +++ b/src/atomcontent.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include @@ -50,38 +50,12 @@ typedef struct _AtomContentPrivate AtomContentPrivate; struct _AtomContentPrivate { AtomContentType type; - gchar *media_type, - *src, - *text; + gchar *media_type; + gchar *src; + gchar *text; }; -GType -atom_content_get_type (void) -{ - static GType atom_content_type = 0; - - if (!atom_content_type) - { - static const GTypeInfo atom_content_info = - { - sizeof (AtomContentClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_content_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomContent), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_content_init, - NULL - }; - - atom_content_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomContent", - &atom_content_info, 0); - } - - return atom_content_type; -} +G_DEFINE_TYPE (AtomContent, atom_content, TYPE_ATOM_COMMON) static void atom_content_class_init (AtomContentClass *klass) @@ -285,7 +259,6 @@ static void atom_content_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomContent *atom_content = ATOM_CONTENT (object); - AtomContentPrivate *priv = ATOM_CONTENT_GET_PRIVATE (atom_content); switch (property_id) @@ -316,7 +289,6 @@ static void atom_content_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomContent *atom_content = ATOM_CONTENT (object); - AtomContentPrivate *priv = ATOM_CONTENT_GET_PRIVATE (atom_content); switch (property_id) diff --git a/src/atomdate.c b/src/atomdate.c index ec82b15..2aeeacb 100644 --- a/src/atomdate.c +++ b/src/atomdate.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomdate.h" @@ -47,33 +47,7 @@ struct _AtomDatePrivate struct tm *dateTime; }; -GType -atom_date_get_type (void) -{ - static GType atom_date_type = 0; - - if (!atom_date_type) - { - static const GTypeInfo atom_date_info = - { - sizeof (AtomDateClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_date_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomDate), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_date_init, - NULL - }; - - atom_date_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomDate", - &atom_date_info, 0); - } - - return atom_date_type; -} +G_DEFINE_TYPE (AtomDate, atom_date, TYPE_ATOM_COMMON) static void atom_date_class_init (AtomDateClass *klass) @@ -179,7 +153,6 @@ static void atom_date_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomDate *atom_date = ATOM_DATE (object); - AtomDatePrivate *priv = ATOM_DATE_GET_PRIVATE (atom_date); switch (property_id) @@ -201,7 +174,6 @@ static void atom_date_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomDate *atom_date = ATOM_DATE (object); - AtomDatePrivate *priv = ATOM_DATE_GET_PRIVATE (atom_date); switch (property_id) diff --git a/src/atomentry.c b/src/atomentry.c index 19d67b5..88d3c62 100644 --- a/src/atomentry.c +++ b/src/atomentry.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include @@ -62,47 +62,21 @@ static void atom_entry_get_property (GObject *object, typedef struct _AtomEntryPrivate AtomEntryPrivate; struct _AtomEntryPrivate { - GList *author, - *category, - *contributor; + GList *author; + GList *category; + GList *contributor; AtomContent *content; AtomID *id; AtomLink *link; - AtomText *title, - *rights, - *summary; - AtomDate *published, - *updated; + AtomText *title; + AtomText *rights; + AtomText *summary; + AtomDate *published; + AtomDate *updated; AtomSource *source; }; -GType -atom_entry_get_type (void) -{ - static GType atom_entry_type = 0; - - if (!atom_entry_type) - { - static const GTypeInfo atom_entry_info = - { - sizeof (AtomEntryClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_entry_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomEntry), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_entry_init, - NULL - }; - - atom_entry_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomEntry", - &atom_entry_info, 0); - } - - return atom_entry_type; -} +G_DEFINE_TYPE (AtomEntry, atom_entry, TYPE_ATOM_COMMON) static void atom_entry_class_init (AtomEntryClass *klass) @@ -237,7 +211,7 @@ AtomEntry AtomID *id = NULL; AtomText *title = NULL; AtomDate *updated = NULL; - + xmlXPathObjectPtr xpresult; xmlXPathContextPtr xpcontext = xmlXPathNewContext (xnode->doc); @@ -532,7 +506,6 @@ atom_entry_set_property (GObject *object, guint property_id, const GValue *value GObject *obj; AtomEntry *atome = ATOM_ENTRY (object); - AtomEntryPrivate *priv = ATOM_ENTRY_GET_PRIVATE (atome); switch (property_id) @@ -624,9 +597,8 @@ static void atom_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomEntry *atome = ATOM_ENTRY (object); - AtomEntryPrivate *priv = ATOM_ENTRY_GET_PRIVATE (atome); - + switch (property_id) { case PROP_AUTHOR: diff --git a/src/atomgenerator.c b/src/atomgenerator.c index a8236b4..aa72a89 100644 --- a/src/atomgenerator.c +++ b/src/atomgenerator.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomgenerator.h" @@ -46,38 +46,12 @@ static void atom_generator_get_property (GObject *object, typedef struct _AtomGeneratorPrivate AtomGeneratorPrivate; struct _AtomGeneratorPrivate { - gchar *uri, - *version, - *text; + gchar *uri; + gchar *version; + gchar *text; }; -GType -atom_generator_get_type (void) -{ - static GType atom_generator_type = 0; - - if (!atom_generator_type) - { - static const GTypeInfo atom_generator_info = - { - sizeof (AtomGeneratorClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_generator_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomGenerator), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_generator_init, - NULL - }; - - atom_generator_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomGenerator", - &atom_generator_info, 0); - } - - return atom_generator_type; -} +G_DEFINE_TYPE (AtomGenerator, atom_generator, TYPE_ATOM_COMMON) static void atom_generator_class_init (AtomGeneratorClass *klass) @@ -210,7 +184,6 @@ static void atom_generator_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomGenerator *atom_generator = ATOM_GENERATOR (object); - AtomGeneratorPrivate *priv = ATOM_GENERATOR_GET_PRIVATE (atom_generator); switch (property_id) @@ -247,7 +220,6 @@ static void atom_generator_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomGenerator *atom_generator = ATOM_GENERATOR (object); - AtomGeneratorPrivate *priv = ATOM_GENERATOR_GET_PRIVATE (atom_generator); switch (property_id) diff --git a/src/atomid.c b/src/atomid.c index 1dcbfff..f9e8169 100644 --- a/src/atomid.c +++ b/src/atomid.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomid.h" @@ -47,33 +47,7 @@ struct _AtomIDPrivate gchar *uri; }; -GType -atom_id_get_type (void) -{ - static GType atom_id_type = 0; - - if (!atom_id_type) - { - static const GTypeInfo atom_id_info = - { - sizeof (AtomIDClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_id_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomID), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_id_init, - NULL - }; - - atom_id_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomID", - &atom_id_info, 0); - } - - return atom_id_type; -} +G_DEFINE_TYPE (AtomID, atom_id, TYPE_ATOM_COMMON) static void atom_id_class_init (AtomIDClass *klass) @@ -165,7 +139,6 @@ static void atom_id_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomID *atom_id = ATOM_ID (object); - AtomIDPrivate *priv = ATOM_ID_GET_PRIVATE (atom_id); switch (property_id) @@ -195,7 +168,6 @@ static void atom_id_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomID *atom_id = ATOM_ID (object); - AtomIDPrivate *priv = ATOM_ID_GET_PRIVATE (atom_id); switch (property_id) diff --git a/src/atomlink.c b/src/atomlink.c index 3b37482..3789a49 100644 --- a/src/atomlink.c +++ b/src/atomlink.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomlink.h" @@ -49,41 +49,15 @@ static void atom_link_get_property (GObject *object, typedef struct _AtomLinkPrivate AtomLinkPrivate; struct _AtomLinkPrivate { - gchar *href, - *rel, - *type, - *hreflang, - *title, - *length; + gchar *href; + gchar *rel; + gchar *type; + gchar *hreflang; + gchar *title; + gchar *length; }; -GType -atom_link_get_type (void) -{ - static GType atom_link_type = 0; - - if (!atom_link_type) - { - static const GTypeInfo atom_link_info = - { - sizeof (AtomLinkClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_link_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomLink), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_link_init, - NULL - }; - - atom_link_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomLink", - &atom_link_info, 0); - } - - return atom_link_type; -} +G_DEFINE_TYPE (AtomLink, atom_link, TYPE_ATOM_COMMON) static void atom_link_class_init (AtomLinkClass *klass) @@ -275,7 +249,6 @@ static void atom_link_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomLink *atom_link = ATOM_LINK (object); - AtomLinkPrivate *priv = ATOM_LINK_GET_PRIVATE (atom_link); switch (property_id) @@ -324,7 +297,6 @@ static void atom_link_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomLink *atom_link = ATOM_LINK (object); - AtomLinkPrivate *priv = ATOM_LINK_GET_PRIVATE (atom_link); switch (property_id) diff --git a/src/atomperson.c b/src/atomperson.c index 26529f2..3e2c894 100644 --- a/src/atomperson.c +++ b/src/atomperson.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include @@ -48,38 +48,12 @@ static void atom_person_get_property (GObject *object, typedef struct _AtomPersonPrivate AtomPersonPrivate; struct _AtomPersonPrivate { - gchar *name, - *uri, - *email; + gchar *name; + gchar *uri; + gchar *email; }; -GType -atom_person_get_type (void) -{ - static GType atom_person_type = 0; - - if (!atom_person_type) - { - static const GTypeInfo atom_person_info = - { - sizeof (AtomPersonClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_person_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomPerson), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_person_init, - NULL - }; - - atom_person_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomPerson", - &atom_person_info, 0); - } - - return atom_person_type; -} +G_DEFINE_TYPE (AtomPerson, atom_person, TYPE_ATOM_COMMON) static void atom_person_class_init (AtomPersonClass *klass) @@ -235,7 +209,6 @@ static void atom_person_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomPerson *atom_person = ATOM_PERSON (object); - AtomPersonPrivate *priv = ATOM_PERSON_GET_PRIVATE (atom_person); switch (property_id) @@ -272,7 +245,6 @@ static void atom_person_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomPerson *atom_person = ATOM_PERSON (object); - AtomPersonPrivate *priv = ATOM_PERSON_GET_PRIVATE (atom_person); switch (property_id) diff --git a/src/atomsource.c b/src/atomsource.c index 9cd1e45..43da39b 100644 --- a/src/atomsource.c +++ b/src/atomsource.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include "atomsource.h" @@ -59,47 +59,21 @@ static void atom_source_get_property (GObject *object, typedef struct _AtomSourcePrivate AtomSourcePrivate; struct _AtomSourcePrivate { - GList *author, - *category, - *contributor; + GList *author; + GList *category; + GList *contributor; AtomGenerator *generator; - AtomID *icon, - *id, - *logo; + AtomID *icon; + AtomID *id; + AtomID *logo; AtomLink *link; - AtomText *title, - *rights, - *subtitle; + AtomText *title; + AtomText *rights; + AtomText *subtitle; AtomDate *updated; }; -GType -atom_source_get_type (void) -{ - static GType atom_source_type = 0; - - if (!atom_source_type) - { - static const GTypeInfo atom_source_info = - { - sizeof (AtomSourceClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_source_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomSource), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_source_init, - NULL - }; - - atom_source_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomSource", - &atom_source_info, 0); - } - - return atom_source_type; -} +G_DEFINE_TYPE (AtomSource, atom_source, TYPE_ATOM_COMMON) static void atom_source_class_init (AtomSourceClass *klass) @@ -431,7 +405,6 @@ atom_source_set_property (GObject *object, guint property_id, const GValue *valu GObject *obj; AtomSource *atome = ATOM_SOURCE (object); - AtomSourcePrivate *priv = ATOM_SOURCE_GET_PRIVATE (atome); switch (property_id) @@ -530,7 +503,6 @@ static void atom_source_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomSource *atome = ATOM_SOURCE (object); - AtomSourcePrivate *priv = ATOM_SOURCE_GET_PRIVATE (atome); switch (property_id) diff --git a/src/atomtext.c b/src/atomtext.c index 79387ca..dc721ac 100644 --- a/src/atomtext.c +++ b/src/atomtext.c @@ -1,6 +1,6 @@ /* libgfeed * - * Copyright (C) 2005-2006 Andrea Zagli + * Copyright (C) 2005-2012 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * Andrea Zagli + * Andrea Zagli */ #include @@ -51,33 +51,7 @@ struct _AtomTextPrivate gchar *text; }; -GType -atom_text_get_type (void) -{ - static GType atom_text_type = 0; - - if (!atom_text_type) - { - static const GTypeInfo atom_text_info = - { - sizeof (AtomTextClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) atom_text_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (AtomText), - 0, /* n_preallocs */ - (GInstanceInitFunc) atom_text_init, - NULL - }; - - atom_text_type = g_type_register_static (TYPE_ATOM_COMMON, "AtomText", - &atom_text_info, 0); - } - - return atom_text_type; -} +G_DEFINE_TYPE (AtomText, atom_text, TYPE_ATOM_COMMON) static void atom_text_class_init (AtomTextClass *klass) @@ -244,7 +218,6 @@ static void atom_text_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { AtomText *atom_text = ATOM_TEXT (object); - AtomTextPrivate *priv = ATOM_TEXT_GET_PRIVATE (atom_text); switch (property_id) @@ -267,7 +240,6 @@ static void atom_text_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { AtomText *atom_text = ATOM_TEXT (object); - AtomTextPrivate *priv = ATOM_TEXT_GET_PRIVATE (atom_text); switch (property_id) -- 2.49.0