rimmed pushed a commit to branch eflete-0.6.1.

http://git.enlightenment.org/tools/eflete.git/commit/?id=7881698ffbdd0dfaa99c6da9fee348f54e53f1d7

commit 7881698ffbdd0dfaa99c6da9fee348f54e53f1d7
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Mon Mar 21 16:51:57 2016 +0200

    Revert "Fix build errors"
    
    Downground the efl usage (means Eo) for run to efl v1.17.0
    
    This reverts commit a6eda079f435841a90cfb3bd0c7781da4ab8521b.
---
 src/bin/ui/colorclass_manager.c        |  2 +-
 src/bin/ui/editors/animator.c          |  3 +-
 src/bin/ui/project_navigator.c         |  2 +-
 src/bin/ui/property_group.c            |  2 +-
 src/bin/ui/property_macros.h           |  2 +-
 src/bin/ui/property_sound.c            | 50 +++++++++++++++++-----------------
 src/bin/ui/sound_manager.c             |  4 +--
 src/bin/ui/style_manager.c             |  4 +--
 src/bin/ui/tab_home_import_edc.c       |  2 +-
 src/bin/ui/tab_home_import_edj.c       |  2 +-
 src/bin/ui/tab_home_new.c              |  2 +-
 src/bin/ui/workspace/group_navigator.c | 14 +++++-----
 src/lib/ewe_combobox.c                 | 17 ++++++------
 src/lib/ewe_ruler.c                    | 18 ++++++------
 14 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c
index 1579ed6..6a80ee6 100644
--- a/src/bin/ui/colorclass_manager.c
+++ b/src/bin/ui/colorclass_manager.c
@@ -79,7 +79,7 @@ _on_button_add_clicked_cb(void *data __UNUSED__,
    resource_name_validator_list_set(edit->name_validator, 
&ap.project->colorclasses, true);
    LAYOUT_PROP_ADD(ap.win, _("Color class name: "), "property", "1swallow")
    ENTRY_ADD(item, edit->entry, true);
-   eo_event_callback_add(edit->entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, edit->name_validator);
+   eo_do(edit->entry, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, edit->name_validator));
    evas_object_smart_callback_add(edit->entry, "changed", _validation, edit);
    elm_object_part_text_set(edit->entry, "guide", _("Type new color class name 
here"));
    elm_object_part_content_set(item, "elm.swallow.content", edit->entry);
diff --git a/src/bin/ui/editors/animator.c b/src/bin/ui/editors/animator.c
index 26fd9a5..1dd935d 100644
--- a/src/bin/ui/editors/animator.c
+++ b/src/bin/ui/editors/animator.c
@@ -364,7 +364,8 @@ _on_bt_prog_add(void *data,
    animator->popup.name_validator = elm_validator_regexp_new(NAME_REGEX, NULL);
    LAYOUT_PROP_ADD(animator->popup.popup, _("Frequency:"), "property", 
"1swallow")
    ENTRY_ADD(item, animator->popup.entry, true)
-   eo_event_callback_add(animator->popup.entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator);
+   eo_do(animator->popup.entry,
+         eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, animator->popup.name_validator));
    evas_object_smart_callback_add(animator->popup.entry, "changed", 
_validation, animator);
    elm_object_part_content_set(item, "elm.swallow.content", 
animator->popup.entry);
 
diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index c0eb8cb..7ae285d 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -437,7 +437,7 @@ _btn_add_group_cb(void *data __UNUSED__,
    LAYOUT_PROP_ADD(layout_p.box, _("name"), "property", "1swallow")
    ENTRY_ADD(layout_p.box, layout_p.entry, true)
    evas_object_smart_callback_add(layout_p.entry, "changed", _group_validate, 
NULL);
-   eo_event_callback_add(layout_p.entry, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator);
+   eo_do(layout_p.entry, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, validator));
    elm_layout_content_set(item, NULL, layout_p.entry);
    elm_box_pack_end(layout_p.box, item);
    glit = elm_genlist_selected_item_get(project_navigator.genlist);
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index f8b5715..1fea839 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -1514,7 +1514,7 @@ prop_part_name_add(Evas_Object *parent, Group_Prop_Data 
*pd)
 
    PROPERTY_ITEM_ADD(parent,  _("name"), "1swallow");
    ENTRY_ADD(parent, pd->attributes.part.name, true);
-   eo_event_callback_add(pd->attributes.part.name, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, pd->attributes.part.validator);
+   eo_do(pd->attributes.part.name, 
eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, resource_name_validator_helper, 
pd->attributes.part.validator));
    resource_name_validator_list_set(pd->attributes.part.validator, 
&pd->part->group->parts, false);
    resource_name_validator_resource_set(pd->attributes.part.validator, 
(Resource *)pd->part);
    elm_entry_entry_set(pd->attributes.part.name, pd->part->name);
diff --git a/src/bin/ui/property_macros.h b/src/bin/ui/property_macros.h
index 8a3be98..13cb222 100644
--- a/src/bin/ui/property_macros.h
+++ b/src/bin/ui/property_macros.h
@@ -549,7 +549,7 @@ prop_##SUB##_##VALUE##_add(Evas_Object *parent, \
        evas_object_smart_callback_add(pd->attributes.MEMBER.VALUE, 
"unfocused", _on_##SUB##_##VALUE##_activated, pd); \
      } \
    if (VALIDATOR) \
-      eo_event_callback_add(pd->attributes.MEMBER.VALUE, 
ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, VALIDATOR); \
+      eo_do(pd->attributes.MEMBER.VALUE, 
eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, elm_validator_regexp_helper, 
VALIDATOR)); \
    if (TOOLTIP) elm_object_tooltip_text_set(pd->attributes.MEMBER.VALUE, 
TOOLTIP); \
    elm_layout_content_set(item, NULL, pd->attributes.MEMBER.VALUE); \
    prop_##SUB##_##VALUE##_update(pd); \
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index ca03320..686d8cc 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -281,11 +281,11 @@ _create_io_stream(Sound_Prop_Data *edit)
 
    assert(edit->io.out != NULL);
 
