luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistently use param_spec_follow_override

Browse Source
This commit is contained in:
Matthias Clasen 2022-06-07 08:52:00 -04:00
parent 47c12389a0
commit df43536a68
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gobject/gobject.c
View File

@ -954,6 +954,14 @@ g_object_interface_install_property (gpointer g_iface,
(void) install_property_internal (iface_class->g_type, 0, pspec); (void) install_property_internal (iface_class->g_type, 0, pspec);
} }
/* Inlined version of g_param_spec_get_redirect_target(), for speed */
static inline void
param_spec_follow_override (GParamSpec **pspec)
{
if (((GTypeInstance *) (*pspec))->g_class->g_type == G_TYPE_PARAM_OVERRIDE)
*pspec = ((GParamSpecOverride *) (*pspec))->overridden;
}
/** /**
* g_object_class_find_property: * g_object_class_find_property:
* @oclass: a #GObjectClass * @oclass: a #GObjectClass
@ -975,8 +983,8 @@ g_object_class_find_property (GObjectClass *class,
pspec = find_pspec (class, property_name); pspec = find_pspec (class, property_name);
if (pspec && ((GTypeInstance *)pspec)->g_class->g_type == G_TYPE_PARAM_OVERRIDE) if (pspec)
pspec = ((GParamSpecOverride *)pspec)->overridden; param_spec_follow_override (&pspec);
return pspec; return pspec;
} }
@ -1432,14 +1440,6 @@ g_object_freeze_notify (GObject *object)
g_object_unref (object); g_object_unref (object);
} }
/* Inlined version of g_param_spec_get_redirect_target(), for speed */
static inline void
param_spec_follow_override (GParamSpec **pspec)
{
if (((GTypeInstance *) (*pspec))->g_class->g_type == G_TYPE_PARAM_OVERRIDE)
*pspec = ((GParamSpecOverride *) (*pspec))->overridden;
}
static inline void static inline void
g_object_notify_by_spec_internal (GObject *object, g_object_notify_by_spec_internal (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)