yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=3806ed963b15a60970984f42a82f9e7481cbd88a
commit 3806ed963b15a60970984f42a82f9e7481cbd88a
Author: Yakov Goldberg <yako...@samsung.com>
Date: Mon Jun 1 17:37:14 2015 +0300
Clean up: change functions to Eo style
---
src/bin/gui/editor.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index a807517..be92f11 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -2574,7 +2574,7 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg,
void *data)
eo_do(fr, eo_key_data_set("winwdg", wdg));
}
fr = main_wdg_info_frame_get(wi);
- elm_object_theme_set(fr, theme);
+ eo_do(fr, elm_obj_widget_theme_set(theme));
eo_do(iwin, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_DOWN,
_mouse_down_main, wdg));
eo_do(iwin, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP,
_mouse_up_main, wdg));
@@ -2588,7 +2588,7 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg,
void *data)
eo_do(fr, efl_gfx_visible_set(EINA_TRUE));
eo_do(win, eo_key_data_set("__editor_frame", fr));
- elm_object_content_set(fr, iwin);
+ eo_do(fr, elm_obj_container_content_set(NULL, iwin));
eo_do(win, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE,
_win_resize, NULL));
/* If main object is not a win, add callback on resize event.
@@ -3429,7 +3429,8 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_Descr
Gui_Type type = db_op_desc_nth_par_type_get(op, idx);
if (kl == ELM_ENTRY_CLASS)
{
- const char *entry_data = elm_entry_entry_get(obj);
+ const char *entry_data;
+ eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
if (type == GUI_TYPE_STRING)
{
/* FIXME: part_text_set can receive NULL as parameter.
@@ -3464,7 +3465,8 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_Descr
}
if (kl == ELM_HOVERSEL_CLASS)
{
- const char *new_enum_value = elm_object_item_part_text_get(event_info,
NULL);
+ const char *new_enum_value = NULL;
+ eo_do(event_info, new_enum_value = elm_wdg_item_part_text_get(NULL));
const char *old_enum_value = NULL;
eo_do(obj, old_enum_value = elm_obj_widget_part_text_get(NULL));
@@ -3672,7 +3674,7 @@ _prop_ctx_menu_cb_func(void *data EINA_UNUSED, Eo *obj,
const Eo_Event_Descripti
/* If property not connected to widget, this is default property so can not
be dropped. */
if (it_data->prop && !prop_wdg_get(it_data->prop))
{
- elm_object_item_disabled_set(it, EINA_TRUE);
+ eo_do(it, elm_wdg_item_disabled_set(EINA_TRUE));
}
Evas_Coord x, y;
eo_do(evas_object_evas_get(g->main_win->main_win),
evas_canvas_pointer_canvas_xy_get(&x, &y));
@@ -3754,7 +3756,8 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_Desc
Gui_Type type = db_op_desc_nth_par_type_get(op, idx);
if (kl == ELM_ENTRY_CLASS)
{
- const char *entry_data = elm_entry_entry_get(obj);
+ const char *entry_data = NULL;
+ eo_do(obj, entry_data = elm_obj_layout_text_get(NULL));
if (type == GUI_TYPE_STRING)
{
gui_value_string_free(val);
@@ -3773,9 +3776,10 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_Desc
* and Object of icon*/
if (kl == ELM_HOVERSEL_CLASS)
{
- const char *old_value;
+ const char *old_value = NULL;
eo_do(obj, old_value = elm_obj_widget_part_text_get(NULL));
- const char *new_value = elm_object_item_part_text_get(event_info,
NULL);
+ const char *new_value = NULL;
+ eo_do(event_info, new_value = elm_wdg_item_part_text_get(NULL));
if (!strcmp(new_value, old_value))
return EO_CALLBACK_CONTINUE;
eo_do(obj, elm_obj_widget_part_text_set(NULL, new_value));
@@ -3817,7 +3821,7 @@ _itemview_item_selected(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, vo
Elm_Object_Item *it = session_item_get(session, wit);
if (eo_isa(it, ELM_MENU_ITEM_CLASS))
{
- elm_menu_item_selected_set(it, EINA_TRUE);
+ eo_do(it, elm_obj_menu_item_selected_set(EINA_TRUE));
}
Gui_Widget *wdg = (Gui_Widget *) _editor_wdg_selected_get();
if (IS_NAVIFRAME(wdg))
@@ -4107,8 +4111,8 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo
*obj, const Eo_Event_De
/* Initial check for Hoversel case. */
if (kl == ELM_HOVERSEL_CLASS)
{
- const char *old_value;
- const char *new_value = elm_object_item_part_text_get(event_info,
NULL);
+ const char *old_value = NULL, *new_value = NULL;
+ eo_do(event_info, new_value = elm_wdg_item_part_text_get(NULL));
eo_do(obj, old_value = elm_obj_widget_part_text_get(NULL));
if (!strcmp(new_value, old_value))
return EO_CALLBACK_CONTINUE;
--