-   eo_event_callback_add(edit->io.out, 
ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
-                         _out_fail, NULL);
+   eo_do(edit->io.out, 
eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
+                                             _out_fail, NULL));
 
-   eo_event_callback_add(edit->io.in, ECORE_AUDIO_IN_EVENT_IN_STOPPED,
-                         _play_finished_cb, edit);
+   eo_do(edit->io.in, eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED,
+                                            _play_finished_cb, edit));
 }
 
 static void
@@ -302,19 +302,19 @@ _tone_play(Sound_Prop_Data *edit)
    if (!edit->io.in)
      {
         edit->io.in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
-        ecore_audio_obj_name_set(edit->io.in, tone->name);
-        eo_key_data_set(edit->io.in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->freq);
-        ecore_audio_obj_in_length_set(edit->io.in, TONE_PLAYING_DURATION);
-        eo_event_callback_add(edit->io.in, ECORE_AUDIO_IN_EVENT_IN_STOPPED,
-                              _play_finished_cb, edit);
+        eo_do(edit->io.in, ecore_audio_obj_name_set(tone->name));
+        eo_do(edit->io.in, eo_key_data_set(ECORE_AUDIO_ATTR_TONE_FREQ, 
&tone->freq));
+        eo_do(edit->io.in, 
ecore_audio_obj_in_length_set(TONE_PLAYING_DURATION));
+        eo_do(edit->io.in, 
eo_event_callback_add(ECORE_AUDIO_IN_EVENT_IN_STOPPED,
+                                                 _play_finished_cb, edit));
      }
 
    if (!edit->io.out)
      edit->io.out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL,
-                           eo_event_callback_add(eoid, 
ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
+                           
eo_event_callback_add(ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL,
                                                  _out_fail, NULL));
 
-   ret = ecore_audio_obj_out_input_attach(edit->io.out, edit->io.in);
+   eo_do(edit->io.out, ret = ecore_audio_obj_out_input_attach(edit->io.in));
    if (!ret)
      {
         ERR("Couldn't attach input and output!");
@@ -323,7 +323,7 @@ _tone_play(Sound_Prop_Data *edit)
 
    value = elm_slider_value_get(edit->player_data.rewind);
    if (value)
-     value = ecore_audio_obj_in_seek(edit->io.in, value, SEEK_SET);
+     eo_do(edit->io.in, value = ecore_audio_obj_in_seek(value, SEEK_SET));
 
    edit->player_data.timer = ecore_timer_add(UPDATE_FREQUENCY, _rewind_cb, 
edit);
 }
