mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-04-01 21:33:09 +02:00
gibaseinfo: Make gi_info_init() take a GType rather than a GIInfoType
This is one more step towards removing `GIInfoType`, and will also help in a following commit which will directly make use of the `GType`. Signed-off-by: Philip Withnall <pwithnall@gnome.org> Helps: #3218
This commit is contained in:
parent
c8c1febc7d
commit
eb94acce21
@ -397,7 +397,7 @@ gi_info_new (GIInfoType type,
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
gi_info_init (GIRealInfo *info,
|
gi_info_init (GIRealInfo *info,
|
||||||
GIInfoType type,
|
GType type,
|
||||||
GIRepository *repository,
|
GIRepository *repository,
|
||||||
GIBaseInfo *container,
|
GIBaseInfo *container,
|
||||||
GITypelib *typelib,
|
GITypelib *typelib,
|
||||||
@ -489,7 +489,7 @@ gi_type_info_init (GITypeInfo *info,
|
|||||||
GIRealInfo *rinfo = (GIRealInfo*)container;
|
GIRealInfo *rinfo = (GIRealInfo*)container;
|
||||||
SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
|
SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
|
||||||
|
|
||||||
gi_info_init ((GIRealInfo*)info, GI_INFO_TYPE_TYPE, rinfo->repository, container, typelib,
|
gi_info_init ((GIRealInfo*)info, GI_TYPE_TYPE_INFO, rinfo->repository, container, typelib,
|
||||||
(type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
|
(type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -407,7 +407,7 @@ gi_callable_info_load_arg (GICallableInfo *info,
|
|||||||
offset = signature_offset (info);
|
offset = signature_offset (info);
|
||||||
header = (Header *)rinfo->typelib->data;
|
header = (Header *)rinfo->typelib->data;
|
||||||
|
|
||||||
gi_info_init ((GIRealInfo*)arg, GI_INFO_TYPE_ARG, rinfo->repository, (GIBaseInfo*)info, rinfo->typelib,
|
gi_info_init ((GIRealInfo*)arg, GI_TYPE_ARG_INFO, rinfo->repository, (GIBaseInfo*)info, rinfo->typelib,
|
||||||
offset + header->signature_blob_size + n * header->arg_blob_size);
|
offset + header->signature_blob_size + n * header->arg_blob_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -223,7 +223,7 @@ void gi_unresolved_info_class_init (gpointer g_class,
|
|||||||
gpointer class_data);
|
gpointer class_data);
|
||||||
|
|
||||||
void gi_info_init (GIRealInfo *info,
|
void gi_info_init (GIRealInfo *info,
|
||||||
GIInfoType type,
|
GType type,
|
||||||
GIRepository *repository,
|
GIRepository *repository,
|
||||||
GIBaseInfo *container,
|
GIBaseInfo *container,
|
||||||
GITypelib *typelib,
|
GITypelib *typelib,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user