diff options
| author | Bastien Nocera <hadess@hadess.net> | 2019-04-29 15:04:00 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2019-04-29 15:04:43 +0200 |
| commit | 6b656c9cf1929474587bf65269b9840c47908e06 (patch) | |
| tree | b1bc523304e1524dc7be16f585b3ef226c0a9557 | |
| parent | 576d5aea5d06bec97abd01e049fce1997d3295db (diff) | |
| download | libgudev-6b656c9cf1929474587bf65269b9840c47908e06.tar.gz | |
gudev: Remove use of deprecated g_type_class_add_private()
And replace with the G_ADD_PRIVATE() as available in glib 2.38.
Closes: #2
| -rw-r--r-- | gudev/gudevclient.c | 8 | ||||
| -rw-r--r-- | gudev/gudevdevice.c | 8 | ||||
| -rw-r--r-- | gudev/gudevenumerator.c | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/gudev/gudevclient.c b/gudev/gudevclient.c index 8c204c3..da95f8d 100644 --- a/gudev/gudevclient.c +++ b/gudev/gudevclient.c @@ -79,7 +79,7 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GUdevClient, g_udev_client, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_CODE (GUdevClient, g_udev_client, G_TYPE_OBJECT, G_ADD_PRIVATE(GUdevClient)) /* ---------------------------------------------------------------------------------------------------- */ @@ -309,16 +309,12 @@ g_udev_client_class_init (GUdevClientClass *klass) 2, G_TYPE_STRING, G_UDEV_TYPE_DEVICE); - - g_type_class_add_private (klass, sizeof (GUdevClientPrivate)); } static void g_udev_client_init (GUdevClient *client) { - client->priv = G_TYPE_INSTANCE_GET_PRIVATE (client, - G_UDEV_TYPE_CLIENT, - GUdevClientPrivate); + client->priv = g_udev_client_get_instance_private (client); } /** diff --git a/gudev/gudevdevice.c b/gudev/gudevdevice.c index 28b229b..7838cec 100644 --- a/gudev/gudevdevice.c +++ b/gudev/gudevdevice.c @@ -93,7 +93,7 @@ struct _GUdevDevicePrivate GHashTable *sysfs_attr_strvs; }; -G_DEFINE_TYPE (GUdevDevice, g_udev_device, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_CODE (GUdevDevice, g_udev_device, G_TYPE_OBJECT, G_ADD_PRIVATE(GUdevDevice)) static void g_udev_device_finalize (GObject *object) @@ -124,16 +124,12 @@ g_udev_device_class_init (GUdevDeviceClass *klass) GObjectClass *gobject_class = (GObjectClass *) klass; gobject_class->finalize = g_udev_device_finalize; - - g_type_class_add_private (klass, sizeof (GUdevDevicePrivate)); } static void g_udev_device_init (GUdevDevice *device) { - device->priv = G_TYPE_INSTANCE_GET_PRIVATE (device, - G_UDEV_TYPE_DEVICE, - GUdevDevicePrivate); + device->priv = g_udev_device_get_instance_private (device); } diff --git a/gudev/gudevenumerator.c b/gudev/gudevenumerator.c index 1c70049..fb27f86 100644 --- a/gudev/gudevenumerator.c +++ b/gudev/gudevenumerator.c @@ -50,7 +50,7 @@ enum PROP_CLIENT, }; -G_DEFINE_TYPE (GUdevEnumerator, g_udev_enumerator, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_CODE (GUdevEnumerator, g_udev_enumerator, G_TYPE_OBJECT, G_ADD_PRIVATE(GUdevEnumerator)) /* ---------------------------------------------------------------------------------------------------- */ @@ -155,16 +155,12 @@ g_udev_enumerator_class_init (GUdevEnumeratorClass *klass) G_UDEV_TYPE_CLIENT, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); - - g_type_class_add_private (klass, sizeof (GUdevEnumeratorPrivate)); } static void g_udev_enumerator_init (GUdevEnumerator *enumerator) { - enumerator->priv = G_TYPE_INSTANCE_GET_PRIVATE (enumerator, - G_UDEV_TYPE_ENUMERATOR, - GUdevEnumeratorPrivate); + enumerator->priv = g_udev_enumerator_get_instance_private (enumerator); } /** |