diff --git a/docs/reference/girepository/migrating-gi.md b/docs/reference/girepository/migrating-gi.md index e1fafa793..58eec4294 100644 --- a/docs/reference/girepository/migrating-gi.md +++ b/docs/reference/girepository/migrating-gi.md @@ -50,6 +50,7 @@ your code if integer type warnings are enabled. | `g_arg_info_load_type` | [method@GIRepository.ArgInfo.load_type_info] | | - | [method@GIRepository.BaseInfo.ref] and [method@GIRepository.BaseInfo.unref] | | `g_base_info_get_type` | [method@GIRepository.BaseInfo.get_info_type] | +| `g_info_new` | [ctor@GIRepository.BaseInfo.new] | | `g_callable_info_invoke` arguments | `is_method` and `throws` dropped in [method@GIRepository.CallableInfo.invoke] | | `g_constant_info_get_type` | [method@GIRepository.ConstantInfo.get_type_info] | | `g_field_info_get_type` | [method@GIRepository.FieldInfo.get_type_info] | diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c index 926b6bb73..7351c8382 100644 --- a/girepository/gibaseinfo.c +++ b/girepository/gibaseinfo.c @@ -366,7 +366,7 @@ gi_info_new_full (GIInfoType type, } /** - * gi_info_new: + * gi_base_info_new: * @type: type of the info to create * @container: (nullable): info which contains this one * @typelib: typelib containing the info @@ -380,10 +380,10 @@ gi_info_new_full (GIInfoType type, * Since: 2.80 */ GIBaseInfo * -gi_info_new (GIInfoType type, - GIBaseInfo *container, - GITypelib *typelib, - size_t offset) +gi_base_info_new (GIInfoType type, + GIBaseInfo *container, + GITypelib *typelib, + size_t offset) { return gi_info_new_full (type, ((GIRealInfo*)container)->repository, container, typelib, offset); } @@ -510,8 +510,8 @@ gi_type_info_new (GIBaseInfo *container, { SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset]; - return (GITypeInfo *) gi_info_new (GI_INFO_TYPE_TYPE, container, typelib, - (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); + return (GITypeInfo *) gi_base_info_new (GI_INFO_TYPE_TYPE, container, typelib, + (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset); } /*< private > diff --git a/girepository/gibaseinfo.h b/girepository/gibaseinfo.h index 79969f531..5787f9458 100644 --- a/girepository/gibaseinfo.h +++ b/girepository/gibaseinfo.h @@ -130,7 +130,7 @@ gboolean gi_base_info_equal (GIBaseInfo *info1, GIBaseInfo *info2); GI_AVAILABLE_IN_ALL -GIBaseInfo * gi_info_new (GIInfoType type, +GIBaseInfo * gi_base_info_new (GIInfoType type, GIBaseInfo *container, GITypelib *typelib, size_t offset); diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c index 0095a03b5..077ae4723 100644 --- a/girepository/gicallableinfo.c +++ b/girepository/gicallableinfo.c @@ -379,8 +379,8 @@ gi_callable_info_get_arg (GICallableInfo *info, offset = signature_offset (info); header = (Header *)rinfo->typelib->data; - return (GIArgInfo *) gi_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib, - offset + header->signature_blob_size + n * header->arg_blob_size); + return (GIArgInfo *) gi_base_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib, + offset + header->signature_blob_size + n * header->arg_blob_size); } /** diff --git a/girepository/gienuminfo.c b/girepository/gienuminfo.c index 1848e8fd7..e73b1a6af 100644 --- a/girepository/gienuminfo.c +++ b/girepository/gienuminfo.c @@ -124,7 +124,7 @@ gi_enum_info_get_value (GIEnumInfo *info, offset = rinfo->offset + header->enum_blob_size + n * header->value_blob_size; - return (GIValueInfo *) gi_info_new (GI_INFO_TYPE_VALUE, (GIBaseInfo*)info, rinfo->typelib, offset); + return (GIValueInfo *) gi_base_info_new (GI_INFO_TYPE_VALUE, (GIBaseInfo*)info, rinfo->typelib, offset); } /** @@ -181,8 +181,8 @@ gi_enum_info_get_method (GIEnumInfo *info, + blob->n_values * header->value_blob_size + n * header->function_blob_size; - return (GIFunctionInfo *) gi_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIFunctionInfo *) gi_base_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** diff --git a/girepository/gifieldinfo.c b/girepository/gifieldinfo.c index 5d362a449..a326608a4 100644 --- a/girepository/gifieldinfo.c +++ b/girepository/gifieldinfo.c @@ -158,9 +158,9 @@ gi_field_info_get_type_info (GIFieldInfo *info) if (blob->has_embedded_type) { - type_info = (GIRealInfo *) gi_info_new (GI_INFO_TYPE_TYPE, - (GIBaseInfo*)info, rinfo->typelib, - rinfo->offset + header->field_blob_size); + type_info = (GIRealInfo *) gi_base_info_new (GI_INFO_TYPE_TYPE, + (GIBaseInfo*)info, rinfo->typelib, + rinfo->offset + header->field_blob_size); type_info->type_is_embedded = TRUE; } else diff --git a/girepository/gifunctioninfo.c b/girepository/gifunctioninfo.c index c43f74cf3..e50cc007e 100644 --- a/girepository/gifunctioninfo.c +++ b/girepository/gifunctioninfo.c @@ -64,8 +64,8 @@ gi_base_info_find_method (GIBaseInfo *base, const char *fname = (const char *)&rinfo->typelib->data[fblob->name]; if (strcmp (name, fname) == 0) - return (GIFunctionInfo *) gi_info_new (GI_INFO_TYPE_FUNCTION, base, - rinfo->typelib, offset); + return (GIFunctionInfo *) gi_base_info_new (GI_INFO_TYPE_FUNCTION, base, + rinfo->typelib, offset); offset += header->function_blob_size; } diff --git a/girepository/giinterfaceinfo.c b/girepository/giinterfaceinfo.c index b207d195d..1c5289ea5 100644 --- a/girepository/giinterfaceinfo.c +++ b/girepository/giinterfaceinfo.c @@ -152,8 +152,8 @@ gi_interface_info_get_property (GIInterfaceInfo *info, + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2 + n * header->property_blob_size; - return (GIPropertyInfo *) gi_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIPropertyInfo *) gi_base_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -211,8 +211,8 @@ gi_interface_info_get_method (GIInterfaceInfo *info, + blob->n_properties * header->property_blob_size + n * header->function_blob_size; - return (GIFunctionInfo *) gi_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIFunctionInfo *) gi_base_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -301,8 +301,8 @@ gi_interface_info_get_signal (GIInterfaceInfo *info, + blob->n_methods * header->function_blob_size + n * header->signal_blob_size; - return (GISignalInfo *) gi_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GISignalInfo *) gi_base_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -398,8 +398,8 @@ gi_interface_info_get_vfunc (GIInterfaceInfo *info, + blob->n_signals * header->signal_blob_size + n * header->vfunc_blob_size; - return (GIVFuncInfo *) gi_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIVFuncInfo *) gi_base_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -499,8 +499,8 @@ gi_interface_info_get_constant (GIInterfaceInfo *info, + blob->n_vfuncs * header->vfunc_blob_size + n * header->constant_blob_size; - return (GIConstantInfo *) gi_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIConstantInfo *) gi_base_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** diff --git a/girepository/giobjectinfo.c b/girepository/giobjectinfo.c index 0e7cc5545..6211b9095 100644 --- a/girepository/giobjectinfo.c +++ b/girepository/giobjectinfo.c @@ -330,7 +330,7 @@ gi_object_info_get_field (GIObjectInfo *info, offset = gi_object_info_get_field_offset(info, n); - return (GIFieldInfo *) gi_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset); + return (GIFieldInfo *) gi_base_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset); } /** @@ -388,8 +388,8 @@ gi_object_info_get_property (GIObjectInfo *info, + blob->n_field_callbacks * header->callback_blob_size + n * header->property_blob_size; - return (GIPropertyInfo *) gi_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIPropertyInfo *) gi_base_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -450,8 +450,8 @@ gi_object_info_get_method (GIObjectInfo *info, + blob->n_properties * header->property_blob_size + n * header->function_blob_size; - return (GIFunctionInfo *) gi_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIFunctionInfo *) gi_base_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -615,8 +615,8 @@ gi_object_info_get_signal (GIObjectInfo *info, + blob->n_methods * header->function_blob_size + n * header->signal_blob_size; - return (GISignalInfo *) gi_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GISignalInfo *) gi_base_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -715,8 +715,8 @@ gi_object_info_get_vfunc (GIObjectInfo *info, + blob->n_signals * header->signal_blob_size + n * header->vfunc_blob_size; - return (GIVFuncInfo *) gi_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIVFuncInfo *) gi_base_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -895,8 +895,8 @@ gi_object_info_get_constant (GIObjectInfo *info, + blob->n_vfuncs * header->vfunc_blob_size + n * header->constant_blob_size; - return (GIConstantInfo *) gi_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIConstantInfo *) gi_base_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** diff --git a/girepository/gistructinfo.c b/girepository/gistructinfo.c index d2c31c15a..a122a69eb 100644 --- a/girepository/gistructinfo.c +++ b/girepository/gistructinfo.c @@ -111,8 +111,8 @@ gi_struct_info_get_field (GIStructInfo *info, g_return_val_if_fail (n <= G_MAXUINT16, NULL); - return (GIFieldInfo *) gi_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, - gi_struct_get_field_offset (info, n)); + return (GIFieldInfo *) gi_base_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, + gi_struct_get_field_offset (info, n)); } /** @@ -143,10 +143,10 @@ gi_struct_info_find_field (GIStructInfo *info, if (strcmp (name, fname) == 0) { - return (GIFieldInfo *) gi_info_new (GI_INFO_TYPE_FIELD, - (GIBaseInfo* )info, - rinfo->typelib, - offset); + return (GIFieldInfo *) gi_base_info_new (GI_INFO_TYPE_FIELD, + (GIBaseInfo* )info, + rinfo->typelib, + offset); } offset += header->field_blob_size; @@ -198,8 +198,8 @@ gi_struct_info_get_method (GIStructInfo *info, g_return_val_if_fail (n <= G_MAXUINT16, NULL); offset = gi_struct_get_field_offset (info, blob->n_fields) + n * header->function_blob_size; - return (GIFunctionInfo *) gi_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIFunctionInfo *) gi_base_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** diff --git a/girepository/gitypeinfo.c b/girepository/gitypeinfo.c index 3aa6c9320..ac99b7bc8 100644 --- a/girepository/gitypeinfo.c +++ b/girepository/gitypeinfo.c @@ -211,8 +211,8 @@ gi_type_info_get_interface (GITypeInfo *info) g_assert_not_reached (); return NULL; } - return (GIBaseInfo *) gi_info_new (info_type, (GIBaseInfo*)info, rinfo->typelib, - rinfo->offset); + return (GIBaseInfo *) gi_base_info_new (info_type, (GIBaseInfo*)info, rinfo->typelib, + rinfo->offset); } else { diff --git a/girepository/giunioninfo.c b/girepository/giunioninfo.c index d64ec2c01..1c09f7219 100644 --- a/girepository/giunioninfo.c +++ b/girepository/giunioninfo.c @@ -80,9 +80,9 @@ gi_union_info_get_field (GIUnionInfo *info, GIRealInfo *rinfo = (GIRealInfo *)info; Header *header = (Header *)rinfo->typelib->data; - return (GIFieldInfo *) gi_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, - rinfo->offset + header->union_blob_size + - n * header->field_blob_size); + return (GIFieldInfo *) gi_base_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, + rinfo->offset + header->union_blob_size + + n * header->field_blob_size); } /** @@ -126,8 +126,8 @@ gi_union_info_get_method (GIUnionInfo *info, offset = rinfo->offset + header->union_blob_size + blob->n_fields * header->field_blob_size + n * header->function_blob_size; - return (GIFunctionInfo *) gi_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIFunctionInfo *) gi_base_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, + rinfo->typelib, offset); } /** @@ -217,8 +217,8 @@ gi_union_info_get_discriminator (GIUnionInfo *info, + blob->n_functions * header->function_blob_size + n * header->constant_blob_size; - return (GIConstantInfo *) gi_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, - rinfo->typelib, offset); + return (GIConstantInfo *) gi_base_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, + rinfo->typelib, offset); } return NULL; diff --git a/girepository/givfuncinfo.c b/girepository/givfuncinfo.c index cc49307d9..728cca43c 100644 --- a/girepository/givfuncinfo.c +++ b/girepository/givfuncinfo.c @@ -60,8 +60,8 @@ gi_base_info_find_vfunc (GIRealInfo *rinfo, const char *fname = (const char *)&rinfo->typelib->data[fblob->name]; if (strcmp (name, fname) == 0) - return (GIVFuncInfo *) gi_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo, - rinfo->typelib, offset); + return (GIVFuncInfo *) gi_base_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo, + rinfo->typelib, offset); offset += header->vfunc_blob_size; }