From 7b3ff99a38961b3636dcdc7687f1fb2e9b7cc83f Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 25 Mar 2019 19:59:30 +0100
Subject: LpfManager: Use G_DEFINE_TYPE_WITH_PRIVATE and G_DECLARE_FINAL_TYPE

---
 libplanfahr/lpf-manager.c | 16 ++++++++--------
 libplanfahr/lpf-manager.h | 24 +-----------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/libplanfahr/lpf-manager.c b/libplanfahr/lpf-manager.c
index 3caa992..7faffe3 100644
--- a/libplanfahr/lpf-manager.c
+++ b/libplanfahr/lpf-manager.c
@@ -43,15 +43,16 @@
  */
 
 
-G_DEFINE_TYPE (LpfManager, lpf_manager, G_TYPE_OBJECT)
-#define GET_PRIVATE(o) \
-    (G_TYPE_INSTANCE_GET_PRIVATE ((o), LPF_TYPE_MANAGER, LpfManagerPrivate))
-
-typedef struct _LpfManagerPrivate LpfManagerPrivate;
-struct _LpfManagerPrivate {
+typedef struct _LpfManagerPrivate {
     GSList *active;    /* active providers */
-};
+} LpfManagerPrivate;
+
+typedef struct _LpfManager {
+  GObject parent;
+} LpfManager;
 
+G_DEFINE_TYPE_WITH_PRIVATE (LpfManager, lpf_manager, G_TYPE_OBJECT)
+#define GET_PRIVATE(o) lpf_manager_get_instance_private(o)
 
 GQuark
 lpf_manager_error_quark (void)
@@ -265,7 +266,6 @@ lpf_manager_class_init (LpfManagerClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     object_class->dispose = lpf_manager_dispose;
-    g_type_class_add_private (klass, sizeof (LpfManagerPrivate));
 }
 
 static void
diff --git a/libplanfahr/lpf-manager.h b/libplanfahr/lpf-manager.h
index 5fb1285..ffc1de3 100644
--- a/libplanfahr/lpf-manager.h
+++ b/libplanfahr/lpf-manager.h
@@ -53,31 +53,9 @@ typedef enum {
 
 #define LPF_TYPE_MANAGER lpf_manager_get_type()
 
-#define LPF_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), LPF_TYPE_MANAGER, LpfManager))
-
-#define LPF_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), LPF_TYPE_MANAGER, LpfManagerClass))
-
-#define LPF_IS_MANAGER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LPF_TYPE_MANAGER))
-
-#define LPF_IS_MANAGER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), LPF_TYPE_MANAGER))
-
-#define LPF_MANAGER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), LPF_TYPE_MANAGER, LpfManagerClass))
-
-typedef struct {
-  GObject parent;
-} LpfManager;
-
-typedef struct {
-  GObjectClass parent_class;
-} LpfManagerClass;
+G_DECLARE_FINAL_TYPE (LpfManager, lpf_manager, LPF, MANAGER, GObject)
 
 LpfManager *lpf_manager_new (void);
-GType lpf_manager_get_type (void);
 GQuark lpf_manager_error_quark (void);
 GStrv lpf_manager_get_available_providers(void);
 LpfProvider* lpf_manager_activate_provider(LpfManager *self,
-- 
cgit v1.2.3