Use OSINFO_DECLARE_TYPE* macros

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

1 files changed, 8 insertions, 37 deletions

diff --git a/osinfo/osinfo_loader.h b/osinfo/osinfo_loader.h
index 28f3404..e2f2171 100644
--- a/osinfo/osinfo_loader.h
+++ b/osinfo/osinfo_loader.h
@@ -24,43 +24,14 @@
 #ifndef __OSINFO_LOADER_H__
 # define __OSINFO_LOADER_H__
 
-/*
- * Type macros.
- */
-# define OSINFO_TYPE_LOADER                  (osinfo_loader_get_type ())
-# define OSINFO_LOADER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), OSINFO_TYPE_LOADER, OsinfoLoader))
-# define OSINFO_IS_LOADER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OSINFO_TYPE_LOADER))
-# define OSINFO_LOADER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), OSINFO_TYPE_LOADER, OsinfoLoaderClass))
-# define OSINFO_IS_LOADER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), OSINFO_TYPE_LOADER))
-# define OSINFO_LOADER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), OSINFO_TYPE_LOADER, OsinfoLoaderClass))
-
-typedef struct _OsinfoLoader        OsinfoLoader;
-
-typedef struct _OsinfoLoaderClass   OsinfoLoaderClass;
-
-typedef struct _OsinfoLoaderPrivate OsinfoLoaderPrivate;
-
-/* object */
-struct _OsinfoLoader
-{
-    GObject parent_instance;
-
-    /* public */
-
-    /* private */
-    OsinfoLoaderPrivate *priv;
-};
-
-/* class */
-struct _OsinfoLoaderClass
-{
-    /*< private >*/
-    GObjectClass parent_class;
-
-    /* class members */
-};
-
-GType osinfo_loader_get_type(void);
+# include "osinfo/osinfo_macros.h"
+
+# define OSINFO_TYPE_LOADER (osinfo_loader_get_type ())
+OSINFO_DECLARE_TYPE_WITH_PRIVATE_AND_CLASS(OsinfoLoader,
+                                           osinfo_loader,
+                                           OSINFO,
+                                           LOADER,
+                                           GObject)
 
 /**
  * OsinfoError: