[gcr/wip/nielsdg/g-add-private: 1/3] gck: g_type_class_add_private() is deprecated

[Niels De Graef <nielsdg src gnome org>]

commit f5966efc51c8524c430ab6cea1d2920368969558
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri May 24 00:02:25 2019 +0200

    gck: g_type_class_add_private() is deprecated
    
    Use `G_ADD_PRIVATE()` (or the convenience macro
    `G_DEFINE_TYPE_WITH_PRIVATE()`) instead.

 gck/gck-enumerator.c | 6 ++----
 gck/gck-module.c     | 6 ++----
 gck/gck-object.c     | 6 ++----
 gck/gck-password.c   | 6 ++----
 gck/gck-session.c    | 5 ++---
 gck/gck-slot.c       | 6 ++----
 6 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/gck/gck-enumerator.c b/gck/gck-enumerator.c
index 3121aff..3921822 100644
--- a/gck/gck-enumerator.c
+++ b/gck/gck-enumerator.c
@@ -115,7 +115,7 @@ struct _GckEnumeratorPrivate {
        GckEnumerator *chained;
 };
 
-G_DEFINE_TYPE (GckEnumerator, gck_enumerator, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GckEnumerator, gck_enumerator, G_TYPE_OBJECT);
 
 static gpointer state_modules        (GckEnumeratorState *args,
                                       gboolean forward);
