1 files changed, 26 insertions, 26 deletions

diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c
index 5c6a57a99c..b74457edd8 100644
--- a/src/lib/edje/edje_part_box.c
+++ b/src/lib/edje/edje_part_box.c
@@ -16,14 +16,14 @@ EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_pack_clear(Eo *obj, void *_pd EINA_UNUSED)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_TRUE));
+   return _edje_part_box_remove_all(pd->ed, pd->part, EINA_TRUE);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_unpack_all(Eo *obj, void *_pd EINA_UNUSED)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_remove_all(pd->ed, pd->part, EINA_FALSE));
+   return _edje_part_box_remove_all(pd->ed, pd->part, EINA_FALSE);
 }
 
 EOLIAN static Eina_Bool
@@ -32,63 +32,63 @@ _efl_canvas_layout_part_box_efl_pack_unpack(Eo *obj, void *_pd EINA_UNUSED, Efl_
    Evas_Object *removed;
    PROXY_DATA_GET(obj, pd);
    removed = _edje_part_box_remove(pd->ed, pd->part, subobj);
-   RETURN_VAL((removed == subobj));
+   return (removed == subobj);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_pack(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj));
+   return _edje_part_box_append(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_linear_pack_begin(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_prepend(pd->ed, pd->part, subobj));
+   return _edje_part_box_prepend(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_linear_pack_end(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj));
+   return _edje_part_box_append(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_linear_pack_before(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_insert_before(pd->ed, pd->part, subobj, existing));
+   return _edje_part_box_insert_before(pd->ed, pd->part, subobj, existing);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_linear_pack_after(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, const Efl_Gfx *existing)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(_edje_part_box_insert_after(pd->ed, pd->part, subobj, existing));
+   return _edje_part_box_insert_after(pd->ed, pd->part, subobj, existing);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_pack_linear_pack_at(Eo *obj, void *_pd EINA_UNUSED, Efl_Gfx *subobj, int index)
 {
    PROXY_DATA_GET(obj, pd);
-   int cnt = PROXY_CALL(efl_content_count(obj));
+   int cnt = efl_content_count(obj);
    if ((index < 0) && ((-index) <= (cnt + 1)))
      index = cnt + index + 1;
    if ((index >= 0) && (index < cnt))
-     RETURN_VAL(_edje_part_box_insert_at(pd->ed, pd->part, subobj, index));
+     return _edje_part_box_insert_at(pd->ed, pd->part, subobj, index);
    else
-     RETURN_VAL(_edje_part_box_append(pd->ed, pd->part, subobj));
+     return _edje_part_box_append(pd->ed, pd->part, subobj);
 }
 
 EOLIAN static Efl_Gfx *
 _efl_canvas_layout_part_box_efl_pack_linear_pack_unpack_at(Eo *obj, void *_pd EINA_UNUSED, int index)
 {
    PROXY_DATA_GET(obj, pd);
-   if (index < 0) index += PROXY_CALL(efl_content_count(obj));
-   RETURN_VAL(_edje_part_box_remove_at(pd->ed, pd->part, index));
+   if (index < 0) index += efl_content_count(obj);
+   return _edje_part_box_remove_at(pd->ed, pd->part, index);
 }
 
 /* New APIs with Eo */
@@ -97,15 +97,15 @@ EOLIAN static Efl_Gfx *
 _efl_canvas_layout_part_box_efl_pack_linear_pack_content_get(Eo *obj, void *_pd EINA_UNUSED, int index)
 {
    PROXY_DATA_GET(obj, pd);
-   if (index < 0) index += PROXY_CALL(efl_content_count(obj));
-   RETURN_VAL(_edje_part_box_content_at(pd->ed, pd->part, index));
+   if (index < 0) index += efl_content_count(obj);
+   return _edje_part_box_content_at(pd->ed, pd->part, index);
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_layout_part_box_efl_container_content_remove(Eo *obj, void *_pd EINA_UNUSED EINA_UNUSED, Efl_Gfx *subobj)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(PROXY_CALL(efl_pack_unpack(obj, subobj)));
+   return efl_pack_unpack(obj, subobj);
 }
 
 EOLIAN static int
@@ -118,14 +118,14 @@ _efl_canvas_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj, void *_pd EI
 
    PROXY_DATA_GET(obj, pd);
    priv = efl_data_scope_get(pd->rp->object, EVAS_BOX_CLASS);
-   if (!priv) RETURN_VAL(-1);
+   if (!priv) return -1;
    EINA_LIST_FOREACH(priv->children, l, opt)
      {
         if (opt->obj == subobj)
-          RETURN_VAL(k);
+          return k;
         k++;
      }
-   RETURN_VAL(-1);
+   return -1;
 }
 
 /* this iterator is the same as efl_ui_box */
@@ -182,17 +182,17 @@ _efl_canvas_layout_part_box_efl_container_content_iterate(Eo *obj, void *_pd EIN
    Eina_Iterator *it;
 
    PROXY_DATA_GET(obj, pd);
-   if (!pd->rp->typedata.container) RETURN_VAL(NULL);
+   if (!pd->rp->typedata.container) return NULL;
    it = evas_object_box_iterator_new(pd->rp->object);
 
-   RETURN_VAL(_part_item_iterator_create(pd->rp->object, it));
+   return _part_item_iterator_create(pd->rp->object, it);
 }
 
 EOLIAN static int
 _efl_canvas_layout_part_box_efl_container_content_count(Eo *obj, void *_pd EINA_UNUSED)
 {
    PROXY_DATA_GET(obj, pd);
-   RETURN_VAL(evas_obj_box_count(pd->rp->object));
+   return evas_obj_box_count(pd->rp->object);
 }
 
 EOLIAN static Efl_Ui_Dir
@@ -203,15 +203,15 @@ _efl_canvas_layout_part_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EI
          (Edje_Part_Description_Box *) pd->rp->chosen_description;
 
    if (!desc || !desc->box.layout)
-     RETURN_VAL(EFL_UI_DIR_DEFAULT);
+     return EFL_UI_DIR_DEFAULT;
 
    if (!strncmp(desc->box.layout, "vertical", 8))
-     RETURN_VAL(EFL_UI_DIR_VERTICAL);
+     return EFL_UI_DIR_VERTICAL;
    else if (!strncmp(desc->box.layout, "horizontal", 10))
-     RETURN_VAL(EFL_UI_DIR_HORIZONTAL);
+     return EFL_UI_DIR_HORIZONTAL;
 
    WRN("unknown orientation '%s'", desc->box.layout);
-   RETURN_VAL(EFL_UI_DIR_DEFAULT);
+   return EFL_UI_DIR_DEFAULT;
 }
 
 #include "efl_canvas_layout_part_box.eo.c"