plugin-loader: modernize type definition

1 files changed, 6 insertions, 14 deletions

diff --git a/libpeas/peas-plugin-loader.h b/libpeas/peas-plugin-loader.h
index a61842c..e5f41a8 100644
--- a/libpeas/peas-plugin-loader.h
+++ b/libpeas/peas-plugin-loader.h
@@ -25,23 +25,14 @@
 
 #include <glib-object.h>
 #include <gmodule.h>
+
 #include "peas-plugin-info.h"
 
 G_BEGIN_DECLS
 
-#define PEAS_TYPE_PLUGIN_LOADER                (peas_plugin_loader_get_type ())
-#define PEAS_PLUGIN_LOADER(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), PEAS_TYPE_PLUGIN_LOADER, PeasPluginLoader))
-#define PEAS_PLUGIN_LOADER_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass), PEAS_TYPE_PLUGIN_LOADER, PeasPluginLoaderClass))
-#define PEAS_IS_PLUGIN_LOADER(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PEAS_TYPE_PLUGIN_LOADER))
-#define PEAS_IS_PLUGIN_LOADER_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), PEAS_TYPE_PLUGIN_LOADER))
-#define PEAS_PLUGIN_LOADER_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), PEAS_TYPE_PLUGIN_LOADER, PeasPluginLoaderClass))
-
-typedef struct _PeasPluginLoader      PeasPluginLoader;
-typedef struct _PeasPluginLoaderClass PeasPluginLoaderClass;
+#define PEAS_TYPE_PLUGIN_LOADER (peas_plugin_loader_get_type())
 
-struct _PeasPluginLoader {
-  GObject parent;
-};
+G_DECLARE_DERIVABLE_TYPE (PeasPluginLoader, peas_plugin_loader, PEAS, PLUGIN_LOADER, GObject)
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 struct _PeasPluginLoaderClass {
@@ -62,12 +53,13 @@ struct _PeasPluginLoaderClass {
                                    guint             n_parameters,
                                    GParameter       *parameters);
   void      (*garbage_collect)    (PeasPluginLoader *loader);
+
+  /*< private >*/
+  gpointer _reserved[8];
 };
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 PEAS_AVAILABLE_IN_ALL
-GType     peas_plugin_loader_get_type           (void) G_GNUC_CONST;
-PEAS_AVAILABLE_IN_ALL
 gboolean  peas_plugin_loader_initialize         (PeasPluginLoader *loader);
 PEAS_AVAILABLE_IN_ALL
 gboolean  peas_plugin_loader_is_global          (PeasPluginLoader *loader);