[EGIT] [tools/enventor] master 03/03: Revert "Revert "Fix to apply Eo4.""

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=498c1259ebc7b3087af84bece94924c7b45e2673

commit 498c1259ebc7b3087af84bece94924c7b45e2673
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Tue Mar 8 16:53:27 2016 +0900

    Revert "Revert "Fix to apply Eo4.""
    
    This reverts commit e67a1d1607a846a0b7192cc735990ab35aa145d6.
    
    0.8.0 was released. revert this again.
---
 src/lib/edj_viewer.c     |  3 +--
 src/lib/enventor_smart.c | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 2b28701..0a24dea 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -163,8 +163,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)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 7b5c3a8..a5b118c 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -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;
 }
@@ -759,8 +758,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"

--