/* --- defines --- */
-#define G_PARAM_SPEC_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_PARAM, GParamSpecClass))
#define G_PARAM_USER_MASK (~0 << G_PARAM_USER_SHIFT)
#define PSPEC_APPLIES_TO_VALUE(pspec, value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_PARAM_SPEC_VALUE_TYPE (pspec)))
#define G_SLOCK(mutex) g_static_mutex_lock (mutex)
GParamSpecClass *class)
{
pspec->name = NULL;
- pspec->nick = NULL;
- pspec->blurb = NULL;
+ pspec->_nick = NULL;
+ pspec->_blurb = NULL;
pspec->flags = 0;
pspec->value_type = class->value_type;
pspec->owner_type = 0;
g_datalist_clear (&pspec->qdata);
g_free (pspec->name);
- g_free (pspec->nick);
- g_free (pspec->blurb);
+ g_free (pspec->_nick);
+ g_free (pspec->_blurb);
g_type_free_instance ((GTypeInstance*) pspec);
}
}
}
+G_CONST_RETURN gchar*
+g_param_spec_get_name (GParamSpec *pspec)
+{
+ g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+ return pspec->name;
+}
+
+G_CONST_RETURN gchar*
+g_param_spec_get_nick (GParamSpec *pspec)
+{
+ g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+ return pspec->_nick ? pspec->_nick : pspec->name;
+}
+
+G_CONST_RETURN gchar*
+g_param_spec_get_blurb (GParamSpec *pspec)
+{
+ g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
+
+ return pspec->_blurb;
+}
+
+static void
+canonalize_key (gchar *key)
+{
+ gchar *p;
+
+ for (p = key; *p != 0; p++)
+ {
+ gchar c = *p;
+
+ if (c != '-' &&
+ (c < '0' || c > '9') &&
+ (c < 'A' || c > 'Z') &&
+ (c < 'a' || c > 'z'))
+ *p = '-';
+ }
+}
+
gpointer
g_param_spec_internal (GType param_type,
const gchar *name,
GParamFlags flags)
{
GParamSpec *pspec;
-
+
g_return_val_if_fail (G_TYPE_IS_PARAM (param_type) && param_type != G_TYPE_PARAM, NULL);
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail ((name[0] >= 'A' && name[0] <= 'Z') || (name[0] >= 'a' && name[0] <= 'z'), NULL);
-
+
pspec = (gpointer) g_type_create_instance (param_type);
pspec->name = g_strdup (name);
- g_strcanon (pspec->name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
- pspec->nick = g_strdup (nick ? nick : pspec->name);
- pspec->blurb = g_strdup (blurb);
+ canonalize_key (pspec->name);
+ pspec->_nick = g_strdup (nick);
+ pspec->_blurb = g_strdup (blurb);
pspec->flags = (flags & G_PARAM_USER_MASK) | (flags & G_PARAM_MASK);
-
+
return pspec;
}
key.name = g_strdup (param_name);
key.owner_type = owner_type;
- g_strcanon (key.name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
+ canonalize_key (key.name);
if (walk_ancestors)
do
{
{
GParamSpec *pspec = value;
gpointer *data = user_data;
- GType owner_type = GPOINTER_TO_UINT (data[1]);
+ GType owner_type = (GType) data[1];
if (owner_type == pspec->owner_type)
data[0] = g_list_prepend (data[0], pspec);
}
GList*
-g_param_spec_pool_belongings (GParamSpecPool *pool,
+g_param_spec_pool_list_owned (GParamSpecPool *pool,
GType owner_type)
{
gpointer data[2];
G_SLOCK (&pool->smutex);
data[0] = NULL;
- data[1] = GUINT_TO_POINTER (owner_type);
+ data[1] = (gpointer) owner_type;
g_hash_table_foreach (pool->hash_table, pool_list, &data);
G_SUNLOCK (&pool->smutex);
GParamSpec *pspec = value;
gpointer *data = user_data;
GSList **slists = data[0];
- GType owner_type = GPOINTER_TO_UINT (data[1]);
+ GType owner_type = (GType) data[1];
if (g_type_is_a (owner_type, pspec->owner_type))
{
d = g_type_depth (owner_type);
slists = g_new0 (GSList*, d);
data[0] = slists;
- data[1] = GUINT_TO_POINTER (owner_type);
+ data[1] = (gpointer) owner_type;
g_hash_table_foreach (pool->hash_table, pool_depth_list, &data);
for (i = 0; i < d - 1; i++)
slists[i] = pspec_list_remove_overridden (slists[i], pool->hash_table, owner_type, n_pspecs_p);
g_param_spec_ref (value->data[0].v_pointer);
}
+void
+g_value_set_param_take_ownership (GValue *value,
+ GParamSpec *param)
+{
+ g_return_if_fail (G_VALUE_HOLDS_PARAM (value));
+ if (param)
+ g_return_if_fail (G_IS_PARAM_SPEC (param));
+
+ if (value->data[0].v_pointer)
+ g_param_spec_unref (value->data[0].v_pointer);
+ value->data[0].v_pointer = param; /* we take over the reference count */
+}
+
GParamSpec*
g_value_get_param (const GValue *value)
{