enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

eo2: change the order of EO2_OP_FUNC* to put EAPI first. 

This looks cleaner and more aligned. Also, it makes more sense as the
internal function is bound to the EAPI and not the other way around.
This commit is contained in:
Tom Hacohen 2013-11-11 13:27:36 +00:00
parent 0dc70153e5
commit 055dd3c521
27 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/eo/Eo.h
View File

@ -450,8 +450,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. */
@ -699,10 +699,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

48
src/lib/eo/eo2_base_class.c
View File

@ -956,30 +956,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
};

2
src/tests/eo/access/access_inherit.c
View File

@ -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
};

2
src/tests/eo/access/access_simple.c
View File

@ -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
};

4
src/tests/eo/composite_objects/composite_objects_comp.c
View File

@ -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
};

4
src/tests/eo/composite_objects/composite_objects_simple.c
View File

@ -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
};

6
src/tests/eo/constructors/constructors_mixin.c
View File

@ -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
};

14
src/tests/eo/constructors/constructors_simple.c
View File

@ -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
};

2
src/tests/eo/constructors/constructors_simple2.c
View File

@ -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
};

2
src/tests/eo/constructors/constructors_simple3.c
View File

@ -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
};

2
src/tests/eo/constructors/constructors_simple5.c
View File

@ -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
};

2
src/tests/eo/constructors/constructors_simple6.c
View File

@ -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
};

2
src/tests/eo/constructors/constructors_simple7.c
View File

@ -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
};

8
src/tests/eo/function_overrides/function_overrides_inherit2.c
View File

@ -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
};

2
src/tests/eo/function_overrides/function_overrides_inherit3.c
View File

@ -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
};

8
src/tests/eo/function_overrides/function_overrides_simple.c
View File

@ -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
};

2
src/tests/eo/interface/interface_interface.c
View File

@ -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
};

2
src/tests/eo/interface/interface_interface2.c
View File

@ -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
};

12
src/tests/eo/interface/interface_simple.c
View File

@ -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
};

2
src/tests/eo/mixin/mixin_inherit.c
View File

@ -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
};

6
src/tests/eo/mixin/mixin_mixin.c
View File

@ -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
};

6
src/tests/eo/mixin/mixin_mixin2.c
View File

@ -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
};

6
src/tests/eo/mixin/mixin_mixin3.c
View File

@ -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
};

8
src/tests/eo/mixin/mixin_simple.c
View File

@ -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
};

4
src/tests/eo/signals/signals_simple.c
View File

@ -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
};

10
src/tests/eo/suite/eo_test_class_simple.c
View File

@ -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
};

8
src/tests/eo/suite/eo_test_general.c
View File

@ -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
};
@ -682,8 +682,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
};