unit: avoid deprecated 'g_type_class_add_private'

sc0w · sc0w · commit e8ddb38f2b72 · 2019-01-30T20:17:24.000+01:00
diff --git a/src/unit.c b/src/unit.c
@@ -27,7 +27,7 @@ struct UnitPrivate
     MpSerializer *serializer;
 };
 
-G_DEFINE_TYPE (Unit, unit, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (Unit, unit, G_TYPE_OBJECT);
 
 
 Unit *
@@ -199,14 +199,13 @@ unit_format(Unit *unit, MPNumber *x)
 static void
 unit_class_init(UnitClass *klass)
 {
-    g_type_class_add_private(klass, sizeof(UnitPrivate));
 }
 
 
 static void
 unit_init(Unit *unit)
 {
-    unit->priv = G_TYPE_INSTANCE_GET_PRIVATE(unit, unit_get_type(), UnitPrivate);
+    unit->priv = unit_get_instance_private (unit);
     unit->priv->serializer = mp_serializer_new(MP_DISPLAY_FORMAT_AUTOMATIC, 10, 2);
     mp_serializer_set_leading_digits(unit->priv->serializer, 6);
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ struct UnitPrivate`
`27`	`27`	`MpSerializer *serializer;`
`28`	`28`	`};`
`29`	`29`
`30`		`-G_DEFINE_TYPE (Unit, unit, G_TYPE_OBJECT);`
	`30`	`+G_DEFINE_TYPE_WITH_PRIVATE (Unit, unit, G_TYPE_OBJECT);`
`31`	`31`
`32`	`32`
`33`	`33`	`Unit *`
`@@ -199,14 +199,13 @@ unit_format(Unit unit, MPNumber x)`
`199`	`199`	`static void`
`200`	`200`	`unit_class_init(UnitClass *klass)`
`201`	`201`	`{`
`202`		`- g_type_class_add_private(klass, sizeof(UnitPrivate));`
`203`	`202`	`}`
`204`	`203`
`205`	`204`
`206`	`205`	`static void`
`207`	`206`	`unit_init(Unit *unit)`
`208`	`207`	`{`
`209`		`- unit->priv = G_TYPE_INSTANCE_GET_PRIVATE(unit, unit_get_type(), UnitPrivate);`
	`208`	`+ unit->priv = unit_get_instance_private (unit);`
`210`	`209`	`unit->priv->serializer = mp_serializer_new(MP_DISPLAY_FORMAT_AUTOMATIC, 10, 2);`
`211`	`210`	`mp_serializer_set_leading_digits(unit->priv->serializer, 6);`
`212`	`211`	`}`