mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-13 15:56:23 +01:00
Merge branch '3243-get-type-info-type-type-type' into 'main'
girepository: Rename gi_arg_info_load_type() to gi_arg_info_load_type_info() Closes #3243 See merge request GNOME/glib!3878
This commit is contained in:
commit
59a818c28b
@ -344,7 +344,7 @@ gi_arg_info_get_type_info (GIArgInfo *info)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gi_arg_info_load_type:
|
* gi_arg_info_load_type_info:
|
||||||
* @info: a #GIArgInfo
|
* @info: a #GIArgInfo
|
||||||
* @type: (out caller-allocates): Initialized with information about type of @info
|
* @type: (out caller-allocates): Initialized with information about type of @info
|
||||||
*
|
*
|
||||||
@ -360,8 +360,8 @@ gi_arg_info_get_type_info (GIArgInfo *info)
|
|||||||
* Since: 2.80
|
* Since: 2.80
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
gi_arg_info_load_type (GIArgInfo *info,
|
gi_arg_info_load_type_info (GIArgInfo *info,
|
||||||
GITypeInfo *type)
|
GITypeInfo *type)
|
||||||
{
|
{
|
||||||
GIRealInfo *rinfo = (GIRealInfo*) info;
|
GIRealInfo *rinfo = (GIRealInfo*) info;
|
||||||
|
|
||||||
|
@ -95,6 +95,6 @@ GI_AVAILABLE_IN_ALL
|
|||||||
GITypeInfo * gi_arg_info_get_type_info (GIArgInfo *info);
|
GITypeInfo * gi_arg_info_get_type_info (GIArgInfo *info);
|
||||||
|
|
||||||
GI_AVAILABLE_IN_ALL
|
GI_AVAILABLE_IN_ALL
|
||||||
void gi_arg_info_load_type (GIArgInfo *info,
|
void gi_arg_info_load_type_info (GIArgInfo *info,
|
||||||
GITypeInfo *type);
|
GITypeInfo *type);
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
@ -211,7 +211,8 @@ void gi_arg_info_class_init (gpointer g_class,
|
|||||||
gpointer class_data);
|
gpointer class_data);
|
||||||
|
|
||||||
/* GITypeInfo is stack-allocatable so it can be used with
|
/* GITypeInfo is stack-allocatable so it can be used with
|
||||||
* gi_arg_info_load_type(), so its definition is actually public in gitypes.h. */
|
* gi_arg_info_load_type_info(), so its definition is actually public in
|
||||||
|
* gitypes.h. */
|
||||||
|
|
||||||
void gi_type_info_class_init (gpointer g_class,
|
void gi_type_info_class_init (gpointer g_class,
|
||||||
gpointer class_data);
|
gpointer class_data);
|
||||||
|
@ -207,7 +207,7 @@ gi_callable_info_get_ffi_arg_types (GICallableInfo *callable_info,
|
|||||||
GITypeInfo arg_type;
|
GITypeInfo arg_type;
|
||||||
|
|
||||||
gi_callable_info_load_arg (callable_info, i, &arg_info);
|
gi_callable_info_load_arg (callable_info, i, &arg_info);
|
||||||
gi_arg_info_load_type (&arg_info, &arg_type);
|
gi_arg_info_load_type_info (&arg_info, &arg_type);
|
||||||
switch (gi_arg_info_get_direction (&arg_info))
|
switch (gi_arg_info_get_direction (&arg_info))
|
||||||
{
|
{
|
||||||
case GI_DIRECTION_IN:
|
case GI_DIRECTION_IN:
|
||||||
|
@ -199,7 +199,7 @@ test_repository_arg_info (RepositoryFixture *fx,
|
|||||||
g_assert_true (gi_type_info_is_pointer (type_info));
|
g_assert_true (gi_type_info_is_pointer (type_info));
|
||||||
g_assert_cmpint (gi_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UTF8);
|
g_assert_cmpint (gi_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UTF8);
|
||||||
|
|
||||||
gi_arg_info_load_type (arg_info, &type_info_stack);
|
gi_arg_info_load_type_info (arg_info, &type_info_stack);
|
||||||
g_assert_true (gi_type_info_is_pointer (&type_info_stack) == gi_type_info_is_pointer (type_info));
|
g_assert_true (gi_type_info_is_pointer (&type_info_stack) == gi_type_info_is_pointer (type_info));
|
||||||
g_assert_cmpint (gi_type_info_get_tag (&type_info_stack), ==, gi_type_info_get_tag (type_info));
|
g_assert_cmpint (gi_type_info_get_tag (&type_info_stack), ==, gi_type_info_get_tag (type_info));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user