diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-11 00:29:58 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-24 14:18:01 +0100 |
| commit | 32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d (patch) | |
| tree | 3caf429cb269a3046af9512dbd7b9bee94381e6a /gio/ginetaddressmask.c | |
| parent | aba80eea6c2965ee253a675610bd31c3dc256419 (diff) | |
| download | glib-32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d.tar.gz | |
gio: Use the new private instance data declaration
Use the newly added macros, and remove the explicit calls to
g_type_class_add_private().
https://bugzilla.gnome.org/show_bug.cgi?id=700035
Diffstat (limited to 'gio/ginetaddressmask.c')
| -rw-r--r-- | gio/ginetaddressmask.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gio/ginetaddressmask.c b/gio/ginetaddressmask.c index 560f47cf9..0e2404d8e 100644 --- a/gio/ginetaddressmask.c +++ b/gio/ginetaddressmask.c @@ -49,18 +49,19 @@ * Since: 2.32 */ -static void g_inet_address_mask_initable_iface_init (GInitableIface *iface); - -G_DEFINE_TYPE_WITH_CODE (GInetAddressMask, g_inet_address_mask, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, - g_inet_address_mask_initable_iface_init)); - struct _GInetAddressMaskPrivate { GInetAddress *addr; guint length; }; +static void g_inet_address_mask_initable_iface_init (GInitableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (GInetAddressMask, g_inet_address_mask, G_TYPE_OBJECT, + G_ADD_PRIVATE (GInetAddressMask) + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, + g_inet_address_mask_initable_iface_init)) + enum { PROP_0, @@ -138,8 +139,6 @@ g_inet_address_mask_class_init (GInetAddressMaskClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (GInetAddressMaskPrivate)); - gobject_class->set_property = g_inet_address_mask_set_property; gobject_class->get_property = g_inet_address_mask_get_property; gobject_class->dispose = g_inet_address_mask_dispose; @@ -238,9 +237,7 @@ g_inet_address_mask_initable_iface_init (GInitableIface *iface) static void g_inet_address_mask_init (GInetAddressMask *mask) { - mask->priv = G_TYPE_INSTANCE_GET_PRIVATE (mask, - G_TYPE_INET_ADDRESS_MASK, - GInetAddressMaskPrivate); + mask->priv = g_inet_address_mask_get_private (mask); } /** |