[libgit2-glib] Port GgitConfig to G_DECLARE_FINAL_TYPE macro



commit 61debd5dfa650df139cc020b845d6f2f9c82341f
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Jul 14 20:34:34 2015 +0200

    Port GgitConfig to G_DECLARE_FINAL_TYPE macro

 libgit2-glib/ggit-autocleanup.h |    1 -
 libgit2-glib/ggit-config.c      |   10 +++++++++-
 libgit2-glib/ggit-config.h      |   33 ++-------------------------------
 libgit2-glib/ggit-types.h       |    7 -------
 4 files changed, 11 insertions(+), 40 deletions(-)
---
diff --git a/libgit2-glib/ggit-autocleanup.h b/libgit2-glib/ggit-autocleanup.h
index 8a3d5ff..dbee71b 100644
--- a/libgit2-glib/ggit-autocleanup.h
+++ b/libgit2-glib/ggit-autocleanup.h
@@ -66,7 +66,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCherryPickOptions, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCloneOptions, ggit_clone_options_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCommit, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCommitParents, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitConfig, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitConfigEntry, ggit_config_entry_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCred, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCredPlaintext, g_object_unref)
diff --git a/libgit2-glib/ggit-config.c b/libgit2-glib/ggit-config.c
index 834ce69..a00b4e0 100644
--- a/libgit2-glib/ggit-config.c
+++ b/libgit2-glib/ggit-config.c
@@ -25,7 +25,15 @@
 
 #include "ggit-error.h"
 
-#define GGIT_CONFIG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GGIT_TYPE_CONFIG, 
GgitConfigPrivate))
+/**
+ * GgitConfig:
+ *
+ * Represents a git configuration.
+ */
+struct _GgitConfig
+{
+       GgitNative parent_instance;
+};
 
 G_DEFINE_TYPE (GgitConfig, ggit_config, GGIT_TYPE_NATIVE)
 
diff --git a/libgit2-glib/ggit-config.h b/libgit2-glib/ggit-config.h
index dde9f4b..1f825c9 100644
--- a/libgit2-glib/ggit-config.h
+++ b/libgit2-glib/ggit-config.h
@@ -30,37 +30,8 @@
 
 G_BEGIN_DECLS
 
-#define GGIT_TYPE_CONFIG               (ggit_config_get_type ())
-#define GGIT_CONFIG(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GGIT_TYPE_CONFIG, GgitConfig))
-#define GGIT_CONFIG_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GGIT_TYPE_CONFIG, GgitConfigClass))
-#define GGIT_IS_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GGIT_TYPE_CONFIG))
-#define GGIT_IS_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GGIT_TYPE_CONFIG))
-#define GGIT_CONFIG_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GGIT_TYPE_CONFIG, GgitConfigClass))
-
-typedef struct _GgitConfigClass                GgitConfigClass;
-
-struct _GgitConfig
-{
-       /*< private >*/
-       GgitNative parent;
-
-       /* priv padding */
-       gpointer priv;
-};
-
-/**
- * GgitConfigClass:
- * @parent_class: The parent class.
- *
- * The class structure for #GgitConfigClass.
- */
-struct _GgitConfigClass
-{
-       /*< private >*/
-       GgitNativeClass parent_class;
-};
-
-GType        ggit_config_get_type      (void) G_GNUC_CONST;
+#define GGIT_TYPE_CONFIG (ggit_config_get_type ())
+G_DECLARE_FINAL_TYPE (GgitConfig, ggit_config, GGIT, CONFIG, GgitNative)
 
 GgitConfig  *ggit_config_new           (void);
 
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index ab05af9..1486e79 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -61,13 +61,6 @@ typedef struct _GgitCommit GgitCommit;
 typedef struct _GgitCommitParents GgitCommitParents;
 
 /**
- * GgitConfig:
- *
- * Represents a git configuration.
- */
-typedef struct _GgitConfig GgitConfig;
-
-/**
  * GgitConfigEntry:
  *
  * Represents a git configuration entry.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]