callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app, libgimp*, modules: don't use g_type_class_add_private() ...

Browse Source 
... 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:
Ell
2018-09-18 12:09:39 -04:00
parent ee11477dc5
commit 31b369d09f
172 changed files with 485 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/display/gimptoolpolygon.c
View File

@ -192,7 +192,8 @@ static gint gimp_tool_polygon_get_segment_index (GimpToolPolygon *polygo
const GimpCoords *coords);
G_DEFINE_TYPE (GimpToolPolygon, gimp_tool_polygon, GIMP_TYPE_TOOL_WIDGET)
G_DEFINE_TYPE_WITH_PRIVATE (GimpToolPolygon, gimp_tool_polygon,
GIMP_TYPE_TOOL_WIDGET)
#define parent_class gimp_tool_polygon_parent_class
@ -221,16 +222,12 @@ gimp_tool_polygon_class_init (GimpToolPolygonClass *klass)
widget_class->motion_modifier = gimp_tool_polygon_motion_modifier;
widget_class->hover_modifier = gimp_tool_polygon_hover_modifier;
widget_class->get_cursor = gimp_tool_polygon_get_cursor;
g_type_class_add_private (klass, sizeof (GimpToolPolygonPrivate));
}
static void
gimp_tool_polygon_init (GimpToolPolygon *polygon)
{
polygon->private = G_TYPE_INSTANCE_GET_PRIVATE (polygon,
GIMP_TYPE_TOOL_POLYGON,
GimpToolPolygonPrivate);
polygon->private = gimp_tool_polygon_get_instance_private (polygon);
polygon->private->grabbed_segment_index = INVALID_INDEX;
polygon->private->last_click_time = NO_CLICK_TIME_AVAILABLE;