app, libgimp*, modules: don't use g_type_class_add_private() ...
... and G_TYPE_INSTANCE_GET_PRIVATE() g_type_class_add_private() and G_TYPE_INSTANCE_GET_PRIVATE() were deprecated in GLib 2.58. Instead, use G_DEFINE_[ABSTRACT_]TYPE_WITH_PRIVATE(), and G_ADD_PRIVATE[_DYNAMIC](), and the implictly-defined foo_get_instance_private() functions, all of which are available in the GLib versions we depend on. This commit only covers types registered using one of the G_DEFINE_FOO() macros (i.e., most types), but not types with a custom registration function, of which we still have a few -- GLib currently only provides a (non-deprecated) public API for adding a private struct using the G_DEFINE_FOO() macros. Note that this commit was 99% auto-generated (because I'm not *that* crazy :), so if there are any style mismatches... we'll have to live with them for now.
This commit is contained in:
@ -93,8 +93,7 @@ static gboolean gimp_canvas_item_real_hit (GimpCanvasItem *item
|
||||
gdouble y);
|
||||
|
||||
|
||||
G_DEFINE_TYPE (GimpCanvasItem, gimp_canvas_item,
|
||||
GIMP_TYPE_OBJECT)
|
||||
G_DEFINE_TYPE_WITH_PRIVATE (GimpCanvasItem, gimp_canvas_item, GIMP_TYPE_OBJECT)
|
||||
|
||||
#define parent_class gimp_canvas_item_parent_class
|
||||
|
||||
@ -155,8 +154,6 @@ gimp_canvas_item_class_init (GimpCanvasItemClass *klass)
|
||||
NULL, NULL,
|
||||
FALSE,
|
||||
GIMP_PARAM_READWRITE));
|
||||
|
||||
g_type_class_add_private (klass, sizeof (GimpCanvasItemPrivate));
|
||||
}
|
||||
|
||||
static void
|
||||
@ -164,9 +161,7 @@ gimp_canvas_item_init (GimpCanvasItem *item)
|
||||
{
|
||||
GimpCanvasItemPrivate *private;
|
||||
|
||||
item->private = G_TYPE_INSTANCE_GET_PRIVATE (item,
|
||||
GIMP_TYPE_CANVAS_ITEM,
|
||||
GimpCanvasItemPrivate);
|
||||
item->private = gimp_canvas_item_get_instance_private (item);
|
||||
private = item->private;
|
||||
|
||||
private->shell = NULL;
|
||||
|
Reference in New Issue
Block a user