diff options
Diffstat (limited to 'src/tests/eo/mixin/mixin_mixin3.c')
| -rw-r--r-- | src/tests/eo/mixin/mixin_mixin3.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c index d98b8c87f6..5a29e9d3ae 100644 --- a/src/tests/eo/mixin/mixin_mixin3.c +++ b/src/tests/eo/mixin/mixin_mixin3.c @@ -17,8 +17,8 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) /* This cast is just a hack for the test. */ Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data; int sum = 0; - printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); - sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS)); + printf("%s %s\n", efl_class_name_get(MY_CLASS), __func__); + sum = mixin_ab_sum_get(efl_super(obj, MY_CLASS)); ++sum; pd->count += 3; @@ -36,31 +36,31 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) static Eo * _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - return efl_constructor(eo_super(obj, MY_CLASS)); + return efl_constructor(efl_super(obj, MY_CLASS)); } static void _destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) { - efl_destructor(eo_super(obj, MY_CLASS)); + efl_destructor(efl_super(obj, MY_CLASS)); } static Efl_Op_Description op_descs[] = { - EO_OP_FUNC_OVERRIDE(efl_constructor, _constructor), - EO_OP_FUNC_OVERRIDE(efl_destructor, _destructor), - EO_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), + EFL_OBJECT_OP_FUNC_OVERRIDE(efl_constructor, _constructor), + EFL_OBJECT_OP_FUNC_OVERRIDE(efl_destructor, _destructor), + EFL_OBJECT_OP_FUNC_OVERRIDE(mixin_ab_sum_get, _ab_sum_get), }; static const Efl_Class_Description class_desc = { EO_VERSION, "Mixin3", - EO_CLASS_TYPE_MIXIN, - EO_CLASS_DESCRIPTION_OPS(op_descs), + EFL_CLASS_TYPE_MIXIN, + EFL_CLASS_DESCRIPTION_OPS(op_descs), NULL, sizeof(Mixin3_Public_Data), NULL, NULL }; -EO_DEFINE_CLASS(mixin3_class_get, &class_desc, MIXIN_CLASS, NULL); +EFL_DEFINE_CLASS(mixin3_class_get, &class_desc, MIXIN_CLASS, NULL); |