@@ -341,8 +341,8 @@ _sample_play(Sound_Prop_Data *edit)
      {
         sample = (External_Resource *)edit->snd->resource;
         _create_io_stream(edit);
-        ecore_audio_obj_name_set(edit->io.in, sample->source);
-        ret = ecore_audio_obj_source_set(edit->io.in, sample->source);
+        eo_do(edit->io.in, ecore_audio_obj_name_set(sample->source));
+        eo_do(edit->io.in, ret = ecore_audio_obj_source_set(sample->source));
         if (!ret)
           {
              ERR("Can not set source obj for added sample");
@@ -350,7 +350,7 @@ _sample_play(Sound_Prop_Data *edit)
           }
      }
 
-   ret = ecore_audio_obj_out_input_attach(edit->io.out, edit->io.in);
+   eo_do(edit->io.out, ret = ecore_audio_obj_out_input_attach(edit->io.in));
    if (!ret)
      {
         ERR("Couldn't attach input and output!");
@@ -359,7 +359,7 @@ _sample_play(Sound_Prop_Data *edit)
 
    value = elm_slider_value_get(edit->player_data.rewind);
    if (value)
-     value = ecore_audio_obj_in_seek(edit->io.in, value, SEEK_SET);
+     eo_do(edit->io.in, value = ecore_audio_obj_in_seek(value, SEEK_SET));
 
    edit->player_data.timer = ecore_timer_add(UPDATE_FREQUENCY, _rewind_cb, 
edit);
 }
@@ -372,10 +372,10 @@ _interrupt_playing(Sound_Prop_Data *edit)
    assert(edit != NULL);
 
    if (!edit->io.in) return; /* case when previous sound playing is finished */
