#include <stdlib.h> /* qsort() */
#include "gvaluetypes.h"
+#include "gtype-private.h"
#include "gvaluecollector.h"
#include "gobject.h"
#include "gparam.h"
#include "gboxed.h"
#include "genums.h"
-#include "gobjectalias.h"
/* --- value functions --- */
/* --- type initialization --- */
void
-g_value_types_init (void)
+_g_value_types_init (void)
{
GTypeInfo info = {
0, /* class_size */
* @v_char: character value to be set
*
* Set the contents of a %G_TYPE_CHAR #GValue to @v_char.
+ * Deprecated: 2.32: This function's input type is broken, see g_value_set_schar()
*/
void
g_value_set_char (GValue *value,
* g_value_get_char:
* @value: a valid #GValue of type %G_TYPE_CHAR
*
- * Get the contents of a %G_TYPE_CHAR #GValue.
+ * Do not use this function; it is broken on platforms where the %char
+ * type is unsigned, such as ARM and PowerPC. See g_value_get_schar().
+ *
+ * Get the contents of a %G_TYPE_CHAR #GValue.
*
* Returns: character contents of @value
+ * Deprecated: 2.32: This function's return type is broken, see g_value_get_schar()
*/
gchar
g_value_get_char (const GValue *value)
}
/**
+ * g_value_set_schar:
+ * @value: a valid #GValue of type %G_TYPE_CHAR
+ * @v_char: signed 8 bit integer to be set
+ *
+ * Set the contents of a %G_TYPE_CHAR #GValue to @v_char.
+ *
+ * Since: 2.32
+ */
+void
+g_value_set_schar (GValue *value,
+ gint8 v_char)
+{
+ g_return_if_fail (G_VALUE_HOLDS_CHAR (value));
+
+ value->data[0].v_int = v_char;
+}
+
+/**
+ * g_value_get_schar:
+ * @value: a valid #GValue of type %G_TYPE_CHAR
+ *
+ * Get the contents of a %G_TYPE_CHAR #GValue.
+ *
+ * Returns: signed 8 bit integer contents of @value
+ * Since: 2.32
+ */
+gint8
+g_value_get_schar (const GValue *value)
+{
+ g_return_val_if_fail (G_VALUE_HOLDS_CHAR (value), 0);
+
+ return value->data[0].v_int;
+}
+
+/**
* g_value_set_uchar:
* @value: a valid #GValue of type %G_TYPE_UCHAR
* @v_uchar: unsigned character value to be set
/**
* g_value_set_string:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: caller-owned string to be duplicated for the #GValue
+ * @v_string: (allow-none): caller-owned string to be duplicated for the #GValue
*
* Set the contents of a %G_TYPE_STRING #GValue to @v_string.
*/
/**
* g_value_set_static_string:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: static string to be set
+ * @v_string: (allow-none): static string to be set
*
* Set the contents of a %G_TYPE_STRING #GValue to @v_string.
* The string is assumed to be static, and is thus not duplicated
/**
* g_value_set_string_take_ownership:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: duplicated unowned string to be set
+ * @v_string: (allow-none): duplicated unowned string to be set
*
* This is an internal function introduced mainly for C marshallers.
*
/**
* g_value_take_string:
* @value: a valid #GValue of type %G_TYPE_STRING
- * @v_string: string to take ownership of
+ * @v_string: (allow-none): string to take ownership of
*
* Sets the contents of a %G_TYPE_STRING #GValue to @v_string.
*
*
* Returns: string content of @value
*/
-G_CONST_RETURN gchar*
+const gchar*
g_value_get_string (const GValue *value)
{
g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);
*
* Get the contents of a pointer #GValue.
*
- * Returns: pointer contents of @value
+ * Returns: (transfer none): pointer contents of @value
*/
gpointer
g_value_get_pointer (const GValue *value)
return value->data[0].v_pointer;
}
-GType
-g_gtype_get_type (void)
-{
- static const GTypeInfo type_info = { 0, };
- static GType type;
- if (!type)
- type = g_type_register_static (G_TYPE_POINTER, g_intern_static_string ("GType"), &type_info, 0);
- return type;
-}
+G_DEFINE_POINTER_TYPE (GType, g_gtype)
/**
* g_value_set_gtype:
/**
* g_value_set_variant:
- * @value: a valid #GValue of %G_TYPE_VARIANT
- * @variant: a #GVariant, or %NULL
+ * @value: a valid #GValue of type %G_TYPE_VARIANT
+ * @variant: (allow-none): a #GVariant, or %NULL
*
* Set the contents of a variant #GValue to @variant.
* If the variant is floating, it is consumed.
}
/**
+ * g_value_take_variant:
+ * @value: a valid #GValue of type %G_TYPE_VARIANT
+ * @variant: (allow-none): a #GVariant, or %NULL
+ *
+ * Set the contents of a variant #GValue to @variant, and takes over
+ * the ownership of the caller's reference to @variant;
+ * the caller doesn't have to unref it any more (i.e. the reference
+ * count of the variant is not increased).
+ *
+ * If @variant was floating then its floating reference is converted to
+ * a hard reference.
+ *
+ * If you want the #GValue to hold its own reference to @variant, use
+ * g_value_set_variant() instead.
+ *
+ * This is an internal function introduced mainly for C marshallers.
+ *
+ * Since: 2.26
+ */
+void
+g_value_take_variant (GValue *value,
+ GVariant *variant)
+{
+ GVariant *old_variant;
+
+ g_return_if_fail (G_VALUE_HOLDS_VARIANT (value));
+
+ old_variant = value->data[0].v_pointer;
+
+ if (variant)
+ value->data[0].v_pointer = g_variant_take_ref (variant);
+ else
+ value->data[0].v_pointer = NULL;
+
+ if (old_variant)
+ g_variant_unref (old_variant);
+}
+
+/**
* g_value_get_variant:
- * @value: a valid #GValue of %G_TYPE_VARIANT
+ * @value: a valid #GValue of type %G_TYPE_VARIANT
*
* Get the contents of a variant #GValue.
*
/**
* g_value_dup_variant:
- * @value: a valid #GValue of %G_TYPE_VARIANT
+ * @value: a valid #GValue of type %G_TYPE_VARIANT
*
* Get the contents of a variant #GValue, increasing its refcount.
*
}
else if (g_value_type_transformable (G_VALUE_TYPE (value), G_TYPE_STRING))
{
- GValue tmp_value = { 0, };
+ GValue tmp_value = G_VALUE_INIT;
gchar *s;
g_value_init (&tmp_value, G_TYPE_STRING);
contents = g_strdup_printf ("((%s*) %p)", G_OBJECT_TYPE_NAME (p), p);
else if (G_VALUE_HOLDS_PARAM (value))
contents = g_strdup_printf ("((%s*) %p)", G_PARAM_SPEC_TYPE_NAME (p), p);
+ else if (G_VALUE_HOLDS (value, G_TYPE_STRV))
+ {
+ GStrv strv = g_value_get_boxed (value);
+ GString *tmp = g_string_new ("[");
+
+ while (*strv != NULL)
+ {
+ gchar *escaped = g_strescape (*strv, NULL);
+
+ g_string_append_printf (tmp, "\"%s\"", escaped);
+ g_free (escaped);
+
+ if (*++strv != NULL)
+ g_string_append (tmp, ", ");
+ }
+
+ g_string_append (tmp, "]");
+ contents = g_string_free (tmp, FALSE);
+ }
else if (G_VALUE_HOLDS_BOXED (value))
contents = g_strdup_printf ("((%s*) %p)", g_type_name (G_VALUE_TYPE (value)), p);
else if (G_VALUE_HOLDS_POINTER (value))
return type;
}
-
-#define __G_VALUETYPES_C__
-#include "gobjectaliasdef.c"
projects / platform / upstream / glib.git / blobdiff