[GIRepository] Rename GArgument to GIArgument

Keep a typedef for backwards compatibility, until
the major bindings has moved over.
This commit is contained in:
Johan Dahlin 2010-08-31 17:33:06 -03:00
parent 180e1b61eb
commit 9c80c84dc7
8 changed files with 26 additions and 21 deletions

View File

@ -77,7 +77,7 @@ g_constant_info_get_type (GIConstantInfo *info)
*/ */
gint gint
g_constant_info_get_value (GIConstantInfo *info, g_constant_info_get_value (GIConstantInfo *info,
GArgument *value) GIArgument *value)
{ {
GIRealInfo *rinfo = (GIRealInfo *)info; GIRealInfo *rinfo = (GIRealInfo *)info;
ConstantBlob *blob; ConstantBlob *blob;

View File

@ -35,7 +35,7 @@ G_BEGIN_DECLS
GITypeInfo * g_constant_info_get_type (GIConstantInfo *info); GITypeInfo * g_constant_info_get_type (GIConstantInfo *info);
gint g_constant_info_get_value(GIConstantInfo *info, gint g_constant_info_get_value(GIConstantInfo *info,
GArgument *value); GIArgument *value);
G_END_DECLS G_END_DECLS

View File

@ -164,7 +164,7 @@ g_field_info_get_type (GIFieldInfo *info)
* g_field_info_get_field: * g_field_info_get_field:
* @field_info: a #GIFieldInfo * @field_info: a #GIFieldInfo
* @mem: pointer to a block of memory representing a C structure or union * @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 * Reads a field identified by a #GFieldInfo from a C structure or
* union. This only handles fields of simple C types. It will fail * union. This only handles fields of simple C types. It will fail
@ -176,7 +176,7 @@ g_field_info_get_type (GIFieldInfo *info)
gboolean gboolean
g_field_info_get_field (GIFieldInfo *field_info, g_field_info_get_field (GIFieldInfo *field_info,
gpointer mem, gpointer mem,
GArgument *value) GIArgument *value)
{ {
int offset; int offset;
GITypeInfo *type_info; GITypeInfo *type_info;
@ -346,7 +346,7 @@ g_field_info_get_field (GIFieldInfo *field_info,
* g_field_info_set_field: * g_field_info_set_field:
* @field_info: a #GIFieldInfo * @field_info: a #GIFieldInfo
* @mem: pointer to a block of memory representing a C structure or union * @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 * Writes a field identified by a #GFieldInfo to a C structure or
* union. This only handles fields of simple C types. It will fail * 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 gboolean
g_field_info_set_field (GIFieldInfo *field_info, g_field_info_set_field (GIFieldInfo *field_info,
gpointer mem, gpointer mem,
const GArgument *value) const GIArgument *value)
{ {
int offset; int offset;
GITypeInfo *type_info; GITypeInfo *type_info;

View File

@ -39,10 +39,10 @@ gint g_field_info_get_offset (GIFieldInfo *info);
GITypeInfo * g_field_info_get_type (GIFieldInfo *info); GITypeInfo * g_field_info_get_type (GIFieldInfo *info);
gboolean g_field_info_get_field (GIFieldInfo *field_info, gboolean g_field_info_get_field (GIFieldInfo *field_info,
gpointer mem, gpointer mem,
GArgument *value); GIArgument *value);
gboolean g_field_info_set_field (GIFieldInfo *field_info, gboolean g_field_info_set_field (GIFieldInfo *field_info,
gpointer mem, gpointer mem,
const GArgument *value); const GIArgument *value);
G_END_DECLS G_END_DECLS

View File

@ -217,11 +217,11 @@ g_invoke_error_quark (void)
/** /**
* g_function_info_invoke: * g_function_info_invoke:
* @info: a #GIFunctionInfo describing the function to 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 * parameter of @info. If there are no in parameter, @in_args
* can be %NULL * can be %NULL
* @n_in_args: the length of the @in_args array * @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 * parameter of @info. If there are no out parameters, @out_args
* may be %NULL * may be %NULL
* @n_out_args: the length of the @out_args array * @n_out_args: the length of the @out_args array
@ -242,11 +242,11 @@ g_invoke_error_quark (void)
*/ */
gboolean gboolean
g_function_info_invoke (GIFunctionInfo *info, g_function_info_invoke (GIFunctionInfo *info,
const GArgument *in_args, const GIArgument *in_args,
int n_in_args, int n_in_args,
const GArgument *out_args, const GIArgument *out_args,
int n_out_args, int n_out_args,
GArgument *return_value, GIArgument *return_value,
GError **error) GError **error)
{ {
ffi_cif cif; ffi_cif cif;

View File

@ -61,11 +61,11 @@ typedef enum
} GInvokeError; } GInvokeError;
gboolean g_function_info_invoke (GIFunctionInfo *info, gboolean g_function_info_invoke (GIFunctionInfo *info,
const GArgument *in_args, const GIArgument *in_args,
int n_in_args, int n_in_args,
const GArgument *out_args, const GIArgument *out_args,
int n_out_args, int n_out_args,
GArgument *return_value, GIArgument *return_value,
GError **error); GError **error);

View File

@ -389,7 +389,7 @@ write_return_value_attributes (Xml *file,
static void static void
write_constant_value (const gchar *namespace, write_constant_value (const gchar *namespace,
GITypeInfo *info, GITypeInfo *info,
GArgument *argument, GIArgument *argument,
Xml *file); Xml *file);
static void static void
@ -409,7 +409,7 @@ write_field_info (const gchar *namespace,
gint offset; gint offset;
GITypeInfo *type; GITypeInfo *type;
GIBaseInfo *interface; GIBaseInfo *interface;
GArgument value; GIArgument value;
name = g_base_info_get_name ((GIBaseInfo *)info); name = g_base_info_get_name ((GIBaseInfo *)info);
flags = g_field_info_get_flags (info); flags = g_field_info_get_flags (info);
@ -725,7 +725,7 @@ write_value_info (const gchar *namespace,
static void static void
write_constant_value (const gchar *namespace, write_constant_value (const gchar *namespace,
GITypeInfo *type, GITypeInfo *type,
GArgument *value, GIArgument *value,
Xml *file) Xml *file)
{ {
switch (g_type_info_get_tag (type)) switch (g_type_info_get_tag (type))
@ -780,7 +780,7 @@ write_constant_info (const gchar *namespace,
GITypeInfo *type; GITypeInfo *type;
const gchar *name; const gchar *name;
gboolean deprecated; gboolean deprecated;
GArgument value; GIArgument value;
name = g_base_info_get_name ((GIBaseInfo *)info); name = g_base_info_get_name ((GIBaseInfo *)info);
deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info); deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info);

View File

@ -187,7 +187,7 @@ typedef union
gsize v_size; gsize v_size;
gchar * v_string; gchar * v_string;
gpointer v_pointer; gpointer v_pointer;
} GArgument; } GIArgument;
/** /**
* GIInfoType: * GIInfoType:
@ -438,6 +438,11 @@ typedef enum
GI_FUNCTION_THROWS = 1 << 5 GI_FUNCTION_THROWS = 1 << 5
} GIFunctionInfoFlags; } GIFunctionInfoFlags;
#ifndef __GI_SCANNER__
/* backwards compatibility */
typedef union GIArgument GArgument;
#endif
G_END_DECLS G_END_DECLS
#endif /* __GITYPES_H__ */ #endif /* __GITYPES_H__ */