-   ret = ecore_audio_obj_paused_get(edit->io.in);
+   eo_do(edit->io.in, ret = ecore_audio_obj_paused_get());
    if (ret)
      {
-        ret = ecore_audio_obj_out_input_detach(edit->io.out, edit->io.in);
+        eo_do(edit->io.out, ret = 
ecore_audio_obj_out_input_detach(edit->io.in));
         if (!ret) ERR("Could not detach input");
 
         ecore_timer_del(edit->player_data.timer);
@@ -405,10 +405,10 @@ _on_play_cb(void *data,
 
    if (edit->io.in)
      {
-        paused = ecore_audio_obj_paused_get(edit->io.in);
+        eo_do(edit->io.in, paused = ecore_audio_obj_paused_get());
         if (paused)
           {
-             ecore_audio_obj_paused_set(edit->io.in, false);
+             eo_do(edit->io.in, ecore_audio_obj_paused_set(false));
              ecore_timer_thaw(edit->player_data.timer);
              return;
           }
@@ -438,7 +438,7 @@ _on_pause_cb(void *data EINA_UNUSED,
 
    assert(edit != NULL);
 
-   ecore_audio_obj_paused_set(edit->io.in, true);
+   eo_do(edit->io.in, ecore_audio_obj_paused_set(true));
 
    ecore_timer_freeze(edit->player_data.timer);
    elm_object_part_content_unset(edit->sound_player, "swallow.button.play");
@@ -457,7 +457,7 @@ _on_rewind_cb(void *data,
    assert(edit != NULL);
 
    double value = elm_slider_value_get(edit->player_data.rewind);
-   value = ecore_audio_obj_in_seek(edit->io.in, value, SEEK_SET);
+   eo_do(edit->io.in, value = ecore_audio_obj_in_seek(value, SEEK_SET));
 }
 
 #define BT_ADD(PARENT, OBJ, ICON, ICON_STYLE) \
@@ -610,10 +610,10 @@ _grid_sample_selected(void *data,
 
    sample = (External_Resource *)snd->resource;
    _create_io_stream(edit);
-   ecore_audio_obj_name_set(edit->io.in, sample->source);
-   ret = ecore_audio_obj_source_set(edit->io.in, sample->source);
+   eo_do(edit->io.in, ecore_audio_obj_name_set(sample->source));
+   eo_do(edit->io.in, ret = ecore_audio_obj_source_set(sample->source));
    if (!ret) ERR("Can not set source '%s' to obj sample", sample->source)
-   len = ecore_audio_obj_in_length_get(edit->io.in);
+   eo_do(edit->io.in, len = ecore_audio_obj_in_length_get());
    elm_slider_min_max_set(edit->player_data.rewind, 0, len);
    elm_slider_value_set(edit->player_data.rewind, 0.0);
    edit->io.length = ecore_file_size(sample->source);
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index c69b22d..50d55bf 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -451,7 +451,7 @@ _tone_add_cb(void *data,
    elm_object_content_set(popup, box);
    LAYOUT_PROP_ADD(box, _("Tone name:"), "property", "1swallow")
    ENTRY_ADD(item, edit->tone_entry, true);
-   eo_event_callback_add(edit->tone_entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, edit->tone_validator);
+   eo_do(edit->tone_entry, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, edit->tone_validator));
    evas_object_smart_callback_add(edit->tone_entry, "changed", _validation, 
edit);
    elm_object_part_text_set(edit->tone_entry, "guide", _("Type a new tone 
name"));
    /* need to manualy set not valid string for triggered validator */
@@ -461,7 +461,7 @@ _tone_add_cb(void *data,
 
    LAYOUT_PROP_ADD(box, _("Frequency:"), "property", "1swallow")
    ENTRY_ADD(item, edit->frq_entry, true);
-   eo_event_callback_add(edit->frq_entry, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, edit->frq_validator);
+   eo_do(edit->frq_entry, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, edit->frq_validator));
    evas_object_smart_callback_add(edit->frq_entry, "changed", _validation, 
edit);
    elm_object_part_text_set(edit->frq_entry, "guide", _("Type a frequency (20 
- 20000)"));
    /* need to manualy set not valid string for triggered validator */
diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c
index fe0057f..7967921 100644
--- a/src/bin/ui/style_manager.c
+++ b/src/bin/ui/style_manager.c
@@ -356,7 +356,7 @@ _on_bt_style_add(void *data,
    POPUP.name_validator = resource_name_validator_new(NAME_REGEX, NULL);
    resource_name_validator_list_set(POPUP.name_validator, &ap.project->styles, 
true);
    ENTRY_ADD(item, POPUP.name, true);
-   eo_event_callback_add(POPUP.name, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, POPUP.name_validator);
+   eo_do(POPUP.name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, POPUP.name_validator));
    evas_object_smart_callback_add(POPUP.name, "changed", _validate, 
style_edit);
    elm_object_part_text_set(POPUP.name, "guide", _("Type a new style name"));
    elm_object_part_content_set(item, "elm.swallow.content", POPUP.name);
@@ -440,7 +440,7 @@ _on_bt_tag_add(void *data,
    POPUP.name_validator = resource_name_validator_new(NAME_REGEX, NULL);
    resource_name_validator_list_set(POPUP.name_validator, 
&POPUP.buf_resources, true);
    ENTRY_ADD(item, POPUP.name, true);
-   eo_event_callback_add(POPUP.name, ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, POPUP.name_validator);
+   eo_do(POPUP.name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
resource_name_validator_helper, POPUP.name_validator));
    evas_object_smart_callback_add(POPUP.name, "changed", _validate, 
style_edit);
    elm_object_part_text_set(POPUP.name, "guide", _("Type a new tag name."));
    elm_object_part_content_set(item, "elm.swallow.content", POPUP.name);
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index b08a3af..d38dcc9 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -471,7 +471,7 @@ _tab_import_edc_add(void)
    /* label.name */
    LAYOUT_PROP_ADD(tab_edc.box, _("Project name:"), "tab_home", "item")
    ENTRY_ADD(item, tab_edc.name, true)
-   eo_event_callback_add(tab_edc.name, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, tab_edc.name_validator);
+   eo_do(tab_edc.name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, tab_edc.name_validator));
    evas_object_smart_callback_add(tab_edc.name, "changed", _validate, NULL);
    elm_layout_content_set(item, NULL, tab_edc.name);
    elm_box_pack_end(tab_edc.box, item);
diff --git a/src/bin/ui/tab_home_import_edj.c b/src/bin/ui/tab_home_import_edj.c
index 9caac2d..2fe8b92 100644
--- a/src/bin/ui/tab_home_import_edj.c
+++ b/src/bin/ui/tab_home_import_edj.c
@@ -179,7 +179,7 @@ _tab_import_edj_add(void)
    /* label.name */
    elm_object_part_text_set(tab_edj.layout, "label.name", _("Project name:"));
    ENTRY_ADD(tab_edj.layout, tab_edj.name, true)
-   eo_event_callback_add(tab_edj.name, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, tab_edj.name_validator);
+   eo_do(tab_edj.name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, tab_edj.name_validator));
    evas_object_smart_callback_add(tab_edj.name, "changed", _validate, NULL);
    elm_object_part_content_set(tab_edj.layout, "swallow.name", tab_edj.name);
    /* label.path */
diff --git a/src/bin/ui/tab_home_new.c b/src/bin/ui/tab_home_new.c
index 61760b7..d01f399 100644
--- a/src/bin/ui/tab_home_new.c
+++ b/src/bin/ui/tab_home_new.c
@@ -591,7 +591,7 @@ _tab_new_project_add(void)
    /* label.name */
    elm_object_part_text_set(tab_new.layout, "label.name", _("Project name:"));
    ENTRY_ADD(tab_new.layout, tab_new.name, true)
-   eo_event_callback_add(tab_new.name, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, tab_new.name_validator);
+   eo_do(tab_new.name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, tab_new.name_validator));
    evas_object_smart_callback_add(tab_new.name, "changed", _validate, NULL);
    elm_object_part_content_set(tab_new.layout, "swallow.name", tab_new.name);
    /* label.path */
diff --git a/src/bin/ui/workspace/group_navigator.c 
b/src/bin/ui/workspace/group_navigator.c
index 3821bcb..22854c6 100644
--- a/src/bin/ui/workspace/group_navigator.c
+++ b/src/bin/ui/workspace/group_navigator.c
@@ -838,7 +838,7 @@ _on_menu_add_part_clicked(void *data __UNUSED__,
 
    LAYOUT_PROP_ADD(box, _("Part name:"), "property", "1swallow")
    ENTRY_ADD(box, pl->popup.entry_name, true);
-   eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, pl->name_validator);
+   eo_do(pl->popup.entry_name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, 
elm_validator_regexp_helper, pl->name_validator));
    elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter name for 
new part here."));
    evas_object_smart_callback_add(pl->popup.entry_name, "changed", 
_on_entry_changed, pl);
    evas_object_smart_callback_add(pl->popup.entry_name, "activated", 
_popup_add_part_ok_clicked, pl);
@@ -987,8 +987,8 @@ _on_menu_add_state_clicked(void *data __UNUSED__,
    BOX_ADD(ap.popup, box, false, false);
    LAYOUT_PROP_ADD(box, _("Name:"), "property", "1swallow")
    ENTRY_ADD(item, pl->popup.entry_name, true);
-   eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
-                         elm_validator_regexp_helper, pl->name_validator);
+   eo_do(pl->popup.entry_name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE,
+         elm_validator_regexp_helper, pl->name_validator));
    evas_object_smart_callback_add(pl->popup.entry_name, "changed", 
_state_validate, pl);
    evas_object_smart_callback_add(pl->popup.entry_name, "activated", 
_popup_add_state_ok_clicked, pl);
    elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter name for 
new state here."));
@@ -1112,8 +1112,8 @@ _on_menu_add_item_clicked(void *data __UNUSED__,
    BOX_ADD(ap.popup, box, false, false);
    LAYOUT_PROP_ADD(box, _("Name:"), "property", "1swallow")
    ENTRY_ADD(item, pl->popup.entry_name, true);
-   eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
-                         elm_validator_regexp_helper, pl->name_validator);
+   eo_do(pl->popup.entry_name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE,
+         elm_validator_regexp_helper, pl->name_validator));
    evas_object_smart_callback_add(pl->popup.entry_name, "changed", 
_item_validate, pl);
    evas_object_smart_callback_add(pl->popup.entry_name, "activated", 
_popup_add_item_ok_clicked, pl);
    elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter name for 
new item here."));
@@ -1228,8 +1228,8 @@ _on_menu_add_program_clicked(void *data __UNUSED__,
    BOX_ADD(ap.popup, box, false, false);
    LAYOUT_PROP_ADD(box, _("Name:"), "property", "1swallow")
    ENTRY_ADD(item, pl->popup.entry_name, true);
-   eo_event_callback_add(pl->popup.entry_name, ELM_ENTRY_EVENT_VALIDATE,
-                         elm_validator_regexp_helper, pl->name_validator);
+   eo_do(pl->popup.entry_name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE,
+         elm_validator_regexp_helper, pl->name_validator));
    evas_object_smart_callback_add(pl->popup.entry_name, "changed", 
_program_validate, pl);
    evas_object_smart_callback_add(pl->popup.entry_name, "activated", 
_popup_add_program_ok_clicked, pl);
    elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter name for 
new program here."));
diff --git a/src/lib/ewe_combobox.c b/src/lib/ewe_combobox.c
index 439ce29..0d8ec72 100644
--- a/src/lib/ewe_combobox.c
+++ b/src/lib/ewe_combobox.c
@@ -436,7 +436,7 @@ _ewe_combobox_evas_object_smart_add(Eo *obj, 
Ewe_Combobox_Smart_Data *sd)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
-   evas_obj_smart_add(eo_super(obj, MY_CLASS));
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
    elm_widget_sub_object_parent_add(obj);
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
@@ -467,7 +467,7 @@ EOLIAN static void
 _ewe_combobox_evas_object_smart_show(Eo *obj EINA_UNUSED,
                                      Ewe_Combobox_Smart_Data *sd)
 {
-   evas_obj_smart_show(eo_super(obj, MY_CLASS));
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
    evas_object_show(sd->combobox);
 }
 
@@ -475,7 +475,7 @@ EOLIAN static void
 _ewe_combobox_evas_object_smart_hide(Eo *obj EINA_UNUSED,
                                      Ewe_Combobox_Smart_Data *sd)
 {
-   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
    evas_object_hide(sd->combobox);
 }
 
@@ -493,7 +493,7 @@ _ewe_combobox_evas_object_smart_move(Eo                     
 *obj,
                                      Evas_Coord              x,
                                      Evas_Coord              y)
 {
-   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
    evas_object_move(sd->combobox, x, y);
 }
 
@@ -505,7 +505,7 @@ _ewe_combobox_evas_object_smart_resize(Eo                   
   *obj,
 {
    int height = 0;
    edje_object_size_max_get(sd->combobox, NULL, &height);
-   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, height);
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, height));
    evas_object_resize(sd->combobox, w, height);
 }
 
