[glib/gvariant] drop _ANY_ from G_VARIANT_TYPE_ANY_ARRAY, etc.
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib/gvariant] drop _ANY_ from G_VARIANT_TYPE_ANY_ARRAY, etc.
- Date: Thu, 21 Jan 2010 19:36:28 +0000 (UTC)
commit 4b926ca10c0a3438a5aef98e99429b0d7308d52e
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Jan 21 14:36:04 2010 -0500
drop _ANY_ from G_VARIANT_TYPE_ANY_ARRAY, etc.
glib/gvariant-markup.c | 10 +++++-----
glib/gvariant-valist.c | 6 +++---
glib/gvarianttype.c | 6 +++---
glib/gvarianttype.h | 24 ++++++++++++------------
glib/tests/gvariant-big.c | 2 +-
glib/tests/gvariant-varargs.c | 2 +-
6 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/glib/gvariant-markup.c b/glib/gvariant-markup.c
index 037804a..27d6e2b 100644
--- a/glib/gvariant-markup.c
+++ b/glib/gvariant-markup.c
@@ -425,11 +425,11 @@ type_from_keyword (const char *keyword)
{ G_VARIANT_TYPE_OBJECT_PATH, "object-path" },
{ G_VARIANT_TYPE_SIGNATURE, "signature" },
{ G_VARIANT_TYPE_VARIANT, "variant" },
- { G_VARIANT_TYPE_ANY_MAYBE, "maybe" },
- { G_VARIANT_TYPE_ANY_MAYBE, "nothing" },
- { G_VARIANT_TYPE_ANY_ARRAY, "array" },
- { G_VARIANT_TYPE_ANY_TUPLE, "tuple" },
- { G_VARIANT_TYPE_ANY_DICT_ENTRY, "dictionary-entry" }
+ { G_VARIANT_TYPE_MAYBE, "maybe" },
+ { G_VARIANT_TYPE_MAYBE, "nothing" },
+ { G_VARIANT_TYPE_ARRAY, "array" },
+ { G_VARIANT_TYPE_TUPLE, "tuple" },
+ { G_VARIANT_TYPE_DICT_ENTRY, "dictionary-entry" }
};
gint i;
diff --git a/glib/gvariant-valist.c b/glib/gvariant-valist.c
index f9cea9b..f92643e 100644
--- a/glib/gvariant-valist.c
+++ b/glib/gvariant-valist.c
@@ -396,7 +396,7 @@ g_variant_valist_new (const gchar **format_string,
NULL, NULL);
g_assert (g_variant_type_is_concrete (type));
- if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ANY_ARRAY))
+ if (g_variant_type_is_array (type))
n_items = va_arg (*app, gsize);
else
n_items = 0;
@@ -442,9 +442,9 @@ g_variant_valist_new (const gchar **format_string,
GVariantBuilder *builder;
if (**format_string == '(')
- builder = g_variant_builder_new (G_VARIANT_TYPE_ANY_TUPLE);
+ builder = g_variant_builder_new (G_VARIANT_TYPE_TUPLE);
else
- builder = g_variant_builder_new (G_VARIANT_TYPE_ANY_DICT_ENTRY);
+ builder = g_variant_builder_new (G_VARIANT_TYPE_DICT_ENTRY);
(*format_string)++; /* '(' */
while (**format_string != ')' && **format_string != '}')
diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
index adf6d09..d8b732e 100644
--- a/glib/gvarianttype.c
+++ b/glib/gvarianttype.c
@@ -391,7 +391,7 @@ g_variant_type_is_container (const GVariantType *type)
* Only a basic type may be used as the key of a dictionary entry.
*
* This function returns %FALSE for all wildcard types except
- * %G_VARIANT_TYPE_ANY_BASIC.
+ * %G_VARIANT_TYPE_BASIC.
**/
gboolean
g_variant_type_is_basic (const GVariantType *type)
@@ -614,7 +614,7 @@ g_variant_type_element (const GVariantType *type)
* This function must be called with a type in one of the classes
* %G_VARIANT_TYPE_CLASS_TUPLE or %G_VARIANT_TYPE_CLASS_DICT_ENTRY
* but must not be called on the generic tuple type
- * %G_VARIANT_TYPE_ANY_TUPLE.
+ * %G_VARIANT_TYPE_TUPLE.
*
* In the case of a dictionary entry type, this returns the type of
* the key.
@@ -679,7 +679,7 @@ g_variant_type_next (const GVariantType *type)
* This function must be called with a type in one of the classes
* %G_VARIANT_TYPE_CLASS_TUPLE or %G_VARIANT_TYPE_CLASS_DICT_ENTRY
* but must not be called on the generic tuple type
- * %G_VARIANT_TYPE_ANY_TUPLE.
+ * %G_VARIANT_TYPE_TUPLE.
*
* In the case of a dictionary entry type, this function will always
* return 2.
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index c5b12ab..11d0222 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -162,46 +162,46 @@ typedef struct _GVariantType GVariantType;
#define G_VARIANT_TYPE_ANY ((const GVariantType *) "*")
/**
- * G_VARIANT_TYPE_ANY_BASIC:
+ * G_VARIANT_TYPE_BASIC:
*
* A wildcard type matching any basic type.
**/
-#define G_VARIANT_TYPE_ANY_BASIC ((const GVariantType *) "?")
+#define G_VARIANT_TYPE_BASIC ((const GVariantType *) "?")
/**
- * G_VARIANT_TYPE_ANY_MAYBE:
+ * G_VARIANT_TYPE_MAYBE:
*
* A wildcard type matching any maybe type.
**/
-#define G_VARIANT_TYPE_ANY_MAYBE ((const GVariantType *) "m*")
+#define G_VARIANT_TYPE_MAYBE ((const GVariantType *) "m*")
/**
- * G_VARIANT_TYPE_ANY_ARRAY:
+ * G_VARIANT_TYPE_ARRAY:
*
* A wildcard type matching any array type.
**/
-#define G_VARIANT_TYPE_ANY_ARRAY ((const GVariantType *) "a*")
+#define G_VARIANT_TYPE_ARRAY ((const GVariantType *) "a*")
/**
- * G_VARIANT_TYPE_ANY_TUPLE:
+ * G_VARIANT_TYPE_TUPLE:
*
* A wildcard type matching any tuple type.
**/
-#define G_VARIANT_TYPE_ANY_TUPLE ((const GVariantType *) "r")
+#define G_VARIANT_TYPE_TUPLE ((const GVariantType *) "r")
/**
- * G_VARIANT_TYPE_ANY_DICT_ENTRY:
+ * G_VARIANT_TYPE_DICT_ENTRY:
*
* A wildcard type matching any dictionary entry type.
**/
-#define G_VARIANT_TYPE_ANY_DICT_ENTRY ((const GVariantType *) "{?*}")
+#define G_VARIANT_TYPE_DICT_ENTRY ((const GVariantType *) "{?*}")
/**
- * G_VARIANT_TYPE_ANY_DICTIONARY:
+ * G_VARIANT_TYPE_DICTIONARY:
*
* A wildcard type matching any dictionary type.
**/
-#define G_VARIANT_TYPE_ANY_DICTIONARY ((const GVariantType *) "ae")
+#define G_VARIANT_TYPE_DICTIONARY ((const GVariantType *) "a{?*}")
G_BEGIN_DECLS
diff --git a/glib/tests/gvariant-big.c b/glib/tests/gvariant-big.c
index d1714ed..3a10a9b 100644
--- a/glib/tests/gvariant-big.c
+++ b/glib/tests/gvariant-big.c
@@ -118,7 +118,7 @@ generate2 (GRand *rand)
type = (const GVariantType *) (possible + g_rand_int_range (rand, 0, 6));
class = *(const gchar *) type;
- builder = g_variant_builder_new (G_VARIANT_TYPE_ANY_ARRAY);
+ builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
for (i = 0; i < length; i++)
{
switch (class)
diff --git a/glib/tests/gvariant-varargs.c b/glib/tests/gvariant-varargs.c
index 3904b2b..66694ee 100644
--- a/glib/tests/gvariant-varargs.c
+++ b/glib/tests/gvariant-varargs.c
@@ -31,7 +31,7 @@ make_value (void)
{ FALSE, 16161, 3232323232u, 6464646464646464ull, 42.0 }
};
- array = g_variant_builder_new (G_VARIANT_TYPE_ANY_ARRAY);
+ array = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
ebuilder1 = g_variant_builder_new (G_VARIANT_TYPE ("an"));
ebuilder2 = g_variant_builder_new (G_VARIANT_TYPE ("an"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]