diff options
28 files changed, 92 insertions, 94 deletions
diff --git a/eo2test/TODO b/eo2test/TODO index 9fa0f4f82e..07af5bd718 100644 --- a/eo2test/TODO +++ b/eo2test/TODO @@ -17,8 +17,6 @@ - function name from pointer dladdr backtrace ?? -- Change the order of EO2_OP_FUNC* functions to put the ID first? - - Get rid of some of the EO2_VOID_FUNC_BODY? - Add line number to errors (like in eo1...) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 61666ed4d6..9a0ec13993 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -448,8 +448,8 @@ typedef struct _Eo_Op_Description Eo_Op_Description; typedef struct _Eo2_Op_Description { - void *func; /**< The static function to call for the op. */ void *api_func; /**< The EAPI function offering this op. */ + void *func; /**< The static function to call for the op. */ Eo_Op op; /**< The op. */ Eo_Op_Type op_type; /**< The type of the Op. */ const char *doc; /**< Explanation about the Op. */ @@ -697,10 +697,10 @@ EAPI extern Eo2_Hook_Call eo2_hook_call_post; // OP ID of an overriding function #define EO2_OP_OVERRIDE ((Eo_Op) -1) -#define EO2_OP_FUNC(_private, _api, _doc) {_private, _api, EO_NOOP, EO_OP_TYPE_REGULAR, _doc} -#define EO2_OP_CLASS_FUNC(_private, _api, _doc) {_private, _api, EO_NOOP, EO_OP_TYPE_CLASS, _doc} -#define EO2_OP_FUNC_OVERRIDE(_private, _api) {_private, _api, EO2_OP_OVERRIDE, EO_OP_TYPE_REGULAR, NULL} -#define EO2_OP_CLASS_FUNC_OVERRIDE(_private, _api) {_private, _api, EO2_OP_OVERRIDE, EO_OP_TYPE_CLASS, NULL} +#define EO2_OP_FUNC(_api, _private, _doc) {_api, _private, EO_NOOP, EO_OP_TYPE_REGULAR, _doc} +#define EO2_OP_CLASS_FUNC(_api, _private, _doc) {_api, _private, EO_NOOP, EO_OP_TYPE_CLASS, _doc} +#define EO2_OP_FUNC_OVERRIDE(_api, _private) {_api, _private, EO2_OP_OVERRIDE, EO_OP_TYPE_REGULAR, NULL} +#define EO2_OP_CLASS_FUNC_OVERRIDE(_api, _private) {_api, _private, EO2_OP_OVERRIDE, EO_OP_TYPE_CLASS, NULL} #define EO2_OP_SENTINEL { NULL, NULL, 0, EO_OP_TYPE_INVALID, NULL} // returns the OP id corresponding to the given api_func diff --git a/src/lib/eo/eo2_base_class.c b/src/lib/eo/eo2_base_class.c index ba863024e0..ad5bc6400d 100644 --- a/src/lib/eo/eo2_base_class.c +++ b/src/lib/eo/eo2_base_class.c @@ -926,30 +926,30 @@ _class_constructor(Eo_Class *klass EINA_UNUSED) } static Eo2_Op_Description op_descs [] = { - EO2_OP_FUNC(_constructor, eo2_constructor, "Constructor."), - EO2_OP_FUNC(_destructor, eo2_destructor, "Destructor."), - EO2_OP_FUNC(_parent_set, eo2_parent_set, "Set parent."), - EO2_OP_FUNC(_parent_get, eo2_parent_get, "Get parent."), - EO2_OP_FUNC(_children_iterator_new, eo2_children_iterator_new, "Get Children Iterator."), - EO2_OP_FUNC(_data_set, eo2_base_data_set, "Set data for key."), - EO2_OP_FUNC(_data_get, eo2_base_data_get, "Get data for key."), - EO2_OP_FUNC(_data_del, eo2_base_data_del, "Del key."), - EO2_OP_FUNC(_wref_add, eo2_wref_add, "Add a weak ref to the object."), - EO2_OP_FUNC(_wref_del, eo2_wref_del, "Delete the weak ref."), - EO2_OP_FUNC(_ev_cb_priority_add, eo2_event_callback_priority_add, "Add an event callback with a priority."), - EO2_OP_FUNC(_ev_cb_del, eo2_event_callback_del, "Delete an event callback"), - EO2_OP_FUNC(_ev_cb_array_priority_add, eo2_event_callback_array_priority_add, "Add an event callback array with a priority."), - EO2_OP_FUNC(_ev_cb_array_del, eo2_event_callback_array_del, "Delete an event callback array"), - EO2_OP_FUNC(_ev_cb_call, eo2_event_callback_call, "Call the event callbacks for an event."), - EO2_OP_FUNC(_ev_cb_forwarder_add, eo2_event_callback_forwarder_add, "Add an event forwarder."), - EO2_OP_FUNC(_ev_cb_forwarder_del, eo2_event_callback_forwarder_del, "Delete an event forwarder."), - EO2_OP_FUNC(_ev_freeze, eo2_event_freeze, "Freezes events."), - EO2_OP_FUNC(_ev_thaw, eo2_event_thaw, "Thaws events."), - EO2_OP_FUNC(_ev_freeze_get, eo2_event_freeze_get, "Get event freeze counter."), - EO2_OP_FUNC(_ev_global_freeze, eo2_event_global_freeze, "Freezes events globally."), - EO2_OP_FUNC(_ev_global_thaw, eo2_event_global_thaw, "Thaws events globally."), - EO2_OP_FUNC(_ev_global_freeze_get, eo2_event_global_freeze_get, "Get global event freeze counter."), - EO2_OP_FUNC(_dbg_info_get, eo2_dbg_info_get, "Get debug info list for obj."), + EO2_OP_FUNC(eo2_constructor, _constructor, "Constructor."), + EO2_OP_FUNC(eo2_destructor, _destructor, "Destructor."), + EO2_OP_FUNC(eo2_parent_set, _parent_set, "Set parent."), + EO2_OP_FUNC(eo2_parent_get, _parent_get, "Get parent."), + EO2_OP_FUNC(eo2_children_iterator_new, _children_iterator_new, "Get Children Iterator."), + EO2_OP_FUNC(eo2_base_data_set, _data_set, "Set data for key."), + EO2_OP_FUNC(eo2_base_data_get, _data_get, "Get data for key."), + EO2_OP_FUNC(eo2_base_data_del, _data_del, "Del key."), + EO2_OP_FUNC(eo2_wref_add, _wref_add, "Add a weak ref to the object."), + EO2_OP_FUNC(eo2_wref_del, _wref_del, "Delete the weak ref."), + EO2_OP_FUNC(eo2_event_callback_priority_add, _ev_cb_priority_add, "Add an event callback with a priority."), + EO2_OP_FUNC(eo2_event_callback_del, _ev_cb_del, "Delete an event callback"), + EO2_OP_FUNC(eo2_event_callback_array_priority_add, _ev_cb_array_priority_add, "Add an event callback array with a priority."), + EO2_OP_FUNC(eo2_event_callback_array_del, _ev_cb_array_del, "Delete an event callback array"), + EO2_OP_FUNC(eo2_event_callback_call, _ev_cb_call, "Call the event callbacks for an event."), + EO2_OP_FUNC(eo2_event_callback_forwarder_add, _ev_cb_forwarder_add, "Add an event forwarder."), + EO2_OP_FUNC(eo2_event_callback_forwarder_del, _ev_cb_forwarder_del, "Delete an event forwarder."), + EO2_OP_FUNC(eo2_event_freeze, _ev_freeze, "Freezes events."), + EO2_OP_FUNC(eo2_event_thaw, _ev_thaw, "Thaws events."), + EO2_OP_FUNC(eo2_event_freeze_get, _ev_freeze_get, "Get event freeze counter."), + EO2_OP_FUNC(eo2_event_global_freeze, _ev_global_freeze, "Freezes events globally."), + EO2_OP_FUNC(eo2_event_global_thaw, _ev_global_thaw, "Thaws events globally."), + EO2_OP_FUNC(eo2_event_global_freeze_get, _ev_global_freeze_get, "Get global event freeze counter."), + EO2_OP_FUNC(eo2_dbg_info_get, _dbg_info_get, "Get debug info list for obj."), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/access/access_inherit.c b/src/tests/eo/access/access_inherit.c index 303f60f261..6db73134de 100644 --- a/src/tests/eo/access/access_inherit.c +++ b/src/tests/eo/access/access_inherit.c @@ -19,7 +19,7 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED) EAPI EO2_VOID_FUNC_BODY(inherit_prot_print); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_prot_print, inherit_prot_print, "Print protected var x1."), + EO2_OP_FUNC(inherit_prot_print, _prot_print, "Print protected var x1."), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c index a7a14a10f7..59997f3a78 100644 --- a/src/tests/eo/access/access_simple.c +++ b/src/tests/eo/access/access_simple.c @@ -33,7 +33,7 @@ _a_set(Eo *obj, void *class_data, int a) EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_a_set, simple_a_set, "Set property A"), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c index fb874f1b86..9d1ec64eab 100644 --- a/src/tests/eo/composite_objects/composite_objects_comp.c +++ b/src/tests/eo/composite_objects/composite_objects_comp.c @@ -37,8 +37,8 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_a_get, simple_a_get), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC_OVERRIDE(simple_a_get, _a_get), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c index 3ccef86d27..e44df196fb 100644 --- a/src/tests/eo/composite_objects/composite_objects_simple.c +++ b/src/tests/eo/composite_objects/composite_objects_simple.c @@ -31,8 +31,8 @@ EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); EAPI EO2_FUNC_BODY(simple_a_get, int, 0); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_a_set, simple_a_set, "Set property A"), - EO2_OP_FUNC(_a_get, simple_a_get, "Get property A"), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"), + EO2_OP_FUNC(simple_a_get, _a_get, "Get property A"), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c index a72911733b..62ebf7bb09 100644 --- a/src/tests/eo/constructors/constructors_mixin.c +++ b/src/tests/eo/constructors/constructors_mixin.c @@ -37,9 +37,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED) EAPI EO2_VOID_FUNC_BODYV(mixin_add_and_print, EO2_FUNC_CALL(x), int x); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_add_and_print_set, mixin_add_and_print, "Add A + B + param and print it"), - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), + EO2_OP_FUNC(mixin_add_and_print, _add_and_print_set, "Add A + B + param and print it"), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c index f5ab9f5123..dfa51bf75e 100644 --- a/src/tests/eo/constructors/constructors_simple.c +++ b/src/tests/eo/constructors/constructors_simple.c @@ -83,13 +83,13 @@ _class_destructor(Eo_Class *klass EINA_UNUSED) EO2_VOID_FUNC_BODYV(simple_constructor, EO2_FUNC_CALL(a), int a); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), - EO2_OP_FUNC(_simple_constructor, simple_constructor, "Construct and set A."), - EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), - EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), - EO2_OP_FUNC(_b_set, simple_b_set, "Set property b"), - EO2_OP_FUNC(_b_get, simple_b_get, "Get property b"), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), + EO2_OP_FUNC(simple_constructor, _simple_constructor, "Construct and set A."), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), + EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), + EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"), + EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c index 3f6d6bdded..b7b4aaef2d 100644 --- a/src/tests/eo/constructors/constructors_simple2.c +++ b/src/tests/eo/constructors/constructors_simple2.c @@ -17,7 +17,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_simple3.c b/src/tests/eo/constructors/constructors_simple3.c index 1a8a32fac5..233005eecb 100644 --- a/src/tests/eo/constructors/constructors_simple3.c +++ b/src/tests/eo/constructors/constructors_simple3.c @@ -15,7 +15,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_simple5.c b/src/tests/eo/constructors/constructors_simple5.c index ea43291eea..b64b969819 100644 --- a/src/tests/eo/constructors/constructors_simple5.c +++ b/src/tests/eo/constructors/constructors_simple5.c @@ -15,7 +15,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c index d78cad88e0..7a23eb31d4 100644 --- a/src/tests/eo/constructors/constructors_simple6.c +++ b/src/tests/eo/constructors/constructors_simple6.c @@ -17,7 +17,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED) } static Eo2_Op_Description op_descs [] = { - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c index 90b11c4984..fb4a731261 100644 --- a/src/tests/eo/constructors/constructors_simple7.c +++ b/src/tests/eo/constructors/constructors_simple7.c @@ -19,7 +19,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static Eo2_Op_Description op_descs [] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c index f228528719..cf8b1cb0db 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit2.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c @@ -60,10 +60,10 @@ EAPI EO2_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE); EAPI EO2_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_print, inherit2_print, "Print hey"), - EO2_OP_FUNC(_print2, inherit2_print2, "Print hey2"), - EO2_OP_CLASS_FUNC_OVERRIDE(_class_print, simple_class_print), - EO2_OP_FUNC_OVERRIDE(_a_set, simple_a_set), + EO2_OP_FUNC(inherit2_print, _print, "Print hey"), + EO2_OP_FUNC(inherit2_print2, _print2, "Print hey2"), + EO2_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print), + EO2_OP_FUNC_OVERRIDE(simple_a_set, _a_set), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c index ad4cb67f8c..68214b7b26 100644 --- a/src/tests/eo/function_overrides/function_overrides_inherit3.c +++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c @@ -17,7 +17,7 @@ _a_set(Eo *obj, void *class_data EINA_UNUSED, int a) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_a_set, simple_a_set), + EO2_OP_FUNC_OVERRIDE(simple_a_set, _a_set), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c index 3de5938aad..1e2ef0e6f7 100644 --- a/src/tests/eo/function_overrides/function_overrides_simple.c +++ b/src/tests/eo/function_overrides/function_overrides_simple.c @@ -57,10 +57,10 @@ EAPI EO2_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE); EAPI EO2_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_a_set, simple_a_set, "Set property A"), - EO2_OP_FUNC(_a_print, simple_a_print, "Print property A"), - EO2_OP_FUNC(_class_print, simple_class_print, "Print class name."), - EO2_OP_FUNC(_class_print2, simple_class_print2, "Print2 class name."), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property A"), + EO2_OP_FUNC(simple_a_print, _a_print, "Print property A"), + EO2_OP_FUNC(simple_class_print, _class_print, "Print class name."), + EO2_OP_FUNC(simple_class_print2, _class_print2, "Print2 class name."), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/interface/interface_interface.c b/src/tests/eo/interface/interface_interface.c index 0afd136b6c..eac93cd2b0 100644 --- a/src/tests/eo/interface/interface_interface.c +++ b/src/tests/eo/interface/interface_interface.c @@ -11,7 +11,7 @@ EO2_FUNC_BODY(interface_ab_sum_get, int, 0); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(NULL, interface_ab_sum_get, "Get the sum of a and b."), + EO2_OP_FUNC(interface_ab_sum_get, NULL, "Get the sum of a and b."), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/interface/interface_interface2.c b/src/tests/eo/interface/interface_interface2.c index 27f2e3c35c..198850da05 100644 --- a/src/tests/eo/interface/interface_interface2.c +++ b/src/tests/eo/interface/interface_interface2.c @@ -12,7 +12,7 @@ EO2_FUNC_BODY(interface2_ab_sum_get2, int, 0); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(NULL, interface2_ab_sum_get2, "Print the sum of a and b."), + EO2_OP_FUNC(interface2_ab_sum_get2, NULL, "Print the sum of a and b."), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c index 16e2b836a5..8a0aa1f06b 100644 --- a/src/tests/eo/interface/interface_simple.c +++ b/src/tests/eo/interface/interface_simple.c @@ -55,12 +55,12 @@ _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), - EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), - EO2_OP_FUNC(_b_set, simple_b_set, "Set property b"), - EO2_OP_FUNC(_b_get, simple_b_get, "Get property b"), - EO2_OP_FUNC_OVERRIDE(_ab_sum_get, interface_ab_sum_get), - EO2_OP_FUNC_OVERRIDE(_ab_sum_get2, interface2_ab_sum_get2), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), + EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), + EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"), + EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"), + EO2_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get), + EO2_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c index 7c8b3b568f..558c54cf04 100644 --- a/src/tests/eo/mixin/mixin_inherit.c +++ b/src/tests/eo/mixin/mixin_inherit.c @@ -20,7 +20,7 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_a_get, simple_a_get), + EO2_OP_FUNC_OVERRIDE(simple_a_get, _a_get), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c index 71983850d5..9b6ac802a1 100644 --- a/src/tests/eo/mixin/mixin_mixin.c +++ b/src/tests/eo/mixin/mixin_mixin.c @@ -32,9 +32,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED) EAPI EO2_FUNC_BODY(mixin_ab_sum_get, int, 0); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), - EO2_OP_FUNC(_ab_sum_get, mixin_ab_sum_get, "Get the sum of a and b."), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), + EO2_OP_FUNC(mixin_ab_sum_get, _ab_sum_get, "Get the sum of a and b."), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c index 417321f12c..80dfa8275b 100644 --- a/src/tests/eo/mixin/mixin_mixin2.c +++ b/src/tests/eo/mixin/mixin_mixin2.c @@ -45,9 +45,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), - EO2_OP_FUNC_OVERRIDE(_ab_sum_get, mixin_ab_sum_get), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), + EO2_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c index 1a04b94be1..441fd29e72 100644 --- a/src/tests/eo/mixin/mixin_mixin3.c +++ b/src/tests/eo/mixin/mixin_mixin3.c @@ -45,9 +45,9 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_destructor, eo2_destructor), - EO2_OP_FUNC_OVERRIDE(_ab_sum_get, mixin_ab_sum_get), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _destructor), + EO2_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/mixin/mixin_simple.c b/src/tests/eo/mixin/mixin_simple.c index 8dc515bb87..879728964f 100644 --- a/src/tests/eo/mixin/mixin_simple.c +++ b/src/tests/eo/mixin/mixin_simple.c @@ -38,10 +38,10 @@ _GET_SET_FUNC(a) _GET_SET_FUNC(b) static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), - EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), - EO2_OP_FUNC(_b_set, simple_b_set, "Set property b"), - EO2_OP_FUNC(_b_get, simple_b_get, "Get property b"), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), + EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), + EO2_OP_FUNC(simple_b_set, _b_set, "Set property b"), + EO2_OP_FUNC(simple_b_get, _b_get, "Get property b"), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c index 4b7364772a..1de1ad9e34 100644 --- a/src/tests/eo/signals/signals_simple.c +++ b/src/tests/eo/signals/signals_simple.c @@ -74,8 +74,8 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED) EAPI EO2_VOID_FUNC_BODYV(simple_a_set, EO2_FUNC_CALL(a), int a); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_constructor, eo2_constructor), - EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _constructor), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c index 9b55ffb3fa..8690dfc540 100644 --- a/src/tests/eo/suite/eo_test_class_simple.c +++ b/src/tests/eo/suite/eo_test_class_simple.c @@ -59,11 +59,11 @@ EO2_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); EO2_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE); static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_dbg_info_get, eo2_dbg_info_get), - EO2_OP_FUNC(_a_set, simple_a_set, "Set property a"), - EO2_OP_FUNC(_a_get, simple_a_get, "Get property a"), - EO2_OP_FUNC(_a_print, simple_a_print, "Print property a"), - EO2_OP_CLASS_FUNC(_class_hi_print, simple_class_hi_print, "Print property a"), + EO2_OP_FUNC_OVERRIDE(eo2_dbg_info_get, _dbg_info_get), + EO2_OP_FUNC(simple_a_set, _a_set, "Set property a"), + EO2_OP_FUNC(simple_a_get, _a_get, "Get property a"), + EO2_OP_FUNC(simple_a_print, _a_print, "Print property a"), + EO2_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print, "Print property a"), EO2_OP_SENTINEL }; diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 6900ba4eb4..e1f2acfab7 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -265,8 +265,8 @@ _man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) } static Eo2_Op_Description op_descs[] = { - EO2_OP_FUNC_OVERRIDE(_man_con, eo2_constructor), - EO2_OP_FUNC_OVERRIDE(_man_des, eo2_destructor), + EO2_OP_FUNC_OVERRIDE(eo2_constructor, _man_con), + EO2_OP_FUNC_OVERRIDE(eo2_destructor, _man_des), EO2_OP_SENTINEL }; @@ -676,8 +676,8 @@ EO2_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE); EO2_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE); static Eo2_Op_Description _multi_do_op_descs[] = { - EO2_OP_FUNC(_a_print, multi_a_print, "Print property a"), - EO2_OP_FUNC(_class_hi_print, multi_class_hi_print, "Print Hi"), + EO2_OP_FUNC(multi_a_print, _a_print, "Print property a"), + EO2_OP_FUNC(multi_class_hi_print, _class_hi_print, "Print Hi"), EO2_OP_SENTINEL }; |