diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/experiment-reader/experiment-reader.c | 32 | ||||
| -rw-r--r-- | lib/experiment-reader/experiment-reader.h | 1 |
2 files changed, 7 insertions, 26 deletions
diff --git a/lib/experiment-reader/experiment-reader.c b/lib/experiment-reader/experiment-reader.c index 739ee41..a97cf8a 100644 --- a/lib/experiment-reader/experiment-reader.c +++ b/lib/experiment-reader/experiment-reader.c @@ -38,31 +38,11 @@ struct _ExperimentReaderPrivate { xmlDoc *doc; }; -/** @private */ -GType -experiment_reader_get_type(void) -{ - static GType type = 0; - - if (!type) { - const GTypeInfo info = { - sizeof(ExperimentReaderClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)experiment_reader_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof(ExperimentReader), - 0, /* n_preallocs */ - (GInstanceInitFunc)experiment_reader_init, - }; - - type = g_type_register_static(G_TYPE_OBJECT, - "ExperimentReader", &info, 0); - } - - return type; -} +/** + * @private + * will create experiment_reader_get_type and set experiment_reader_parent_class + */ +G_DEFINE_TYPE(ExperimentReader, experiment_reader, G_TYPE_OBJECT); static void experiment_reader_class_init(ExperimentReaderClass *klass) @@ -92,7 +72,7 @@ experiment_reader_finalize(GObject *gobject) xmlFreeDoc(reader->priv->doc); /* Chain up to the parent class */ - //G_OBJECT_CLASS(experiment_reader_parent_class)->finalize(gobject); + G_OBJECT_CLASS(experiment_reader_parent_class)->finalize(gobject); } static gint64 diff --git a/lib/experiment-reader/experiment-reader.h b/lib/experiment-reader/experiment-reader.h index 99c5018..9eab878 100644 --- a/lib/experiment-reader/experiment-reader.h +++ b/lib/experiment-reader/experiment-reader.h @@ -48,6 +48,7 @@ typedef struct _ExperimentReaderClass { GObjectClass parent_class; /**< Parent class structure */ } ExperimentReaderClass; +/** @private */ GType experiment_reader_get_type(void); /* |