summaryrefslogtreecommitdiff
path: root/girepository
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2010-08-31 17:33:06 -0300
committerJohan Dahlin <johan@gnome.org>2010-08-31 17:35:57 -0300
commit6379b8a497e2bf8c5b09e37ded88c7a28483389d (patch)
treeaf51d195834f33251e1f5dcdcba8c2936f833f28 /girepository
parent8ebf89911bcf93baea4d5d9e22b0e40d0c43f946 (diff)
downloadgobject-introspection-6379b8a497e2bf8c5b09e37ded88c7a28483389d.tar.gz
[GIRepository] Rename GArgument to GIArgument
Keep a typedef for backwards compatibility, until the major bindings has moved over.
Diffstat (limited to 'girepository')
-rw-r--r--girepository/giconstantinfo.c2
-rw-r--r--girepository/giconstantinfo.h2
-rw-r--r--girepository/gifieldinfo.c8
-rw-r--r--girepository/gifieldinfo.h4
-rw-r--r--girepository/gifunctioninfo.c10
-rw-r--r--girepository/gifunctioninfo.h6
-rw-r--r--girepository/girwriter.c8
-rw-r--r--girepository/gitypes.h7
8 files changed, 26 insertions, 21 deletions
diff --git a/girepository/giconstantinfo.c b/girepository/giconstantinfo.c
index 58b223fb..ea7d4160 100644
--- a/girepository/giconstantinfo.c
+++ b/girepository/giconstantinfo.c
@@ -77,7 +77,7 @@ g_constant_info_get_type (GIConstantInfo *info)
*/
gint
g_constant_info_get_value (GIConstantInfo *info,
- GArgument *value)
+ GIArgument *value)
{
GIRealInfo *rinfo = (GIRealInfo *)info;
ConstantBlob *blob;
diff --git a/girepository/giconstantinfo.h b/girepository/giconstantinfo.h
index eea0f66d..a2679bd2 100644
--- a/girepository/giconstantinfo.h
+++ b/girepository/giconstantinfo.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
GITypeInfo * g_constant_info_get_type (GIConstantInfo *info);
gint g_constant_info_get_value(GIConstantInfo *info,
- GArgument *value);
+ GIArgument *value);
G_END_DECLS
diff --git a/girepository/gifieldinfo.c b/girepository/gifieldinfo.c
index 9862a723..4acc8e3a 100644
--- a/girepository/gifieldinfo.c
+++ b/girepository/gifieldinfo.c
@@ -164,7 +164,7 @@ g_field_info_get_type (GIFieldInfo *info)
* g_field_info_get_field:
* @field_info: a #GIFieldInfo
* @mem: pointer to a block of memory representing a C structure or union
- * @value: a #GArgument into which to store the value retrieved
+ * @value: a #GIArgument into which to store the value retrieved
*
* Reads a field identified by a #GFieldInfo from a C structure or
* union. This only handles fields of simple C types. It will fail
@@ -176,7 +176,7 @@ g_field_info_get_type (GIFieldInfo *info)
gboolean
g_field_info_get_field (GIFieldInfo *field_info,
gpointer mem,
- GArgument *value)
+ GIArgument *value)
{
int offset;
GITypeInfo *type_info;
@@ -346,7 +346,7 @@ g_field_info_get_field (GIFieldInfo *field_info,
* g_field_info_set_field:
* @field_info: a #GIFieldInfo
* @mem: pointer to a block of memory representing a C structure or union
- * @value: a #GArgument holding the value to store
+ * @value: a #GIArgument holding the value to store
*
* Writes a field identified by a #GFieldInfo to a C structure or
* union. This only handles fields of simple C types. It will fail
@@ -360,7 +360,7 @@ g_field_info_get_field (GIFieldInfo *field_info,
gboolean
g_field_info_set_field (GIFieldInfo *field_info,
gpointer mem,
- const GArgument *value)
+ const GIArgument *value)
{
int offset;
GITypeInfo *type_info;
diff --git a/girepository/gifieldinfo.h b/girepository/gifieldinfo.h
index 53ff9be3..589221b7 100644
--- a/girepository/gifieldinfo.h
+++ b/girepository/gifieldinfo.h
@@ -39,10 +39,10 @@ gint g_field_info_get_offset (GIFieldInfo *info);
GITypeInfo * g_field_info_get_type (GIFieldInfo *info);
gboolean g_field_info_get_field (GIFieldInfo *field_info,
gpointer mem,
- GArgument *value);
+ GIArgument *value);
gboolean g_field_info_set_field (GIFieldInfo *field_info,
gpointer mem,
- const GArgument *value);
+ const GIArgument *value);
G_END_DECLS
diff --git a/girepository/gifunctioninfo.c b/girepository/gifunctioninfo.c
index 73653702..9dd6daae 100644
--- a/girepository/gifunctioninfo.c
+++ b/girepository/gifunctioninfo.c
@@ -217,11 +217,11 @@ g_invoke_error_quark (void)
/**
* g_function_info_invoke:
* @info: a #GIFunctionInfo describing the function to invoke
- * @in_args: an array of #GArgument<!-- -->s, one for each in
+ * @in_args: an array of #GIArgument<!-- -->s, one for each in
* parameter of @info. If there are no in parameter, @in_args
* can be %NULL
* @n_in_args: the length of the @in_args array
- * @out_args: an array of #GArgument<!-- -->s, one for each out
+ * @out_args: an array of #GIArgument<!-- -->s, one for each out
* parameter of @info. If there are no out parameters, @out_args
* may be %NULL
* @n_out_args: the length of the @out_args array
@@ -242,11 +242,11 @@ g_invoke_error_quark (void)
*/
gboolean
g_function_info_invoke (GIFunctionInfo *info,
- const GArgument *in_args,
+ const GIArgument *in_args,
int n_in_args,
- const GArgument *out_args,
+ const GIArgument *out_args,
int n_out_args,
- GArgument *return_value,
+ GIArgument *return_value,
GError **error)
{
ffi_cif cif;
diff --git a/girepository/gifunctioninfo.h b/girepository/gifunctioninfo.h
index a07b60f7..b2fa1f76 100644
--- a/girepository/gifunctioninfo.h
+++ b/girepository/gifunctioninfo.h
@@ -61,11 +61,11 @@ typedef enum
} GInvokeError;
gboolean g_function_info_invoke (GIFunctionInfo *info,
- const GArgument *in_args,
+ const GIArgument *in_args,
int n_in_args,
- const GArgument *out_args,
+ const GIArgument *out_args,
int n_out_args,
- GArgument *return_value,
+ GIArgument *return_value,
GError **error);
diff --git a/girepository/girwriter.c b/girepository/girwriter.c
index bf7ea9dc..48f1a5d2 100644
--- a/girepository/girwriter.c
+++ b/girepository/girwriter.c
@@ -389,7 +389,7 @@ write_return_value_attributes (Xml *file,
static void
write_constant_value (const gchar *namespace,
GITypeInfo *info,
- GArgument *argument,
+ GIArgument *argument,
Xml *file);
static void
@@ -409,7 +409,7 @@ write_field_info (const gchar *namespace,
gint offset;
GITypeInfo *type;
GIBaseInfo *interface;
- GArgument value;
+ GIArgument value;
name = g_base_info_get_name ((GIBaseInfo *)info);
flags = g_field_info_get_flags (info);
@@ -725,7 +725,7 @@ write_value_info (const gchar *namespace,
static void
write_constant_value (const gchar *namespace,
GITypeInfo *type,
- GArgument *value,
+ GIArgument *value,
Xml *file)
{
switch (g_type_info_get_tag (type))
@@ -780,7 +780,7 @@ write_constant_info (const gchar *namespace,
GITypeInfo *type;
const gchar *name;
gboolean deprecated;
- GArgument value;
+ GIArgument value;
name = g_base_info_get_name ((GIBaseInfo *)info);
deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info);
diff --git a/girepository/gitypes.h b/girepository/gitypes.h
index eb1c1021..882f00fb 100644
--- a/girepository/gitypes.h
+++ b/girepository/gitypes.h
@@ -187,7 +187,7 @@ typedef union
gsize v_size;
gchar * v_string;
gpointer v_pointer;
-} GArgument;
+} GIArgument;
/**
* GIInfoType:
@@ -438,6 +438,11 @@ typedef enum
GI_FUNCTION_THROWS = 1 << 5
} GIFunctionInfoFlags;
+#ifndef __GI_SCANNER__
+/* backwards compatibility */
+typedef union GIArgument GArgument;
+#endif
+
G_END_DECLS
#endif /* __GITYPES_H__ */