list: Update GObject boilerplate

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>

1 files changed, 5 insertions, 31 deletions

diff --git a/osinfo/osinfo_list.h b/osinfo/osinfo_list.h
index 4955066..07731f0 100644
--- a/osinfo/osinfo_list.h
+++ b/osinfo/osinfo_list.h
@@ -27,44 +27,16 @@
 
 # include <osinfo/osinfo_filter.h>
 
-/*
- * Type macros.
- */
-# define OSINFO_TYPE_LIST                  (osinfo_list_get_type ())
-# define OSINFO_LIST(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), OSINFO_TYPE_LIST, OsinfoList))
-# define OSINFO_IS_LIST(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OSINFO_TYPE_LIST))
-# define OSINFO_LIST_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), OSINFO_TYPE_LIST, OsinfoListClass))
-# define OSINFO_IS_LIST_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), OSINFO_TYPE_LIST))
-# define OSINFO_LIST_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), OSINFO_TYPE_LIST, OsinfoListClass))
-
-typedef struct _OsinfoList       OsinfoList;
-
-typedef struct _OsinfoListClass   OsinfoListClass;
-
-typedef struct _OsinfoListPrivate OsinfoListPrivate;
-
-/* object */
-struct _OsinfoList
-{
-    GObject parent_instance;
-
-    /* public */
+G_BEGIN_DECLS
 
-    /* private */
-    OsinfoListPrivate *priv;
-};
+# define OSINFO_TYPE_LIST (osinfo_list_get_type ())
+G_DECLARE_DERIVABLE_TYPE(OsinfoList, osinfo_list, OSINFO, LIST, GObject)
 
-/* class */
 struct _OsinfoListClass
 {
-    /*< private >*/
     GObjectClass parent_class;
-
-    /* class members */
 };
 
-GType osinfo_list_get_type(void);
-
 GType osinfo_list_get_element_type(OsinfoList *list);
 gint osinfo_list_get_length(OsinfoList *list);
 OsinfoEntity *osinfo_list_get_nth(OsinfoList *list, gint idx);
@@ -83,4 +55,6 @@ OsinfoList *osinfo_list_new_filtered(OsinfoList *source, OsinfoFilter *filter);
 OsinfoList *osinfo_list_new_intersection(OsinfoList *sourceOne, OsinfoList *sourceTwo);
 OsinfoList *osinfo_list_new_union(OsinfoList *sourceOne, OsinfoList *sourceTwo);
 
+G_END_DECLS
+
 #endif /* __OSINFO_LIST_H__ */