summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/elementary
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_box.c14
-rw-r--r--src/lib/elementary/efl_ui_box_flow.c8
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_flip.c20
-rw-r--r--src/lib/elementary/efl_ui_frame.c6
-rw-r--r--src/lib/elementary/efl_ui_grid.c30
-rw-r--r--src/lib/elementary/efl_ui_grid_static.c6
-rw-r--r--src/lib/elementary/efl_ui_image.c44
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c26
-rw-r--r--src/lib/elementary/efl_ui_nstate.c8
-rw-r--r--src/lib/elementary/efl_ui_text.c74
-rw-r--r--src/lib/elementary/efl_ui_video.c12
-rw-r--r--src/lib/elementary/efl_ui_video_legacy.h4
-rw-r--r--src/lib/elementary/efl_ui_video_private.h4
-rw-r--r--src/lib/elementary/efl_ui_widget_flip.h4
-rw-r--r--src/lib/elementary/efl_ui_widget_frame.h4
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h4
-rw-r--r--src/lib/elementary/efl_ui_win.c46
-rw-r--r--src/lib/elementary/efl_ui_win_standard.c4
-rw-r--r--src/lib/elementary/elc_combobox.c24
-rw-r--r--src/lib/elementary/elc_ctxpopup.c46
-rw-r--r--src/lib/elementary/elc_fileselector.c138
-rw-r--r--src/lib/elementary/elc_fileselector_button.c42
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c32
-rw-r--r--src/lib/elementary/elc_hoversel.c32
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c50
-rw-r--r--src/lib/elementary/elc_naviframe.c26
-rw-r--r--src/lib/elementary/elc_player.c18
-rw-r--r--src/lib/elementary/elc_popup.c28
-rw-r--r--src/lib/elementary/elm_access.c6
-rw-r--r--src/lib/elementary/elm_actionslider.c14
-rw-r--r--src/lib/elementary/elm_app_client.c18
-rw-r--r--src/lib/elementary/elm_app_client_view.c12
-rw-r--r--src/lib/elementary/elm_app_server.c16
-rw-r--r--src/lib/elementary/elm_app_server_view.c26
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c4
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c40
-rw-r--r--src/lib/elementary/elm_bg.c6
-rw-r--r--src/lib/elementary/elm_box.c12
-rw-r--r--src/lib/elementary/elm_bubble.c8
-rw-r--r--src/lib/elementary/elm_button.c12
-rw-r--r--src/lib/elementary/elm_calendar.c34
-rw-r--r--src/lib/elementary/elm_check.c14
-rw-r--r--src/lib/elementary/elm_clock.c10
-rw-r--r--src/lib/elementary/elm_cnp.c22
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c4
-rw-r--r--src/lib/elementary/elm_code_widget.c76
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c16
-rw-r--r--src/lib/elementary/elm_code_widget_undo.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c30
-rw-r--r--src/lib/elementary/elm_config.c2
-rw-r--r--src/lib/elementary/elm_conform.c14
-rw-r--r--src/lib/elementary/elm_datetime.c16
-rw-r--r--src/lib/elementary/elm_dayselector.c26
-rw-r--r--src/lib/elementary/elm_diskselector.c32
-rw-r--r--src/lib/elementary/elm_entry.c50
-rw-r--r--src/lib/elementary/elm_flipselector.c18
-rw-r--r--src/lib/elementary/elm_gengrid.c88
-rw-r--r--src/lib/elementary/elm_genlist.c102
-rw-r--r--src/lib/elementary/elm_gesture_layer.c12
-rw-r--r--src/lib/elementary/elm_glview.c18
-rw-r--r--src/lib/elementary/elm_grid.c10
-rw-r--r--src/lib/elementary/elm_hover.c36
-rw-r--r--src/lib/elementary/elm_icon.c24
-rw-r--r--src/lib/elementary/elm_index.c26
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c20
-rw-r--r--src/lib/elementary/elm_interface_atspi_component.c2
-rw-r--r--src/lib/elementary/elm_interface_atspi_widget_action.c2
-rw-r--r--src/lib/elementary/elm_interface_fileselector.h2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c28
-rw-r--r--src/lib/elementary/elm_interface_scrollable.h2
-rw-r--r--src/lib/elementary/elm_inwin.c8
-rw-r--r--src/lib/elementary/elm_label.c10
-rw-r--r--src/lib/elementary/elm_layout.c36
-rw-r--r--src/lib/elementary/elm_layout_pack.c22
-rw-r--r--src/lib/elementary/elm_list.c46
-rw-r--r--src/lib/elementary/elm_main.c2
-rw-r--r--src/lib/elementary/elm_map.c28
-rw-r--r--src/lib/elementary/elm_mapbuf.c20
-rw-r--r--src/lib/elementary/elm_menu.c38
-rw-r--r--src/lib/elementary/elm_notify.c24
-rw-r--r--src/lib/elementary/elm_panel.c30
-rw-r--r--src/lib/elementary/elm_panes.c8
-rw-r--r--src/lib/elementary/elm_part_helper.h30
-rw-r--r--src/lib/elementary/elm_photo.c10
-rw-r--r--src/lib/elementary/elm_photocam.c36
-rw-r--r--src/lib/elementary/elm_plug.c10
-rw-r--r--src/lib/elementary/elm_prefs.c8
-rw-r--r--src/lib/elementary/elm_progressbar.c14
-rw-r--r--src/lib/elementary/elm_radio.c12
-rw-r--r--src/lib/elementary/elm_removed.h2
-rw-r--r--src/lib/elementary/elm_route.c10
-rw-r--r--src/lib/elementary/elm_scroller.c28
-rw-r--r--src/lib/elementary/elm_segment_control.c24
-rw-r--r--src/lib/elementary/elm_separator.c8
-rw-r--r--src/lib/elementary/elm_slider.c12
-rw-r--r--src/lib/elementary/elm_slideshow.c18
-rw-r--r--src/lib/elementary/elm_spinner.c14
-rw-r--r--src/lib/elementary/elm_sys_notify.c8
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.c4
-rw-r--r--src/lib/elementary/elm_table.c12
-rw-r--r--src/lib/elementary/elm_theme.c2
-rw-r--r--src/lib/elementary/elm_thumb.c28
-rw-r--r--src/lib/elementary/elm_toolbar.c36
-rw-r--r--src/lib/elementary/elm_view_form.c14
-rw-r--r--src/lib/elementary/elm_view_list.c22
-rw-r--r--src/lib/elementary/elm_web2.c4
-rw-r--r--src/lib/elementary/elm_widget.c124
-rw-r--r--src/lib/elementary/elm_widget.h8
-rw-r--r--src/lib/elementary/elm_widget_actionslider.h4
-rw-r--r--src/lib/elementary/elm_widget_bg.h4
-rw-r--r--src/lib/elementary/elm_widget_box.h4
-rw-r--r--src/lib/elementary/elm_widget_bubble.h4
-rw-r--r--src/lib/elementary/elm_widget_button.h4
-rw-r--r--src/lib/elementary/elm_widget_calendar.h4
-rw-r--r--src/lib/elementary/elm_widget_check.h4
-rw-r--r--src/lib/elementary/elm_widget_clipper.h4
-rw-r--r--src/lib/elementary/elm_widget_clock.h4
-rw-r--r--src/lib/elementary/elm_widget_colorselector.h10
-rw-r--r--src/lib/elementary/elm_widget_combobox.h4
-rw-r--r--src/lib/elementary/elm_widget_conform.h4
-rw-r--r--src/lib/elementary/elm_widget_ctxpopup.h6
-rw-r--r--src/lib/elementary/elm_widget_datetime.h4
-rw-r--r--src/lib/elementary/elm_widget_dayselector.h6
-rw-r--r--src/lib/elementary/elm_widget_diskselector.h8
-rw-r--r--src/lib/elementary/elm_widget_entry.h4
-rw-r--r--src/lib/elementary/elm_widget_fileselector.h4
-rw-r--r--src/lib/elementary/elm_widget_fileselector_button.h4
-rw-r--r--src/lib/elementary/elm_widget_fileselector_entry.h4
-rw-r--r--src/lib/elementary/elm_widget_flipselector.h10
-rw-r--r--src/lib/elementary/elm_widget_gengrid.h10
-rw-r--r--src/lib/elementary/elm_widget_genlist.h10
-rw-r--r--src/lib/elementary/elm_widget_glview.h4
-rw-r--r--src/lib/elementary/elm_widget_grid.h2
-rw-r--r--src/lib/elementary/elm_widget_hover.h4
-rw-r--r--src/lib/elementary/elm_widget_hoversel.h10
-rw-r--r--src/lib/elementary/elm_widget_icon.h4
-rw-r--r--src/lib/elementary/elm_widget_index.h10
-rw-r--r--src/lib/elementary/elm_widget_inwin.h4
-rw-r--r--src/lib/elementary/elm_widget_label.h4
-rw-r--r--src/lib/elementary/elm_widget_layout.h4
-rw-r--r--src/lib/elementary/elm_widget_list.h6
-rw-r--r--src/lib/elementary/elm_widget_map.h6
-rw-r--r--src/lib/elementary/elm_widget_mapbuf.h4
-rw-r--r--src/lib/elementary/elm_widget_menu.h10
-rw-r--r--src/lib/elementary/elm_widget_multibuttonentry.h12
-rw-r--r--src/lib/elementary/elm_widget_naviframe.h10
-rw-r--r--src/lib/elementary/elm_widget_notify.h4
-rw-r--r--src/lib/elementary/elm_widget_panel.h4
-rw-r--r--src/lib/elementary/elm_widget_panes.h4
-rw-r--r--src/lib/elementary/elm_widget_photo.h4
-rw-r--r--src/lib/elementary/elm_widget_photocam.h6
-rw-r--r--src/lib/elementary/elm_widget_player.h4
-rw-r--r--src/lib/elementary/elm_widget_plug.h4
-rw-r--r--src/lib/elementary/elm_widget_popup.h6
-rw-r--r--src/lib/elementary/elm_widget_prefs.h4
-rw-r--r--src/lib/elementary/elm_widget_progressbar.h4
-rw-r--r--src/lib/elementary/elm_widget_radio.h4
-rw-r--r--src/lib/elementary/elm_widget_route.h4
-rw-r--r--src/lib/elementary/elm_widget_scroller.h4
-rw-r--r--src/lib/elementary/elm_widget_segment_control.h10
-rw-r--r--src/lib/elementary/elm_widget_separator.h4
-rw-r--r--src/lib/elementary/elm_widget_slider.h4
-rw-r--r--src/lib/elementary/elm_widget_slideshow.h10
-rw-r--r--src/lib/elementary/elm_widget_spinner.h4
-rw-r--r--src/lib/elementary/elm_widget_table.h2
-rw-r--r--src/lib/elementary/elm_widget_thumb.h4
-rw-r--r--src/lib/elementary/elm_widget_toolbar.h8
-rw-r--r--src/lib/elementary/elm_widget_web.h4
-rw-r--r--src/lib/elementary/els_cursor.c2
-rw-r--r--src/lib/elementary/els_tooltip.c2
171 files changed, 1383 insertions, 1383 deletions
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index fd8309b..0688119 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -130,7 +130,7 @@ _on_size_hints_changed(void *data, Evas *e EINA_UNUSED,
130 Evas_Object *resizeobj, void *event_info EINA_UNUSED) 130 Evas_Object *resizeobj, void *event_info EINA_UNUSED)
131{ 131{
132 Efl_Ui_Box *obj = data; 132 Efl_Ui_Box *obj = data;
133 Efl_Ui_Box_Data *pd = eo_data_scope_get(obj, EFL_UI_BOX_CLASS); 133 Efl_Ui_Box_Data *pd = efl_data_scope_get(obj, EFL_UI_BOX_CLASS);
134 134
135 if (obj == resizeobj) 135 if (obj == resizeobj)
136 efl_pack_layout_request(obj); 136 efl_pack_layout_request(obj);
@@ -170,7 +170,7 @@ EOLIAN static void
170_efl_ui_box_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Box_Data *pd, 170_efl_ui_box_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Box_Data *pd,
171 const Efl_Class *klass, const void *data) 171 const Efl_Class *klass, const void *data)
172{ 172{
173 pd->layout_engine = klass ? klass : eo_class_get(obj); 173 pd->layout_engine = klass ? klass : efl_class_get(obj);
174 pd->layout_data = data; 174 pd->layout_data = data;
175 efl_pack_layout_request(obj); 175 efl_pack_layout_request(obj);
176 _sizing_eval(obj, pd); 176 _sizing_eval(obj, pd);
@@ -208,7 +208,7 @@ _efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED
208 evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj); 208 evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
209 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj); 209 evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj);
210 210
211 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 211 efl_canvas_group_add(efl_super(obj, MY_CLASS));
212 elm_widget_sub_object_parent_add(obj); 212 elm_widget_sub_object_parent_add(obj);
213 213
214 efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj); 214 efl_event_callback_add(wd->resize_obj, EVAS_BOX_EVENT_CHILD_ADDED, _child_added_cb_proxy, obj);
@@ -246,20 +246,20 @@ _efl_ui_box_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Box_Data *sd)
246 } 246 }
247 } 247 }
248 248
249 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 249 efl_canvas_group_del(efl_super(obj, MY_CLASS));
250} 250}
251 251
252EOLIAN static Eo * 252EOLIAN static Eo *
253_efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd) 253_efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
254{ 254{
255 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); 255 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
256 obj = efl_constructor(eo_super(obj, MY_CLASS)); 256 obj = efl_constructor(efl_super(obj, MY_CLASS));
257 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 257 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
258 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 258 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
259 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 259 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
260 260
261 pd->orient = EFL_ORIENT_RIGHT; 261 pd->orient = EFL_ORIENT_RIGHT;
262 pd->layout_engine = eo_class_get(obj); 262 pd->layout_engine = efl_class_get(obj);
263 pd->align.h = 0.5; 263 pd->align.h = 0.5;
264 pd->align.v = 0.5; 264 pd->align.v = 0.5;
265 265
@@ -499,7 +499,7 @@ _efl_ui_box_efl_pack_linear_pack_index_get(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNU
499 499
500end: 500end:
501 ERR("object %p (%s) is not a child of %p (%s)", 501 ERR("object %p (%s) is not a child of %p (%s)",
502 subobj, eo_class_name_get(subobj), obj, eo_class_name_get(obj)); 502 subobj, efl_class_name_get(subobj), obj, efl_class_name_get(obj));
503 return -1; 503 return -1;
504} 504}
505 505
diff --git a/src/lib/elementary/efl_ui_box_flow.c b/src/lib/elementary/efl_ui_box_flow.c
index 99042b7..c1f72b4 100644
--- a/src/lib/elementary/efl_ui_box_flow.c
+++ b/src/lib/elementary/efl_ui_box_flow.c
@@ -12,7 +12,7 @@ struct _Efl_Ui_Box_Flow_Data
12EOLIAN static Eo * 12EOLIAN static Eo *
13_efl_ui_box_flow_efl_object_constructor(Eo *obj, Efl_Ui_Box_Flow_Data *pd) 13_efl_ui_box_flow_efl_object_constructor(Eo *obj, Efl_Ui_Box_Flow_Data *pd)
14{ 14{
15 efl_constructor(eo_super(obj, MY_CLASS)); 15 efl_constructor(efl_super(obj, MY_CLASS));
16 efl_pack_layout_engine_set(obj, MY_CLASS, &pd->params); 16 efl_pack_layout_engine_set(obj, MY_CLASS, &pd->params);
17 return obj; 17 return obj;
18} 18}
@@ -52,10 +52,10 @@ _efl_ui_box_flow_efl_pack_layout_layout_do(Efl_Class *klass EINA_UNUSED,
52 Efl_Ui_Box_Data *pd; 52 Efl_Ui_Box_Data *pd;
53 Eina_Bool homo = EINA_FALSE, maxsize = EINA_FALSE; 53 Eina_Bool homo = EINA_FALSE, maxsize = EINA_FALSE;
54 54
55 EINA_SAFETY_ON_FALSE_RETURN(eo_isa(obj, EFL_UI_BOX_CLASS)); 55 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(obj, EFL_UI_BOX_CLASS));
56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
57 bd = eo_data_scope_get(wd->resize_obj, EVAS_BOX_CLASS); 57 bd = efl_data_scope_get(wd->resize_obj, EVAS_BOX_CLASS);
58 pd = eo_data_scope_get(obj, EFL_UI_BOX_CLASS); 58 pd = efl_data_scope_get(obj, EFL_UI_BOX_CLASS);
59 59
60 if (params) 60 if (params)
61 { 61 {
diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c
index 9ad89c3..6556654 100644
--- a/src/lib/elementary/efl_ui_box_layout.c
+++ b/src/lib/elementary/efl_ui_box_layout.c
@@ -21,7 +21,7 @@ struct _Item_Calc
21void 21void
22_efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd) 22_efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
23{ 23{
24 Efl_Ui_Box_Data *pd = eo_data_scope_get(ui_box, EFL_UI_BOX_CLASS); 24 Efl_Ui_Box_Data *pd = efl_data_scope_get(ui_box, EFL_UI_BOX_CLASS);
25 Evas_Object_Box_Option *opt; 25 Evas_Object_Box_Option *opt;
26 Evas_Object *o; 26 Evas_Object *o;
27 Eina_List *li; 27 Eina_List *li;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index f06d9c5..5dc8214 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -101,7 +101,7 @@ EOLIAN static Elm_Theme_Apply
101_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 103 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
104 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 104 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return ELM_THEME_APPLY_FAILED; 105 if (!int_ret) return ELM_THEME_APPLY_FAILED;
106 106
107 _sizing_eval(obj); 107 _sizing_eval(obj);
@@ -175,7 +175,7 @@ _efl_ui_flip_elm_widget_sub_object_add(Eo *obj, Efl_Ui_Flip_Data *_pd EINA_UNUSE
175 if (evas_object_data_get(sobj, "elm-parent") == obj) 175 if (evas_object_data_get(sobj, "elm-parent") == obj)
176 return EINA_TRUE; 176 return EINA_TRUE;
177 177
178 int_ret = elm_obj_widget_sub_object_add(eo_super(obj, MY_CLASS), sobj); 178 int_ret = elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj);
179 if (!int_ret) return EINA_FALSE; 179 if (!int_ret) return EINA_FALSE;
180 180
181 evas_object_data_set(sobj, "_elm_leaveme", sobj); 181 evas_object_data_set(sobj, "_elm_leaveme", sobj);
@@ -193,7 +193,7 @@ _efl_ui_flip_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Flip_Data *sd, Evas_Objec
193 Eina_Bool int_ret = EINA_FALSE; 193 Eina_Bool int_ret = EINA_FALSE;
194 194
195 195
196 int_ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj); 196 int_ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
197 if (!int_ret) return EINA_FALSE; 197 if (!int_ret) return EINA_FALSE;
198 198
199 if (sobj == sd->front.content) 199 if (sobj == sd->front.content)
@@ -511,7 +511,7 @@ _slice_obj_vert_color_merge(Slice *s1,
511static int 511static int
512_state_update(Evas_Object *obj) 512_state_update(Evas_Object *obj)
513{ 513{
514 Efl_Ui_Flip_Data *sd = eo_data_scope_get(obj, MY_CLASS); 514 Efl_Ui_Flip_Data *sd = efl_data_scope_get(obj, MY_CLASS);
515 Slice *sl; 515 Slice *sl;
516 Vertex3 *tvo, *tvol; 516 Vertex3 *tvo, *tvol;
517 Evas_Object *front, *back; 517 Evas_Object *front, *back;
@@ -940,7 +940,7 @@ _map_uv_set(Evas_Object *obj, Evas_Map *map)
940 Evas_Coord x, y, w, h; 940 Evas_Coord x, y, w, h;
941 941
942 // FIXME: only handles filled obj 942 // FIXME: only handles filled obj
943 if (eo_isa(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS) && 943 if (efl_isa(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS) &&
944 !evas_object_image_source_get(obj)) 944 !evas_object_image_source_get(obj))
945 { 945 {
946 int iw, ih; 946 int iw, ih;
@@ -1532,7 +1532,7 @@ _update_job(void *data)
1532{ 1532{
1533 Elm_Flip_Mode m = ELM_FLIP_ROTATE_X_CENTER_AXIS; 1533 Elm_Flip_Mode m = ELM_FLIP_ROTATE_X_CENTER_AXIS;
1534 Evas_Object *obj = data; 1534 Evas_Object *obj = data;
1535 Efl_Ui_Flip_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1535 Efl_Ui_Flip_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1536 int rev = 0; 1536 int rev = 0;
1537 double p; 1537 double p;
1538 1538
@@ -1811,7 +1811,7 @@ _efl_ui_flip_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *_pd EINA_UNUSE
1811EOLIAN static void 1811EOLIAN static void
1812_efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv) 1812_efl_ui_flip_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Flip_Data *priv)
1813{ 1813{
1814 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 1814 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1815 elm_widget_sub_object_parent_add(obj); 1815 elm_widget_sub_object_parent_add(obj);
1816 1816
1817 priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj)); 1817 priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -1857,21 +1857,21 @@ _efl_ui_flip_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Flip_Data *sd)
1857 ecore_animator_del(sd->animator); 1857 ecore_animator_del(sd->animator);
1858 _state_slices_clear(sd); 1858 _state_slices_clear(sd);
1859 1859
1860 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 1860 efl_canvas_group_del(efl_super(obj, MY_CLASS));
1861} 1861}
1862 1862
1863EAPI Evas_Object * 1863EAPI Evas_Object *
1864elm_flip_add(Evas_Object *parent) 1864elm_flip_add(Evas_Object *parent)
1865{ 1865{
1866 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 1866 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
1867 Evas_Object *obj = eo_add(MY_CLASS, parent); 1867 Evas_Object *obj = efl_add(MY_CLASS, parent);
1868 return obj; 1868 return obj;
1869} 1869}
1870 1870
1871EOLIAN static Eo * 1871EOLIAN static Eo *
1872_efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd) 1872_efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
1873{ 1873{
1874 obj = efl_constructor(eo_super(obj, MY_CLASS)); 1874 obj = efl_constructor(efl_super(obj, MY_CLASS));
1875 sd->obj = obj; 1875 sd->obj = obj;
1876 1876
1877 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1877 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index a8de44c..3b19afe 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -159,7 +159,7 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
159{ 159{
160 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 160 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
161 161
162 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 162 efl_canvas_group_add(efl_super(obj, MY_CLASS));
163 elm_widget_sub_object_parent_add(obj); 163 elm_widget_sub_object_parent_add(obj);
164 164
165 edje_object_signal_callback_add 165 edje_object_signal_callback_add
@@ -193,14 +193,14 @@ EAPI Evas_Object *
193elm_frame_add(Evas_Object *parent) 193elm_frame_add(Evas_Object *parent)
194{ 194{
195 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 195 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
196 Evas_Object *obj = eo_add(MY_CLASS, parent); 196 Evas_Object *obj = efl_add(MY_CLASS, parent);
197 return obj; 197 return obj;
198} 198}
199 199
200EOLIAN static Eo * 200EOLIAN static Eo *
201_efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED) 201_efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED)
202{ 202{
203 obj = efl_constructor(eo_super(obj, MY_CLASS)); 203 obj = efl_constructor(efl_super(obj, MY_CLASS));
204 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 204 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
205 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 205 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
206 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME); 206 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME);
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 1fd7aa7..639395d 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -17,7 +17,7 @@ struct _Custom_Table_Data
17 Efl_Ui_Grid_Data *gd; 17 Efl_Ui_Grid_Data *gd;
18}; 18};
19 19
20EO_CALLBACKS_ARRAY_DEFINE(subobj_callbacks, 20EFL_CALLBACKS_ARRAY_DEFINE(subobj_callbacks,
21 { EFL_EVENT_DEL, _subobj_del_cb }); 21 { EFL_EVENT_DEL, _subobj_del_cb });
22 22
23EOLIAN static Eina_Bool 23EOLIAN static Eina_Bool
@@ -116,7 +116,7 @@ EOLIAN static Elm_Theme_Apply
116_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) 116_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
117{ 117{
118 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 118 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
119 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 119 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
120 if (!int_ret) return ELM_THEME_APPLY_FAILED; 120 if (!int_ret) return ELM_THEME_APPLY_FAILED;
121 121
122 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 122 _mirrored_set(obj, elm_widget_mirrored_get(obj));
@@ -157,7 +157,7 @@ _table_size_hints_changed(void *data, Evas *e EINA_UNUSED,
157 Evas_Object *table EINA_UNUSED, 157 Evas_Object *table EINA_UNUSED,
158 void *event_info EINA_UNUSED) 158 void *event_info EINA_UNUSED)
159{ 159{
160 Efl_Ui_Grid_Data *pd = eo_data_scope_get(data, MY_CLASS); 160 Efl_Ui_Grid_Data *pd = efl_data_scope_get(data, MY_CLASS);
161 161
162 _sizing_eval(data, pd); 162 _sizing_eval(data, pd);
163} 163}
@@ -166,16 +166,16 @@ _table_size_hints_changed(void *data, Evas *e EINA_UNUSED,
166static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd); 166static void _custom_table_calc(Eo *obj, Custom_Table_Data *pd);
167 167
168static const Efl_Op_Description custom_table_op_desc[] = { 168static const Efl_Op_Description custom_table_op_desc[] = {
169 EO_OP_CLASS_FUNC_OVERRIDE(efl_canvas_group_calculate, _custom_table_calc), 169 EFL_OBJECT_OP_CLASS_FUNC_OVERRIDE(efl_canvas_group_calculate, _custom_table_calc),
170}; 170};
171 171
172static const Efl_Class_Description custom_table_class_desc = { 172static const Efl_Class_Description custom_table_class_desc = {
173 EO_VERSION, "Efl.Ui.Grid.Internal", EO_CLASS_TYPE_REGULAR, 173 EO_VERSION, "Efl.Ui.Grid.Internal", EFL_CLASS_TYPE_REGULAR,
174 EO_CLASS_DESCRIPTION_OPS(custom_table_op_desc), NULL, 174 EFL_CLASS_DESCRIPTION_OPS(custom_table_op_desc), NULL,
175 sizeof(Custom_Table_Data), NULL, NULL 175 sizeof(Custom_Table_Data), NULL, NULL
176}; 176};
177 177
178EO_DEFINE_CLASS(_efl_ui_grid_custom_table_class_get, &custom_table_class_desc, 178EFL_DEFINE_CLASS(_efl_ui_grid_custom_table_class_get, &custom_table_class_desc,
179 EVAS_TABLE_CLASS, NULL) 179 EVAS_TABLE_CLASS, NULL)
180 180
181#define CUSTOM_TABLE_CLASS _efl_ui_grid_custom_table_class_get() 181#define CUSTOM_TABLE_CLASS _efl_ui_grid_custom_table_class_get()
@@ -196,7 +196,7 @@ _custom_table_calc(Eo *obj, Custom_Table_Data *pd)
196EOLIAN static void 196EOLIAN static void
197_efl_ui_grid_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Grid_Data *pd, const Efl_Class *engine, const void *data) 197_efl_ui_grid_efl_pack_layout_layout_engine_set(Eo *obj, Efl_Ui_Grid_Data *pd, const Efl_Class *engine, const void *data)
198{ 198{
199 pd->layout_engine = engine ? engine : eo_class_get(obj); 199 pd->layout_engine = engine ? engine : efl_class_get(obj);
200 pd->layout_data = data; 200 pd->layout_data = data;
201 efl_pack_layout_request(obj); 201 efl_pack_layout_request(obj);
202} 202}
@@ -222,7 +222,7 @@ _efl_ui_grid_efl_pack_layout_layout_do(Eo *klass EINA_UNUSED,
222{ 222{
223 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 223 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
224 224
225 efl_canvas_group_calculate(eo_super(wd->resize_obj, CUSTOM_TABLE_CLASS)); 225 efl_canvas_group_calculate(efl_super(wd->resize_obj, CUSTOM_TABLE_CLASS));
226} 226}
227 227
228EOLIAN void 228EOLIAN void
@@ -243,8 +243,8 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
243 243
244 elm_widget_sub_object_parent_add(obj); 244 elm_widget_sub_object_parent_add(obj);
245 245
246 table = eo_add(CUSTOM_TABLE_CLASS, obj); 246 table = efl_add(CUSTOM_TABLE_CLASS, obj);
247 custom = eo_data_scope_get(table, CUSTOM_TABLE_CLASS); 247 custom = efl_data_scope_get(table, CUSTOM_TABLE_CLASS);
248 custom->gd = pd; 248 custom->gd = pd;
249 custom->parent = obj; 249 custom->parent = obj;
250 250
@@ -254,7 +254,7 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
254 evas_object_event_callback_add 254 evas_object_event_callback_add
255 (table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _table_size_hints_changed, obj); 255 (table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _table_size_hints_changed, obj);
256 256
257 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 257 efl_canvas_group_add(efl_super(obj, MY_CLASS));
258 258
259 elm_widget_can_focus_set(obj, EINA_FALSE); 259 elm_widget_can_focus_set(obj, EINA_FALSE);
260 elm_widget_highlight_ignore_set(obj, EINA_FALSE); 260 elm_widget_highlight_ignore_set(obj, EINA_FALSE);
@@ -286,13 +286,13 @@ _efl_ui_grid_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSE
286 } 286 }
287 } 287 }
288 288
289 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 289 efl_canvas_group_del(efl_super(obj, MY_CLASS));
290} 290}
291 291
292EOLIAN static Eo * 292EOLIAN static Eo *
293_efl_ui_grid_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Data *pd) 293_efl_ui_grid_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
294{ 294{
295 obj = efl_constructor(eo_super(obj, MY_CLASS)); 295 obj = efl_constructor(efl_super(obj, MY_CLASS));
296 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 296 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
297 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 297 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
298 298
@@ -341,7 +341,7 @@ static void
341_subobj_del_cb(void *data, const Eo_Event *event) 341_subobj_del_cb(void *data, const Eo_Event *event)
342{ 342{
343 Efl_Ui_Grid *obj = data; 343 Efl_Ui_Grid *obj = data;
344 Efl_Ui_Grid_Data *pd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS); 344 Efl_Ui_Grid_Data *pd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
345 345
346 efl_event_callback_array_del(event->object, subobj_callbacks(), data); 346 efl_event_callback_array_del(event->object, subobj_callbacks(), data);
347 _item_remove(obj, pd, event->object); 347 _item_remove(obj, pd, event->object);
diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c
index 94f7bf9..06b4759 100644
--- a/src/lib/elementary/efl_ui_grid_static.c
+++ b/src/lib/elementary/efl_ui_grid_static.c
@@ -9,11 +9,11 @@ _efl_ui_grid_static_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
9{ 9{
10 Efl_Ui_Grid_Data *gd; 10 Efl_Ui_Grid_Data *gd;
11 11
12 obj = efl_constructor(eo_super(obj, MY_CLASS)); 12 obj = efl_constructor(efl_super(obj, MY_CLASS));
13 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 13 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
14 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 14 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
15 15
16 gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS); 16 gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
17 gd->layout_engine = MY_CLASS; 17 gd->layout_engine = MY_CLASS;
18 gd->req_cols = 100; 18 gd->req_cols = 100;
19 gd->req_rows = 100; 19 gd->req_rows = 100;
@@ -33,7 +33,7 @@ _efl_ui_grid_static_efl_pack_layout_layout_do(Efl_Class *klass EINA_UNUSED,
33 long long xl, yl, wl, hl, vwl, vhl; 33 long long xl, yl, wl, hl, vwl, vhl;
34 Eina_Bool mirror; 34 Eina_Bool mirror;
35 35
36 gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS); 36 gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
37 if (!gd->items) return; 37 if (!gd->items) return;
38 38
39 e = evas_object_evas_get(obj); 39 e = evas_object_evas_get(obj);
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 15bf16a..a392b6e 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -126,7 +126,7 @@ _efl_ui_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Efl_Ui_Image_Da
126{ 126{
127 if (!sd->img) return; 127 if (!sd->img) return;
128 128
129 if (eo_isa(sd->img, EDJE_OBJECT_CLASS)) 129 if (efl_isa(sd->img, EDJE_OBJECT_CLASS))
130 { 130 {
131 evas_object_move(sd->img, sd->img_x, sd->img_y); 131 evas_object_move(sd->img, sd->img_x, sd->img_y);
132 evas_object_resize(sd->img, sd->img_w, sd->img_h); 132 evas_object_resize(sd->img, sd->img_w, sd->img_h);
@@ -575,7 +575,7 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj,
575EOLIAN static void 575EOLIAN static void
576_efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv) 576_efl_ui_image_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Data *priv)
577{ 577{
578 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 578 efl_canvas_group_add(efl_super(obj, MY_CLASS));
579 elm_widget_sub_object_parent_add(obj); 579 elm_widget_sub_object_parent_add(obj);
580 580
581 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 581 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
@@ -626,7 +626,7 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
626 { 626 {
627 ERR("Async open thread timed out during cancellation."); 627 ERR("Async open thread timed out during cancellation.");
628 // skipping all other data free to avoid crashes (this leaks) 628 // skipping all other data free to avoid crashes (this leaks)
629 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 629 efl_canvas_group_del(efl_super(obj, MY_CLASS));
630 return; 630 return;
631 } 631 }
632 sd->async.th = NULL; 632 sd->async.th = NULL;
@@ -637,13 +637,13 @@ _efl_ui_image_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Image_Data *sd)
637 eina_stringshare_del(sd->async.file); 637 eina_stringshare_del(sd->async.file);
638 eina_stringshare_del(sd->async.key); 638 eina_stringshare_del(sd->async.key);
639 639
640 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 640 efl_canvas_group_del(efl_super(obj, MY_CLASS));
641} 641}
642 642
643EOLIAN static void 643EOLIAN static void
644_efl_ui_image_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y) 644_efl_ui_image_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y)
645{ 645{
646 efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y); 646 efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
647 647
648 if ((sd->img_x == x) && (sd->img_y == y)) return; 648 if ((sd->img_x == x) && (sd->img_y == y)) return;
649 sd->img_x = x; 649 sd->img_x = x;
@@ -656,7 +656,7 @@ _efl_ui_image_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_C
656EOLIAN static void 656EOLIAN static void
657_efl_ui_image_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h) 657_efl_ui_image_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h)
658{ 658{
659 efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h); 659 efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
660 660
661 if ((sd->img_w == w) && (sd->img_h == h)) return; 661 if ((sd->img_w == w) && (sd->img_h == h)) return;
662 662
@@ -673,7 +673,7 @@ _efl_ui_image_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Image_Data *sd)
673 sd->show = EINA_TRUE; 673 sd->show = EINA_TRUE;
674 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return; 674 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return;
675 675
676 efl_canvas_group_show(eo_super(obj, MY_CLASS)); 676 efl_canvas_group_show(efl_super(obj, MY_CLASS));
677 677
678 evas_object_show(sd->img); 678 evas_object_show(sd->img);
679 679
@@ -683,7 +683,7 @@ _efl_ui_image_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Image_Data *sd)
683EOLIAN static void 683EOLIAN static void
684_efl_ui_image_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Image_Data *sd) 684_efl_ui_image_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Image_Data *sd)
685{ 685{
686 efl_canvas_group_hide(eo_super(obj, MY_CLASS)); 686 efl_canvas_group_hide(efl_super(obj, MY_CLASS));
687 687
688 sd->show = EINA_FALSE; 688 sd->show = EINA_FALSE;
689 evas_object_hide(sd->img); 689 evas_object_hide(sd->img);
@@ -694,7 +694,7 @@ _efl_ui_image_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Image_Data *sd)
694EOLIAN static void 694EOLIAN static void
695_efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member) 695_efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member)
696{ 696{
697 efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member); 697 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
698 698
699 if (sd->hit_rect) 699 if (sd->hit_rect)
700 evas_object_raise(sd->hit_rect); 700 evas_object_raise(sd->hit_rect);
@@ -703,7 +703,7 @@ _efl_ui_image_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Image_Data *sd,
703EOLIAN static void 703EOLIAN static void
704_efl_ui_image_efl_canvas_group_group_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a) 704_efl_ui_image_efl_canvas_group_group_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
705{ 705{
706 efl_canvas_group_color_set(eo_super(obj, MY_CLASS), r, g, b, a); 706 efl_canvas_group_color_set(efl_super(obj, MY_CLASS), r, g, b, a);
707 707
708 evas_object_color_set(sd->hit_rect, 0, 0, 0, 0); 708 evas_object_color_set(sd->hit_rect, 0, 0, 0, 0);
709 evas_object_color_set(sd->img, r, g, b, a); 709 evas_object_color_set(sd->img, r, g, b, a);
@@ -713,7 +713,7 @@ _efl_ui_image_efl_canvas_group_group_color_set(Eo *obj, Efl_Ui_Image_Data *sd, i
713EOLIAN static void 713EOLIAN static void
714_efl_ui_image_efl_canvas_group_group_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip) 714_efl_ui_image_efl_canvas_group_group_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
715{ 715{
716 efl_canvas_group_clip_set(eo_super(obj, MY_CLASS), clip); 716 efl_canvas_group_clip_set(efl_super(obj, MY_CLASS), clip);
717 717
718 evas_object_clip_set(sd->img, clip); 718 evas_object_clip_set(sd->img, clip);
719 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); 719 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
@@ -722,7 +722,7 @@ _efl_ui_image_efl_canvas_group_group_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Ev
722EOLIAN static void 722EOLIAN static void
723_efl_ui_image_efl_canvas_group_group_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd) 723_efl_ui_image_efl_canvas_group_group_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd)
724{ 724{
725 efl_canvas_group_clip_unset(eo_super(obj, MY_CLASS)); 725 efl_canvas_group_clip_unset(efl_super(obj, MY_CLASS));
726 726
727 evas_object_clip_unset(sd->img); 727 evas_object_clip_unset(sd->img);
728 if (sd->prev_img) evas_object_clip_unset(sd->prev_img); 728 if (sd->prev_img) evas_object_clip_unset(sd->prev_img);
@@ -736,7 +736,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
736 if (sd->stdicon) 736 if (sd->stdicon)
737 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 737 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
738 738
739 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 739 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
740 if (!int_ret) return ELM_THEME_APPLY_FAILED; 740 if (!int_ret) return ELM_THEME_APPLY_FAILED;
741 741
742 _efl_ui_image_sizing_eval(obj); 742 _efl_ui_image_sizing_eval(obj);
@@ -869,14 +869,14 @@ EAPI Evas_Object *
869elm_image_add(Evas_Object *parent) 869elm_image_add(Evas_Object *parent)
870{ 870{
871 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 871 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
872 Evas_Object *obj = eo_add(MY_CLASS, parent); 872 Evas_Object *obj = efl_add(MY_CLASS, parent);
873 return obj; 873 return obj;
874} 874}
875 875
876EOLIAN static Eo * 876EOLIAN static Eo *
877_efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd) 877_efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
878{ 878{
879 obj = efl_constructor(eo_super(obj, MY_CLASS)); 879 obj = efl_constructor(efl_super(obj, MY_CLASS));
880 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 880 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
881 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 881 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
882 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 882 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
@@ -956,7 +956,7 @@ static void
956_efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download) 956_efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download)
957{ 957{
958 Eo *obj = data; 958 Eo *obj = data;
959 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 959 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
960 Eina_File *f; 960 Eina_File *f;
961 size_t length; 961 size_t length;
962 Eina_Bool ret = EINA_FALSE; 962 Eina_Bool ret = EINA_FALSE;
@@ -997,7 +997,7 @@ static void
997_efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error) 997_efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int error)
998{ 998{
999 Eo *obj = data; 999 Eo *obj = data;
1000 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1000 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1001 Efl_Ui_Image_Error err = { error, EINA_FALSE }; 1001 Efl_Ui_Image_Error err = { error, EINA_FALSE };
1002 1002
1003 efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err); 1003 efl_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
@@ -1158,7 +1158,7 @@ _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data
1158 if (w) *w = 0; 1158 if (w) *w = 0;
1159 if (h) *h = 0; 1159 if (h) *h = 0;
1160 1160
1161 if (eo_isa(sd->img, EDJE_OBJECT_CLASS)) 1161 if (efl_isa(sd->img, EDJE_OBJECT_CLASS))
1162 edje_object_size_min_get(sd->img, &tw, &th); 1162 edje_object_size_min_get(sd->img, &tw, &th);
1163 else 1163 else
1164 evas_object_image_size_get(sd->img, &tw, &th); 1164 evas_object_image_size_get(sd->img, &tw, &th);
@@ -1336,7 +1336,7 @@ _efl_ui_image_animated_get_internal(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data
1336EAPI void 1336EAPI void
1337elm_image_animated_set(Evas_Object *obj, Eina_Bool anim) 1337elm_image_animated_set(Evas_Object *obj, Eina_Bool anim)
1338{ 1338{
1339 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1339 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1340 if (!sd) return; 1340 if (!sd) return;
1341 _efl_ui_image_animated_set_internal(obj, sd, anim); 1341 _efl_ui_image_animated_set_internal(obj, sd, anim);
1342} 1342}
@@ -1344,7 +1344,7 @@ elm_image_animated_set(Evas_Object *obj, Eina_Bool anim)
1344EAPI Eina_Bool 1344EAPI Eina_Bool
1345elm_image_animated_get(const Evas_Object *obj) 1345elm_image_animated_get(const Evas_Object *obj)
1346{ 1346{
1347 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1347 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1348 if (!sd) return EINA_FALSE; 1348 if (!sd) return EINA_FALSE;
1349 return _efl_ui_image_animated_get_internal(obj, sd); 1349 return _efl_ui_image_animated_get_internal(obj, sd);
1350} 1350}
@@ -1382,7 +1382,7 @@ _efl_ui_image_animated_play_get_internal(const Eo *obj EINA_UNUSED, Efl_Ui_Image
1382EAPI void 1382EAPI void
1383elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play) 1383elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play)
1384{ 1384{
1385 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1385 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1386 if (!sd) return; 1386 if (!sd) return;
1387 _efl_ui_image_animated_play_set_internal(obj, sd, play); 1387 _efl_ui_image_animated_play_set_internal(obj, sd, play);
1388} 1388}
@@ -1390,7 +1390,7 @@ elm_image_animated_play_set(Elm_Image *obj, Eina_Bool play)
1390EAPI Eina_Bool 1390EAPI Eina_Bool
1391elm_image_animated_play_get(const Elm_Image *obj) 1391elm_image_animated_play_get(const Elm_Image *obj)
1392{ 1392{
1393 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 1393 Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
1394 if (!sd) return EINA_FALSE; 1394 if (!sd) return EINA_FALSE;
1395 return _efl_ui_image_animated_play_get_internal(obj, sd); 1395 return _efl_ui_image_animated_play_get_internal(obj, sd);
1396} 1396}
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index abecff9..6a98319 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -105,7 +105,7 @@ static void
105_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 105_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
106{ 106{
107 Efl_Canvas_Text *obj = data; 107 Efl_Canvas_Text *obj = data;
108 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 108 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
109 char *commit_str = event_info; 109 char *commit_str = event_info;
110 110
111 if (en->have_selection) 111 if (en->have_selection)
@@ -179,7 +179,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
179{ 179{
180 Efl_Canvas_Text *obj = data; 180 Efl_Canvas_Text *obj = data;
181 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj); 181 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
182 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 182 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
183 int cursor_pos; 183 int cursor_pos;
184 int preedit_start_pos, preedit_end_pos; 184 int preedit_start_pos, preedit_end_pos;
185 char *preedit_string; 185 char *preedit_string;
@@ -332,7 +332,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
332{ 332{
333 Efl_Canvas_Text *obj = data; 333 Efl_Canvas_Text *obj = data;
334 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj); 334 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
335 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 335 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
336 Ecore_IMF_Event_Delete_Surrounding *ev = event_info; 336 Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
337 Evas_Textblock_Cursor *del_start, *del_end; 337 Evas_Textblock_Cursor *del_start, *del_end;
338 Efl_Ui_Text_Interactive_Change_Info info = { NULL, 0, 0, 0, 0 }; 338 Efl_Ui_Text_Interactive_Change_Info info = { NULL, 0, 0, 0, 0 };
@@ -375,7 +375,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
375{ 375{
376 Efl_Canvas_Text *obj = data; 376 Efl_Canvas_Text *obj = data;
377 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj); 377 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
378 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 378 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
379 Ecore_IMF_Event_Selection *ev = event_info; 379 Ecore_IMF_Event_Selection *ev = event_info;
380 380
381 if (ev->start == ev->end) 381 if (ev->start == ev->end)
@@ -397,7 +397,7 @@ static Eina_Bool
397_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text) 397_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
398{ 398{
399 Efl_Canvas_Text *obj = data; 399 Efl_Canvas_Text *obj = data;
400 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 400 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
401 const char *selection_text = NULL; 401 const char *selection_text = NULL;
402 402
403 if (en->have_selection) 403 if (en->have_selection)
@@ -460,7 +460,7 @@ static void
460_focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 460_focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
461{ 461{
462#ifdef HAVE_ECORE_IMF 462#ifdef HAVE_ECORE_IMF
463 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 463 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
464 if (!en->imf_context) return; 464 if (!en->imf_context) return;
465 465
466 ecore_imf_context_focus_in(en->imf_context); 466 ecore_imf_context_focus_in(en->imf_context);
@@ -485,7 +485,7 @@ static void
485_focus_out_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 485_focus_out_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
486{ 486{
487#ifdef HAVE_ECORE_IMF 487#ifdef HAVE_ECORE_IMF
488 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 488 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
489 if (!en->imf_context) return; 489 if (!en->imf_context) return;
490 490
491 ecore_imf_context_reset(en->imf_context); 491 ecore_imf_context_reset(en->imf_context);
@@ -709,7 +709,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
709 if (!ev->key) return; 709 if (!ev->key) return;
710 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 710 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
711 711
712 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 712 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
713 713
714 /* FIXME: Maybe allow selctions to happen even when not editable. */ 714 /* FIXME: Maybe allow selctions to happen even when not editable. */
715 if (!en->editable) return; 715 if (!en->editable) return;
@@ -1071,7 +1071,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1071{ 1071{
1072 Evas_Coord cx, cy; 1072 Evas_Coord cx, cy;
1073 Evas_Event_Mouse_Down *ev = event_info; 1073 Evas_Event_Mouse_Down *ev = event_info;
1074 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 1074 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1075 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj); 1075 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
1076 Evas_Textblock_Cursor *tc = NULL; 1076 Evas_Textblock_Cursor *tc = NULL;
1077 Eina_Bool dosel = EINA_FALSE; 1077 Eina_Bool dosel = EINA_FALSE;
@@ -1182,7 +1182,7 @@ static void
1182_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) 1182_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
1183{ 1183{
1184 Evas_Coord cx, cy; 1184 Evas_Coord cx, cy;
1185 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 1185 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1186 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj); 1186 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
1187 Evas_Event_Mouse_Up *ev = event_info; 1187 Evas_Event_Mouse_Up *ev = event_info;
1188 1188
@@ -1223,7 +1223,7 @@ static void
1223_mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) 1223_mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
1224{ 1224{
1225 Evas_Coord cx, cy; 1225 Evas_Coord cx, cy;
1226 Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS); 1226 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1227 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj); 1227 Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
1228 Evas_Event_Mouse_Move *ev = event_info; 1228 Evas_Event_Mouse_Move *ev = event_info;
1229 Evas_Coord x, y, w, h; 1229 Evas_Coord x, y, w, h;
@@ -1278,7 +1278,7 @@ _efl_ui_internal_text_interactive_efl_object_constructor(Eo *obj, Efl_Ui_Interna
1278 en->select_allow = EINA_TRUE; 1278 en->select_allow = EINA_TRUE;
1279 en->multiline = EINA_TRUE; 1279 en->multiline = EINA_TRUE;
1280 en->editable = EINA_TRUE; 1280 en->editable = EINA_TRUE;
1281 return efl_constructor(eo_super(obj, MY_CLASS)); 1281 return efl_constructor(efl_super(obj, MY_CLASS));
1282} 1282}
1283 1283
1284EOLIAN static Efl_Object * 1284EOLIAN static Efl_Object *
@@ -1363,7 +1363,7 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
1363#endif 1363#endif
1364 1364
1365done: 1365done:
1366 return efl_finalize(eo_super(obj, MY_CLASS)); 1366 return efl_finalize(efl_super(obj, MY_CLASS));
1367} 1367}
1368 1368
1369EOLIAN static void 1369EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index c8fd3a1..254b252 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -34,7 +34,7 @@ static const Elm_Action key_actions[] = {
34EOLIAN static Efl_Object * 34EOLIAN static Efl_Object *
35_efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) 35_efl_ui_nstate_efl_object_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
36{ 36{
37 obj = efl_constructor(eo_super(obj, MY_CLASS)); 37 obj = efl_constructor(efl_super(obj, MY_CLASS));
38 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 38 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
39 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 39 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
40 //TODO: Add ATSPI call here 40 //TODO: Add ATSPI call here
@@ -75,7 +75,7 @@ _efl_ui_nstate_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
75{ 75{
76 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 76 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
77 77
78 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 78 efl_canvas_group_add(efl_super(obj, MY_CLASS));
79 elm_widget_sub_object_parent_add(obj); 79 elm_widget_sub_object_parent_add(obj);
80 80
81 pd->state = 0; 81 pd->state = 0;
@@ -92,7 +92,7 @@ _efl_ui_nstate_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
92EOLIAN static void 92EOLIAN static void
93_efl_ui_nstate_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) 93_efl_ui_nstate_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
94{ 94{
95 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 95 efl_canvas_group_del(efl_super(obj, MY_CLASS));
96} 96}
97 97
98EOLIAN static int 98EOLIAN static int
@@ -139,7 +139,7 @@ _efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
139{ 139{
140 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 140 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
141 141
142 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 142 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
143 if (!int_ret) return ELM_THEME_APPLY_FAILED; 143 if (!int_ret) return ELM_THEME_APPLY_FAILED;
144 144
145 _state_active(obj, pd); 145 _state_active(obj, pd);
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 5dcc078..b0c17a0 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -147,7 +147,7 @@ struct _Item_Obj
147}; 147};
148 148
149#define EFL_UI_TEXT_DATA_GET(o, sd) \ 149#define EFL_UI_TEXT_DATA_GET(o, sd) \
150 Efl_Ui_Text_Data * sd = eo_data_scope_get(o, EFL_UI_TEXT_CLASS) 150 Efl_Ui_Text_Data * sd = efl_data_scope_get(o, EFL_UI_TEXT_CLASS)
151 151
152#define EFL_UI_TEXT_DATA_GET_OR_RETURN(o, ptr) \ 152#define EFL_UI_TEXT_DATA_GET_OR_RETURN(o, ptr) \
153 EFL_UI_TEXT_DATA_GET(o, ptr); \ 153 EFL_UI_TEXT_DATA_GET(o, ptr); \
@@ -168,7 +168,7 @@ struct _Item_Obj
168 } 168 }
169 169
170#define EFL_UI_TEXT_CHECK(obj) \ 170#define EFL_UI_TEXT_CHECK(obj) \
171 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_TEXT_CLASS))) \ 171 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_TEXT_CLASS))) \
172 return 172 return
173 173
174struct _Efl_Ui_Text_Rectangle 174struct _Efl_Ui_Text_Rectangle
@@ -523,7 +523,7 @@ _viewport_region_get(Evas_Object *obj)
523 parent = elm_widget_parent_get(obj); 523 parent = elm_widget_parent_get(obj);
524 while (parent) 524 while (parent)
525 { 525 {
526 if (eo_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN)) 526 if (efl_isa(parent, ELM_INTERFACE_SCROLLABLE_MIXIN))
527 { 527 {
528 Eina_Rectangle r; 528 Eina_Rectangle r;
529 EINA_RECTANGLE_SET(&r, 0, 0, 0, 0); 529 EINA_RECTANGLE_SET(&r, 0, 0, 0, 0);
@@ -906,7 +906,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
906 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 906 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
907 907
908 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 908 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
909 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 909 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
910 if (!int_ret) return ELM_THEME_APPLY_FAILED; 910 if (!int_ret) return ELM_THEME_APPLY_FAILED;
911 911
912 evas_event_freeze(evas_object_evas_get(obj)); 912 evas_event_freeze(evas_object_evas_get(obj));
@@ -1110,7 +1110,7 @@ _efl_ui_text_elm_widget_on_focus(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Object_Item
1110 if (!sd->editable) return EINA_FALSE; 1110 if (!sd->editable) return EINA_FALSE;
1111 1111
1112 top = elm_widget_top_get(obj); 1112 top = elm_widget_top_get(obj);
1113 if (top && eo_isa(top, EFL_UI_WIN_CLASS)) 1113 if (top && efl_isa(top, EFL_UI_WIN_CLASS))
1114 top_is_win = EINA_TRUE; 1114 top_is_win = EINA_TRUE;
1115 1115
1116 if (elm_widget_focus_get(obj)) 1116 if (elm_widget_focus_get(obj))
@@ -1213,7 +1213,7 @@ _efl_ui_text_elm_widget_sub_object_del(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSE
1213 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm"); 1213 elm_layout_signal_emit(obj, "elm,action,hide,end", "elm");
1214 } 1214 }
1215 1215
1216 ret = elm_obj_widget_sub_object_del(eo_super(obj, MY_CLASS), sobj); 1216 ret = elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj);
1217 if (!ret) return EINA_FALSE; 1217 if (!ret) return EINA_FALSE;
1218 1218
1219 return EINA_TRUE; 1219 return EINA_TRUE;
@@ -1740,7 +1740,7 @@ _magnifier_move(void *data)
1740 1740
1741 // keep magnifier inside window 1741 // keep magnifier inside window
1742 top = elm_widget_top_get(data); 1742 top = elm_widget_top_get(data);
1743 if (top && eo_isa(top, EFL_UI_WIN_CLASS)) 1743 if (top && efl_isa(top, EFL_UI_WIN_CLASS))
1744 { 1744 {
1745 Evas_Coord wh, ww; 1745 Evas_Coord wh, ww;
1746 evas_object_geometry_get(top, NULL, NULL, &ww, &wh); 1746 evas_object_geometry_get(top, NULL, NULL, &ww, &wh);
@@ -1938,7 +1938,7 @@ _mouse_up_cb(void *data,
1938 top = elm_widget_top_get(data); 1938 top = elm_widget_top_get(data);
1939 if (top) 1939 if (top)
1940 { 1940 {
1941 if (eo_isa(top, EFL_UI_WIN_CLASS)) 1941 if (efl_isa(top, EFL_UI_WIN_CLASS))
1942 top_is_win = EINA_TRUE; 1942 top_is_win = EINA_TRUE;
1943 1943
1944 if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand && 1944 if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&
@@ -2655,14 +2655,14 @@ _efl_ui_text_elm_layout_signal_callback_add (Eo *obj, Efl_Ui_Text_Data *sd, cons
2655 wd->resize_obj = sd->entry_edje; 2655 wd->resize_obj = sd->entry_edje;
2656 2656
2657 elm_obj_layout_signal_callback_add 2657 elm_obj_layout_signal_callback_add
2658 (eo_super(obj, MY_CLASS), emission, source, func_cb, data); 2658 (efl_super(obj, MY_CLASS), emission, source, func_cb, data);
2659 2659
2660 if (sd->scr_edje) 2660 if (sd->scr_edje)
2661 { 2661 {
2662 wd->resize_obj = sd->scr_edje; 2662 wd->resize_obj = sd->scr_edje;
2663 2663
2664 elm_obj_layout_signal_callback_add 2664 elm_obj_layout_signal_callback_add
2665 (eo_super(obj, MY_CLASS), emission, source, func_cb, data); 2665 (efl_super(obj, MY_CLASS), emission, source, func_cb, data);
2666 } 2666 }
2667 2667
2668 wd->resize_obj = ro; 2668 wd->resize_obj = ro;
@@ -2681,14 +2681,14 @@ _efl_ui_text_elm_layout_signal_callback_del(Eo *obj, Efl_Ui_Text_Data *sd, const
2681 wd->resize_obj = sd->entry_edje; 2681 wd->resize_obj = sd->entry_edje;
2682 2682
2683 data = elm_obj_layout_signal_callback_del 2683 data = elm_obj_layout_signal_callback_del
2684 (eo_super(obj, MY_CLASS), emission, source, func_cb); 2684 (efl_super(obj, MY_CLASS), emission, source, func_cb);
2685 2685
2686 if (sd->scr_edje) 2686 if (sd->scr_edje)
2687 { 2687 {
2688 wd->resize_obj = sd->scr_edje; 2688 wd->resize_obj = sd->scr_edje;
2689 2689
2690 data = elm_obj_layout_signal_callback_del 2690 data = elm_obj_layout_signal_callback_del
2691 (eo_super(obj, MY_CLASS), emission, source, func_cb); 2691 (efl_super(obj, MY_CLASS), emission, source, func_cb);
2692 } 2692 }
2693 2693
2694 wd->resize_obj = ro; 2694 wd->resize_obj = ro;
@@ -2700,7 +2700,7 @@ static Eina_Bool
2700_efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) 2700_efl_ui_text_content_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content)
2701{ 2701{
2702 Eina_Bool int_ret = EINA_FALSE; 2702 Eina_Bool int_ret = EINA_FALSE;
2703 int_ret = efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content); 2703 int_ret = efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
2704 if (!int_ret) return EINA_FALSE; 2704 if (!int_ret) return EINA_FALSE;
2705 2705
2706 /* too bad entry does not follow the pattern 2706 /* too bad entry does not follow the pattern
@@ -2719,7 +2719,7 @@ static Evas_Object*
2719_efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *part) 2719_efl_ui_text_content_unset(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *part)
2720{ 2720{
2721 Evas_Object *ret = NULL; 2721 Evas_Object *ret = NULL;
2722 ret = efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part)); 2722 ret = efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
2723 if (!ret) return NULL; 2723 if (!ret) return NULL;
2724 2724
2725 /* too bad entry does not follow the pattern 2725 /* too bad entry does not follow the pattern
@@ -3204,10 +3204,10 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
3204 /* XXX: needs to be before efl_canvas_group_add, since the latter will 3204 /* XXX: needs to be before efl_canvas_group_add, since the latter will
3205 * trigger a layout_sizing_eval call and requires the canvas text object to 3205 * trigger a layout_sizing_eval call and requires the canvas text object to
3206 * be instantiated. */ 3206 * be instantiated. */
3207 text_obj = eo_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj); 3207 text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
3208 efl_composite_attach(obj, text_obj); 3208 efl_composite_attach(obj, text_obj);
3209 3209
3210 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 3210 efl_canvas_group_add(efl_super(obj, MY_CLASS));
3211 elm_widget_sub_object_parent_add(obj); 3211 elm_widget_sub_object_parent_add(obj);
3212 3212
3213 priv->test_bit = EINA_TRUE; 3213 priv->test_bit = EINA_TRUE;
@@ -3491,13 +3491,13 @@ _efl_ui_text_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Text_Data *sd)
3491 evas_object_event_callback_del_full(sd->entry_edje, EVAS_CALLBACK_MOVE, 3491 evas_object_event_callback_del_full(sd->entry_edje, EVAS_CALLBACK_MOVE,
3492 _efl_ui_text_move_cb, obj); 3492 _efl_ui_text_move_cb, obj);
3493 3493
3494 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 3494 efl_canvas_group_del(efl_super(obj, MY_CLASS));
3495} 3495}
3496 3496
3497EOLIAN static void 3497EOLIAN static void
3498_efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y) 3498_efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y)
3499{ 3499{
3500 efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y); 3500 efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
3501 3501
3502 evas_object_move(sd->hit_rect, x, y); 3502 evas_object_move(sd->hit_rect, x, y);
3503 3503
@@ -3509,7 +3509,7 @@ _efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coo
3509EOLIAN static void 3509EOLIAN static void
3510_efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h) 3510_efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h)
3511{ 3511{
3512 efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h); 3512 efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
3513 3513
3514 evas_object_resize(sd->hit_rect, w, h); 3514 evas_object_resize(sd->hit_rect, w, h);
3515 _update_selection_handler(obj); 3515 _update_selection_handler(obj);
@@ -3518,7 +3518,7 @@ _efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_C
3518EOLIAN static void 3518EOLIAN static void
3519_efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED) 3519_efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED)
3520{ 3520{
3521 efl_canvas_group_show(eo_super(obj, MY_CLASS)); 3521 efl_canvas_group_show(efl_super(obj, MY_CLASS));
3522 3522
3523 _update_selection_handler(obj); 3523 _update_selection_handler(obj);
3524} 3524}
@@ -3526,7 +3526,7 @@ _efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUS
3526EOLIAN static void 3526EOLIAN static void
3527_efl_ui_text_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Text_Data *sd) 3527_efl_ui_text_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Text_Data *sd)
3528{ 3528{
3529 efl_canvas_group_hide(eo_super(obj, MY_CLASS)); 3529 efl_canvas_group_hide(efl_super(obj, MY_CLASS));
3530 3530
3531 if (sd->have_selection) 3531 if (sd->have_selection)
3532 _hide_selection_handler(obj); 3532 _hide_selection_handler(obj);
@@ -3535,7 +3535,7 @@ _efl_ui_text_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Text_Data *sd)
3535EOLIAN static void 3535EOLIAN static void
3536_efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member) 3536_efl_ui_text_efl_canvas_group_group_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member)
3537{ 3537{
3538 efl_canvas_group_member_add(eo_super(obj, MY_CLASS), member); 3538 efl_canvas_group_member_add(efl_super(obj, MY_CLASS), member);
3539 3539
3540 if (sd->hit_rect) 3540 if (sd->hit_rect)
3541 evas_object_raise(sd->hit_rect); 3541 evas_object_raise(sd->hit_rect);
@@ -3578,7 +3578,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3578EOLIAN static Eo * 3578EOLIAN static Eo *
3579_efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 3579_efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
3580{ 3580{
3581 obj = efl_constructor(eo_super(obj, MY_CLASS)); 3581 obj = efl_constructor(efl_super(obj, MY_CLASS));
3582 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 3582 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
3583 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 3583 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3584 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 3584 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
@@ -3593,7 +3593,7 @@ EOLIAN static void
3593_efl_ui_text_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd) 3593_efl_ui_text_efl_object_destructor(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd)
3594{ 3594{
3595 ecore_job_del(pd->deferred_decoration_job); 3595 ecore_job_del(pd->deferred_decoration_job);
3596 efl_destructor(eo_super(obj, MY_CLASS)); 3596 efl_destructor(efl_super(obj, MY_CLASS));
3597} 3597}
3598 3598
3599EOLIAN static void 3599EOLIAN static void
@@ -3689,7 +3689,7 @@ _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
3689EOLIAN static void 3689EOLIAN static void
3690_efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool editable) 3690_efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool editable)
3691{ 3691{
3692 efl_ui_text_interactive_editable_set(eo_super(obj, MY_CLASS), editable); 3692 efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable);
3693 if (sd->editable == editable) return; 3693 if (sd->editable == editable) return;
3694 sd->editable = editable; 3694 sd->editable = editable;
3695 elm_obj_widget_theme_apply(obj); 3695 elm_obj_widget_theme_apply(obj);
@@ -4022,7 +4022,7 @@ _efl_ui_text_elm_interface_scrollable_policy_set(Eo *obj, Efl_Ui_Text_Data *sd,
4022{ 4022{
4023 sd->policy_h = h; 4023 sd->policy_h = h;
4024 sd->policy_v = v; 4024 sd->policy_v = v;
4025 elm_interface_scrollable_policy_set(eo_super(obj, MY_CLASS), sd->policy_h, sd->policy_v); 4025 elm_interface_scrollable_policy_set(efl_super(obj, MY_CLASS), sd->policy_h, sd->policy_v);
4026} 4026}
4027 4027
4028EOLIAN static void 4028EOLIAN static void
@@ -4030,7 +4030,7 @@ _efl_ui_text_elm_interface_scrollable_bounce_allow_set(Eo *obj, Efl_Ui_Text_Data
4030{ 4030{
4031 sd->h_bounce = h_bounce; 4031 sd->h_bounce = h_bounce;
4032 sd->v_bounce = v_bounce; 4032 sd->v_bounce = v_bounce;
4033 elm_interface_scrollable_bounce_allow_set(eo_super(obj, MY_CLASS), h_bounce, v_bounce); 4033 elm_interface_scrollable_bounce_allow_set(efl_super(obj, MY_CLASS), h_bounce, v_bounce);
4034} 4034}
4035 4035
4036EOLIAN static void 4036EOLIAN static void
@@ -4862,7 +4862,7 @@ EOLIAN static Elm_Atspi_State_Set
4862_efl_ui_text_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4862_efl_ui_text_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4863{ 4863{
4864 Elm_Atspi_State_Set ret; 4864 Elm_Atspi_State_Set ret;
4865 ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, EFL_UI_TEXT_CLASS)); 4865 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
4866 4866
4867 if (efl_ui_text_interactive_editable_get(obj)) 4867 if (efl_ui_text_interactive_editable_get(obj))
4868 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); 4868 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE);
@@ -4874,7 +4874,7 @@ EOLIAN static char*
4874_efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *sd) 4874_efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *sd)
4875{ 4875{
4876 char *name; 4876 char *name;
4877 name = elm_interface_atspi_accessible_name_get(eo_super(obj, EFL_UI_TEXT_CLASS)); 4877 name = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_TEXT_CLASS));
4878 if (name && strncmp("", name, 1)) return name; 4878 if (name && strncmp("", name, 1)) return name;
4879 const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide"); 4879 const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide");
4880 return ret ? strdup(ret) : NULL; 4880 return ret ? strdup(ret) : NULL;
@@ -4884,8 +4884,8 @@ EOLIAN static Efl_Canvas_Text_Cursor *
4884_efl_ui_text_cursor_new(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED) 4884_efl_ui_text_cursor_new(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED)
4885{ 4885{
4886 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); 4886 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
4887 return eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj, 4887 return efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, (Eo *) obj,
4888 efl_canvas_text_cursor_text_object_set(eo_self, text_obj)); 4888 efl_canvas_text_cursor_text_object_set(efl_self, text_obj));
4889} 4889}
4890 4890
4891static void 4891static void
@@ -4900,7 +4900,7 @@ static inline Eo *
4900_decoration_create(Efl_Ui_Text_Data *sd, const char *file, 4900_decoration_create(Efl_Ui_Text_Data *sd, const char *file,
4901 const char *source, Eina_Bool above) 4901 const char *source, Eina_Bool above)
4902{ 4902{
4903 Eo *ret = eo_add(EDJE_OBJECT_CLASS, sd->entry_edje); 4903 Eo *ret = efl_add(EDJE_OBJECT_CLASS, sd->entry_edje);
4904 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); 4904 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
4905 edje_object_file_set(ret, file, source); 4905 edje_object_file_set(ret, file, source);
4906 evas_object_smart_member_add(ret, sd->entry_edje); 4906 evas_object_smart_member_add(ret, sd->entry_edje);
@@ -5245,10 +5245,10 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd)
5245 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); 5245 Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
5246 _anchors_clear(obj, sd); 5246 _anchors_clear(obj, sd);
5247 5247
5248 start = eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj, 5248 start = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
5249 efl_canvas_text_cursor_text_object_set(eo_self, text_obj)); 5249 efl_canvas_text_cursor_text_object_set(efl_self, text_obj));
5250 end = eo_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj, 5250 end = efl_add(EFL_CANVAS_TEXT_CURSOR_CLASS, obj,
5251 efl_canvas_text_cursor_text_object_set(eo_self, text_obj)); 5251 efl_canvas_text_cursor_text_object_set(efl_self, text_obj));
5252 5252
5253 /* Retrieve all annotations in the text. */ 5253 /* Retrieve all annotations in the text. */
5254 efl_canvas_text_cursor_paragraph_first(start); 5254 efl_canvas_text_cursor_paragraph_first(start);
@@ -5470,7 +5470,7 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_entry, EFL_UI_TEXT, ELM_LAYOUT, Efl_Ui_Text_
5470EOLIAN static Eo * 5470EOLIAN static Eo *
5471_efl_ui_text_editable_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED) 5471_efl_ui_text_editable_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED)
5472{ 5472{
5473 obj = efl_constructor(eo_super(obj, MY_CLASS)); 5473 obj = efl_constructor(efl_super(obj, MY_CLASS));
5474 efl_ui_text_interactive_editable_set(obj, EINA_TRUE); 5474 efl_ui_text_interactive_editable_set(obj, EINA_TRUE);
5475 5475
5476 return obj; 5476 return obj;
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 1112114..5acfb94 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -49,7 +49,7 @@ static const Elm_Action key_actions[] = {
49 {NULL, NULL} 49 {NULL, NULL}
50}; 50};
51 51
52EO_CALLBACKS_ARRAY_DEFINE(_video_cb, 52EFL_CALLBACKS_ARRAY_DEFINE(_video_cb,
53 { EMOTION_OBJECT_EVENT_OPEN_DONE, _on_open_done }, 53 { EMOTION_OBJECT_EVENT_OPEN_DONE, _on_open_done },
54 { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _on_playback_started }, 54 { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _on_playback_started },
55 { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _on_playback_finished }, 55 { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _on_playback_finished },
@@ -240,7 +240,7 @@ _efl_ui_video_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Video_Data *priv)
240{ 240{
241 _elm_emotion_init(); 241 _elm_emotion_init();
242 242
243 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 243 efl_canvas_group_add(efl_super(obj, MY_CLASS));
244 elm_widget_sub_object_parent_add(obj); 244 elm_widget_sub_object_parent_add(obj);
245 elm_widget_can_focus_set(obj, EINA_TRUE); 245 elm_widget_can_focus_set(obj, EINA_TRUE);
246 246
@@ -268,21 +268,21 @@ _efl_ui_video_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Video_Data *sd)
268 ecore_timer_del(sd->timer); 268 ecore_timer_del(sd->timer);
269 if (sd->remember) emotion_object_last_position_save(sd->emotion); 269 if (sd->remember) emotion_object_last_position_save(sd->emotion);
270 270
271 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 271 efl_canvas_group_del(efl_super(obj, MY_CLASS));
272} 272}
273 273
274EAPI Evas_Object * 274EAPI Evas_Object *
275elm_video_add(Evas_Object *parent) 275elm_videfl_add(Evas_Object *parent)
276{ 276{
277 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 277 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
278 Evas_Object *obj = eo_add(MY_CLASS, parent); 278 Evas_Object *obj = efl_add(MY_CLASS, parent);
279 return obj; 279 return obj;
280} 280}
281 281
282EOLIAN static Eo * 282EOLIAN static Eo *
283_efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED) 283_efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED)
284{ 284{
285 obj = efl_constructor(eo_super(obj, MY_CLASS)); 285 obj = efl_constructor(efl_super(obj, MY_CLASS));
286 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 286 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
287 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 287 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
288 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 288 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
diff --git a/src/lib/elementary/efl_ui_video_legacy.h b/src/lib/elementary/efl_ui_video_legacy.h
index 0cc087b..e56e620 100644
--- a/src/lib/elementary/efl_ui_video_legacy.h
+++ b/src/lib/elementary/efl_ui_video_legacy.h
@@ -24,7 +24,7 @@ EAPI Evas_Object *elm_player_add(Evas_Object *parent);
24 * 24 *
25 * @ingroup Elm_Video 25 * @ingroup Elm_Video
26 */ 26 */
27EAPI Evas_Object *elm_video_add(Evas_Object *parent); 27EAPI Evas_Object *elm_videfl_add(Evas_Object *parent);
28 28
29/** 29/**
30 * 30 *
@@ -35,7 +35,7 @@ EAPI Evas_Object *elm_video_add(Evas_Object *parent);
35 * This function will explicitly define a file or URI as a source 35 * This function will explicitly define a file or URI as a source
36 * for the video of the Elm_Video object. 36 * for the video of the Elm_Video object.
37 * 37 *
38 * @see elm_video_add() 38 * @see elm_videfl_add()
39 * @see elm_player_add() 39 * @see elm_player_add()
40 * 40 *
41 * @ingroup Elm_Video 41 * @ingroup Elm_Video
diff --git a/src/lib/elementary/efl_ui_video_private.h b/src/lib/elementary/efl_ui_video_private.h
index 2d33ebe..c38ddb7 100644
--- a/src/lib/elementary/efl_ui_video_private.h
+++ b/src/lib/elementary/efl_ui_video_private.h
@@ -38,7 +38,7 @@ struct _Efl_Ui_Video_Data
38 */ 38 */
39 39
40#define EFL_UI_VIDEO_DATA_GET(o, sd) \ 40#define EFL_UI_VIDEO_DATA_GET(o, sd) \
41 Efl_Ui_Video_Data * sd = eo_data_scope_get(o, EFL_UI_VIDEO_CLASS) 41 Efl_Ui_Video_Data * sd = efl_data_scope_get(o, EFL_UI_VIDEO_CLASS)
42 42
43#define EFL_UI_VIDEO_DATA_GET_OR_RETURN(o, ptr) \ 43#define EFL_UI_VIDEO_DATA_GET_OR_RETURN(o, ptr) \
44 EFL_UI_VIDEO_DATA_GET(o, ptr); \ 44 EFL_UI_VIDEO_DATA_GET(o, ptr); \
@@ -59,7 +59,7 @@ struct _Efl_Ui_Video_Data
59 } 59 }
60 60
61#define EFL_UI_VIDEO_CHECK(obj) \ 61#define EFL_UI_VIDEO_CHECK(obj) \
62 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_VIDEO_CLASS))) \ 62 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_VIDEO_CLASS))) \
63 return 63 return
64 64
65#endif 65#endif
diff --git a/src/lib/elementary/efl_ui_widget_flip.h b/src/lib/elementary/efl_ui_widget_flip.h
index 616214f..012580f 100644
--- a/src/lib/elementary/efl_ui_widget_flip.h
+++ b/src/lib/elementary/efl_ui_widget_flip.h
@@ -84,7 +84,7 @@ struct _Vertex3
84 */ 84 */
85 85
86#define EFL_UI_FLIP_DATA_GET(o, sd) \ 86#define EFL_UI_FLIP_DATA_GET(o, sd) \
87 Efl_Ui_Flip_Data * sd = eo_data_scope_get(o, EFL_UI_FLIP_CLASS) 87 Efl_Ui_Flip_Data * sd = efl_data_scope_get(o, EFL_UI_FLIP_CLASS)
88 88
89#define EFL_UI_FLIP_DATA_GET_OR_RETURN(o, ptr) \ 89#define EFL_UI_FLIP_DATA_GET_OR_RETURN(o, ptr) \
90 EFL_UI_FLIP_DATA_GET(o, ptr); \ 90 EFL_UI_FLIP_DATA_GET(o, ptr); \
@@ -105,7 +105,7 @@ struct _Vertex3
105 } 105 }
106 106
107#define ELM_FLIP_CHECK(obj) \ 107#define ELM_FLIP_CHECK(obj) \
108 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_FLIP_CLASS))) \ 108 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_FLIP_CLASS))) \
109 return 109 return
110 110
111#endif 111#endif
diff --git a/src/lib/elementary/efl_ui_widget_frame.h b/src/lib/elementary/efl_ui_widget_frame.h
index 30c3a79..ddd7f70 100644
--- a/src/lib/elementary/efl_ui_widget_frame.h
+++ b/src/lib/elementary/efl_ui_widget_frame.h
@@ -36,7 +36,7 @@ struct _Efl_Ui_Frame_Data
36 */ 36 */
37 37
38#define EFL_UI_FRAME_DATA_GET(o, sd) \ 38#define EFL_UI_FRAME_DATA_GET(o, sd) \
39 Efl_Ui_Frame_Data * sd = eo_data_scope_get(o, EFL_UI_FRAME_CLASS) 39 Efl_Ui_Frame_Data * sd = efl_data_scope_get(o, EFL_UI_FRAME_CLASS)
40 40
41#define EFL_UI_FRAME_DATA_GET_OR_RETURN(o, ptr) \ 41#define EFL_UI_FRAME_DATA_GET_OR_RETURN(o, ptr) \
42 EFL_UI_FRAME_DATA_GET(o, ptr); \ 42 EFL_UI_FRAME_DATA_GET(o, ptr); \
@@ -57,7 +57,7 @@ struct _Efl_Ui_Frame_Data
57 } 57 }
58 58
59#define EFL_UI_FRAME_CHECK(obj) \ 59#define EFL_UI_FRAME_CHECK(obj) \
60 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_FRAME_CLASS))) \ 60 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_FRAME_CLASS))) \
61 return 61 return
62 62
63#endif 63#endif
diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index 64f7b97..a0da68a 100644
--- a/src/lib/elementary/efl_ui_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -105,7 +105,7 @@ struct _Efl_Ui_Image_Data
105 */ 105 */
106 106
107#define EFL_UI_IMAGE_DATA_GET(o, sd) \ 107#define EFL_UI_IMAGE_DATA_GET(o, sd) \
108 Efl_Ui_Image_Data * sd = eo_data_scope_get(o, EFL_UI_IMAGE_CLASS) 108 Efl_Ui_Image_Data * sd = efl_data_scope_get(o, EFL_UI_IMAGE_CLASS)
109 109
110#define EFL_UI_IMAGE_DATA_GET_OR_RETURN(o, ptr) \ 110#define EFL_UI_IMAGE_DATA_GET_OR_RETURN(o, ptr) \
111 EFL_UI_IMAGE_DATA_GET(o, ptr); \ 111 EFL_UI_IMAGE_DATA_GET(o, ptr); \
@@ -126,7 +126,7 @@ struct _Efl_Ui_Image_Data
126 } 126 }
127 127
128#define EFL_UI_IMAGE_CHECK(obj) \ 128#define EFL_UI_IMAGE_CHECK(obj) \
129 if (EINA_UNLIKELY(!eo_isa((obj), EFL_UI_IMAGE_CLASS))) \ 129 if (EINA_UNLIKELY(!efl_isa((obj), EFL_UI_IMAGE_CLASS))) \
130 return 130 return
131 131
132#endif 132#endif
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 11d018a..00b6ab1 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -38,19 +38,19 @@ static const Elm_Win_Trap *trap = NULL;
38 while (0) 38 while (0)
39 39
40#define ELM_WIN_DATA_GET(o, sd) \ 40#define ELM_WIN_DATA_GET(o, sd) \
41 Efl_Ui_Win_Data * sd = eo_data_scope_get(o, MY_CLASS) 41 Efl_Ui_Win_Data * sd = efl_data_scope_get(o, MY_CLASS)
42 42
43#define ELM_WIN_DATA_GET_OR_RETURN(o, ptr, ...) \ 43#define ELM_WIN_DATA_GET_OR_RETURN(o, ptr, ...) \
44 ELM_WIN_DATA_GET(o, ptr); \ 44 ELM_WIN_DATA_GET(o, ptr); \
45 if (!ptr) \ 45 if (!ptr) \
46 { \ 46 { \
47 CRI("No widget data for object %p (%s)", \ 47 CRI("No widget data for object %p (%s)", \
48 o, eo_class_name_get(o)); \ 48 o, efl_class_name_get(o)); \
49 return __VA_ARGS__; \ 49 return __VA_ARGS__; \
50 } 50 }
51 51
52#define ELM_WIN_CHECK(obj) \ 52#define ELM_WIN_CHECK(obj) \
53 if (!obj || !eo_isa(obj, MY_CLASS)) \ 53 if (!obj || !efl_isa(obj, MY_CLASS)) \
54 return 54 return
55 55
56#define DECREMENT_MODALITY() \ 56#define DECREMENT_MODALITY() \
@@ -1604,7 +1604,7 @@ EOLIAN static Eina_Bool
1604_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED) 1604_efl_ui_win_elm_widget_on_focus(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
1605{ 1605{
1606 Eina_Bool int_ret = EINA_FALSE; 1606 Eina_Bool int_ret = EINA_FALSE;
1607 int_ret = elm_obj_widget_on_focus(eo_super(obj, MY_CLASS), NULL); 1607 int_ret = elm_obj_widget_on_focus(efl_super(obj, MY_CLASS), NULL);
1608 if (!int_ret) return EINA_TRUE; 1608 if (!int_ret) return EINA_TRUE;
1609 1609
1610 if (sd->img_obj) 1610 if (sd->img_obj)
@@ -1667,7 +1667,7 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
1667 Eo *evt = ev->info; 1667 Eo *evt = ev->info;
1668 Efl_Event_Key_Data *evdata; 1668 Efl_Event_Key_Data *evdata;
1669 1669
1670 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1670 evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
1671 if (!evdata || evdata->win_fed) 1671 if (!evdata || evdata->win_fed)
1672 return; 1672 return;
1673 1673
@@ -1685,7 +1685,7 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
1685 Eo *evt = ev->info; 1685 Eo *evt = ev->info;
1686 Efl_Event_Pointer_Data *evdata; 1686 Efl_Event_Pointer_Data *evdata;
1687 1687
1688 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1688 evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
1689 if (!evdata || evdata->win_fed) 1689 if (!evdata || evdata->win_fed)
1690 return; 1690 return;
1691 1691
@@ -1703,7 +1703,7 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1703 if (!efl_event_fake_get(evt)) 1703 if (!efl_event_fake_get(evt))
1704 return; 1704 return;
1705 1705
1706 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1706 evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
1707 if (!evdata || evdata->win_fed) 1707 if (!evdata || evdata->win_fed)
1708 return; 1708 return;
1709 evdata->win_fed = EINA_TRUE; 1709 evdata->win_fed = EINA_TRUE;
@@ -1723,7 +1723,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1723 if (!efl_event_fake_get(evt)) 1723 if (!efl_event_fake_get(evt))
1724 return; 1724 return;
1725 1725
1726 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1726 evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
1727 if (!evdata || evdata->win_fed) 1727 if (!evdata || evdata->win_fed)
1728 return; 1728 return;
1729 evdata->win_fed = EINA_TRUE; 1729 evdata->win_fed = EINA_TRUE;
@@ -1733,7 +1733,7 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1733 evdata->evas_done = EINA_FALSE; 1733 evdata->evas_done = EINA_FALSE;
1734} 1734}
1735 1735
1736EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks, 1736EFL_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
1737{ EFL_EVENT_POINTER_MOVE, _evas_event_pointer_feed_fake_cb }, 1737{ EFL_EVENT_POINTER_MOVE, _evas_event_pointer_feed_fake_cb },
1738{ EFL_EVENT_POINTER_DOWN, _evas_event_pointer_feed_fake_cb }, 1738{ EFL_EVENT_POINTER_DOWN, _evas_event_pointer_feed_fake_cb },
1739{ EFL_EVENT_POINTER_UP, _evas_event_pointer_feed_fake_cb }, 1739{ EFL_EVENT_POINTER_UP, _evas_event_pointer_feed_fake_cb },
@@ -2062,7 +2062,7 @@ _efl_ui_win_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Win_Data *sd)
2062 Eina_Bool do_eval = EINA_FALSE; 2062 Eina_Bool do_eval = EINA_FALSE;
2063 2063
2064 if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE; 2064 if (!evas_object_visible_get(obj)) do_eval = EINA_TRUE;
2065 efl_canvas_group_show(eo_super(obj, MY_CLASS)); 2065 efl_canvas_group_show(efl_super(obj, MY_CLASS));
2066 2066
2067 if ((sd->modal) && (!evas_object_visible_get(obj))) 2067 if ((sd->modal) && (!evas_object_visible_get(obj)))
2068 { 2068 {
@@ -2105,7 +2105,7 @@ _efl_ui_win_efl_canvas_group_group_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2105 2105
2106 if (evas_object_visible_get(obj)) 2106 if (evas_object_visible_get(obj))
2107 _elm_win_state_eval_queue(); 2107 _elm_win_state_eval_queue();
2108 efl_canvas_group_hide(eo_super(obj, MY_CLASS)); 2108 efl_canvas_group_hide(efl_super(obj, MY_CLASS));
2109 2109
2110 if ((sd->modal) && (evas_object_visible_get(obj))) 2110 if ((sd->modal) && (evas_object_visible_get(obj)))
2111 { 2111 {
@@ -2542,7 +2542,7 @@ _efl_ui_win_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Win_Data *sd)
2542 ecore_evas_callback_state_change_set(sd->ee, NULL); 2542 ecore_evas_callback_state_change_set(sd->ee, NULL);
2543 ecore_evas_callback_pre_render_set(sd->ee, NULL); 2543 ecore_evas_callback_pre_render_set(sd->ee, NULL);
2544 2544
2545 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 2545 efl_canvas_group_del(efl_super(obj, MY_CLASS));
2546 2546
2547 if (_elm_win_policy_quit_triggered(obj)) 2547 if (_elm_win_policy_quit_triggered(obj))
2548 { 2548 {
@@ -2601,7 +2601,7 @@ _efl_ui_win_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord
2601 if (!ecore_evas_override_get(sd->ee)) return; 2601 if (!ecore_evas_override_get(sd->ee)) return;
2602 } 2602 }
2603 2603
2604 efl_canvas_group_move(eo_super(obj, MY_CLASS), x, y); 2604 efl_canvas_group_move(efl_super(obj, MY_CLASS), x, y);
2605 2605
2606 if (ecore_evas_override_get(sd->ee)) 2606 if (ecore_evas_override_get(sd->ee))
2607 { 2607 {
@@ -2630,7 +2630,7 @@ _efl_ui_win_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coo
2630{ 2630{
2631 if (sd->img_obj) 2631 if (sd->img_obj)
2632 { 2632 {
2633 efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h); 2633 efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
2634 if (sd->constrain) 2634 if (sd->constrain)
2635 { 2635 {
2636 int sw, sh; 2636 int sw, sh;
@@ -3823,7 +3823,7 @@ _elm_win_on_icon_del(void *data,
3823EOLIAN static void 3823EOLIAN static void
3824_efl_ui_win_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED) 3824_efl_ui_win_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
3825{ 3825{
3826 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 3826 efl_canvas_group_add(efl_super(obj, MY_CLASS));
3827 3827
3828 elm_widget_can_focus_set(obj, EINA_TRUE); 3828 elm_widget_can_focus_set(obj, EINA_TRUE);
3829 3829
@@ -3848,14 +3848,14 @@ elm_win_add(Evas_Object *parent,
3848 const char *name, 3848 const char *name,
3849 Elm_Win_Type type) 3849 Elm_Win_Type type)
3850{ 3850{
3851 Evas_Object *obj = eo_add(MY_CLASS, parent, efl_ui_win_name_set(eo_self, name), efl_ui_win_type_set(eo_self, type)); 3851 Evas_Object *obj = efl_add(MY_CLASS, parent, efl_ui_win_name_set(efl_self, name), efl_ui_win_type_set(efl_self, type));
3852 return obj; 3852 return obj;
3853} 3853}
3854 3854
3855EAPI Evas_Object * 3855EAPI Evas_Object *
3856elm_win_fake_add(Ecore_Evas *ee) 3856elm_win_fake_add(Ecore_Evas *ee)
3857{ 3857{
3858 return eo_add(MY_CLASS, NULL, elm_win_fake_canvas_set(eo_self, ee), efl_ui_win_name_set(eo_self, NULL), efl_ui_win_type_set(eo_self, ELM_WIN_FAKE)); 3858 return efl_add(MY_CLASS, NULL, elm_win_fake_canvas_set(efl_self, ee), efl_ui_win_name_set(efl_self, NULL), efl_ui_win_type_set(efl_self, ELM_WIN_FAKE));
3859} 3859}
3860 3860
3861static void 3861static void
@@ -4324,7 +4324,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
4324 4324
4325 efl_parent_set(obj, ecore_evas_get(tmp_sd.ee)); 4325 efl_parent_set(obj, ecore_evas_get(tmp_sd.ee));
4326 4326
4327 efl_constructor(eo_super(obj, MY_CLASS)); 4327 efl_constructor(efl_super(obj, MY_CLASS));
4328 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 4328 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
4329 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 4329 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
4330 4330
@@ -4598,7 +4598,7 @@ _efl_ui_win_efl_object_finalize(Eo *obj, Efl_Ui_Win_Data *_pd)
4598 obj = _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type); 4598 obj = _elm_win_finalize_internal(obj, _pd, _pd->name, _pd->type);
4599 if (obj) 4599 if (obj)
4600 { 4600 {
4601 obj = efl_finalize(eo_super(obj, MY_CLASS)); 4601 obj = efl_finalize(efl_super(obj, MY_CLASS));
4602 } 4602 }
4603 return obj; 4603 return obj;
4604} 4604}
@@ -4781,7 +4781,7 @@ _efl_ui_win_efl_container_content_count(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd
4781{ 4781{
4782 Evas_Object_Box_Data *bd; 4782 Evas_Object_Box_Data *bd;
4783 4783
4784 bd = eo_data_scope_get(sd->box, EVAS_BOX_CLASS); 4784 bd = efl_data_scope_get(sd->box, EVAS_BOX_CLASS);
4785 if (!bd) return 0; 4785 if (!bd) return 0;
4786 4786
4787 return eina_list_count(bd->children); 4787 return eina_list_count(bd->children);
@@ -5641,7 +5641,7 @@ EOLIAN static Elm_Theme_Apply
5641_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 5641_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
5642{ 5642{
5643 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 5643 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
5644 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 5644 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
5645 if (!int_ret) return ELM_THEME_APPLY_FAILED; 5645 if (!int_ret) return ELM_THEME_APPLY_FAILED;
5646 5646
5647 sd->focus_highlight.theme_changed = EINA_TRUE; 5647 sd->focus_highlight.theme_changed = EINA_TRUE;
@@ -5862,7 +5862,7 @@ EOLIAN static Elm_Atspi_State_Set
5862_efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 5862_efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
5863{ 5863{
5864 Elm_Atspi_State_Set ret; 5864 Elm_Atspi_State_Set ret;
5865 ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS)); 5865 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS));
5866 5866
5867 if (elm_win_focus_get(obj)) 5867 if (elm_win_focus_get(obj))
5868 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE); 5868 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE);
@@ -5874,7 +5874,7 @@ EOLIAN static char*
5874_efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 5874_efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
5875{ 5875{
5876 char *ret; 5876 char *ret;
5877 ret = elm_interface_atspi_accessible_name_get(eo_super(obj, EFL_UI_WIN_CLASS)); 5877 ret = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
5878 if (ret) return ret; 5878 if (ret) return ret;
5879 const char *name = elm_win_title_get(obj); 5879 const char *name = elm_win_title_get(obj);
5880 return name ? strdup(name) : NULL; 5880 return name ? strdup(name) : NULL;
diff --git a/src/lib/elementary/efl_ui_win_standard.c b/src/lib/elementary/efl_ui_win_standard.c
index ed9b01d..5189233 100644
--- a/src/lib/elementary/efl_ui_win_standard.c
+++ b/src/lib/elementary/efl_ui_win_standard.c
@@ -15,11 +15,11 @@
15EOLIAN static Eo * 15EOLIAN static Eo *
16_efl_ui_win_standard_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED) 16_efl_ui_win_standard_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED)
17{ 17{
18 obj = efl_finalize(eo_super(obj, MY_CLASS)); 18 obj = efl_finalize(efl_super(obj, MY_CLASS));
19 if (!obj) 19 if (!obj)
20 return NULL; 20 return NULL;
21 21
22 Evas_Object *bg = eo_add(ELM_BG_CLASS, obj); 22 Evas_Object *bg = efl_add(ELM_BG_CLASS, obj);
23 if (!bg) 23 if (!bg)
24 { 24 {
25 ERR("Cannot create background."); 25 ERR("Cannot create background.");
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 0554c07..c545193 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -44,7 +44,7 @@ static const Elm_Action key_actions[] = {
44EOLIAN static Eina_Bool 44EOLIAN static Eina_Bool
45_elm_combobox_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd) 45_elm_combobox_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Combobox_Data *sd)
46{ 46{
47 elm_obj_widget_translate(eo_super(obj, MY_CLASS)); 47 elm_obj_widget_translate(efl_super(obj, MY_CLASS));
48 elm_obj_widget_translate(sd->genlist); 48 elm_obj_widget_translate(sd->genlist);
49 elm_obj_widget_translate(sd->entry); 49 elm_obj_widget_translate(sd->entry);
50 50
@@ -71,7 +71,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
71 /* combobox's style has no extra bit for orientation but could have... */ 71 /* combobox's style has no extra bit for orientation but could have... */
72 eina_stringshare_replace(&(wd->style), buf); 72 eina_stringshare_replace(&(wd->style), buf);
73 73
74 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 74 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
75 if (!int_ret) return ELM_THEME_APPLY_FAILED; 75 if (!int_ret) return ELM_THEME_APPLY_FAILED;
76 76
77 eina_stringshare_replace(&(wd->style), style); 77 eina_stringshare_replace(&(wd->style), style);
@@ -266,7 +266,7 @@ _on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
266EOLIAN static void 266EOLIAN static void
267_elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) 267_elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
268{ 268{
269 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 269 efl_canvas_group_add(efl_super(obj, MY_CLASS));
270 elm_widget_sub_object_parent_add(obj); 270 elm_widget_sub_object_parent_add(obj);
271 271
272 elm_widget_mirrored_automatic_set(obj, EINA_FALSE); 272 elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
@@ -281,20 +281,20 @@ EOLIAN static void
281_elm_combobox_efl_canvas_group_group_del(Eo *obj, Elm_Combobox_Data *sd) 281_elm_combobox_efl_canvas_group_group_del(Eo *obj, Elm_Combobox_Data *sd)
282{ 282{
283 sd->hover_parent = NULL; 283 sd->hover_parent = NULL;
284 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 284 efl_canvas_group_del(efl_super(obj, MY_CLASS));
285} 285}
286 286
287EOLIAN static void 287EOLIAN static void
288_elm_combobox_efl_canvas_group_group_show(Eo *obj, Elm_Combobox_Data *sd) 288_elm_combobox_efl_canvas_group_group_show(Eo *obj, Elm_Combobox_Data *sd)
289{ 289{
290 efl_canvas_group_show(eo_super(obj, MY_CLASS)); 290 efl_canvas_group_show(efl_super(obj, MY_CLASS));
291 if (sd->expanded) evas_object_show(sd->hover); 291 if (sd->expanded) evas_object_show(sd->hover);
292} 292}
293 293
294EOLIAN static void 294EOLIAN static void
295_elm_combobox_efl_canvas_group_group_hide(Eo *obj, Elm_Combobox_Data *sd) 295_elm_combobox_efl_canvas_group_group_hide(Eo *obj, Elm_Combobox_Data *sd)
296{ 296{
297 efl_canvas_group_hide(eo_super(obj, MY_CLASS)); 297 efl_canvas_group_hide(efl_super(obj, MY_CLASS));
298 if (sd->hover) evas_object_hide(sd->hover); 298 if (sd->hover) evas_object_hide(sd->hover);
299} 299}
300 300
@@ -309,7 +309,7 @@ EAPI Evas_Object *
309elm_combobox_add(Evas_Object *parent) 309elm_combobox_add(Evas_Object *parent)
310{ 310{
311 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 311 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
312 Evas_Object *obj = eo_add(MY_CLASS, parent); 312 Evas_Object *obj = efl_add(MY_CLASS, parent);
313 return obj; 313 return obj;
314} 314}
315 315
@@ -320,7 +320,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
320 Evas_Object *entry; 320 Evas_Object *entry;
321 char buf[128]; 321 char buf[128];
322 322
323 obj = efl_constructor(eo_super(obj, MY_CLASS)); 323 obj = efl_constructor(efl_super(obj, MY_CLASS));
324 324
325 sd->first_filter = EINA_TRUE; 325 sd->first_filter = EINA_TRUE;
326 326
@@ -332,7 +332,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
332 sd->hover_parent = elm_object_parent_widget_get(obj); 332 sd->hover_parent = elm_object_parent_widget_get(obj);
333 333
334 //hover 334 //hover
335 sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent); 335 sd->hover = efl_add(ELM_HOVER_CLASS, sd->hover_parent);
336 elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE); 336 elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
337 elm_hover_target_set(sd->hover, obj); 337 elm_hover_target_set(sd->hover, obj);
338 elm_widget_sub_object_add(obj, sd->hover); 338 elm_widget_sub_object_add(obj, sd->hover);
@@ -358,7 +358,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
358 elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1); 358 elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1);
359 359
360 // This is the genlist object that will take over the genlist call 360 // This is the genlist object that will take over the genlist call
361 sd->genlist = gl = eo_add(ELM_GENLIST_CLASS, obj); 361 sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj);
362 elm_genlist_filter_set(gl, NULL); 362 elm_genlist_filter_set(gl, NULL);
363 elm_widget_mirrored_automatic_set(gl, EINA_FALSE); 363 elm_widget_mirrored_automatic_set(gl, EINA_FALSE);
364 elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj)); 364 elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj));
@@ -373,7 +373,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
373 elm_object_style_set(gl, buf); 373 elm_object_style_set(gl, buf);
374 374
375 // This is the entry object that will take over the entry call 375 // This is the entry object that will take over the entry call
376 sd->entry = entry = eo_add(ELM_ENTRY_CLASS, obj); 376 sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj);
377 elm_widget_mirrored_automatic_set(entry, EINA_FALSE); 377 elm_widget_mirrored_automatic_set(entry, EINA_FALSE);
378 elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj)); 378 elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj));
379 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF, 379 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
@@ -529,7 +529,7 @@ EOLIAN static void
529_elm_combobox_efl_canvas_group_group_resize(Eo *obj, Elm_Combobox_Data *pd, 529_elm_combobox_efl_canvas_group_group_resize(Eo *obj, Elm_Combobox_Data *pd,
530 Evas_Coord w, Evas_Coord h) 530 Evas_Coord w, Evas_Coord h)
531{ 531{
532 efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h); 532 efl_canvas_group_resize(efl_super(obj, MY_CLASS), w, h);
533 if (pd->count > 0) _table_resize(obj); 533 if (pd->count > 0) _table_resize(obj);
534} 534}
535#include "elm_combobox.eo.c" 535#include "elm_combobox.eo.c"
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 4955270..6fcebde 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -60,7 +60,7 @@ _elm_ctxpopup_elm_widget_translate(Eo *obj, Elm_Ctxpopup_Data *sd)
60 EINA_LIST_FOREACH(sd->items, l, it) 60 EINA_LIST_FOREACH(sd->items, l, it)
61 elm_wdg_item_translate(it); 61 elm_wdg_item_translate(it);
62 62
63 elm_obj_widget_translate(eo_super(obj, MY_CLASS)); 63 elm_obj_widget_translate(efl_super(obj, MY_CLASS));
64 64
65 return EINA_TRUE; 65 return EINA_TRUE;
66} 66}
@@ -228,7 +228,7 @@ _base_geometry_calc(Evas_Object *obj,
228 evas_object_geometry_get 228 evas_object_geometry_get
229 (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w, 229 (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w,
230 &hover_area.h); 230 &hover_area.h);
231 if (sd->parent && eo_isa(sd->parent, EFL_UI_WIN_CLASS)) 231 if (sd->parent && efl_isa(sd->parent, EFL_UI_WIN_CLASS))
232 hover_area.x = hover_area.y = 0; 232 hover_area.x = hover_area.y = 0;
233 233
234 evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL); 234 evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
@@ -750,7 +750,7 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
750{ 750{
751 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 751 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
752 752
753 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 753 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
754 if (!int_ret) return ELM_THEME_APPLY_FAILED; 754 if (!int_ret) return ELM_THEME_APPLY_FAILED;
755 755
756 elm_widget_theme_object_set 756 elm_widget_theme_object_set
@@ -780,7 +780,7 @@ _elm_ctxpopup_content_set(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part, Evas
780{ 780{
781 if ((part) && (strcmp(part, "default"))) 781 if ((part) && (strcmp(part, "default")))
782 { 782 {
783 return efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content); 783 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
784 } 784 }
785 785
786 if (!content) return EINA_FALSE; 786 if (!content) return EINA_FALSE;
@@ -810,7 +810,7 @@ static Evas_Object*
810_elm_ctxpopup_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part) 810_elm_ctxpopup_content_get(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
811{ 811{
812 if ((part) && (strcmp(part, "default"))) 812 if ((part) && (strcmp(part, "default")))
813 return efl_content_get(efl_part(eo_super(obj, MY_CLASS), part)); 813 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
814 814
815 return sd->content; 815 return sd->content;
816} 816}
@@ -821,7 +821,7 @@ _elm_ctxpopup_content_unset(Eo *obj, Elm_Ctxpopup_Data *sd, const char *part)
821 Evas_Object *content = NULL; 821 Evas_Object *content = NULL;
822 822
823 if ((part) && (strcmp(part, "default"))) 823 if ((part) && (strcmp(part, "default")))
824 return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part)); 824 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
825 825
826 content = sd->content; 826 content = sd->content;
827 if (!content) return content; 827 if (!content) return content;
@@ -1049,7 +1049,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
1049 list = elm_object_item_widget_get(ctxpopup_it->list_item); 1049 list = elm_object_item_widget_get(ctxpopup_it->list_item);
1050 1050
1051 if (ctxpopup_it->list_item) 1051 if (ctxpopup_it->list_item)
1052 eo_unref(ctxpopup_it->list_item); 1052 efl_unref(ctxpopup_it->list_item);
1053 sd->items = eina_list_remove(sd->items, eo_ctxpopup_it); 1053 sd->items = eina_list_remove(sd->items, eo_ctxpopup_it);
1054 if (list && eina_list_count(elm_list_items_get(list)) < 2) 1054 if (list && eina_list_count(elm_list_items_get(list)) < 2)
1055 { 1055 {
@@ -1060,7 +1060,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
1060 if (sd->list_visible) elm_layout_sizing_eval(WIDGET(ctxpopup_it)); 1060 if (sd->list_visible) elm_layout_sizing_eval(WIDGET(ctxpopup_it));
1061 } 1061 }
1062 1062
1063 efl_destructor(eo_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS)); 1063 efl_destructor(efl_super(eo_ctxpopup_it, ELM_CTXPOPUP_ITEM_CLASS));
1064} 1064}
1065 1065
1066EOLIAN static Eina_Bool 1066EOLIAN static Eina_Bool
@@ -1068,7 +1068,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd)
1068{ 1068{
1069 Eina_Bool int_ret = EINA_FALSE; 1069 Eina_Bool int_ret = EINA_FALSE;
1070 1070
1071 int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS)); 1071 int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
1072 if (!int_ret) return EINA_FALSE; 1072 if (!int_ret) return EINA_FALSE;
1073 if (sd->list) 1073 if (sd->list)
1074 elm_object_disabled_set(sd->list, elm_widget_disabled_get(obj)); 1074 elm_object_disabled_set(sd->list, elm_widget_disabled_get(obj));
@@ -1083,7 +1083,7 @@ _elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1083{ 1083{
1084 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1084 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1085 1085
1086 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 1086 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1087 elm_widget_sub_object_parent_add(obj); 1087 elm_widget_sub_object_parent_add(obj);
1088 1088
1089 if (!elm_layout_theme_set 1089 if (!elm_layout_theme_set
@@ -1124,7 +1124,7 @@ _elm_ctxpopup_efl_canvas_group_group_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1124 (priv->box, EVAS_CALLBACK_RESIZE, _on_content_resized, obj); 1124 (priv->box, EVAS_CALLBACK_RESIZE, _on_content_resized, obj);
1125 1125
1126 /* box will be our content placeholder, thus the parent's version call */ 1126 /* box will be our content placeholder, thus the parent's version call */
1127 efl_content_set(efl_part(eo_super(obj, MY_CLASS), "elm.swallow.content"), priv->box); 1127 efl_content_set(efl_part(efl_super(obj, MY_CLASS), "elm.swallow.content"), priv->box);
1128 1128
1129 evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _on_show, NULL); 1129 evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _on_show, NULL);
1130 evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _on_hide, NULL); 1130 evas_object_event_callback_add(obj, EVAS_CALLBACK_HIDE, _on_hide, NULL);
@@ -1149,7 +1149,7 @@ _elm_ctxpopup_efl_canvas_group_group_del(Eo *obj, Elm_Ctxpopup_Data *sd)
1149 EINA_LIST_FREE(sd->items, it) 1149 EINA_LIST_FREE(sd->items, it)
1150 efl_del(it); 1150 efl_del(it);
1151 1151
1152 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 1152 efl_canvas_group_del(efl_super(obj, MY_CLASS));
1153} 1153}
1154 1154
1155EOLIAN static void 1155EOLIAN static void
@@ -1163,7 +1163,7 @@ EAPI Evas_Object *
1163elm_ctxpopup_add(Evas_Object *parent) 1163elm_ctxpopup_add(Evas_Object *parent)
1164{ 1164{
1165 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 1165 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
1166 Evas_Object *obj = eo_add(MY_CLASS, parent); 1166 Evas_Object *obj = efl_add(MY_CLASS, parent);
1167 1167
1168 /* access: parent could be any object such as elm_list which does 1168 /* access: parent could be any object such as elm_list which does
1169 not know elc_ctxpopup as its child object in the focus_next(); */ 1169 not know elc_ctxpopup as its child object in the focus_next(); */
@@ -1176,7 +1176,7 @@ elm_ctxpopup_add(Evas_Object *parent)
1176EOLIAN static Eo * 1176EOLIAN static Eo *
1177_elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED) 1177_elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
1178{ 1178{
1179 obj = efl_constructor(eo_super(obj, MY_CLASS)); 1179 obj = efl_constructor(efl_super(obj, MY_CLASS));
1180 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1180 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1181 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1181 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1182 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); 1182 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
@@ -1204,7 +1204,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare
1204 1204
1205 //Update Background 1205 //Update Background
1206 evas_object_geometry_get(parent, &x, &y, &w, &h); 1206 evas_object_geometry_get(parent, &x, &y, &w, &h);
1207 if (parent && eo_isa(parent, EFL_UI_WIN_CLASS)) 1207 if (parent && efl_isa(parent, EFL_UI_WIN_CLASS))
1208 x = y = 0; 1208 x = y = 0;
1209 evas_object_move(sd->bg, x, y); 1209 evas_object_move(sd->bg, x, y);
1210 evas_object_resize(sd->bg, w, h); 1210 evas_object_resize(sd->bg, w, h);
@@ -1250,8 +1250,8 @@ _item_wrap_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
1250EOLIAN static Eo * 1250EOLIAN static Eo *
1251_elm_ctxpopup_item_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it) 1251_elm_ctxpopup_item_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Item_Data *it)
1252{ 1252{
1253 obj = efl_constructor(eo_super(obj, ELM_CTXPOPUP_ITEM_CLASS)); 1253 obj = efl_constructor(efl_super(obj, ELM_CTXPOPUP_ITEM_CLASS));
1254 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 1254 it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
1255 1255
1256 return obj; 1256 return obj;
1257} 1257}
@@ -1261,14 +1261,14 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva
1261{ 1261{
1262 Eo *eo_item; 1262 Eo *eo_item;
1263 1263
1264 eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data)); 1264 eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data));
1265 if (!eo_item) return NULL; 1265 if (!eo_item) return NULL;
1266 1266
1267 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); 1267 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
1268 1268
1269 item->list_item = 1269 item->list_item =
1270 elm_list_item_append(sd->list, label, icon, NULL, _item_wrap_cb, item); 1270 elm_list_item_append(sd->list, label, icon, NULL, _item_wrap_cb, item);
1271 eo_ref(item->list_item); 1271 efl_ref(item->list_item);
1272 sd->items = eina_list_append(sd->items, eo_item); 1272 sd->items = eina_list_append(sd->items, eo_item);
1273 1273
1274 if (sd->visible) elm_layout_sizing_eval(obj); 1274 if (sd->visible) elm_layout_sizing_eval(obj);
@@ -1354,14 +1354,14 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev
1354{ 1354{
1355 Eo *eo_item; 1355 Eo *eo_item;
1356 1356
1357 eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data)); 1357 eo_item = efl_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(efl_self, func, data));
1358 if (!eo_item) return NULL; 1358 if (!eo_item) return NULL;
1359 1359
1360 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item); 1360 ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
1361 1361
1362 item->list_item = 1362 item->list_item =
1363 elm_list_item_prepend(sd->list, label, icon, NULL, _item_wrap_cb, item); 1363 elm_list_item_prepend(sd->list, label, icon, NULL, _item_wrap_cb, item);
1364 eo_ref(item->list_item); 1364 efl_ref(item->list_item);
1365 sd->items = eina_list_prepend(sd->items, eo_item); 1365 sd->items = eina_list_prepend(sd->items, eo_item);
1366 1366
1367 if (sd->visible) elm_layout_sizing_eval(obj); 1367 if (sd->visible) elm_layout_sizing_eval(obj);
@@ -1407,7 +1407,7 @@ _elm_ctxpopup_item_init(Eo *eo_item,
1407{ 1407{
1408 Eo *obj; 1408 Eo *obj;
1409 obj = efl_parent_get(eo_item); 1409 obj = efl_parent_get(eo_item);
1410 Elm_Ctxpopup_Data *sd = eo_data_scope_get(obj, ELM_CTXPOPUP_CLASS); 1410 Elm_Ctxpopup_Data *sd = efl_data_scope_get(obj, ELM_CTXPOPUP_CLASS);
1411 if (!sd->list) 1411 if (!sd->list)
1412 { 1412 {
1413 sd->list = elm_list_add(obj); 1413 sd->list = elm_list_add(obj);
@@ -1468,7 +1468,7 @@ EOLIAN static Elm_Atspi_State_Set
1468_elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) 1468_elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
1469{ 1469{
1470 Elm_Atspi_State_Set ret; 1470 Elm_Atspi_State_Set ret;
1471 ret = elm_interface_atspi_accessible_state_set_get(eo_super(obj, MY_CLASS)); 1471 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS));
1472 1472
1473 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL); 1473 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL);
1474 1474
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 512ac61..eaa2aeb 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -66,7 +66,7 @@ static void _resource_created(void *, const Eo_Event *);
66static void _resource_deleted(void *, const Eo_Event *); 66static void _resource_deleted(void *, const Eo_Event *);
67static void _listing_request_cleanup(Listing_Request *); 67static void _listing_request_cleanup(Listing_Request *);
68 68
69EO_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks, 69EFL_CALLBACKS_ARRAY_DEFINE(monitoring_callbacks,
70 { EFL_MODEL_EVENT_CHILD_ADDED, _resource_created }, 70 { EFL_MODEL_EVENT_CHILD_ADDED, _resource_created },
71 { EFL_MODEL_EVENT_CHILD_REMOVED, _resource_deleted }); 71 { EFL_MODEL_EVENT_CHILD_REMOVED, _resource_deleted });
72 72
@@ -74,7 +74,7 @@ static void
74_model_free_eo_cb(void *data) 74_model_free_eo_cb(void *data)
75{ 75{
76 Eo *eo = data; 76 Eo *eo = data;
77 eo_unref(eo); 77 efl_unref(eo);
78} 78}
79 79
80static void 80static void
@@ -97,12 +97,12 @@ _elm_fileselector_replace_model(Elm_Fileselector *fs, Elm_Fileselector_Data *sd,
97 if (sd->model) 97 if (sd->model)
98 { 98 {
99 _monitoring_stop(fs, sd, sd->model); 99 _monitoring_stop(fs, sd, sd->model);
100 eo_unref(sd->model); 100 efl_unref(sd->model);
101 } 101 }
102 102
103 if (model && path) 103 if (model && path)
104 { 104 {
105 sd->model = eo_ref(model); 105 sd->model = efl_ref(model);
106 eina_stringshare_replace(&sd->path, path); 106 eina_stringshare_replace(&sd->path, path);
107 _monitoring_start(fs, sd, sd->model); 107 _monitoring_start(fs, sd, sd->model);
108 /* TODO: sub directory should be monitored for expand mode */ 108 /* TODO: sub directory should be monitored for expand mode */
@@ -120,11 +120,11 @@ _elm_fileselector_smart_del_do(Elm_Fileselector *fs, Elm_Fileselector_Data *sd)
120{ 120{
121 _elm_fileselector_replace_model(fs, sd, NULL, NULL); 121 _elm_fileselector_replace_model(fs, sd, NULL, NULL);
122 if (sd->prev_model) 122 if (sd->prev_model)
123 eo_unref(sd->prev_model); 123 efl_unref(sd->prev_model);
124 free(ecore_idler_del(sd->populate_idler)); 124 free(ecore_idler_del(sd->populate_idler));
125 ecore_idler_del(sd->path_entry_idler); 125 ecore_idler_del(sd->path_entry_idler);
126 126
127 efl_canvas_group_del(eo_super(sd->obj, MY_CLASS)); 127 efl_canvas_group_del(efl_super(sd->obj, MY_CLASS));
128} 128}
129 129
130static void 130static void
@@ -171,7 +171,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
171 char buf[1024]; 171 char buf[1024];
172 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 172 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
173 173
174 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 174 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
175 if (!int_ret) return ELM_THEME_APPLY_FAILED; 175 if (!int_ret) return ELM_THEME_APPLY_FAILED;
176 176
177 style = elm_widget_style_get(obj); 177 style = elm_widget_style_get(obj);
@@ -231,7 +231,7 @@ _key_action_backspace(Evas_Object *obj, const char *params EINA_UNUSED)
231 if (sd->prev_model) 231 if (sd->prev_model)
232 { 232 {
233 _populate(obj, sd->prev_model, NULL, NULL); 233 _populate(obj, sd->prev_model, NULL, NULL);
234 eo_unref(sd->prev_model); 234 efl_unref(sd->prev_model);
235 sd->prev_model = NULL; 235 sd->prev_model = NULL;
236 } 236 }
237 else 237 else
@@ -362,11 +362,11 @@ _itc_del(void *data,
362 Evas_Object *obj EINA_UNUSED) 362 Evas_Object *obj EINA_UNUSED)
363{ 363{
364 Elm_Fileselector_Item_Data *it_data = data; 364 Elm_Fileselector_Item_Data *it_data = data;
365 eo_unref(it_data->model); 365 efl_unref(it_data->model);
366 eina_stringshare_del(it_data->path); 366 eina_stringshare_del(it_data->path);
367 eina_stringshare_del(it_data->filename); 367 eina_stringshare_del(it_data->filename);
368 eina_stringshare_del(it_data->mime_type); 368 eina_stringshare_del(it_data->mime_type);
369 eo_unref(it_data->parent_model); 369 efl_unref(it_data->parent_model);
370 eina_stringshare_del(it_data->parent_path); 370 eina_stringshare_del(it_data->parent_path);
371 free(it_data); 371 free(it_data);
372} 372}
@@ -694,7 +694,7 @@ _process_child(Elm_Fileselector_Item_Data *it_data, Eina_Iterator *value_itt)
694 it_data->size = size; 694 it_data->size = size;
695 it_data->mtime = mtime; 695 it_data->mtime = mtime;
696 it_data->mime_type = eina_stringshare_add(mime_type); 696 it_data->mime_type = eina_stringshare_add(mime_type);
697 it_data->parent_model = eo_ref(lreq->model); 697 it_data->parent_model = efl_ref(lreq->model);
698 it_data->parent_path = eina_stringshare_add(lreq->path); 698 it_data->parent_path = eina_stringshare_add(lreq->path);
699 it_data->is_dir = dir; 699 it_data->is_dir = dir;
700 700
@@ -746,7 +746,7 @@ _process_child_cb(void *data, void *values)
746 if (!lreq->valid || 746 if (!lreq->valid ||
747 !_process_child(it_data, value_itt)) 747 !_process_child(it_data, value_itt))
748 { 748 {
749 eo_unref(it_data->model); 749 efl_unref(it_data->model);
750 free(it_data); 750 free(it_data);
751 } 751 }
752 752
@@ -769,7 +769,7 @@ _process_child_error_cb(void *data, Eina_Error err EINA_UNUSED)
769 Elm_Fileselector_Item_Data *it_data = data; 769 Elm_Fileselector_Item_Data *it_data = data;
770 Listing_Request *lreq = it_data->user_data; 770 Listing_Request *lreq = it_data->user_data;
771 771
772 eo_unref(it_data->model); 772 efl_unref(it_data->model);
773 free(it_data); 773 free(it_data);
774 774
775 WRN("could not get data from child Efl.Model"); 775 WRN("could not get data from child Efl.Model");
@@ -791,11 +791,11 @@ static void
791_listing_request_cleanup(Listing_Request *lreq) 791_listing_request_cleanup(Listing_Request *lreq)
792{ 792{
793 if (lreq->parent_it) 793 if (lreq->parent_it)
794 eo_unref(lreq->parent_it); 794 efl_unref(lreq->parent_it);
795 eo_unref(lreq->obj); 795 efl_unref(lreq->obj);
796 eo_unref(lreq->model); 796 efl_unref(lreq->model);
797 if (lreq->selected) 797 if (lreq->selected)
798 eo_unref(lreq->selected); 798 efl_unref(lreq->selected);
799 eina_stringshare_del(lreq->path); 799 eina_stringshare_del(lreq->path);
800 eina_stringshare_del(lreq->selected_path); 800 eina_stringshare_del(lreq->selected_path);
801 free(lreq); 801 free(lreq);
@@ -850,7 +850,7 @@ _process_children_cb(void *data, void *values)
850 break; 850 break;
851 } 851 }
852 852
853 it_data->model = eo_ref(child); 853 it_data->model = efl_ref(child);
854 it_data->user_data = lreq; 854 it_data->user_data = lreq;
855 855
856 promises[0] = efl_model_property_get(child, "path"); 856 promises[0] = efl_model_property_get(child, "path");
@@ -926,10 +926,10 @@ _populate(Evas_Object *obj,
926 if (!lreq) return; 926 if (!lreq) return;
927 927
928 lreq->sd = sd; 928 lreq->sd = sd;
929 lreq->parent_it = (parent_it ? eo_ref(parent_it) : NULL); 929 lreq->parent_it = (parent_it ? efl_ref(parent_it) : NULL);
930 lreq->obj = eo_ref(obj); 930 lreq->obj = efl_ref(obj);
931 lreq->model = eo_ref(model); 931 lreq->model = efl_ref(model);
932 lreq->selected = (selected ? eo_ref(selected) : NULL); 932 lreq->selected = (selected ? efl_ref(selected) : NULL);
933 lreq->path = NULL; 933 lreq->path = NULL;
934 lreq->selected_path = NULL; 934 lreq->selected_path = NULL;
935 lreq->item_total = 0; 935 lreq->item_total = 0;
@@ -997,9 +997,9 @@ _populate_do(void *data)
997 ELM_FILESELECTOR_DATA_GET(sdata->fs, sd); 997 ELM_FILESELECTOR_DATA_GET(sdata->fs, sd);
998 _populate(sdata->fs, sdata->model, NULL, sdata->selected); 998 _populate(sdata->fs, sdata->model, NULL, sdata->selected);
999 if (sdata->model) 999 if (sdata->model)
1000 eo_unref(sdata->model); 1000 efl_unref(sdata->model);
1001 if (sdata->selected) 1001 if (sdata->selected)
1002 eo_unref(sdata->selected); 1002 efl_unref(sdata->selected);
1003 1003
1004 sd->populate_idler = NULL; 1004 sd->populate_idler = NULL;
1005 1005
@@ -1021,17 +1021,17 @@ _schedule_populate(Evas_Object *fs,
1021 sdata->model = model; 1021 sdata->model = model;
1022 sdata->selected = selected; 1022 sdata->selected = selected;
1023 1023
1024 if (model) eo_ref(model); 1024 if (model) efl_ref(model);
1025 if (selected) eo_ref(selected); 1025 if (selected) efl_ref(selected);
1026 1026
1027 if (sd->populate_idler) 1027 if (sd->populate_idler)
1028 { 1028 {
1029 struct sel_data *old_sdata; 1029 struct sel_data *old_sdata;
1030 old_sdata = ecore_idler_del(sd->populate_idler); 1030 old_sdata = ecore_idler_del(sd->populate_idler);
1031 if (old_sdata->model) 1031 if (old_sdata->model)
1032 eo_unref(old_sdata->model); 1032 efl_unref(old_sdata->model);
1033 if (old_sdata->selected) 1033 if (old_sdata->selected)
1034 eo_unref(old_sdata->selected); 1034 efl_unref(old_sdata->selected);
1035 free(old_sdata); 1035 free(old_sdata);
1036 } 1036 }
1037 sd->populate_idler = ecore_idler_add(_populate_do, sdata); 1037 sd->populate_idler = ecore_idler_add(_populate_do, sdata);
@@ -1247,12 +1247,12 @@ _home(void *data, const Eo_Event *event EINA_UNUSED)
1247 ELM_FILESELECTOR_DATA_GET(fs, sd); 1247 ELM_FILESELECTOR_DATA_GET(fs, sd);
1248 1248
1249 // FIXME: maybe use vpath 1249 // FIXME: maybe use vpath
1250 if (!sd->model || eo_isa(sd->model, EIO_MODEL_CLASS)) 1250 if (!sd->model || efl_isa(sd->model, EIO_MODEL_CLASS))
1251 { 1251 {
1252 Eio_Model *model = eo_add(EIO_MODEL_CLASS, NULL, 1252 Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL,
1253 eio_model_path_set(eo_self, eina_environment_home_get())); 1253 eio_model_path_set(efl_self, eina_environment_home_get()));
1254 _populate(fs, model, NULL, NULL); 1254 _populate(fs, model, NULL, NULL);
1255 eo_unref(model); 1255 efl_unref(model);
1256 } 1256 }
1257} 1257}
1258 1258
@@ -1297,7 +1297,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1297 else 1297 else
1298 selection = eina_stringshare_printf("%s/%s", sd->path, name); 1298 selection = eina_stringshare_printf("%s/%s", sd->path, name);
1299 1299
1300 selected_model = eo_add(eo_class_get(sd->model), NULL); 1300 selected_model = efl_add(efl_class_get(sd->model), NULL);
1301 _model_str_property_set(selected_model, "path", selection, NULL); 1301 _model_str_property_set(selected_model, "path", selection, NULL);
1302 1302
1303 // EVENTS: should not call legacy 1303 // EVENTS: should not call legacy
@@ -1305,7 +1305,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1305 // (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model); 1305 // (fs, ELM_FILESELECTOR_EVENT_DONE, selected_model);
1306 evas_object_smart_callback_call(fs, "done", (void *) selection); 1306 evas_object_smart_callback_call(fs, "done", (void *) selection);
1307 1307
1308 eo_unref(selected_model); 1308 efl_unref(selected_model);
1309 eina_stringshare_del(selection); 1309 eina_stringshare_del(selection);
1310 } 1310 }
1311 else 1311 else
@@ -1342,7 +1342,7 @@ _text_activated_free_fs_data(Elm_Fileselector *fs)
1342 eina_stringshare_del(str); 1342 eina_stringshare_del(str);
1343 efl_key_data_set(fs, _text_activated_path_key, NULL); 1343 efl_key_data_set(fs, _text_activated_path_key, NULL);
1344 efl_key_ref_set(fs, _text_activated_model_key, NULL); 1344 efl_key_ref_set(fs, _text_activated_model_key, NULL);
1345 eo_unref(fs); 1345 efl_unref(fs);
1346} 1346}
1347 1347
1348static void 1348static void
@@ -1360,8 +1360,8 @@ _text_activated_is_dir_then(void *data, void *value)
1360 { 1360 {
1361 // keep previous path for backspace key action 1361 // keep previous path for backspace key action
1362 if (sd->prev_model) 1362 if (sd->prev_model)
1363 eo_unref(sd->prev_model); 1363 efl_unref(sd->prev_model);
1364 sd->prev_model = eo_ref(sd->model); 1364 sd->prev_model = efl_ref(sd->model);
1365 1365
1366 _populate(fs, model, NULL, NULL); 1366 _populate(fs, model, NULL, NULL);
1367 1367
@@ -1452,7 +1452,7 @@ _on_text_activated(void *data, const Eo_Event *event)
1452 return; 1452 return;
1453 1453
1454 path = elm_widget_part_text_get(event->object, NULL); 1454 path = elm_widget_part_text_get(event->object, NULL);
1455 model = eo_add(eo_class_get(sd->model), NULL); 1455 model = efl_add(efl_class_get(sd->model), NULL);
1456 if (!model) 1456 if (!model)
1457 return; 1457 return;
1458 1458
@@ -1460,13 +1460,13 @@ _on_text_activated(void *data, const Eo_Event *event)
1460 1460
1461 efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path)); 1461 efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
1462 efl_key_ref_set(fs, _text_activated_model_key, model); 1462 efl_key_ref_set(fs, _text_activated_model_key, model);
1463 eo_ref(fs); 1463 efl_ref(fs);
1464 eina_promise_then(promise, 1464 eina_promise_then(promise,
1465 _on_text_activated_set_path_then, 1465 _on_text_activated_set_path_then,
1466 _on_text_activated_set_path_then_error, 1466 _on_text_activated_set_path_then_error,
1467 fs); 1467 fs);
1468 1468
1469 eo_unref(model); 1469 efl_unref(model);
1470 elm_object_focus_set(event->object, EINA_FALSE); 1470 elm_object_focus_set(event->object, EINA_FALSE);
1471} 1471}
1472 1472
@@ -1511,13 +1511,13 @@ _anchor_clicked(void *data, const Eo_Event *event)
1511 if (!sd->model) 1511 if (!sd->model)
1512 return; 1512 return;
1513 1513
1514 model = eo_add(eo_class_get(sd->model), NULL); 1514 model = efl_add(efl_class_get(sd->model), NULL);
1515 if (!model) 1515 if (!model)
1516 return; 1516 return;
1517 _model_str_property_set(model, "path", info->name, NULL); 1517 _model_str_property_set(model, "path", info->name, NULL);
1518 1518
1519 _populate(fs, model, NULL, NULL); 1519 _populate(fs, model, NULL, NULL);
1520 eo_unref(model); 1520 efl_unref(model);
1521 /* After anchor was clicked, entry will be focused, and will be editable. 1521 /* After anchor was clicked, entry will be focused, and will be editable.
1522 * It's wrong. So remove focus. */ 1522 * It's wrong. So remove focus. */
1523 elm_object_focus_set(event->object, EINA_FALSE); 1523 elm_object_focus_set(event->object, EINA_FALSE);
@@ -1626,8 +1626,8 @@ _resource_then_error(void *data, Eina_Error err EINA_UNUSED)
1626{ 1626{
1627 Elm_Fileselector_Item_Data *it_data = data; 1627 Elm_Fileselector_Item_Data *it_data = data;
1628 WRN("could not get information from Efl.Model"); 1628 WRN("could not get information from Efl.Model");
1629 eo_unref(it_data->user_data); 1629 efl_unref(it_data->user_data);
1630 eo_unref(it_data->model); 1630 efl_unref(it_data->model);
1631 free(it_data); 1631 free(it_data);
1632} 1632}
1633 1633
@@ -1693,13 +1693,13 @@ _resource_created_then(void *data, void *values)
1693 it_data, 1693 it_data,
1694 _file_grid_cmp, NULL, NULL); 1694 _file_grid_cmp, NULL, NULL);
1695 1695
1696 eo_unref(obj); 1696 efl_unref(obj);
1697 return; 1697 return;
1698 1698
1699cancel: 1699cancel:
1700 eo_unref(obj); 1700 efl_unref(obj);
1701 eo_unref(it_data->model); 1701 efl_unref(it_data->model);
1702 eo_unref(it_data->parent_model); 1702 efl_unref(it_data->parent_model);
1703 eina_stringshare_del(it_data->parent_path); 1703 eina_stringshare_del(it_data->parent_path);
1704 free(it_data); 1704 free(it_data);
1705} 1705}
@@ -1723,9 +1723,9 @@ _resource_created(void *data, const Eo_Event *event)
1723 if (!it_data) 1723 if (!it_data)
1724 return; 1724 return;
1725 1725
1726 it_data->model = eo_ref(child); 1726 it_data->model = efl_ref(child);
1727 it_data->user_data = eo_ref(fs); 1727 it_data->user_data = efl_ref(fs);
1728 it_data->parent_model = eo_ref(sd->model); 1728 it_data->parent_model = efl_ref(sd->model);
1729 it_data->parent_path = eina_stringshare_add(sd->path); 1729 it_data->parent_path = eina_stringshare_add(sd->path);
1730 1730
1731 promises[0] = efl_model_property_get(child, "path"); 1731 promises[0] = efl_model_property_get(child, "path");
@@ -1844,7 +1844,7 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
1844 const char *data; 1844 const char *data;
1845 char buf[1024]; 1845 char buf[1024];
1846 1846
1847 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 1847 efl_canvas_group_add(efl_super(obj, MY_CLASS));
1848 elm_widget_sub_object_parent_add(obj); 1848 elm_widget_sub_object_parent_add(obj);
1849 elm_widget_can_focus_set(obj, EINA_TRUE); 1849 elm_widget_can_focus_set(obj, EINA_TRUE);
1850 1850
@@ -2011,14 +2011,14 @@ EAPI Evas_Object *
2011elm_fileselector_add(Evas_Object *parent) 2011elm_fileselector_add(Evas_Object *parent)
2012{ 2012{
2013 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 2013 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
2014 Evas_Object *obj = eo_add(MY_CLASS, parent); 2014 Evas_Object *obj = efl_add(MY_CLASS, parent);
2015 return obj; 2015 return obj;
2016} 2016}
2017 2017
2018EOLIAN static Eo * 2018EOLIAN static Eo *
2019_elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd) 2019_elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd)
2020{ 2020{
2021 obj = efl_constructor(eo_super(obj, MY_CLASS)); 2021 obj = efl_constructor(efl_super(obj, MY_CLASS));
2022 sd->obj = obj; 2022 sd->obj = obj;
2023 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 2023 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2024 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2024 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
@@ -2171,7 +2171,7 @@ elm_fileselector_path_set(Evas_Object *obj,
2171 const char *_path) 2171 const char *_path)
2172{ 2172{
2173 ELM_FILESELECTOR_INTERFACE_CHECK(obj); 2173 ELM_FILESELECTOR_INTERFACE_CHECK(obj);
2174 const Efl_Class *cls = eo_class_get(obj); 2174 const Efl_Class *cls = efl_class_get(obj);
2175 if (cls == ELM_FILESELECTOR_CLASS) 2175 if (cls == ELM_FILESELECTOR_CLASS)
2176 _elm_fileselector_path_set_internal(obj, _path); 2176 _elm_fileselector_path_set_internal(obj, _path);
2177 else if (cls == ELM_FILESELECTOR_ENTRY_CLASS) 2177 else if (cls == ELM_FILESELECTOR_ENTRY_CLASS)
@@ -2185,14 +2185,14 @@ elm_fileselector_path_set(Evas_Object *obj,
2185void 2185void
2186_elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path) 2186_elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path)
2187{ 2187{
2188 Eio_Model *model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, _path)); 2188 Eio_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, _path));
2189 if (!model) 2189 if (!model)
2190 { 2190 {
2191 ERR("Efl.Model allocation error"); 2191 ERR("Efl.Model allocation error");
2192 return; 2192 return;
2193 } 2193 }
2194 elm_interface_fileselector_model_set(obj, model); 2194 elm_interface_fileselector_model_set(obj, model);
2195 eo_unref(model); 2195 efl_unref(model);
2196} 2196}
2197 2197
2198EOLIAN static void 2198EOLIAN static void
@@ -2205,7 +2205,7 @@ EAPI const char *
2205elm_fileselector_path_get(const Evas_Object *obj) 2205elm_fileselector_path_get(const Evas_Object *obj)
2206{ 2206{
2207 ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL); 2207 ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
2208 const Efl_Class *cls = eo_class_get(obj); 2208 const Efl_Class *cls = efl_class_get(obj);
2209 if (cls == ELM_FILESELECTOR_CLASS) 2209 if (cls == ELM_FILESELECTOR_CLASS)
2210 return _elm_fileselector_path_get_internal(obj); 2210 return _elm_fileselector_path_get_internal(obj);
2211 else if (cls == ELM_FILESELECTOR_ENTRY_CLASS) 2211 else if (cls == ELM_FILESELECTOR_ENTRY_CLASS)
@@ -2405,7 +2405,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
2405 2405
2406 if (ecore_file_is_dir(path)) 2406 if (ecore_file_is_dir(path))
2407 { 2407 {
2408 model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path)); 2408 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
2409 if (!model) 2409 if (!model)
2410 { 2410 {
2411 ERR("Efl.Model allocation error"); 2411 ERR("Efl.Model allocation error");
@@ -2413,7 +2413,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
2413 } 2413 }
2414 2414
2415 _schedule_populate(obj, sd, model, NULL); 2415 _schedule_populate(obj, sd, model, NULL);
2416 eo_unref(model); 2416 efl_unref(model);
2417 ret = EINA_TRUE; 2417 ret = EINA_TRUE;
2418 } 2418 }
2419 else 2419 else
@@ -2423,7 +2423,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
2423 goto clean_up; 2423 goto clean_up;
2424 } 2424 }
2425 2425
2426 model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path)); 2426 model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
2427 if (!model) 2427 if (!model)
2428 { 2428 {
2429 ERR("Efl.Model allocation error"); 2429 ERR("Efl.Model allocation error");
@@ -2431,15 +2431,15 @@ elm_fileselector_selected_set(Evas_Object *obj,
2431 } 2431 }
2432 2432
2433 dir = ecore_file_dir_get(path); 2433 dir = ecore_file_dir_get(path);
2434 parent = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dir)); 2434 parent = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, dir));
2435 if (parent) 2435 if (parent)
2436 { 2436 {
2437 _schedule_populate(obj, sd, parent, model); 2437 _schedule_populate(obj, sd, parent, model);
2438 eo_unref(parent); 2438 efl_unref(parent);
2439 ret = EINA_TRUE; 2439 ret = EINA_TRUE;
2440 } 2440 }
2441 free(dir); 2441 free(dir);
2442 eo_unref(model); 2442 efl_unref(model);
2443 } 2443 }
2444 2444
2445clean_up: 2445clean_up:
@@ -2453,7 +2453,7 @@ _selected_model_set_free_fs_data(Elm_Fileselector *fs)
2453{ 2453{
2454 efl_key_ref_set(fs, _selected_model_set_model_key, NULL); 2454 efl_key_ref_set(fs, _selected_model_set_model_key, NULL);
2455 efl_key_data_set(fs, _selected_model_set_promise_owner_key, NULL); 2455 efl_key_data_set(fs, _selected_model_set_promise_owner_key, NULL);
2456 eo_unref(fs); 2456 efl_unref(fs);
2457} 2457}
2458 2458
2459static void 2459static void
@@ -2480,7 +2480,7 @@ _selected_model_set_is_dir_then(void *data, void *value)
2480 _schedule_populate(fs, sd, model, NULL); 2480 _schedule_populate(fs, sd, model, NULL);
2481 if (promise_owner) 2481 if (promise_owner)
2482 { 2482 {
2483 eo_ref(model); 2483 efl_ref(model);
2484 eina_promise_owner_value_set(promise_owner, model, _model_free_eo_cb); 2484 eina_promise_owner_value_set(promise_owner, model, _model_free_eo_cb);
2485 } 2485 }
2486 } 2486 }
@@ -2493,7 +2493,7 @@ _selected_model_set_is_dir_then(void *data, void *value)
2493 2493
2494 if (promise_owner) 2494 if (promise_owner)
2495 { 2495 {
2496 eo_ref(model); 2496 efl_ref(model);
2497 eina_promise_owner_value_set(promise_owner, model, _model_free_eo_cb); 2497 eina_promise_owner_value_set(promise_owner, model, _model_free_eo_cb);
2498 } 2498 }
2499 } 2499 }
@@ -2522,7 +2522,7 @@ _elm_fileselector_elm_interface_fileselector_selected_model_set(Eo *obj, Elm_Fil
2522 if (promise_owner) 2522 if (promise_owner)
2523 efl_key_data_set(obj, _selected_model_set_promise_owner_key, promise_owner); 2523 efl_key_data_set(obj, _selected_model_set_promise_owner_key, promise_owner);
2524 2524
2525 eina_promise_then(promise, _selected_model_set_is_dir_then, _selected_model_set_then_error, eo_ref(obj)); 2525 eina_promise_then(promise, _selected_model_set_is_dir_then, _selected_model_set_then_error, efl_ref(obj));
2526} 2526}
2527 2527
2528EAPI const Eina_List * 2528EAPI const Eina_List *
@@ -2962,7 +2962,7 @@ _elm_fileselector_elm_layout_text_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Data
2962 else 2962 else
2963 { 2963 {
2964 Eina_Bool int_ret = EINA_FALSE; 2964 Eina_Bool int_ret = EINA_FALSE;
2965 int_ret = elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label); 2965 int_ret = elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
2966 return int_ret; 2966 return int_ret;
2967 } 2967 }
2968 2968
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 19b251a..9507ad3 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -37,7 +37,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
37static void 37static void
38_model_free_eo_cb(void *eo) 38_model_free_eo_cb(void *eo)
39{ 39{
40 eo_unref(eo); 40 efl_unref(eo);
41} 41}
42 42
43EOLIAN static Elm_Theme_Apply 43EOLIAN static Elm_Theme_Apply
@@ -57,7 +57,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
57 /* file selector button's style has an extra bit */ 57 /* file selector button's style has an extra bit */
58 eina_stringshare_replace(&(wd->style), buf); 58 eina_stringshare_replace(&(wd->style), buf);
59 59
60 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 60 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
61 if (!int_ret) return ELM_THEME_APPLY_FAILED; 61 if (!int_ret) return ELM_THEME_APPLY_FAILED;
62 62
63 eina_stringshare_replace(&(wd->style), style); 63 eina_stringshare_replace(&(wd->style), style);
@@ -95,8 +95,8 @@ _selection_done(void *data, const Eo_Event *event)
95 { 95 {
96 Eina_Promise *promise = NULL; 96 Eina_Promise *promise = NULL;
97 if (sd->fsd.model) 97 if (sd->fsd.model)
98 eo_unref(sd->fsd.model); 98 efl_unref(sd->fsd.model);
99 sd->fsd.model = eo_ref(model); 99 sd->fsd.model = efl_ref(model);
100 promise = efl_model_property_get(model, "path"); 100 promise = efl_model_property_get(model, "path");
101 eina_promise_then(promise, _replace_path_then, _replace_path_then_error, sd); 101 eina_promise_then(promise, _replace_path_then, _replace_path_then_error, sd);
102 } 102 }
@@ -123,7 +123,7 @@ _selection_done_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
123 // EVENTS: code above should not be needed 123 // EVENTS: code above should not be needed
124 Eo_Event e = { NULL, NULL, NULL }; 124 Eo_Event e = { NULL, NULL, NULL };
125 if (path) 125 if (path)
126 e.info = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path)); 126 e.info = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
127 _selection_done(data, &e); 127 _selection_done(data, &e);
128} 128}
129 129
@@ -150,7 +150,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
150static Evas_Object * 150static Evas_Object *
151_parent_win_get(Evas_Object *obj) 151_parent_win_get(Evas_Object *obj)
152{ 152{
153 while (!eo_isa(obj, EFL_UI_WIN_CLASS)) 153 while (!efl_isa(obj, EFL_UI_WIN_CLASS))
154 obj = elm_object_parent_widget_get(obj); 154 obj = elm_object_parent_widget_get(obj);
155 155
156 return obj; 156 return obj;
@@ -218,7 +218,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
218{ 218{
219 const char *path; 219 const char *path;
220 220
221 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 221 efl_canvas_group_add(efl_super(obj, MY_CLASS));
222 elm_widget_sub_object_parent_add(obj); 222 elm_widget_sub_object_parent_add(obj);
223 223
224 priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE); 224 priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
@@ -226,7 +226,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
226 if (path) priv->fsd.path = eina_stringshare_add(path); 226 if (path) priv->fsd.path = eina_stringshare_add(path);
227 else priv->fsd.path = eina_stringshare_add("/"); 227 else priv->fsd.path = eina_stringshare_add("/");
228 228
229 priv->fsd.model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, priv->fsd.path)); 229 priv->fsd.model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, priv->fsd.path));
230 230
231 priv->fsd.expandable = _elm_config->fileselector_expand_enable; 231 priv->fsd.expandable = _elm_config->fileselector_expand_enable;
232 priv->inwin_mode = _elm_config->inwin_dialogs_enable; 232 priv->inwin_mode = _elm_config->inwin_dialogs_enable;
@@ -245,14 +245,14 @@ EOLIAN static void
245_elm_fileselector_button_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Button_Data *sd) 245_elm_fileselector_button_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
246{ 246{
247 if (sd->fsd.model) 247 if (sd->fsd.model)
248 eo_unref(sd->fsd.model); 248 efl_unref(sd->fsd.model);
249 eina_stringshare_del(sd->window_title); 249 eina_stringshare_del(sd->window_title);
250 eina_stringshare_del(sd->fsd.path); 250 eina_stringshare_del(sd->fsd.path);
251 if (sd->fsd.selection) 251 if (sd->fsd.selection)
252 eo_unref(sd->fsd.selection); 252 efl_unref(sd->fsd.selection);
253 evas_object_del(sd->fsw); 253 evas_object_del(sd->fsw);
254 254
255 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 255 efl_canvas_group_del(efl_super(obj, MY_CLASS));
256} 256}
257 257
258EOLIAN static Eina_Bool 258EOLIAN static Eina_Bool
@@ -265,14 +265,14 @@ EAPI Evas_Object *
265elm_fileselector_button_add(Evas_Object *parent) 265elm_fileselector_button_add(Evas_Object *parent)
266{ 266{
267 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 267 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
268 Evas_Object *obj = eo_add(MY_CLASS, parent); 268 Evas_Object *obj = efl_add(MY_CLASS, parent);
269 return obj; 269 return obj;
270} 270}
271 271
272EOLIAN static Eo * 272EOLIAN static Eo *
273_elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd) 273_elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button_Data *sd)
274{ 274{
275 obj = efl_constructor(eo_super(obj, MY_CLASS)); 275 obj = efl_constructor(efl_super(obj, MY_CLASS));
276 sd->obj = obj; 276 sd->obj = obj;
277 277
278 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 278 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
@@ -325,7 +325,7 @@ _elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path)
325{ 325{
326 ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd); 326 ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd);
327 327
328 Efl_Model *model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path)); 328 Efl_Model *model = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
329 if (!model) 329 if (!model)
330 { 330 {
331 ERR("Efl.Model allocation error"); 331 ERR("Efl.Model allocation error");
@@ -333,8 +333,8 @@ _elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path)
333 } 333 }
334 334
335 if (sd->fsd.model) 335 if (sd->fsd.model)
336 eo_unref(sd->fsd.model); 336 efl_unref(sd->fsd.model);
337 sd->fsd.model = eo_ref(model); 337 sd->fsd.model = efl_ref(model);
338 338
339 eina_stringshare_replace(&sd->fsd.path, path); 339 eina_stringshare_replace(&sd->fsd.path, path);
340 340
@@ -352,12 +352,12 @@ EOLIAN static void
352_elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model) 352_elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model)
353{ 353{
354 if (sd->fsd.model) 354 if (sd->fsd.model)
355 eo_unref(sd->fsd.model); 355 efl_unref(sd->fsd.model);
356 356
357 if (model) 357 if (model)
358 { 358 {
359 Eina_Promise *promise = NULL; 359 Eina_Promise *promise = NULL;
360 sd->fsd.model = eo_ref(model); 360 sd->fsd.model = efl_ref(model);
361 promise = efl_model_property_get(model, "path"); 361 promise = efl_model_property_get(model, "path");
362 eina_promise_then(promise, _replace_path_then, _replace_path_then_error, sd); 362 eina_promise_then(promise, _replace_path_then, _replace_path_then_error, sd);
363 } 363 }
@@ -545,7 +545,7 @@ static void
545_selected_model_then(void *data, void *v) 545_selected_model_then(void *data, void *v)
546{ 546{
547 Eina_Promise_Owner *owner = data; 547 Eina_Promise_Owner *owner = data;
548 eina_promise_owner_value_set(owner, eo_ref(v), _model_free_eo_cb); 548 eina_promise_owner_value_set(owner, efl_ref(v), _model_free_eo_cb);
549} 549}
550 550
551static void 551static void
@@ -566,8 +566,8 @@ _elm_fileselector_button_elm_interface_fileselector_selected_model_set(Eo *obj E
566 } 566 }
567 567
568 if (sd->fsd.selection) 568 if (sd->fsd.selection)
569 eo_unref(sd->fsd.selection); 569 efl_unref(sd->fsd.selection);
570 sd->fsd.selection = model ? eo_ref(model) : NULL; 570 sd->fsd.selection = model ? efl_ref(model) : NULL;
571} 571}
572 572
573EOLIAN static void 573EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 02c95ff..8af305e 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -106,7 +106,7 @@ _FILE_CHOSEN_fwd_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
106 106
107 Eo_Event e = { NULL, NULL, NULL }; 107 Eo_Event e = { NULL, NULL, NULL };
108 if (path) 108 if (path)
109 e.info = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path)); 109 e.info = efl_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_self, path));
110 _FILE_CHOSEN_fwd(data, &e); 110 _FILE_CHOSEN_fwd(data, &e);
111} 111}
112 112
@@ -124,7 +124,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
124 bmodel = elm_interface_fileselector_model_get(sd->button); 124 bmodel = elm_interface_fileselector_model_get(sd->button);
125 if (bmodel) 125 if (bmodel)
126 { 126 {
127 model = eo_add(eo_class_get(bmodel), NULL); 127 model = efl_add(efl_class_get(bmodel), NULL);
128 eina_value_setup(&path, EINA_VALUE_TYPE_STRING); 128 eina_value_setup(&path, EINA_VALUE_TYPE_STRING);
129 eina_value_set(&path, file); 129 eina_value_set(&path, file);
130 efl_model_property_set(model, "path", &path, NULL); 130 efl_model_property_set(model, "path", &path, NULL);
@@ -139,7 +139,7 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
139static void 139static void
140_model_free_eo_cb(void *eo) 140_model_free_eo_cb(void *eo)
141{ 141{
142 eo_unref(eo); 142 efl_unref(eo);
143} 143}
144 144
145EOLIAN static void 145EOLIAN static void
@@ -211,7 +211,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
211 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED); 211 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, ELM_THEME_APPLY_FAILED);
212 212
213 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 213 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
214 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 214 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
215 if (!int_ret) return ELM_THEME_APPLY_FAILED; 215 if (!int_ret) return ELM_THEME_APPLY_FAILED;
216 216
217 style = elm_widget_style_get(obj); 217 style = elm_widget_style_get(obj);
@@ -239,7 +239,7 @@ _elm_fileselector_entry_elm_widget_disable(Eo *obj, Elm_Fileselector_Entry_Data
239 Eina_Bool val; 239 Eina_Bool val;
240 240
241 Eina_Bool int_ret = EINA_FALSE; 241 Eina_Bool int_ret = EINA_FALSE;
242 int_ret = elm_obj_widget_disable(eo_super(obj, MY_CLASS)); 242 int_ret = elm_obj_widget_disable(efl_super(obj, MY_CLASS));
243 if (!int_ret) return EINA_FALSE; 243 if (!int_ret) return EINA_FALSE;
244 244
245 val = elm_widget_disabled_get(obj); 245 val = elm_widget_disabled_get(obj);
@@ -255,7 +255,7 @@ _elm_fileselector_entry_elm_layout_text_set(Eo *obj, Elm_Fileselector_Entry_Data
255{ 255{
256 if (part && strcmp(part, "default")) 256 if (part && strcmp(part, "default"))
257 { 257 {
258 return elm_obj_layout_text_set(eo_super(obj, MY_CLASS), part, label); 258 return elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label);
259 } 259 }
260 260
261 elm_object_text_set(sd->button, label); 261 elm_object_text_set(sd->button, label);
@@ -268,7 +268,7 @@ _elm_fileselector_entry_elm_layout_text_get(Eo *obj, Elm_Fileselector_Entry_Data
268 if (part && strcmp(part, "default")) 268 if (part && strcmp(part, "default"))
269 { 269 {
270 const char *text = NULL; 270 const char *text = NULL;
271 text = elm_obj_layout_text_get(eo_super(obj, MY_CLASS), part); 271 text = elm_obj_layout_text_get(efl_super(obj, MY_CLASS), part);
272 return text; 272 return text;
273 } 273 }
274 274
@@ -280,7 +280,7 @@ _elm_fileselector_entry_content_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, co
280{ 280{
281 if (part && strcmp(part, "button icon")) 281 if (part && strcmp(part, "button icon"))
282 { 282 {
283 return efl_content_set(efl_part(eo_super(obj, MY_CLASS), part), content); 283 return efl_content_set(efl_part(efl_super(obj, MY_CLASS), part), content);
284 } 284 }
285 285
286 elm_layout_content_set(sd->button, NULL, content); 286 elm_layout_content_set(sd->button, NULL, content);
@@ -293,7 +293,7 @@ _elm_fileselector_entry_content_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, co
293{ 293{
294 if (part && strcmp(part, "button icon")) 294 if (part && strcmp(part, "button icon"))
295 { 295 {
296 return efl_content_get(efl_part(eo_super(obj, MY_CLASS), part)); 296 return efl_content_get(efl_part(efl_super(obj, MY_CLASS), part));
297 } 297 }
298 298
299 return elm_layout_content_get(sd->button, NULL); 299 return elm_layout_content_get(sd->button, NULL);
@@ -304,7 +304,7 @@ _elm_fileselector_entry_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd,
304{ 304{
305 if (part && strcmp(part, "button icon")) 305 if (part && strcmp(part, "button icon"))
306 { 306 {
307 return efl_content_unset(efl_part(eo_super(obj, MY_CLASS), part)); 307 return efl_content_unset(efl_part(efl_super(obj, MY_CLASS), part));
308 } 308 }
309 309
310 return elm_layout_content_unset(sd->button, NULL); 310 return elm_layout_content_unset(sd->button, NULL);
@@ -313,7 +313,7 @@ _elm_fileselector_entry_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd,
313EOLIAN static void 313EOLIAN static void
314_elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) 314_elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
315{ 315{
316 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 316 efl_canvas_group_add(efl_super(obj, MY_CLASS));
317 elm_widget_sub_object_parent_add(obj); 317 elm_widget_sub_object_parent_add(obj);
318 318
319 priv->button = elm_fileselector_button_add(obj); 319 priv->button = elm_fileselector_button_add(obj);
@@ -375,20 +375,20 @@ _elm_fileselector_entry_efl_canvas_group_group_del(Eo *obj, Elm_Fileselector_Ent
375{ 375{
376 free(sd->path); 376 free(sd->path);
377 377
378 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 378 efl_canvas_group_del(efl_super(obj, MY_CLASS));
379} 379}
380 380
381EAPI Evas_Object * 381EAPI Evas_Object *
382elm_fileselector_entry_add(Evas_Object *parent) 382elm_fileselector_entry_add(Evas_Object *parent)
383{ 383{
384 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 384 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
385 return eo_add(MY_CLASS, parent); 385 return efl_add(MY_CLASS, parent);
386} 386}
387 387
388EOLIAN static Eo * 388EOLIAN static Eo *
389_elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) 389_elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
390{ 390{
391 obj = efl_constructor(eo_super(obj, MY_CLASS)); 391 obj = efl_constructor(efl_super(obj, MY_CLASS));
392 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 392 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
393 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 393 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
394 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING); 394 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING);
@@ -411,7 +411,7 @@ _elm_fileselector_entry_elm_interface_fileselector_selected_model_set(Eo *obj EI
411 Eina_Promise_Owner *promise_owner) 411 Eina_Promise_Owner *promise_owner)
412{ 412{
413 elm_interface_fileselector_model_set(sd->button, model); 413 elm_interface_fileselector_model_set(sd->button, model);
414 eina_promise_owner_value_set(promise_owner, eo_ref(model), _model_free_eo_cb); 414 eina_promise_owner_value_set(promise_owner, efl_ref(model), _model_free_eo_cb);
415} 415}
416 416
417EINA_DEPRECATED EAPI const char * 417EINA_DEPRECATED EAPI const char *
@@ -541,7 +541,7 @@ _elm_fileselector_entry_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED
541 return NULL; 541 return NULL;
542 } 542 }
543 543
544 ret = eo_add(eo_class_get(bmodel), NULL); 544 ret = efl_add(efl_class_get(bmodel), NULL);
545 free(sd->path); 545 free(sd->path);
546 sd->path = elm_entry_markup_to_utf8(elm_object_text_get(sd->entry)); 546 sd->path = elm_entry_markup_to_utf8(elm_object_text_get(sd->entry));
547 eina_value_setup(&path, EINA_VALUE_TYPE_STRING); 547 eina_value_setup(&path, EINA_VALUE_TYPE_STRING);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 0ca7139..fc9ed81 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -54,7 +54,7 @@ _elm_hoversel_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
54 EINA_LIST_FOREACH(sd->items, l, it) 54 EINA_LIST_FOREACH(sd->items, l, it)
55 elm_wdg_item_translate(it); 55 elm_wdg_item_translate(it);
56 56
57 elm_obj_widget_translate(eo_super(obj, MY_CLASS)); 57 elm_obj_widget_translate(efl_super(obj, MY_CLASS));
58 58
59 return EINA_TRUE; 59 return EINA_TRUE;
60} 60}
@@ -81,7 +81,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
81 /* hoversel's style has an extra bit: orientation */ 81 /* hoversel's style has an extra bit: orientation */
82 eina_stringshare_replace(&(wd->style), buf); 82 eina_stringshare_replace(&(wd->style), buf);
83 83
84 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 84 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
85 if (!int_ret) return ELM_THEME_APPLY_FAILED; 85 if (!int_ret) return ELM_THEME_APPLY_FAILED;
86 86
87 eina_stringshare_replace(&(wd->style), style); 87 eina_stringshare_replace(&(wd->style), style);
@@ -264,7 +264,7 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
264 } 264 }
265 265
266 evas_object_geometry_get(sd->hover_parent, &x, &y, &w, &h); 266 evas_object_geometry_get(sd->hover_parent, &x, &y, &w, &h);
267 if (eo_isa(sd->hover_parent, EFL_UI_WIN_CLASS)) 267 if (efl_isa(sd->hover_parent, EFL_UI_WIN_CLASS))
268 { 268 {
269 x = 0; 269 x = 0;
270 y = 0; 270 y = 0;
@@ -525,7 +525,7 @@ _elm_hoversel_item_efl_object_destructor(Eo *eo_item, Elm_Hoversel_Item_Data *it
525 eina_stringshare_del(item->icon_file); 525 eina_stringshare_del(item->icon_file);
526 eina_stringshare_del(item->icon_group); 526 eina_stringshare_del(item->icon_group);
527 527
528 efl_destructor(eo_super(eo_item, ELM_HOVERSEL_ITEM_CLASS)); 528 efl_destructor(efl_super(eo_item, ELM_HOVERSEL_ITEM_CLASS));
529} 529}
530 530
531static void 531static void
@@ -550,7 +550,7 @@ _on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED)
550EOLIAN static void 550EOLIAN static void
551_elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *priv) 551_elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *priv)
552{ 552{
553 efl_canvas_group_add(eo_super(obj, MY_CLASS)); 553 efl_canvas_group_add(efl_super(obj, MY_CLASS));
554 elm_widget_sub_object_parent_add(obj); 554 elm_widget_sub_object_parent_add(obj);
555 555
556 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); 556 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
@@ -575,20 +575,20 @@ _elm_hoversel_efl_canvas_group_group_del(Eo *obj, Elm_Hoversel_Data *sd)
575 } 575 }
576 elm_hoversel_hover_parent_set(obj, NULL); 576 elm_hoversel_hover_parent_set(obj, NULL);
577 577
578 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 578 efl_canvas_group_del(efl_super(obj, MY_CLASS));
579} 579}
580 580
581EOLIAN static void 581EOLIAN static void
582_elm_hoversel_efl_canvas_group_group_show(Eo *obj, Elm_Hoversel_Data *sd) 582_elm_hoversel_efl_canvas_group_group_show(Eo *obj, Elm_Hoversel_Data *sd)
583{ 583{
584 efl_canvas_group_show(eo_super(obj, MY_CLASS)); 584 efl_canvas_group_show(efl_super(obj, MY_CLASS));
585 evas_object_show(sd->hover); 585 evas_object_show(sd->hover);
586} 586}
587 587
588EOLIAN static void 588EOLIAN static void
589_elm_hoversel_efl_canvas_group_group_hide(Eo *obj, Elm_Hoversel_Data *sd) 589_elm_hoversel_efl_canvas_group_group_hide(Eo *obj, Elm_Hoversel_Data *sd)
590{ 590{
591 efl_canvas_group_hide(eo_super(obj, MY_CLASS)); 591 efl_canvas_group_hide(efl_super(obj, MY_CLASS));
592 evas_object_hide(sd->hover); 592 evas_object_hide(sd->hover);
593} 593}
594 594
@@ -608,14 +608,14 @@ EAPI Evas_Object *
608elm_hoversel_add(Evas_Object *parent) 608elm_hoversel_add(Evas_Object *parent)
609{ 609{
610 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 610 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
611 Evas_Object *obj = eo_add(MY_CLASS, parent); 611 Evas_Object *obj = efl_add(MY_CLASS, parent);
612 return obj; 612 return obj;
613} 613}
614 614
615EOLIAN static Eo * 615EOLIAN static Eo *
616_elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) 616_elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
617{ 617{
618 obj = efl_constructor(eo_super(obj, MY_CLASS)); 618 obj = efl_constructor(efl_super(obj, MY_CLASS));
619 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 619 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
620 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 620 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
621 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 621 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
@@ -627,10 +627,10 @@ EOLIAN static void
627_elm_hoversel_efl_object_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) 627_elm_hoversel_efl_object_destructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
628{ 628{
629 elm_obj_hoversel_clear(obj); 629 elm_obj_hoversel_clear(obj);
630 efl_destructor(eo_super(obj, MY_CLASS)); 630 efl_destructor(efl_super(obj, MY_CLASS));
631} 631}
632 632
633EO_CALLBACKS_ARRAY_DEFINE(_on_parent, 633EFL_CALLBACKS_ARRAY_DEFINE(_on_parent,
634 { EFL_EVENT_DEL, _on_parent_del }, 634 { EFL_EVENT_DEL, _on_parent_del },
635 { EFL_GFX_EVENT_RESIZE, _on_parent_resize }); 635 { EFL_GFX_EVENT_RESIZE, _on_parent_resize });
636 636
@@ -739,8 +739,8 @@ _elm_hoversel_items_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *sd)
739EOLIAN static Eo * 739EOLIAN static Eo *
740_elm_hoversel_item_efl_object_constructor(Eo *obj, Elm_Hoversel_Item_Data *it) 740_elm_hoversel_item_efl_object_constructor(Eo *obj, Elm_Hoversel_Item_Data *it)
741{ 741{
742 obj = efl_constructor(eo_super(obj, ELM_HOVERSEL_ITEM_CLASS)); 742 obj = efl_constructor(efl_super(obj, ELM_HOVERSEL_ITEM_CLASS));
743 it->base = eo_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); 743 it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
744 744
745 return obj; 745 return obj;
746} 746}
@@ -751,7 +751,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
751 Evas_Object *bt, *ic; 751 Evas_Object *bt, *ic;
752 char buf[4096]; 752 char buf[4096];
753 753
754 Eo *eo_item = eo_add(ELM_HOVERSEL_ITEM_CLASS, obj); 754 Eo *eo_item = efl_add(ELM_HOVERSEL_ITEM_CLASS, obj);
755 if (!eo_item) return NULL; 755 if (!eo_item) return NULL;
756 756
757 ELM_HOVERSEL_ITEM_DATA_GET(eo_item, item); 757 ELM_HOVERSEL_ITEM_DATA_GET(eo_item, item);
@@ -923,7 +923,7 @@ _elm_hoversel_elm_widget_event(Eo *obj, Elm_Hoversel_Data *sd, Evas_Object *src,
923 Eina_Bool int_ret = EINA_FALSE; 923 Eina_Bool int_ret = EINA_FALSE;
924 Evas_Event_Key_Down *ev = event_info; 924 Evas_Event_Key_Down *ev = event_info;
925 925
926 int_ret = elm_obj_widget_event(eo_super(obj, MY_CLASS), src, type, event_info); 926 int_ret = elm_obj_widget_event(efl_super(obj, MY_CLASS), src, type, event_info);
927 if (int_ret) return EINA_FALSE; 927 if (int_ret) return EINA_FALSE;
928 928
929 if (!sd || !sd->hover) return EINA_FALSE; 929 if (!sd || !sd->hover) return EINA_FALSE;
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 6c4ecb1..dd1a9e4 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -50,7 +50,7 @@ static void _entry_focus_in_cb(void *data, const Eo_Event *event);
50static void _entry_focus_out_cb(void *data, const Eo_Event *event); 50static void _entry_focus_out_cb(void *data, const Eo_Event *event);
51static void _entry_clicked_cb(void *data, const Eo_Event *event); 51static void _entry_clicked_cb(void *data, const Eo_Event *event);
52 52
53EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 53EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
54 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, 54 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
55 { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb }, 55 { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
56 { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb }, 56 { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
@@ -66,7 +66,7 @@ _elm_multibuttonentry_elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Multibuttone
66 EINA_LIST_FOREACH(sd->items, l, it) 66 EINA_LIST_FOREACH(sd->items, l, it)
67 elm_wdg_item_translate(it); 67 elm_wdg_item_translate(it);
68 68
69 elm_obj_widget_translate(eo_super(obj, MY_CLASS)); 69 elm_obj_widget_translate(efl_super(obj, MY_CLASS));
70 70
71 return EINA_TRUE; 71 return EINA_TRUE;
72} 72}
@@ -90,7 +90,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
90 double pad_scale; 90 double pad_scale;
91 91
92 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED; 92 Elm_Theme_Apply int_ret = ELM_THEME_APPLY_FAILED;
93 int_ret = elm_obj_widget_theme_apply(eo_super(obj, MY_CLASS)); 93 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS));
94 if (!int_ret) return ELM_THEME_APPLY_FAILED; 94 if (!int_ret) return ELM_THEME_APPLY_FAILED;
95 95
96 str = elm_layout_data_get(obj, "horizontal_pad"); 96 str = elm_layout_data_get(obj, "horizontal_pad");
@@ -656,7 +656,7 @@ _elm_multibuttonentry_item_efl_object_destructor(Eo *eo_it,
656 elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it); 656 elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it);
657 _item_del(it); 657 _item_del(it);
658 658
659 efl_destructor(eo_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 659 efl_destructor(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
660} 660}
661 661
662static void 662static void
@@ -709,8 +709,8 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
709EOLIAN static Eo * 709EOLIAN static Eo *
710_elm_multibuttonentry_item_efl_object_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item) 710_elm_multibuttonentry_item_efl_object_constructor(Eo *eo_item, Elm_Multibuttonentry_Item_Data *item)
711{ 711{
712 eo_item = efl_constructor(eo_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 712 eo_item = efl_constructor(efl_super(eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
713 item->base = eo_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS); 713 item->base = efl_data_scope_get(eo_item, ELM_WIDGET_ITEM_CLASS);
714 714
715 return eo_item; 715 return eo_item;
716} 716}
@@ -719,15 +719,15 @@ static Elm_Object_Item *
719_item_new(Elm_Multibuttonentry_Data *sd, 719_item_new(Elm_Multibuttonentry_Data *sd,
720 const char *str, 720 const char *str,
721 Multibuttonentry_Pos pos, 721 Multibuttonentry_Pos pos,
722 Elm_Object_Item *eo_reference, 722 Elm_Object_Item *efl_reference,
723 Evas_Smart_Cb func, 723 Evas_Smart_Cb func,
724 void *data) 724 void *data)
725{ 725{
726 Eina_List *l; 726 Eina_List *l;
727 Eo *eo_item; 727 Eo *eo_item;
728 Elm_Multibuttonentry_Item_Filter *item_filter; 728 Elm_Multibuttonentry_Item_Filter *item_filter;
729 Elm_Multibuttonentry_Item_Data *reference = eo_reference? 729 Elm_Multibuttonentry_Item_Data *reference = efl_reference?
730 eo_data_scope_get(eo_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS): 730 efl_data_scope_get(efl_reference, ELM_MULTIBUTTONENTRY_ITEM_CLASS):
731 NULL; 731 NULL;
732 Evas_Object *obj; 732 Evas_Object *obj;
733 int minw, minh, boxw; 733 int minw, minh, boxw;
@@ -742,7 +742,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
742 return NULL; 742 return NULL;
743 } 743 }
744 744
745 eo_item = eo_add(ELM_MULTIBUTTONENTRY_ITEM_CLASS, obj); 745 eo_item = efl_add(ELM_MULTIBUTTONENTRY_ITEM_CLASS, obj);
746 if (!eo_item) 746 if (!eo_item)
747 return NULL;