mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-24 03:02:10 +01:00
paramspec: Stop using g_type_class_ref/unref
These are just wrappers for g_type_class_get/nothing now.
This commit is contained in:
parent
5997f7cc83
commit
f1333c931e
@ -540,14 +540,7 @@ param_enum_init (GParamSpec *pspec)
|
|||||||
static void
|
static void
|
||||||
param_enum_finalize (GParamSpec *pspec)
|
param_enum_finalize (GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
GParamSpecEnum *espec = G_PARAM_SPEC_ENUM (pspec);
|
GParamSpecClass *parent_class = g_type_class_get (g_type_parent (G_TYPE_PARAM_ENUM));
|
||||||
GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_ENUM));
|
|
||||||
|
|
||||||
if (espec->enum_class)
|
|
||||||
{
|
|
||||||
g_type_class_unref (espec->enum_class);
|
|
||||||
espec->enum_class = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
parent_class->finalize (pspec);
|
parent_class->finalize (pspec);
|
||||||
}
|
}
|
||||||
@ -595,14 +588,7 @@ param_flags_init (GParamSpec *pspec)
|
|||||||
static void
|
static void
|
||||||
param_flags_finalize (GParamSpec *pspec)
|
param_flags_finalize (GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
GParamSpecFlags *fspec = G_PARAM_SPEC_FLAGS (pspec);
|
GParamSpecClass *parent_class = g_type_class_get (g_type_parent (G_TYPE_PARAM_FLAGS));
|
||||||
GParamSpecClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_PARAM_FLAGS));
|
|
||||||
|
|
||||||
if (fspec->flags_class)
|
|
||||||
{
|
|
||||||
g_type_class_unref (fspec->flags_class);
|
|
||||||
fspec->flags_class = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
parent_class->finalize (pspec);
|
parent_class->finalize (pspec);
|
||||||
}
|
}
|
||||||
@ -1389,9 +1375,8 @@ param_variant_values_cmp (GParamSpec *pspec,
|
|||||||
/* --- type initialization --- */
|
/* --- type initialization --- */
|
||||||
|
|
||||||
#define set_is_valid_vfunc(type,func) { \
|
#define set_is_valid_vfunc(type,func) { \
|
||||||
GParamSpecClass *class = g_type_class_ref (type); \
|
GParamSpecClass *class = g_type_class_get (type); \
|
||||||
class->value_is_valid = func; \
|
class->value_is_valid = func; \
|
||||||
g_type_class_unref (class); \
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GType *g_param_spec_types = NULL;
|
GType *g_param_spec_types = NULL;
|
||||||
@ -2291,7 +2276,7 @@ g_param_spec_enum (const gchar *name,
|
|||||||
|
|
||||||
g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL);
|
g_return_val_if_fail (G_TYPE_IS_ENUM (enum_type), NULL);
|
||||||
|
|
||||||
enum_class = g_type_class_ref (enum_type);
|
enum_class = g_type_class_get (enum_type);
|
||||||
|
|
||||||
g_return_val_if_fail (g_enum_get_value (enum_class, default_value) != NULL, NULL);
|
g_return_val_if_fail (g_enum_get_value (enum_class, default_value) != NULL, NULL);
|
||||||
|
|
||||||
@ -2337,7 +2322,7 @@ g_param_spec_flags (const gchar *name,
|
|||||||
|
|
||||||
g_return_val_if_fail (G_TYPE_IS_FLAGS (flags_type), NULL);
|
g_return_val_if_fail (G_TYPE_IS_FLAGS (flags_type), NULL);
|
||||||
|
|
||||||
flags_class = g_type_class_ref (flags_type);
|
flags_class = g_type_class_get (flags_type);
|
||||||
|
|
||||||
g_return_val_if_fail ((default_value & flags_class->mask) == default_value, NULL);
|
g_return_val_if_fail ((default_value & flags_class->mask) == default_value, NULL);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user