summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/eo/class_simple.c2
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c2
-rw-r--r--src/bin/eolian/sources.c2
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs20
-rw-r--r--src/lib/elementary/efl_ui_table.c2
-rw-r--r--src/lib/elementary/elc_combobox.c4
-rw-r--r--src/lib/eo/Eo.h3
-rw-r--r--src/lib/eo/eo.c6
-rw-r--r--src/tests/eo/access/access_inherit.c2
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c2
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple3.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple5.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c2
-rw-r--r--src/tests/eo/interface/interface_interface.c2
-rw-r--r--src/tests/eo/interface/interface_interface2.c2
-rw-r--r--src/tests/eo/interface/interface_simple.c2
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c2
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c2
-rw-r--r--src/tests/eo/mixin/mixin_simple.c2
-rw-r--r--src/tests/eo/signals/signals_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c8
-rw-r--r--src/tests/eo/suite/eo_test_class_singleton.c2
-rw-r--r--src/tests/eo/suite/eo_test_domain.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c10
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eolian/data/class_simple_ref.c2
-rw-r--r--src/tests/eolian/data/function_as_argument_ref.c2
-rw-r--r--src/tests/eolian/data/override_ref.c2
-rw-r--r--src/tests/eolian/data/owning.eo.c2
43 files changed, 65 insertions, 64 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 63378d6..3d153ce 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -38,7 +38,7 @@ _class_initializer(Efl_Class *klass)
38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call), 38 EFL_OBJECT_OP_FUNC(simple_other_call, _other_call),
39 ); 39 );
40 40
41 return efl_class_functions_set(klass, &ops, NULL); 41 return efl_class_functions_set(klass, &ops, NULL, NULL);
42} 42}
43 43
44static const Efl_Class_Description class_desc = { 44static const Efl_Class_Description class_desc = {
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 2783b91..cb95185 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -65,7 +65,7 @@ _class_initializer(Efl_Class *klass)
65 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 65 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
66 ); 66 );
67 67
68 return efl_class_functions_set(klass, &ops, NULL); 68 return efl_class_functions_set(klass, &ops, NULL, NULL);
69} 69}
70 70
71static void 71static void
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index a0caefc..eb2ad41 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -882,7 +882,7 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf)
882 eina_strbuf_append(buf, "#endif\n\n"); 882 eina_strbuf_append(buf, "#endif\n\n");
883 } 883 }
884 884
885 eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, copsp);\n"); 885 eina_strbuf_append(buf, " return efl_class_functions_set(klass, opsp, copsp, NULL);\n");
886 886
887 eina_strbuf_free(ops); 887 eina_strbuf_free(ops);
888 eina_strbuf_free(cops); 888 eina_strbuf_free(cops);
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index 2119e07..c7979cc 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -123,7 +123,7 @@ public class Globals {
123 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); 123 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);
124 [DllImport(efl.Libs.Eo)] public static extern IntPtr 124 [DllImport(efl.Libs.Eo)] public static extern IntPtr
125 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); 125 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);
126 [DllImport(efl.Libs.Eo)] public static extern byte efl_class_functions_set(IntPtr klass_id, IntPtr object_ops, IntPtr class_ops); 126 [DllImport(efl.Libs.Eo)] public static extern byte efl_class_functions_set(IntPtr klass_id, IntPtr object_ops, IntPtr class_ops, IntPtr reflection_ops);
127 [DllImport(efl.Libs.Eo)] public static extern IntPtr efl_data_scope_get(IntPtr obj, IntPtr klass); 127 [DllImport(efl.Libs.Eo)] public static extern IntPtr efl_data_scope_get(IntPtr obj, IntPtr klass);
128 [DllImport(efl.Libs.Eo)] public static extern IntPtr efl_super(IntPtr obj, IntPtr klass); 128 [DllImport(efl.Libs.Eo)] public static extern IntPtr efl_super(IntPtr obj, IntPtr klass);
129 [DllImport(efl.Libs.Eo)] public static extern IntPtr efl_class_get(IntPtr obj); 129 [DllImport(efl.Libs.Eo)] public static extern IntPtr efl_class_get(IntPtr obj);
@@ -152,7 +152,7 @@ public class Globals {
152 152
153 public static System.Collections.Concurrent.ConcurrentDictionary<System.Type, System.IntPtr> klasses 153 public static System.Collections.Concurrent.ConcurrentDictionary<System.Type, System.IntPtr> klasses
154 = new System.Collections.Concurrent.ConcurrentDictionary<System.Type, System.IntPtr>(); 154 = new System.Collections.Concurrent.ConcurrentDictionary<System.Type, System.IntPtr>();
155 155
156 public const int RTLD_NOW = 2; 156 public const int RTLD_NOW = 2;
157 157
158 public delegate byte class_initializer(IntPtr klass); 158 public delegate byte class_initializer(IntPtr klass);
@@ -173,7 +173,7 @@ public class Globals {
173 { 173 {
174 return v != null; 174 return v != null;
175 } 175 }
176 176
177 public static IntPtr register_class(String class_name, IntPtr base_klass, System.Type type) 177 public static IntPtr register_class(String class_name, IntPtr base_klass, System.Type type)
178 { 178 {
179 ClassDescription description; 179 ClassDescription description;
@@ -189,7 +189,7 @@ public class Globals {
189 { 189 {
190 return Globals.class_initializer_call(kls, type); 190 return Globals.class_initializer_call(kls, type);
191 }; 191 };
192 192
193 description.class_initializer = Marshal.GetFunctionPointerForDelegate(init); 193 description.class_initializer = Marshal.GetFunctionPointerForDelegate(init);
194 194
195 IntPtr description_ptr = Eina.MemoryNative.Alloc(Marshal.SizeOf(description)); 195 IntPtr description_ptr = Eina.MemoryNative.Alloc(Marshal.SizeOf(description));
@@ -213,7 +213,7 @@ public class Globals {
213 public static List<IntPtr> get_efl_interfaces(System.Type type) 213 public static List<IntPtr> get_efl_interfaces(System.Type type)
214 { 214 {
215 System.Type base_type = type.BaseType; 215 System.Type base_type = type.BaseType;
216 216
217 var ifaces_lst = new List<IntPtr>(); 217 var ifaces_lst = new List<IntPtr>();
218 var base_ifaces = base_type.GetInterfaces(); 218 var base_ifaces = base_type.GetInterfaces();
219 var ifaces = type.GetInterfaces(); 219 var ifaces = type.GetInterfaces();
@@ -271,7 +271,7 @@ public class Globals {
271 } 271 }
272 } 272 }
273 } 273 }
274 274
275 IntPtr descs_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(descs[0])*count); 275 IntPtr descs_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(descs[0])*count);
276 IntPtr ptr = descs_ptr; 276 IntPtr ptr = descs_ptr;
277 for(int i = 0; i != count; ++i) 277 for(int i = 0; i != count; ++i)
@@ -284,12 +284,12 @@ public class Globals {
284 ops.count = (UIntPtr)count; 284 ops.count = (UIntPtr)count;
285 IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops)); 285 IntPtr ops_ptr = Marshal.AllocHGlobal(Marshal.SizeOf(ops));
286 Marshal.StructureToPtr(ops, ops_ptr, false); 286 Marshal.StructureToPtr(ops, ops_ptr, false);
287 Efl.Eo.Globals.efl_class_functions_set(klass, ops_ptr, IntPtr.Zero); 287 Efl.Eo.Globals.efl_class_functions_set(klass, ops_ptr, IntPtr.Zero, IntPtr.Zero);
288 //EoKlass = klass; 288 //EoKlass = klass;
289 } 289 }
290 else 290 else
291 Console.WriteLine("nativeClass == null"); 291 Console.WriteLine("nativeClass == null");
292 292
293 return 1; 293 return 1;
294 } 294 }
295 public static IntPtr call_efl_class_new(IntPtr desc, IntPtr bk, List<IntPtr> il = null) 295 public static IntPtr call_efl_class_new(IntPtr desc, IntPtr bk, List<IntPtr> il = null)
@@ -363,7 +363,7 @@ public class Globals {
363 { 363 {
364 throw new Exception("Instantiation failed"); 364 throw new Exception("Instantiation failed");
365 } 365 }
366 366
367 Console.WriteLine($"Eo instance right after internal_start 0x{eo.ToInt64():x} with refcount {Efl.Eo.Globals.efl_ref_count(eo)}"); 367 Console.WriteLine($"Eo instance right after internal_start 0x{eo.ToInt64():x} with refcount {Efl.Eo.Globals.efl_ref_count(eo)}");
368 Console.WriteLine($"Parent was 0x{parent_ptr.ToInt64()}"); 368 Console.WriteLine($"Parent was 0x{parent_ptr.ToInt64()}");
369 return eo; 369 return eo;
@@ -529,7 +529,7 @@ public interface IWrapper
529 get; 529 get;
530 } 530 }
531 /// <summary>Pointer to internal Eo class.</summary> 531 /// <summary>Pointer to internal Eo class.</summary>
532 IntPtr NativeClass 532 IntPtr NativeClass
533 { 533 {
534 get; 534 get;
535 } 535 }
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 3e5a14d..78b17a7 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -87,7 +87,7 @@ _custom_table_initializer(Efl_Class *klass)
87 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _custom_table_calc) 87 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _custom_table_calc)
88 ); 88 );
89 89
90 return efl_class_functions_set(klass, NULL, &class_ops); 90 return efl_class_functions_set(klass, NULL, &class_ops, NULL);
91}; 91};
92 92
93static const Efl_Class_Description custom_table_class_desc = { 93static const Efl_Class_Description custom_table_class_desc = {
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index cd98f3c..6ca7675 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -279,7 +279,7 @@ _gl_filter_finished_cb(void *data, const Efl_Event *event)
279 else _table_resize(data); 279 else _table_resize(data);
280 elm_genlist_item_selected_set(sd->item, EINA_TRUE); 280 elm_genlist_item_selected_set(sd->item, EINA_TRUE);
281 } 281 }
282 else 282 else
283 { 283 {
284 sd->expanded = EINA_FALSE; 284 sd->expanded = EINA_FALSE;
285 elm_layout_signal_emit(sd->hover, "elm,action,hide,no_animate", "elm"); 285 elm_layout_signal_emit(sd->hover, "elm,action,hide,no_animate", "elm");
@@ -616,7 +616,7 @@ _elm_combobox_class_initializer(Efl_Class *klass)
616 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_combobox) 616 EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_combobox)
617 ); 617 );
618 618
619 return efl_class_functions_set(klass, &ops, NULL); 619 return efl_class_functions_set(klass, &ops, NULL, NULL);
620} 620}
621 621
622static const Efl_Class_Description _elm_combobox_class_desc = { 622static const Efl_Class_Description _elm_combobox_class_desc = {
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 186d7fb..1406984 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -856,13 +856,14 @@ EAPI const Efl_Class *efl_class_new(const Efl_Class_Description *desc, const Efl
856 * @param klass_id the class whose functions we are setting. 856 * @param klass_id the class whose functions we are setting.
857 * @param object_ops The function structure we are setting for object functions 857 * @param object_ops The function structure we are setting for object functions
858 * @param class_ops The function structure we are setting for class functions 858 * @param class_ops The function structure we are setting for class functions
859 * @param reflection_table The reflection table to use within eo
859 * @return True on success, False otherwise. 860 * @return True on success, False otherwise.
860 * 861 *
861 * This should only be called from within the initializer function. 862 * This should only be called from within the initializer function.
862 * 863 *
863 * @see #EFL_DEFINE_CLASS 864 * @see #EFL_DEFINE_CLASS
864 */ 865 */
865EAPI Eina_Bool efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops); 866EAPI 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);
866 867
867/** 868/**
868 * @brief Override Eo functions of this object. 869 * @brief Override Eo functions of this object.
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index c39777b..0d1ae5b 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -819,7 +819,7 @@ _eo_class_funcs_set(Eo_Vtable *vtable, const Efl_Object_Ops *ops, const _Efl_Cla
819} 819}
820 820
821EAPI Eina_Bool 821EAPI Eina_Bool
822efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops) 822efl_class_functions_set(const Efl_Class *klass_id, const Efl_Object_Ops *object_ops, const Efl_Object_Ops *class_ops, const void *reflection_table)
823{ 823{
824 EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass); 824 EO_CLASS_POINTER_GOTO(klass_id, klass, err_klass);
825 Efl_Object_Ops empty_ops = { 0 }; 825 Efl_Object_Ops empty_ops = { 0 };
@@ -982,7 +982,7 @@ _efl_add_internal_end(Eo *eo_id, Eo *finalized_id)
982 // fails or succeeds based on if service is there. 982 // fails or succeeds based on if service is there.
983 // 983 //
984 // until there is a better solution - don't complain here. 984 // until there is a better solution - don't complain here.
985 // 985 //
986 // ERR("Object of class '%s' - Finalizing the object failed.", 986 // ERR("Object of class '%s' - Finalizing the object failed.",
987 // klass->desc->name); 987 // klass->desc->name);
988 goto cleanup; 988 goto cleanup;
@@ -1691,7 +1691,7 @@ efl_class_new(const Efl_Class_Description *desc, const Efl_Class *parent_id, ...
1691 /* If functions haven't been set, invoke it with an empty ops structure. */ 1691 /* If functions haven't been set, invoke it with an empty ops structure. */
1692 if (!klass->functions_set) 1692 if (!klass->functions_set)
1693 { 1693 {
1694 efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL); 1694 efl_class_functions_set(_eo_class_id_get(klass), NULL, NULL, NULL);
1695 } 1695 }
1696 1696
1697 /* Mark which classes we implement */ 1697 /* Mark which classes we implement */
diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c
index 2f830bd..a77e3b4 100644
--- a/src/tests/eo/access/access_inherit.c
+++ b/src/tests/eo/access/access_inherit.c
@@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
25 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print), 25 EFL_OBJECT_OP_FUNC(inherit_prot_print, _prot_print),
26 ); 26 );
27 27
28 return efl_class_functions_set(klass, &ops, NULL); 28 return efl_class_functions_set(klass, &ops, NULL, NULL);
29} 29}
30 30
31static const Efl_Class_Description class_desc = { 31static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 5b75d0c..0ea01db 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -39,7 +39,7 @@ _class_initializer(Efl_Class *klass)
39 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 39 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
40 ); 40 );
41 41
42 return efl_class_functions_set(klass, &ops, NULL); 42 return efl_class_functions_set(klass, &ops, NULL, NULL);
43} 43}
44 44
45static const Efl_Class_Description class_desc = { 45static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index b0b271d..7d6fbe4 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -44,7 +44,7 @@ _class_initializer(Efl_Class *klass)
44 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 44 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
45 ); 45 );
46 46
47 return efl_class_functions_set(klass, &ops, NULL); 47 return efl_class_functions_set(klass, &ops, NULL, NULL);
48} 48}
49 49
50static const Efl_Class_Description class_desc = { 50static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index b9bc70f..c2626ec 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -172,7 +172,7 @@ _class_initializer(Efl_Class *klass)
172 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 172 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
173 ); 173 );
174 174
175 return efl_class_functions_set(klass, &ops, NULL); 175 return efl_class_functions_set(klass, &ops, NULL, NULL);
176} 176}
177 177
178static const Efl_Class_Description class_desc = { 178static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index c3cbdc5..6257d9a 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -46,7 +46,7 @@ _class_initializer(Efl_Class *klass)
46 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 46 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
47 ); 47 );
48 48
49 return efl_class_functions_set(klass, &ops, NULL); 49 return efl_class_functions_set(klass, &ops, NULL, NULL);
50} 50}
51 51
52static const Efl_Class_Description class_desc = { 52static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index cdce5d1..69ecb0d 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -98,7 +98,7 @@ _class_initializer(Efl_Class *klass)
98 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get), 98 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
99 ); 99 );
100 100
101 return efl_class_functions_set(klass, &ops, NULL); 101 return efl_class_functions_set(klass, &ops, NULL, NULL);
102} 102}
103 103
104static const Efl_Class_Description class_desc = { 104static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index 71f8ae1..477de99 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
23 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 23 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
24 ); 24 );
25 25
26 return efl_class_functions_set(klass, &ops, NULL); 26 return efl_class_functions_set(klass, &ops, NULL, NULL);
27} 27}
28 28
29static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c
index 7bab6da..80cc34f 100644
--- a/src/tests/eo/constructors/constructors_simple3.c
+++ b/src/tests/eo/constructors/constructors_simple3.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 21 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops, NULL); 24 return efl_class_functions_set(klass, &ops, NULL, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c
index 73bc8fe..abcb492 100644
--- a/src/tests/eo/constructors/constructors_simple5.c
+++ b/src/tests/eo/constructors/constructors_simple5.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops, NULL); 24 return efl_class_functions_set(klass, &ops, NULL, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 021f1f9..671679e 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -21,7 +21,7 @@ _class_initializer(Efl_Class *klass)
21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor), 21 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor),
22 ); 22 );
23 23
24 return efl_class_functions_set(klass, &ops, NULL); 24 return efl_class_functions_set(klass, &ops, NULL, NULL);
25} 25}
26 26
27static const Efl_Class_Description class_desc = { 27static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index 22c6537..c81d849 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -25,7 +25,7 @@ _class_initializer(Efl_Class *klass)
25 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor), 25 EFL_OBJECT_OP_FUNC(efl_constructor, _constructor),
26 ); 26 );
27 27
28 return efl_class_functions_set(klass, &ops, NULL); 28 return efl_class_functions_set(klass, &ops, NULL, NULL);
29} 29}
30 30
31static const Efl_Class_Description class_desc = { 31static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index 71732fe..7f6b304 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -71,7 +71,7 @@ _class_initializer(Efl_Class *klass)
71 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print), 71 EFL_OBJECT_OP_FUNC(simple_class_print, _class_print),
72 ); 72 );
73 73
74 return efl_class_functions_set(klass, &ops, &cops); 74 return efl_class_functions_set(klass, &ops, &cops, NULL);
75} 75}
76 76
77static const Efl_Class_Description class_desc = { 77static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index e3f3407..54485e2 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -23,7 +23,7 @@ _class_initializer(Efl_Class *klass)
23 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 23 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
24 ); 24 );
25 25
26 return efl_class_functions_set(klass, &ops, NULL); 26 return efl_class_functions_set(klass, &ops, NULL, NULL);
27} 27}
28 28
29static const Efl_Class_Description class_desc = { 29static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index fbd5681..fd65f66 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -66,7 +66,7 @@ _class_initializer(Efl_Class *klass)
66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2), 66 EFL_OBJECT_OP_FUNC(simple_class_print2, _class_print2),
67 ); 67 );
68 68
69 return efl_class_functions_set(klass, &ops, NULL); 69 return efl_class_functions_set(klass, &ops, NULL, NULL);
70} 70}
71 71
72static const Efl_Class_Description class_desc = { 72static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c
index dd5b293..3fd8802 100644
--- a/src/tests/eo/interface/interface_interface.c
+++ b/src/tests/eo/interface/interface_interface.c
@@ -17,7 +17,7 @@ _class_initializer(Efl_Class *klass)
17 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL), 17 EFL_OBJECT_OP_FUNC(interface_ab_sum_get, NULL),
18 ); 18 );
19 19
20 return efl_class_functions_set(klass, &ops, NULL); 20 return efl_class_functions_set(klass, &ops, NULL, NULL);
21} 21}
22 22
23static const Efl_Class_Description class_desc = { 23static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c
index 4b18105..c6e3d1b 100644
--- a/src/tests/eo/interface/interface_interface2.c
+++ b/src/tests/eo/interface/interface_interface2.c
@@ -18,7 +18,7 @@ _class_initializer(Efl_Class *klass)
18 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL), 18 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, NULL),
19 ); 19 );
20 20
21 return efl_class_functions_set(klass, &ops, NULL); 21 return efl_class_functions_set(klass, &ops, NULL, NULL);
22} 22}
23 23
24static const Efl_Class_Description class_desc = { 24static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index 0d20eea..d960f83 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -68,7 +68,7 @@ _class_initializer(Efl_Class *klass)
68 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2), 68 EFL_OBJECT_OP_FUNC(interface2_ab_sum_get2, _ab_sum_get2),
69 ); 69 );
70 70
71 return efl_class_functions_set(klass, &ops, NULL); 71 return efl_class_functions_set(klass, &ops, NULL, NULL);
72} 72}
73 73
74static const Efl_Class_Description class_desc = { 74static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 964fbe2..6d58143 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -26,7 +26,7 @@ _class_initializer(Efl_Class *klass)
26 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get), 26 EFL_OBJECT_OP_FUNC(simple_a_get, _a_get),
27 ); 27 );
28 28
29 return efl_class_functions_set(klass, &ops, NULL); 29 return efl_class_functions_set(klass, &ops, NULL, NULL);
30} 30}
31 31
32static const Efl_Class_Description class_desc = { 32static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index 06bff56..4e61c21 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -41,7 +41,7 @@ _class_initializer(Efl_Class *klass)
41 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 41 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
42 ); 42 );
43 43
44 return efl_class_functions_set(klass, &ops, NULL); 44 return efl_class_functions_set(klass, &ops, NULL, NULL);
45} 45}
46 46
47static const Efl_Class_Description class_desc = { 47static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 48ea26a..6b378c2 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -55,7 +55,7 @@ _class_initializer(Efl_Class *klass)
55 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 55 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
56 ); 56 );
57 57
58 return efl_class_functions_set(klass, &ops, NULL); 58 return efl_class_functions_set(klass, &ops, NULL, NULL);
59} 59}
60 60
61static const Efl_Class_Description class_desc = { 61static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index 8036249..9f4cedc 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -54,7 +54,7 @@ _class_initializer(Efl_Class *klass)
54 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get), 54 EFL_OBJECT_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
55 ); 55 );
56 56
57 return efl_class_functions_set(klass, &ops, NULL); 57 return efl_class_functions_set(klass, &ops, NULL, NULL);
58} 58}
59 59
60static const Efl_Class_Description class_desc = { 60static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c
index 9bc8435..21060b2 100644
--- a/src/tests/eo/mixin/mixin_simple.c
+++ b/src/tests/eo/mixin/mixin_simple.c
@@ -47,7 +47,7 @@ _class_initializer(Efl_Class *klass)
47 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get), 47 EFL_OBJECT_OP_FUNC(simple_b_get, _b_get),
48 ); 48 );
49 49
50 return efl_class_functions_set(klass, &ops, NULL); 50 return efl_class_functions_set(klass, &ops, NULL, NULL);
51} 51}
52 52
53static const Efl_Class_Description class_desc = { 53static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 0e016dc..ae158e3 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -79,7 +79,7 @@ _class_initializer(Efl_Class *klass)
79 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set), 79 EFL_OBJECT_OP_FUNC(simple_a_set, _a_set),
80 ); 80 );
81 81
82 return efl_class_functions_set(klass, &ops, NULL); 82 return efl_class_functions_set(klass, &ops, NULL, NULL);
83} 83}
84 84
85static const Efl_Class_Description class_desc = { 85static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 5a737a4..97a8e76 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -89,7 +89,7 @@ _errorcase_class_initializer(Efl_Class *klass)
89 EFL_OBJECT_OP_FUNC(simple_error_test, _test), 89 EFL_OBJECT_OP_FUNC(simple_error_test, _test),
90 ); 90 );
91 91
92 return efl_class_functions_set(klass, &ops, NULL); 92 return efl_class_functions_set(klass, &ops, NULL, NULL);
93} 93}
94 94
95static const Efl_Class_Description errorcase_class_desc = { 95static const Efl_Class_Description errorcase_class_desc = {
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 0236225..0f670be 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -29,7 +29,7 @@ _destructor_unref_class_initializer(Efl_Class *klass2)
29 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref), 29 EFL_OBJECT_OP_FUNC(efl_destructor, _destructor_unref),
30 ); 30 );
31 31
32 return efl_class_functions_set(klass2, &ops, NULL); 32 return efl_class_functions_set(klass2, &ops, NULL, NULL);
33} 33}
34 34
35EFL_START_TEST(efl_destructor_unref) 35EFL_START_TEST(efl_destructor_unref)
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index a505219..d2dca61 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -203,7 +203,7 @@ _null_class_initializer(Efl_Class *klass)
203 EFL_OBJECT_OP_FUNC(NULL, _null_fct), 203 EFL_OBJECT_OP_FUNC(NULL, _null_fct),
204 ); 204 );
205 205
206 return efl_class_functions_set(klass, &ops, NULL); 206 return efl_class_functions_set(klass, &ops, NULL, NULL);
207} 207}
208 208
209EFL_START_TEST(eo_null_api) 209EFL_START_TEST(eo_null_api)
@@ -240,7 +240,7 @@ _redefined_class_initializer(Efl_Class *klass)
240 EFL_OBJECT_OP_FUNC(null_fct, NULL), 240 EFL_OBJECT_OP_FUNC(null_fct, NULL),
241 ); 241 );
242 242
243 return efl_class_functions_set(klass, &ops, NULL); 243 return efl_class_functions_set(klass, &ops, NULL, NULL);
244} 244}
245 245
246EFL_START_TEST(eo_api_redefined) 246EFL_START_TEST(eo_api_redefined)
@@ -277,7 +277,7 @@ _dich_func_class_initializer(Efl_Class *klass)
277 EFL_OBJECT_OP_FUNC(simple_a_set, NULL), 277 EFL_OBJECT_OP_FUNC(simple_a_set, NULL),
278 ); 278 );
279 279
280 return efl_class_functions_set(klass, &ops, NULL); 280 return efl_class_functions_set(klass, &ops, NULL, NULL);
281} 281}
282 282
283EFL_START_TEST(eo_dich_func_override) 283EFL_START_TEST(eo_dich_func_override)
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 281549c..dfba73f 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -104,7 +104,7 @@ _class_initializer(Efl_Class *klass)
104 EFL_OBJECT_OP_FUNC(simple_class_hi_print, _class_hi_print), 104 EFL_OBJECT_OP_FUNC(simple_class_hi_print, _class_hi_print),
105 ); 105 );
106 106
107 return efl_class_functions_set(klass, &ops, &cops); 107 return efl_class_functions_set(klass, &ops, &cops, NULL);
108} 108}
109 109
110static const Efl_Class_Description class_desc = { 110static const Efl_Class_Description class_desc = {
@@ -135,7 +135,7 @@ _class_initializer2(Efl_Class *klass)
135 EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _beef_get), 135 EFL_OBJECT_OP_FUNC(simple2_class_beef_get, _beef_get),
136 ); 136 );
137 137
138 return efl_class_functions_set(klass, NULL, &cops); 138 return efl_class_functions_set(klass, NULL, &cops, NULL);
139} 139}
140 140
141static const Efl_Class_Description class_desc2 = { 141static const Efl_Class_Description class_desc2 = {
@@ -154,7 +154,7 @@ EFL_DEFINE_CLASS(simple2_class_get, &class_desc2, EO_CLASS, NULL)
154static Eina_Bool 154static Eina_Bool
155_class_initializer3(Efl_Class *klass) 155_class_initializer3(Efl_Class *klass)
156{ 156{
157 return efl_class_functions_set(klass, NULL, NULL); 157 return efl_class_functions_set(klass, NULL, NULL, NULL);
158} 158}
159 159
160static const Efl_Class_Description class_desc3 = { 160static const Efl_Class_Description class_desc3 = {
@@ -185,7 +185,7 @@ _searchable_class_initializer(Efl_Class *klass)
185 EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get) 185 EFL_OBJECT_OP_FUNC(efl_provider_find, _interface_get)
186 ); 186 );
187 187
188 return efl_class_functions_set(klass, &ops, NULL); 188 return efl_class_functions_set(klass, &ops, NULL, NULL);
189} 189}
190 190
191static const Efl_Class_Description class_desc_searchable = { 191static const Efl_Class_Description class_desc_searchable = {
diff --git a/src/tests/eo/suite/eo_test_class_singleton.c b/src/tests/eo/suite/eo_test_class_singleton.c
index a38a52b..d8f325a 100644
--- a/src/tests/eo/suite/eo_test_class_singleton.c
+++ b/src/tests/eo/suite/eo_test_class_singleton.c
@@ -32,7 +32,7 @@ _class_initializer(Efl_Class *klass)
32 EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor), 32 EFL_OBJECT_OP_FUNC(efl_constructor, _singleton_efl_constructor),
33 ); 33 );
34 34
35 return efl_class_functions_set(klass, &ops, NULL); 35 return efl_class_functions_set(klass, &ops, NULL, NULL);
36} 36}
37 37
38static const Efl_Class_Description class_desc = { 38static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_domain.c b/src/tests/eo/suite/eo_test_domain.c
index 114f570..23af220 100644
--- a/src/tests/eo/suite/eo_test_domain.c
+++ b/src/tests/eo/suite/eo_test_domain.c
@@ -64,7 +64,7 @@ _class_initializer(Efl_Class *klass)
64 EFL_OBJECT_OP_FUNC(domain_a_get, _a_get), 64 EFL_OBJECT_OP_FUNC(domain_a_get, _a_get),
65 EFL_OBJECT_OP_FUNC(domain_recursive, _recursive) 65 EFL_OBJECT_OP_FUNC(domain_recursive, _recursive)
66 ); 66 );
67 return efl_class_functions_set(klass, &ops, NULL); 67 return efl_class_functions_set(klass, &ops, NULL, NULL);
68} 68}
69 69
70static const Efl_Class_Description class_desc = { 70static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index fac8c70..1f8c18c 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -472,7 +472,7 @@ _class_initializer(Efl_Class *klass)
472 EFL_OBJECT_OP_FUNC(efl_destructor, _man_des), 472 EFL_OBJECT_OP_FUNC(efl_destructor, _man_des),
473 ); 473 );
474 474
475 return efl_class_functions_set(klass, &ops, NULL); 475 return efl_class_functions_set(klass, &ops, NULL, NULL);
476} 476}
477 477
478EFL_START_TEST(eo_man_free) 478EFL_START_TEST(eo_man_free)
@@ -1049,7 +1049,7 @@ _multi_class_initializer(Efl_Class *klass)
1049 EFL_OBJECT_OP_FUNC(resolve_a_print, _a_print), 1049 EFL_OBJECT_OP_FUNC(resolve_a_print, _a_print),
1050 ); 1050 );
1051 1051
1052 return efl_class_functions_set(klass, &ops, NULL); 1052 return efl_class_functions_set(klass, &ops, NULL, NULL);
1053} 1053}
1054 1054
1055EFL_START_TEST(efl_func_resolve) 1055EFL_START_TEST(efl_func_resolve)
@@ -1215,7 +1215,7 @@ _add_failures_class_initializer(Efl_Class *klass)
1215 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize), 1215 EFL_OBJECT_OP_FUNC(efl_finalize, _efl_add_failures_finalize),
1216 ); 1216 );
1217 1217
1218 return efl_class_functions_set(klass, &ops, NULL); 1218 return efl_class_functions_set(klass, &ops, NULL, NULL);
1219} 1219}
1220 1220
1221EFL_START_TEST(efl_add_failures) 1221EFL_START_TEST(efl_add_failures)
@@ -1628,14 +1628,14 @@ static Eina_Bool
1628_cast_inherit_class_initializer_1(Efl_Class *klass) 1628_cast_inherit_class_initializer_1(Efl_Class *klass)
1629{ 1629{
1630 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_1), ); 1630 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_1), );
1631 return efl_class_functions_set(klass, &ops, NULL); 1631 return efl_class_functions_set(klass, &ops, NULL, NULL);
1632} 1632}
1633 1633
1634static Eina_Bool 1634static Eina_Bool
1635_cast_inherit_class_initializer_2(Efl_Class *klass) 1635_cast_inherit_class_initializer_2(Efl_Class *klass)
1636{ 1636{
1637 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_2), ); 1637 EFL_OPS_DEFINE(ops, EFL_OBJECT_OP_FUNC(inherit_value, _inherit_value_2), );
1638 return efl_class_functions_set(klass, &ops, NULL); 1638 return efl_class_functions_set(klass, &ops, NULL, NULL);
1639} 1639}
1640 1640
1641EFL_START_TEST(efl_cast_test) 1641EFL_START_TEST(efl_cast_test)
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 411eb45..df55e44 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -69,7 +69,7 @@ _class_initializer(Efl_Class *klass)
69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack), 69 EFL_OBJECT_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
70 ); 70 );
71 71
72 return efl_class_functions_set(klass, &ops, NULL); 72 return efl_class_functions_set(klass, &ops, NULL, NULL);
73} 73}
74 74
75static const Efl_Class_Description class_desc = { 75static const Efl_Class_Description class_desc = {
diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c
index 10fa96b..e6c0244 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -50,7 +50,7 @@ _class_simple_class_initializer(Efl_Class *klass)
50 copsp = &cops; 50 copsp = &cops;
51#endif 51#endif
52 52
53 return efl_class_functions_set(klass, opsp, copsp); 53 return efl_class_functions_set(klass, opsp, copsp, NULL);
54} 54}
55 55
56static const Efl_Class_Description _class_simple_class_desc = { 56static const Efl_Class_Description _class_simple_class_desc = {
diff --git a/src/tests/eolian/data/function_as_argument_ref.c b/src/tests/eolian/data/function_as_argument_ref.c
index f73c426..ee9cccc 100644
--- a/src/tests/eolian/data/function_as_argument_ref.c
+++ b/src/tests/eolian/data/function_as_argument_ref.c
@@ -33,7 +33,7 @@ _function_as_argument_class_initializer(Efl_Class *klass)
33 copsp = &cops; 33 copsp = &cops;
34#endif 34#endif
35 35
36 return efl_class_functions_set(klass, opsp, copsp); 36 return efl_class_functions_set(klass, opsp, copsp, NULL);
37} 37}
38 38
39static const Efl_Class_Description _function_as_argument_class_desc = { 39static const Efl_Class_Description _function_as_argument_class_desc = {
diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c
index c177272..45cec76 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -86,7 +86,7 @@ _override_class_initializer(Efl_Class *klass)
86 copsp = &cops; 86 copsp = &cops;
87#endif 87#endif
88 88
89 return efl_class_functions_set(klass, opsp, copsp); 89 return efl_class_functions_set(klass, opsp, copsp, NULL);
90} 90}
91 91
92static const Efl_Class_Description _override_class_desc = { 92static const Efl_Class_Description _override_class_desc = {
diff --git a/src/tests/eolian/data/owning.eo.c b/src/tests/eolian/data/owning.eo.c
index 0c0d03a..8712993 100644
--- a/src/tests/eolian/data/owning.eo.c
+++ b/src/tests/eolian/data/owning.eo.c
@@ -61,7 +61,7 @@ _owning_class_initializer(Efl_Class *klass)
61 copsp = &cops; 61 copsp = &cops;
62#endif 62#endif
63 63
64 return efl_class_functions_set(klass, opsp, copsp); 64 return efl_class_functions_set(klass, opsp, copsp, NULL);
65} 65}
66 66
67static const Efl_Class_Description _owning_class_desc = { 67static const Efl_Class_Description _owning_class_desc = {