enlightenment/enventor
enlightenment
/
enventor
6
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fix to apply Eo4. 

In Eo4, eo_do, eo_do_ret, eo_do_super, eo_do_super_ret are not used.
This commit is contained in:
Jaehyun Cho 2016-03-04 09:21:56 +09:00
parent fb59a491ba
commit b656f774d9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/edj_viewer.c
View File

@ -159,8 +159,7 @@ view_obj_create_post_job(view_data *vd)
if (vd->part_name) view_part_highlight_set(vd, vd->part_name);
Eina_Bool ret;
if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_parts_get()))
if (enventor_obj_dummy_parts_get(vd->enventor))
dummy_obj_new(vd->layout);
if (vd->changed_part.part)

12
src/lib/enventor_smart.c
View File

@ -196,7 +196,7 @@ _enventor_object_evas_object_smart_add(Eo *obj, Enventor_Object_Data *pd)
pd->obj = obj;
elm_widget_sub_object_parent_add(obj);
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
evas_obj_smart_add(eo_super(obj, MY_CLASS));
build_init();
autocomp_init();
@ -288,10 +288,9 @@ EOLIAN static Eo *
_enventor_object_eo_base_constructor(Eo *obj,
Enventor_Object_Data *pd EINA_UNUSED)
{
obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
obj = eo_constructor(eo_super(obj, MY_CLASS));
evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
return obj;
}
@ -774,8 +773,7 @@ enventor_object_add(Evas_Object *parent)
EAPI Eina_Bool
enventor_object_file_set(Evas_Object *obj, const char *file)
{
Eina_Bool ret;
return eo_do_ret(obj, ret, efl_file_set(file, NULL));
return efl_file_set(obj, file, NULL);
}
#include "enventor_object.eo.c"