luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 02:32:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move deprecation warnings to object_set_property

Browse Source 
A small reorg that reduces the code and matches
what we do for object_get_property.
This commit is contained in:
Matthias Clasen 2022-05-14 23:26:58 -04:00
parent 27f0fdd18f
commit 4b7ce7db09
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gobject/gobject.c
View File

@ -1590,6 +1590,8 @@ object_set_property (GObject *object,
if (redirect) if (redirect)
pspec = redirect; pspec = redirect;
consider_issuing_property_deprecation_warning (pspec);
pclass = G_PARAM_SPEC_GET_CLASS (pspec); pclass = G_PARAM_SPEC_GET_CLASS (pspec);
if (g_value_type_compatible (G_VALUE_TYPE (value), pspec->value_type) && if (g_value_type_compatible (G_VALUE_TYPE (value), pspec->value_type) &&
(pclass->value_validate == NULL || (pclass->value_validate == NULL ||
@ -2019,10 +2021,7 @@ g_object_new_with_custom_constructor (GObjectClass *class,
/* set remaining properties */ /* set remaining properties */
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
{ object_set_property (object, params[i].pspec, params[i].value, nqueue);
consider_issuing_property_deprecation_warning (params[i].pspec);
object_set_property (object, params[i].pspec, params[i].value, nqueue);
}
/* If nqueue is non-NULL then we are frozen. Thaw it. */ /* If nqueue is non-NULL then we are frozen. Thaw it. */
if (nqueue) if (nqueue)
@ -2070,7 +2069,6 @@ g_object_new_internal (GObjectClass *class,
for (j = 0; j < n_params; j++) for (j = 0; j < n_params; j++)
if (params[j].pspec == pspec) if (params[j].pspec == pspec)
{ {
consider_issuing_property_deprecation_warning (pspec);
value = params[j].value; value = params[j].value;
break; break;
} }
@ -2096,10 +2094,7 @@ g_object_new_internal (GObjectClass *class,
*/ */
for (i = 0; i < n_params; i++) for (i = 0; i < n_params; i++)
if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))) if (!(params[i].pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)))
{ object_set_property (object, params[i].pspec, params[i].value, nqueue);
consider_issuing_property_deprecation_warning (params[i].pspec);
object_set_property (object, params[i].pspec, params[i].value, nqueue);
}
g_object_notify_queue_thaw (object, nqueue); g_object_notify_queue_thaw (object, nqueue);
} }
@ -2517,7 +2512,6 @@ g_object_setv (GObject *object,
if (!g_object_set_is_valid_property (object, pspec, names[i])) if (!g_object_set_is_valid_property (object, pspec, names[i]))
break; break;
consider_issuing_property_deprecation_warning (pspec);
object_set_property (object, pspec, &values[i], nqueue); object_set_property (object, pspec, &values[i], nqueue);
} }
@ -2572,7 +2566,6 @@ g_object_set_valist (GObject *object,
break; break;
} }
consider_issuing_property_deprecation_warning (pspec);
object_set_property (object, pspec, &value, nqueue); object_set_property (object, pspec, &value, nqueue);
/* We open-code g_value_unset() here to avoid the /* We open-code g_value_unset() here to avoid the