[libgit2-glib] Port GgitObjectFactoryBase to G_DECLARE_DERIVABLE macro

[Ignacio Casal Quinteiro <icq src gnome org>]

commit c8cbec787bfa0cd2e2b205d6a92888f542febf79
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Jul 14 12:42:46 2015 +0200

    Port GgitObjectFactoryBase to G_DECLARE_DERIVABLE macro

 libgit2-glib/ggit-autocleanup.h         |    1 -
 libgit2-glib/ggit-object-factory-base.c |    6 ++++++
 libgit2-glib/ggit-object-factory-base.h |   18 ++----------------
 libgit2-glib/ggit-types.h               |    7 -------
 4 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/libgit2-glib/ggit-autocleanup.h b/libgit2-glib/ggit-autocleanup.h
index 31e6712..3670250 100644
--- a/libgit2-glib/ggit-autocleanup.h
+++ b/libgit2-glib/ggit-autocleanup.h
@@ -93,7 +93,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitIndex, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitMergeOptions, ggit_merge_options_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitNative, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitNote, ggit_note_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitObjectFactoryBase, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitObject, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitOId, ggit_oid_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitPatch, ggit_patch_unref)
diff --git a/libgit2-glib/ggit-object-factory-base.c b/libgit2-glib/ggit-object-factory-base.c
index 15368c1..04780d7 100644
--- a/libgit2-glib/ggit-object-factory-base.c
+++ b/libgit2-glib/ggit-object-factory-base.c
@@ -21,6 +21,12 @@
 #include "ggit-object-factory-base.h"
 #include "ggit-object-factory.h"
 
+/**
+ * GgitObjectFactoryBase:
+ *
+ * Represents the base type for objects created by an object factory.
+ */
+
 G_DEFINE_ABSTRACT_TYPE (GgitObjectFactoryBase, ggit_object_factory_base, G_TYPE_OBJECT)
 
 static GObject *
diff --git a/libgit2-glib/ggit-object-factory-base.h b/libgit2-glib/ggit-object-factory-base.h
index fb769d8..6202061 100644
--- a/libgit2-glib/ggit-object-factory-base.h
+++ b/libgit2-glib/ggit-object-factory-base.h
@@ -27,20 +27,8 @@
 
 G_BEGIN_DECLS
 
-#define GGIT_TYPE_OBJECT_FACTORY_BASE                  (ggit_object_factory_base_get_type ())
-#define GGIT_OBJECT_FACTORY_BASE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GGIT_TYPE_OBJECT_FACTORY_BASE, GgitObjectFactoryBase))
-#define GGIT_OBJECT_FACTORY_BASE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), 
GGIT_TYPE_OBJECT_FACTORY_BASE, GgitObjectFactoryBaseClass))
-#define GGIT_IS_OBJECT_FACTORY_BASE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GGIT_TYPE_OBJECT_FACTORY_BASE))
-#define GGIT_IS_OBJECT_FACTORY_BASE_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GGIT_TYPE_OBJECT_FACTORY_BASE))
-#define GGIT_OBJECT_FACTORY_BASE_GET_CLASS(obj)                (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GGIT_TYPE_OBJECT_FACTORY_BASE, GgitObjectFactoryBaseClass))
-
-typedef struct _GgitObjectFactoryBaseClass     GgitObjectFactoryBaseClass;
-
-struct _GgitObjectFactoryBase
-{
-       /*< private >*/
-       GObject parent;
-};
+#define GGIT_TYPE_OBJECT_FACTORY_BASE (ggit_object_factory_base_get_type ())
+G_DECLARE_DERIVABLE_TYPE (GgitObjectFactoryBase, ggit_object_factory_base, GGIT, OBJECT_FACTORY_BASE, 
GObject)
 
 /**
  * GgitObjectFactoryBaseClass:
@@ -54,8 +42,6 @@ struct _GgitObjectFactoryBaseClass
        GObjectClass parent_class;
 };
 
-GType ggit_object_factory_base_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif /* __GGIT_OBJECT_FACTORY_BASE_H__ */
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index 189e646..6538c45 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -278,13 +278,6 @@ typedef struct _GgitNote GgitNote;
 typedef struct _GgitObject GgitObject;
 
 /**
- * GgitObjectFactoryBase:
- *
- * Represents the base type for objects created by an object factory.
- */
-typedef struct _GgitObjectFactoryBase GgitObjectFactoryBase;
-
-/**
  * GgitOId:
  *
  * Represents a unique ID of any object.