eo: change API call of efl_class_functions_set
The next commit will bring support for something like reflection. This commit prepares the whole tree for getting another argument in efl_class_functions_set. ref T7681 Differential Revision: https://phab.enlightenment.org/D7882
This commit is contained in:
parent
4f9abba440
commit
0709bdea6f
|
@ -38,7 +38,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -65,7 +65,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -882,7 +882,7 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
|
|||
eina_strbuf_append(buf, "#endif\n\n");
|
||||
}
|
||||
|
||||
eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, copsp);\n");
|
||||
eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, copsp, NULL);\n");
|
||||
|
||||
eina_strbuf_free(ops);
|
||||
eina_strbuf_free(cops);
|
||||
|
|
|
@ -123,7 +123,7 @@ public class Globals {
|
|||
efl_class_new(IntPtr class_description, IntPtr parent, IntPtr extn1, IntPtr extn2, IntPtr extn3, IntPtr extn4, IntPtr extn5, IntPtr extn6, IntPtr extn7, IntPtr extn8, IntPtr extn9, IntPtr extn10, IntPtr extn11, IntPtr extn12, IntPtr extn13, IntPtr extn14, IntPtr extn15, IntPtr extn16, IntPtr extn17, IntPtr extn18, IntPtr extn19, IntPtr extn20, IntPtr extn21, IntPtr extn22, IntPtr extn23, IntPtr extn24, IntPtr extn25, IntPtr extn26, IntPtr extn27, IntPtr extn28, IntPtr extn29, IntPtr extn30, IntPtr extn31, IntPtr extn32, IntPtr extn33, IntPtr extn34, IntPtr extn35, IntPtr extn36, IntPtr extn37, IntPtr extn38, IntPtr extn39, IntPtr extn40, IntPtr extn41, IntPtr extn42, IntPtr extn43, IntPtr extn44, IntPtr extn45, IntPtr extn46, IntPtr extn47, IntPtr term);
|
||||
[DllImport(efl.Libs.Eo)] public static extern IntPtr
|
||||
efl_class_new(IntPtr class_description, IntPtr parent, IntPtr extn1, IntPtr extn2, IntPtr extn3, IntPtr extn4, IntPtr extn5, IntPtr extn6, IntPtr extn7, IntPtr extn8, IntPtr extn9, IntPtr extn10, IntPtr extn11, IntPtr extn12, IntPtr extn13, IntPtr extn14, IntPtr extn15, IntPtr extn16, IntPtr extn17, IntPtr extn18, IntPtr extn19, IntPtr extn20, IntPtr extn21, IntPtr extn22, IntPtr extn23, IntPtr extn24, IntPtr extn25, IntPtr extn26, IntPtr extn27, IntPtr extn28, IntPtr extn29, IntPtr extn30, IntPtr extn31, IntPtr extn32, IntPtr extn33, IntPtr extn34, IntPtr extn35, IntPtr extn36, IntPtr extn37, IntPtr extn38, IntPtr extn39, IntPtr extn40, IntPtr extn41, IntPtr extn42, IntPtr extn43, IntPtr extn44, IntPtr extn45, IntPtr extn46, IntPtr extn47, IntPtr extn48, IntPtr term);
|
||||
[DllImport(efl.Libs.Eo)] public static extern byte efl_class_functions_set(IntPtr klass_id, IntPtr object_ops, IntPtr class_ops);
|
||||
[DllImport(efl.Libs.Eo)] public static extern byte efl_class_functions_set(IntPtr klass_id, IntPtr object_ops, IntPtr class_ops, IntPtr reflection_ops);
|
||||
[DllImport(efl.Libs.Eo)] public static extern IntPtr efl_data_scope_get(IntPtr obj, IntPtr klass);
|
||||
[DllImport(efl.Libs.Eo)] public static extern IntPtr efl_super(IntPtr obj, IntPtr klass);
|
||||
[DllImport(efl.Libs.Eo)] public static extern IntPtr efl_class_get(IntPtr obj);
|
||||
|
@ -152,7 +152,7 @@ public class Globals {
|
|||
|
||||
public static System.Collections.Concurrent.ConcurrentDictionary<System.Type, System.IntPtr> klasses
|
||||
= new System.Collections.Concurrent.ConcurrentDictionary<System.Type, System.IntPtr>();
|
||||
|
||||
|
||||
public const int RTLD_NOW = 2;
|
||||
|
||||
public delegate byte class_initializer(IntPtr klass);
|
||||
|
@ -173,7 +173,7 @@ public class Globals {
|
|||
{
|
||||
return v != null;
|
||||
}
|
||||
|
||||
|
||||
public static IntPtr register_class(String class_name, IntPtr base_klass, System.Type type)
|
||||
{
|
||||
ClassDescription description;
|
||||
|
@ -189,7 +189,7 @@ public class Globals {
|
|||
{
|
||||
return Globals.class_initializer_call(kls, type);
|
||||
};
|
||||
|
||||
|
||||
description.class_initializer = Marshal.GetFunctionPointerForDelegate(init);
|
||||
|
||||
IntPtr description_ptr = Eina.MemoryNative.Alloc(Marshal.SizeOf(description));
|
||||
|
@ -213,7 +213,7 @@ public class Globals {
|
|||
public static List<IntPtr> get_efl_interfaces(System.Type type)
|
||||
{
|
||||
System.Type base_type = type.BaseType;
|
||||
|
||||
|
||||
var ifaces_lst = new List<IntPtr>();
|
||||
var base_ifaces = base_type.GetInterfaces();
|
||||
var ifaces = type.GetInterfaces();
|
||||
|
@ -271,7 +271,7 @@ public class Globals {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
IntPtr descs_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(descs[0])*count);
|
||||
IntPtr ptr = descs_ptr;
|
||||
for(int i = 0; i != count; ++i)
|
||||
|
@ -284,12 +284,12 @@ public class Globals {
|
|||
ops.count = (UIntPtr)count;
|
||||
IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops));
|
||||
Marshal.StructureToPtr(ops, ops_ptr, false);
|
||||
Efl.Eo.Globals.efl_class_functions_set(klass, ops_ptr, IntPtr.Zero);
|
||||
Efl.Eo.Globals.efl_class_functions_set(klass, ops_ptr, IntPtr.Zero, IntPtr.Zero);
|
||||
//EoKlass = klass;
|
||||
}
|
||||
else
|
||||
Console.WriteLine("nativeClass == null");
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
public static IntPtr call_efl_class_new(IntPtr desc, IntPtr bk, List<IntPtr> il = null)
|
||||
|
@ -363,7 +363,7 @@ public class Globals {
|
|||
{
|
||||
throw new Exception("Instantiation failed");
|
||||
}
|
||||
|
||||
|
||||
Console.WriteLine($"Eo instance right after internal_start 0x{eo.ToInt64():x} with refcount {Efl.Eo.Globals.efl_ref_count(eo)}");
|
||||
Console.WriteLine($"Parent was 0x{parent_ptr.ToInt64()}");
|
||||
return eo;
|
||||
|
@ -529,7 +529,7 @@ public interface IWrapper
|
|||
get;
|
||||
}
|
||||
/// <summary>Pointer to internal Eo class.</summary>
|
||||
IntPtr NativeClass
|
||||
IntPtr NativeClass
|
||||
{
|
||||
get;
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ _custom_table_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _custom_table_calc)
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, NULL, &class_ops);
|
||||
return efl_class_functions_set(klass, NULL, &class_ops, NULL);
|
||||
};
|
||||
|
||||
static const Efl_Class_Description custom_table_class_desc = {
|
||||
|
|
|
@ -279,7 +279,7 @@ _gl_filter_finished_cb(void *data, const Efl_Event *event)
|
|||
else _table_resize(data);
|
||||
elm_genlist_item_selected_set(sd->item, EINA_TRUE);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
sd->expanded = EINA_FALSE;
|
||||
elm_layout_signal_emit(sd->hover, "elm,action,hide,no_animate", "elm");
|
||||
|
@ -616,7 +616,7 @@ _elm_combobox_class_initializer(Efl_Class *klass)
|
|||
EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_combobox)
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _elm_combobox_class_desc = {
|
||||
|
|
|
@ -856,13 +856,14 @@ EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl
|
|||
* @param klass_id the class whose functions we are setting.
|
||||
* @param object_ops The function structure we are setting for object functions
|
||||
* @param class_ops The function structure we are setting for class functions
|
||||
* @param reflection_table The reflection table to use within eo
|
||||
* @return True on success, False otherwise.
|
||||
*
|
||||
* This should only be called from within the initializer function.
|
||||
*
|
||||
* @see #EFL_DEFINE_CLASS
|
||||
*/
|
||||
EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops);
|
||||
EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops, const void *reflection_table);
|
||||
|
||||
/**
|
||||
* @brief Override Eo functions of this object.
|
||||
|
|
|
@ -819,7 +819,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
|
|||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops)
|
||||
efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops, const void *reflection_table)
|
||||
{
|
||||
EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass);
|
||||
Efl_Object_Ops empty_ops = { 0 };
|
||||
|
@ -982,7 +982,7 @@ _efl_add_internal_end(Eo *eo_id, Eo *finalized_id)
|
|||
// fails or succeeds based on if service is there.
|
||||
//
|
||||
// until there is a better solution - don't complain here.
|
||||
//
|
||||
//
|
||||
// ERR("Object of class '%s' - Finalizing the object failed.",
|
||||
// klass->desc->name);
|
||||
goto cleanup;
|
||||
|
@ -1691,7 +1691,7 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...
|
|||
/* If functions haven't been set, invoke it with an empty ops structure. */
|
||||
if (!klass->functions_set)
|
||||
{
|
||||
efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL);
|
||||
efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
/* Mark which classes we implement */
|
||||
|
|
|
@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -39,7 +39,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -44,7 +44,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -172,7 +172,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -46,7 +46,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -98,7 +98,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -71,7 +71,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, &cops);
|
||||
return efl_class_functions_set(klass, &ops, &cops, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -66,7 +66,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -17,7 +17,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -18,7 +18,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -68,7 +68,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -26,7 +26,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -41,7 +41,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -55,7 +55,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -54,7 +54,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -47,7 +47,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -79,7 +79,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -89,7 +89,7 @@ _errorcase_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_error_test, _test),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description errorcase_class_desc = {
|
||||
|
|
|
@ -29,7 +29,7 @@ _destructor_unref_class_initializer(Efl_Class *klass2)
|
|||
EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass2, &ops, NULL);
|
||||
return efl_class_functions_set(klass2, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(efl_destructor_unref)
|
||||
|
|
|
@ -203,7 +203,7 @@ _null_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(NULL, _null_fct),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(eo_null_api)
|
||||
|
@ -240,7 +240,7 @@ _redefined_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(null_fct, NULL),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(eo_api_redefined)
|
||||
|
@ -277,7 +277,7 @@ _dich_func_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_a_set, NULL),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(eo_dich_func_override)
|
||||
|
|
|
@ -104,7 +104,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple_class_hi_print, _class_hi_print),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, &cops);
|
||||
return efl_class_functions_set(klass, &ops, &cops, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
@ -135,7 +135,7 @@ _class_initializer2(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _beef_get),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, NULL, &cops);
|
||||
return efl_class_functions_set(klass, NULL, &cops, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc2 = {
|
||||
|
@ -154,7 +154,7 @@ EFL_DEFINE_CLASS(simple2_class_get, &class_desc2, EO_CLASS, NULL)
|
|||
static Eina_Bool
|
||||
_class_initializer3(Efl_Class *klass)
|
||||
{
|
||||
return efl_class_functions_set(klass, NULL, NULL);
|
||||
return efl_class_functions_set(klass, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc3 = {
|
||||
|
@ -185,7 +185,7 @@ _searchable_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get)
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc_searchable = {
|
||||
|
|
|
@ -32,7 +32,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -64,7 +64,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(domain_a_get, _a_get),
|
||||
EFL_OBJECT_OP_FUNC(domain_recursive, _recursive)
|
||||
);
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -472,7 +472,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_destructor, _man_des),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(eo_man_free)
|
||||
|
@ -1049,7 +1049,7 @@ _multi_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(resolve_a_print, _a_print),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(efl_func_resolve)
|
||||
|
@ -1215,7 +1215,7 @@ _add_failures_class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(efl_add_failures)
|
||||
|
@ -1628,14 +1628,14 @@ static Eina_Bool
|
|||
_cast_inherit_class_initializer_1(Efl_Class *klass)
|
||||
{
|
||||
EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_1), );
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_cast_inherit_class_initializer_2(Efl_Class *klass)
|
||||
{
|
||||
EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_2), );
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
EFL_START_TEST(efl_cast_test)
|
||||
|
|
|
@ -69,7 +69,7 @@ _class_initializer(Efl_Class *klass)
|
|||
EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
|
||||
);
|
||||
|
||||
return efl_class_functions_set(klass, &ops, NULL);
|
||||
return efl_class_functions_set(klass, &ops, NULL, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description class_desc = {
|
||||
|
|
|
@ -50,7 +50,7 @@ _class_simple_class_initializer(Efl_Class *klass)
|
|||
copsp = &cops;
|
||||
#endif
|
||||
|
||||
return efl_class_functions_set(klass, opsp, copsp);
|
||||
return efl_class_functions_set(klass, opsp, copsp, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _class_simple_class_desc = {
|
||||
|
|
|
@ -33,7 +33,7 @@ _function_as_argument_class_initializer(Efl_Class *klass)
|
|||
copsp = &cops;
|
||||
#endif
|
||||
|
||||
return efl_class_functions_set(klass, opsp, copsp);
|
||||
return efl_class_functions_set(klass, opsp, copsp, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _function_as_argument_class_desc = {
|
||||
|
|
|
@ -86,7 +86,7 @@ _override_class_initializer(Efl_Class *klass)
|
|||
copsp = &cops;
|
||||
#endif
|
||||
|
||||
return efl_class_functions_set(klass, opsp, copsp);
|
||||
return efl_class_functions_set(klass, opsp, copsp, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _override_class_desc = {
|
||||
|
|
|
@ -61,7 +61,7 @@ _owning_class_initializer(Efl_Class *klass)
|
|||
copsp = &cops;
|
||||
#endif
|
||||
|
||||
return efl_class_functions_set(klass, opsp, copsp);
|
||||
return efl_class_functions_set(klass, opsp, copsp, NULL);
|
||||
}
|
||||
|
||||
static const Efl_Class_Description _owning_class_desc = {
|
||||
|
|
Loading…
Reference in New Issue