@@ -560,7 +560,7 @@ state_results (GckEnumeratorState *args,
 static void
 gck_enumerator_init (GckEnumerator *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_ENUMERATOR, GckEnumeratorPrivate);
+       self->pv = gck_enumerator_get_instance_private (self);
        self->pv->mutex = g_new0 (GMutex, 1);
        g_mutex_init (self->pv->mutex);
        self->pv->the_state = g_new0 (GckEnumeratorState, 1);
@@ -657,8 +657,6 @@ gck_enumerator_class_init (GckEnumeratorClass *klass)
        gobject_class->dispose = gck_enumerator_dispose;
        gobject_class->finalize = gck_enumerator_finalize;
 
-       g_type_class_add_private (klass, sizeof (GckEnumeratorPrivate));
-
        /**
         * GckEnumerator:interaction:
         *
diff --git a/gck/gck-module.c b/gck/gck-module.c
index 2c63bd6..f50200b 100644
--- a/gck/gck-module.c
+++ b/gck/gck-module.c
@@ -100,7 +100,7 @@ struct _GckModulePrivate {
        gint finalized;
 };
 
-G_DEFINE_TYPE (GckModule, gck_module, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GckModule, gck_module, G_TYPE_OBJECT);
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
@@ -123,7 +123,7 @@ gck_module_real_authenticate_object (GckModule *module, GckObject *object, gchar
 static void
 gck_module_init (GckModule *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_MODULE, GckModulePrivate);
+       self->pv = gck_module_get_instance_private (self);
 }
 
 static void
@@ -269,8 +269,6 @@ gck_module_class_init (GckModuleClass *klass)
                        G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GckModuleClass, authenticate_object),
                        g_signal_accumulator_true_handled, NULL, _gck_marshal_BOOLEAN__OBJECT_STRING_POINTER,
                        G_TYPE_BOOLEAN, 3, GCK_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_POINTER);
-
-       g_type_class_add_private (gobject_class, sizeof (GckModulePrivate));
 }
 
 GType
diff --git a/gck/gck-object.c b/gck/gck-object.c
index cc7753e..b202cd1 100644
--- a/gck/gck-object.c
+++ b/gck/gck-object.c
@@ -74,7 +74,7 @@ struct _GckObjectPrivate {
        CK_OBJECT_HANDLE handle;
 };
 
-G_DEFINE_TYPE (GckObject, gck_object, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GckObject, gck_object, G_TYPE_OBJECT);
 
 /* ----------------------------------------------------------------------------
  * OBJECT
@@ -83,7 +83,7 @@ G_DEFINE_TYPE (GckObject, gck_object, G_TYPE_OBJECT);
 static void
 gck_object_init (GckObject *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_OBJECT, GckObjectPrivate);
+       self->pv = gck_object_get_instance_private (self);
 }
 
 static void
@@ -192,8 +192,6 @@ gck_object_class_init (GckObjectClass *klass)
        g_object_class_install_property (gobject_class, PROP_SESSION,
                g_param_spec_object ("session", "session", "PKCS11 Session to make calls on",
                                     GCK_TYPE_SESSION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-       g_type_class_add_private (klass, sizeof (GckObjectPrivate));
 }
 
 /* ----------------------------------------------------------------------------
diff --git a/gck/gck-password.c b/gck/gck-password.c
index 90926c9..d97376f 100644
--- a/gck/gck-password.c
+++ b/gck/gck-password.c
@@ -64,12 +64,12 @@ struct _GckPasswordPrivate {
        gpointer token_or_key;
 };
 
-G_DEFINE_TYPE (GckPassword, gck_password, G_TYPE_TLS_PASSWORD);
+G_DEFINE_TYPE_WITH_PRIVATE (GckPassword, gck_password, G_TYPE_TLS_PASSWORD);
 
 static void
 gck_password_init (GckPassword *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_PASSWORD, GckPasswordPrivate);
+       self->pv = gck_password_get_instance_private (self);
 }
 
 static void
@@ -189,8 +189,6 @@ gck_password_class_init (GckPasswordClass *klass)
        g_object_class_install_property (gobject_class, PROP_KEY,
                g_param_spec_object ("key", "Object", "PKCS11 Key Object",
                                     GCK_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-       g_type_class_add_private (gobject_class, sizeof (GckPasswordPrivate));
 }
 
 /**
diff --git a/gck/gck-session.c b/gck/gck-session.c
index 05a1386..433498c 100644
--- a/gck/gck-session.c
+++ b/gck/gck-session.c
@@ -100,6 +100,7 @@ static void    gck_session_initable_iface        (GInitableIface *iface);
 static void    gck_session_async_initable_iface  (GAsyncInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GckSession, gck_session, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GckSession);
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gck_session_initable_iface);
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, gck_session_async_initable_iface);
 );
@@ -138,7 +139,7 @@ gck_session_real_discard_handle (GckSession *self, CK_OBJECT_HANDLE handle)
 static void
 gck_session_init (GckSession *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_SESSION, GckSessionPrivate);
+       self->pv = gck_session_get_instance_private (self);
        self->pv->mutex = g_new0 (GMutex, 1);
        g_mutex_init (self->pv->mutex);
 }
@@ -361,8 +362,6 @@ gck_session_class_init (GckSessionClass *klass)
                        G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GckSessionClass, discard_handle),
                        g_signal_accumulator_true_handled, NULL,
                        _gck_marshal_BOOLEAN__ULONG, G_TYPE_BOOLEAN, 1, G_TYPE_ULONG);
-
-       g_type_class_add_private (klass, sizeof (GckSessionPrivate));
 }
 
 typedef struct OpenSession {
diff --git a/gck/gck-slot.c b/gck/gck-slot.c
index 7218d0e..6eb2a16 100644
--- a/gck/gck-slot.c
+++ b/gck/gck-slot.c
@@ -55,7 +55,7 @@ struct _GckSlotPrivate {
        CK_SLOT_ID handle;
 };
 
-G_DEFINE_TYPE (GckSlot, gck_slot, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GckSlot, gck_slot, G_TYPE_OBJECT);
 
 /* ----------------------------------------------------------------------------
  * OBJECT
@@ -64,7 +64,7 @@ G_DEFINE_TYPE (GckSlot, gck_slot, G_TYPE_OBJECT);
 static void
 gck_slot_init (GckSlot *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCK_TYPE_SLOT, GckSlotPrivate);
+       self->pv = gck_slot_get_instance_private (self);
 }
 
 static void
@@ -148,8 +148,6 @@ gck_slot_class_init (GckSlotClass *klass)
        g_object_class_install_property (gobject_class, PROP_HANDLE,
                g_param_spec_ulong ("handle", "Handle", "PKCS11 Slot ID",
                                   0, G_MAXULONG, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-       g_type_class_add_private (gobject_class, sizeof (GckSlotPrivate));
 }
 
 /* ----------------------------------------------------------------------------