@@ -514,10 +514,11 @@ _ewe_combobox_evas_object_smart_resize(Eo                 
     *obj,
 EOLIAN static Eo*
 _ewe_combobox_eo_base_constructor(Eo *obj, Ewe_Combobox_Smart_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY),
-   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   eo_do(obj,
+         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
+         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
    return obj;
 }
 
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 8737a96..bed0ff8 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -727,7 +727,7 @@ _ewe_ruler_marker_style_get(Eo *obj EINA_UNUSED,
 EOLIAN static void
 _ewe_ruler_evas_object_smart_add(Eo *obj, Ewe_Ruler_Smart_Data *sd)
 {
-   evas_obj_smart_add(eo_super(obj, MY_CLASS));
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
    elm_widget_sub_object_parent_add(obj);
 
    sd->obj = obj;
@@ -809,7 +809,7 @@ EOLIAN static void
 _ewe_ruler_evas_object_smart_hide(Eo* obj, Ewe_Ruler_Smart_Data *sd)
 {
    if (!sd->ruler_visible) return;
-   evas_obj_smart_hide(eo_super(obj, MY_CLASS));
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
    Ewe_Ruler_Scale *scale;
    Ewe_Ruler_Marker *marker;
    Eina_List *ls, *l;
@@ -838,7 +838,7 @@ _ewe_ruler_evas_object_smart_move(Eo *obj,
                                   Evas_Coord y)
 {
 
-   evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
 
    evas_object_move(sd->clip, x, y);
    evas_object_move(sd->bg, x, y);
@@ -860,8 +860,7 @@ _ewe_ruler_evas_object_smart_resize(Eo *obj,
    sd->size_changed = EINA_TRUE;
    sd->geometry.width = w;
    sd->geometry.height = h;
-
-   evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
+   eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
    evas_object_resize(sd->clip, w, h);
    evas_object_resize(sd->bg, w, h);
 
@@ -911,7 +910,7 @@ _ewe_ruler_elm_widget_theme_apply(Eo *obj, 
Ewe_Ruler_Smart_Data *sd)
 {
    Eina_Bool int_ret;
    int count;
-   int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS));
+   eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
    if (!int_ret) return EINA_FALSE;
 
    Ewe_Ruler_Scale *scale;
@@ -958,10 +957,11 @@ ewe_ruler_add(Evas_Object *parent)
 EOLIAN static Eo*
 _ewe_ruler_eo_base_constructor(Eo *obj, Ewe_Ruler_Smart_Data *sd)
 {
-   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
    sd->obj = obj;
-   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
-   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+   eo_do(obj,
+         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
+         evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
    return obj;
 }
 

-- 


Reply via email to