summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 14:03:46 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 14:30:21 +0900
commit2f465e1fbbe5af837b57c81305c74f3c6c87c3ba (patch)
treebc160e88c95bb9119ac6421e64b7fa9d378d8d4c /src/lib/elementary
parentbcb24a40dc2f3e5ad018ca9b8f91770cb44617ff (diff)
widget: Rename EO APIs to efl_ui_widget_xxx
This only changes the eo_prefix for APIs. Ref T5363
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_bg.c2
-rw-r--r--src/lib/elementary/efl_ui_button.c2
-rw-r--r--src/lib/elementary/efl_ui_check.c2
-rw-r--r--src/lib/elementary/efl_ui_clock.c6
-rw-r--r--src/lib/elementary/efl_ui_flip.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_composition.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_layer.c2
-rw-r--r--src/lib/elementary/efl_ui_grid.c4
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_nstate.c2
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c10
-rw-r--r--src/lib/elementary/efl_ui_radio.c2
-rw-r--r--src/lib/elementary/efl_ui_slider.c8
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c10
-rw-r--r--src/lib/elementary/efl_ui_textpath.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c22
-rw-r--r--src/lib/elementary/elc_combobox.c10
-rw-r--r--src/lib/elementary/elc_ctxpopup.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c6
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c6
-rw-r--r--src/lib/elementary/elc_player.c2
-rw-r--r--src/lib/elementary/elm_actionslider.c2
-rw-r--r--src/lib/elementary/elm_box.c2
-rw-r--r--src/lib/elementary/elm_bubble.c2
-rw-r--r--src/lib/elementary/elm_calendar.c4
-rw-r--r--src/lib/elementary/elm_clock.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_conform.c2
-rw-r--r--src/lib/elementary/elm_dayselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c6
-rw-r--r--src/lib/elementary/elm_entry.c16
-rw-r--r--src/lib/elementary/elm_factory.c4
-rw-r--r--src/lib/elementary/elm_flipselector.c4
-rw-r--r--src/lib/elementary/elm_gengrid.c8
-rw-r--r--src/lib/elementary/elm_genlist.c6
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_grid.c4
-rw-r--r--src/lib/elementary/elm_hover.c8
-rw-r--r--src/lib/elementary/elm_icon.c2
-rw-r--r--src/lib/elementary/elm_index.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_label.c2
-rw-r--r--src/lib/elementary/elm_list.c8
-rw-r--r--src/lib/elementary/elm_main.c10
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_mapbuf.c2
-rw-r--r--src/lib/elementary/elm_menu.c10
-rw-r--r--src/lib/elementary/elm_notify.c6
-rw-r--r--src/lib/elementary/elm_panel.c6
-rw-r--r--src/lib/elementary/elm_photo.c2
-rw-r--r--src/lib/elementary/elm_plug.c4
-rw-r--r--src/lib/elementary/elm_route.c2
-rw-r--r--src/lib/elementary/elm_scroller.c6
-rw-r--r--src/lib/elementary/elm_segment_control.c6
-rw-r--r--src/lib/elementary/elm_separator.c4
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_table.c4
-rw-r--r--src/lib/elementary/elm_toolbar.c10
-rw-r--r--src/lib/elementary/elm_widget.c54
-rw-r--r--src/lib/elementary/elm_widget.eo2
68 files changed, 184 insertions, 184 deletions
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index 4170702..a1afbee 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -124,7 +124,7 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *_pd EINA_UNUSED)
124 obj = efl_constructor(efl_super(obj, MY_CLASS)); 124 obj = efl_constructor(efl_super(obj, MY_CLASS));
125 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 125 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
126 126
127 elm_obj_widget_focus_allow_set(obj, EINA_FALSE); 127 efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
128 128
129 return obj; 129 return obj;
130} 130}
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 578e70c..4576238 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -125,7 +125,7 @@ _efl_ui_button_elm_widget_theme_apply(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
125{ 125{
126 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 126 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
127 127
128 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 128 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
129 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 129 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
130 _icon_signal_emit(obj); 130 _icon_signal_emit(obj);
131 131
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index bb25ea4..0cce3e3 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -156,7 +156,7 @@ _efl_ui_check_elm_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
156 156
157 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 157 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
158 158
159 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 159 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
160 160
161 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 161 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
162 162
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index f994d56..bfa4d45 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -451,7 +451,7 @@ _efl_ui_clock_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd, Elm_Obj
451{ 451{
452 Eina_Bool int_ret = EINA_FALSE; 452 Eina_Bool int_ret = EINA_FALSE;
453 453
454 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 454 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
455 if (!int_ret) return EINA_FALSE; 455 if (!int_ret) return EINA_FALSE;
456 456
457 if (!elm_widget_focus_get(obj)) 457 if (!elm_widget_focus_get(obj))
@@ -469,7 +469,7 @@ _efl_ui_clock_elm_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina
469 Clock_Field *field; 469 Clock_Field *field;
470 unsigned int idx = 0; 470 unsigned int idx = 0;
471 471
472 if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 472 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
473 return EINA_FALSE; 473 return EINA_FALSE;
474 474
475 for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++) 475 for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++)
@@ -509,7 +509,7 @@ _efl_ui_clock_elm_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
509 509
510 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 510 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
511 511
512 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 512 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
513 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 513 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
514 514
515 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE; 515 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 63b07ea..cdaebad 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -101,7 +101,7 @@ EOLIAN static Efl_Ui_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 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 103 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
104 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 105 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
106 106
107 _sizing_eval(obj); 107 _sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c
index fe6af14..5fa4950 100644
--- a/src/lib/elementary/efl_ui_focus_composition.c
+++ b/src/lib/elementary/efl_ui_focus_composition.c
@@ -136,7 +136,7 @@ _efl_ui_focus_composition_elm_widget_focus_state_apply(Eo *obj, Efl_Ui_Focus_Com
136 configured_state->parent == current_state.parent) 136 configured_state->parent == current_state.parent)
137 return !!current_state.manager; 137 return !!current_state.manager;
138 138
139 registered = elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); 139 registered = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
140 140
141 if (registered) 141 if (registered)
142 pd->registered = configured_state->manager; 142 pd->registered = configured_state->manager;
diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c
index e18b71e..9f9c9bc 100644
--- a/src/lib/elementary/efl_ui_focus_layer.c
+++ b/src/lib/elementary/efl_ui_focus_layer.c
@@ -73,7 +73,7 @@ _efl_ui_focus_layer_elm_widget_focus_state_apply(Eo *obj EINA_UNUSED, Efl_Ui_Foc
73EOLIAN static Efl_Object* 73EOLIAN static Efl_Object*
74_efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd) 74_efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd)
75{ 75{
76 pd->manager = elm_obj_widget_focus_manager_create(obj, obj); 76 pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
77 77
78 efl_composite_attach(obj, pd->manager); 78 efl_composite_attach(obj, pd->manager);
79 79
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index ef41b21..cec9848 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -32,7 +32,7 @@ EOLIAN static Efl_Ui_Theme_Apply
32_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) 32_efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
33{ 33{
34 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 34 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
35 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 35 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
36 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 36 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
37 37
38 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 38 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -153,7 +153,7 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd)
153 elm_widget_can_focus_set(obj, EINA_FALSE); 153 elm_widget_can_focus_set(obj, EINA_FALSE);
154 elm_widget_highlight_ignore_set(obj, EINA_FALSE); 154 elm_widget_highlight_ignore_set(obj, EINA_FALSE);
155 155
156 elm_obj_widget_theme_apply(obj); 156 efl_ui_widget_theme_apply(obj);
157} 157}
158 158
159EOLIAN static void 159EOLIAN static void
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index be0cef5..871a268 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -728,7 +728,7 @@ _efl_ui_image_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
728 if (sd->stdicon) 728 if (sd->stdicon)
729 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 729 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
730 730
731 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 731 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
732 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 732 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
733 733
734 _efl_ui_image_sizing_eval(obj); 734 _efl_ui_image_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 3b882a4..84f348a 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -866,7 +866,7 @@ _efl_ui_image_zoomable_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Image_Zoomable
866 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 866 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
867 Eina_Bool int_ret = EINA_FALSE; 867 Eina_Bool int_ret = EINA_FALSE;
868 868
869 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 869 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
870 if (!int_ret) return EINA_FALSE; 870 if (!int_ret) return EINA_FALSE;
871 871
872 if (elm_widget_focus_get(obj)) 872 if (elm_widget_focus_get(obj))
@@ -894,7 +894,7 @@ _efl_ui_image_zoomable_elm_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Dat
894 if (sd->stdicon) 894 if (sd->stdicon)
895 _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE); 895 _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE);
896 896
897 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 897 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
898 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 898 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
899 899
900 _sizing_eval(obj); 900 _sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 2afd254..60e9aa4 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -325,7 +325,7 @@ _visuals_refresh(Evas_Object *obj,
325 325
326 _efl_ui_layout_highlight_in_theme(obj); 326 _efl_ui_layout_highlight_in_theme(obj);
327 327
328 ret = elm_obj_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); 328 ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
329 329
330 elm_layout_sizing_eval(obj); 330 elm_layout_sizing_eval(obj);
331 331
@@ -378,7 +378,7 @@ _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
378{ 378{
379 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; 379 Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED;
380 380
381 theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 381 theme_apply = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
382 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; 382 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
383 383
384 theme_apply &= _efl_ui_layout_theme_internal(obj, sd); 384 theme_apply &= _efl_ui_layout_theme_internal(obj, sd);
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index 3d0a5b4..b1798cf 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -121,7 +121,7 @@ _efl_ui_nstate_elm_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
121{ 121{
122 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 122 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
123 123
124 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 124 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
125 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 125 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
126 126
127 _state_active(obj, pd); 127 _state_active(obj, pd);
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index f196b0e..dea1363 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -71,7 +71,7 @@ _efl_ui_panes_elm_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
71 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 71 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
72 evas_object_size_hint_min_set(sd->event, minw, minh); 72 evas_object_size_hint_min_set(sd->event, minw, minh);
73 73
74 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 74 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
75 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 75 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
76 76
77 size = elm_panes_content_left_size_get(obj); 77 size = elm_panes_content_left_size_get(obj);
@@ -434,7 +434,7 @@ _efl_ui_panes_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl
434 dir = EFL_UI_DIR_VERTICAL; 434 dir = EFL_UI_DIR_VERTICAL;
435 435
436 sd->dir = dir; 436 sd->dir = dir;
437 elm_obj_widget_theme_apply(obj); 437 efl_ui_widget_theme_apply(obj);
438 if (elm_widget_is_legacy(obj)) _update_fixed_sides(obj); 438 if (elm_widget_is_legacy(obj)) _update_fixed_sides(obj);
439 else _set_min_size_new(obj); 439 else _set_min_size_new(obj);
440 440
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 3f24cac..90520bb 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -177,7 +177,7 @@ _icon_signal_emit(Evas_Object *obj)
177EOLIAN static Eina_Bool 177EOLIAN static Eina_Bool
178_efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) 178_efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
179{ 179{
180 if (!elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj)) 180 if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj))
181 return EINA_FALSE; 181 return EINA_FALSE;
182 182
183 _icon_signal_emit(obj); 183 _icon_signal_emit(obj);
@@ -187,7 +187,7 @@ _efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar
187static Eina_Bool 187static Eina_Bool
188_efl_ui_progressbar_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) 188_efl_ui_progressbar_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj)
189{ 189{
190 if (!elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj)) 190 if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj))
191 return EINA_FALSE; 191 return EINA_FALSE;
192 192
193 _icon_signal_emit(obj); 193 _icon_signal_emit(obj);
@@ -205,7 +205,7 @@ _efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
205 eina_stringshare_replace(&ld->group, "horizontal"); 205 eina_stringshare_replace(&ld->group, "horizontal");
206 else eina_stringshare_replace(&ld->group, "vertical"); 206 else eina_stringshare_replace(&ld->group, "vertical");
207 207
208 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 208 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
209 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 209 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
210 210
211 if (sd->pulse) 211 if (sd->pulse)
@@ -366,7 +366,7 @@ _efl_ui_progressbar_pulse_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data
366 366
367 sd->pulse = pulse; 367 sd->pulse = pulse;
368 368
369 elm_obj_widget_theme_apply(obj); 369 efl_ui_widget_theme_apply(obj);
370} 370}
371 371
372EOLIAN static Eina_Bool 372EOLIAN static Eina_Bool
@@ -380,7 +380,7 @@ _efl_ui_progressbar_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Progressbar_D
380{ 380{
381 sd->dir = dir; 381 sd->dir = dir;
382 382
383 elm_obj_widget_theme_apply(obj); 383 efl_ui_widget_theme_apply(obj);
384} 384}
385 385
386EOLIAN static Efl_Ui_Dir 386EOLIAN static Efl_Ui_Dir
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 33ff0fc..da7521a 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -151,7 +151,7 @@ _efl_ui_radio_elm_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
151{ 151{
152 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 152 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
153 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 153 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
154 int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); 154 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
155 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 155 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
156 156
157 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm"); 157 if (sd->state) elm_layout_signal_emit(obj, "elm,state,radio,on", "elm");
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 00a0a86..0974e50 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -771,7 +771,7 @@ _efl_ui_slider_elm_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
771 elm_widget_style_get(obj)); 771 elm_widget_style_get(obj));
772 } 772 }
773 773
774 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 774 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
775 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 775 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
776 776
777 if (sd->popup) 777 if (sd->popup)
@@ -1223,7 +1223,7 @@ _efl_ui_slider_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Slider_Data *sd, E
1223{ 1223{
1224 sd->dir = dir; 1224 sd->dir = dir;
1225 1225
1226 elm_obj_widget_theme_apply(obj); 1226 efl_ui_widget_theme_apply(obj);
1227} 1227}
1228 1228
1229EOLIAN static Efl_Ui_Dir 1229EOLIAN static Efl_Ui_Dir
@@ -1372,7 +1372,7 @@ _efl_ui_slider_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Slider_Data *sd EINA_U
1372{ 1372{
1373 Eina_Bool int_ret = EINA_FALSE; 1373 Eina_Bool int_ret = EINA_FALSE;
1374 1374
1375 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 1375 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
1376 1376
1377 if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj)) 1377 if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj))
1378 _popup_show(obj, NULL, NULL, NULL); 1378 _popup_show(obj, NULL, NULL, NULL);
@@ -1614,7 +1614,7 @@ elm_slider_range_enabled_set(Evas_Object *obj, Eina_Bool enable)
1614 if (sd->intvl_enable == enable) return; 1614 if (sd->intvl_enable == enable) return;
1615 1615
1616 sd->intvl_enable = enable; 1616 sd->intvl_enable = enable;
1617 elm_obj_widget_theme_apply(obj); 1617 efl_ui_widget_theme_apply(obj);
1618 if (sd->intvl_enable) 1618 if (sd->intvl_enable)
1619 { 1619 {
1620 elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); 1620 elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm");
diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c
index a47f1c4..c9bcca1 100644
--- a/src/lib/elementary/efl_ui_slider_interval.c
+++ b/src/lib/elementary/efl_ui_slider_interval.c
@@ -111,7 +111,7 @@ _efl_ui_slider_interval_efl_object_finalize(Eo *obj, Efl_Ui_Slider_Interval_Data
111 111
112 pd->intvl_enable = EINA_TRUE; 112 pd->intvl_enable = EINA_TRUE;
113 113
114 elm_obj_widget_theme_apply(obj); 114 efl_ui_widget_theme_apply(obj);
115 115
116 elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); 116 elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm");
117 if (pd->indicator_show) 117 if (pd->indicator_show)
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index afe06ed..3fe0129 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -916,7 +916,7 @@ _efl_ui_text_elm_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
916 916
917 // Note: We are skipping elm_layout here! This is by design. 917 // Note: We are skipping elm_layout here! This is by design.
918 // This assumes the following inheritance: my_class -> layout -> widget ... 918 // This assumes the following inheritance: my_class -> layout -> widget ...
919 theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); 919 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
920 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; 920 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
921 921
922 efl_event_freeze(obj); 922 efl_event_freeze(obj);
@@ -2141,7 +2141,7 @@ _entry_changed_handle(void *data,
2141 if (sd->single_line != single_line) 2141 if (sd->single_line != single_line)
2142 { 2142 {
2143 sd->single_line = single_line; 2143 sd->single_line = single_line;
2144 elm_obj_widget_theme_apply(data); 2144 efl_ui_widget_theme_apply(data);
2145 } 2145 }
2146 2146
2147 elm_layout_sizing_eval(data); 2147 elm_layout_sizing_eval(data);
@@ -3429,7 +3429,7 @@ _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password)
3429 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); 3429 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
3430 } 3430 }
3431 3431
3432 elm_obj_widget_theme_apply(obj); 3432 efl_ui_widget_theme_apply(obj);
3433} 3433}
3434 3434
3435EOLIAN static Eina_Bool 3435EOLIAN static Eina_Bool
@@ -3485,7 +3485,7 @@ _efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd,
3485 efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable); 3485 efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable);
3486 if (sd->editable == editable) return; 3486 if (sd->editable == editable) return;
3487 sd->editable = editable; 3487 sd->editable = editable;
3488 elm_obj_widget_theme_apply(obj); 3488 efl_ui_widget_theme_apply(obj);
3489 3489
3490 elm_drop_target_del(obj, sd->drop_format, 3490 elm_drop_target_del(obj, sd->drop_format,
3491 _dnd_enter_cb, NULL, 3491 _dnd_enter_cb, NULL,
@@ -3799,7 +3799,7 @@ _efl_ui_text_scrollable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool scroll)
3799 elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL); 3799 elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL);
3800 } 3800 }
3801 _update_decorations(obj); 3801 _update_decorations(obj);
3802 elm_obj_widget_theme_apply(obj); 3802 efl_ui_widget_theme_apply(obj);
3803} 3803}
3804 3804
3805EOLIAN static Eina_Bool 3805EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index 5d4678d..5ab8e8a 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -542,7 +542,7 @@ _efl_ui_textpath_elm_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
542{ 542{
543 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; 543 Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED;
544 544
545 ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 545 ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
546 if (!ret) return EFL_UI_THEME_APPLY_FAILED; 546 if (!ret) return EFL_UI_THEME_APPLY_FAILED;
547 547
548 elm_widget_theme_object_set(obj, pd->text_obj, "textpath", "base", 548 elm_widget_theme_object_set(obj, pd->text_obj, "textpath", "base",
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 5d294fe..b05f349 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1231,7 +1231,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
1231 } 1231 }
1232 1232
1233 Evas_Object *focused = efl_ui_focus_manager_focus_get(man); 1233 Evas_Object *focused = efl_ui_focus_manager_focus_get(man);
1234 elm_obj_widget_on_focus_update(focused, NULL); 1234 efl_ui_widget_on_focus_update(focused, NULL);
1235 } 1235 }
1236 1236
1237 evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL); 1237 evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL);
@@ -1618,7 +1618,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1618 _elm_win_xwin_update(sd); 1618 _elm_win_xwin_update(sd);
1619#endif 1619#endif
1620 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 1620 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
1621 elm_obj_widget_on_orientation_update(obj, sd->rot); 1621 efl_ui_widget_on_orientation_update(obj, sd->rot);
1622 efl_event_callback_legacy_call 1622 efl_event_callback_legacy_call
1623 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL); 1623 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
1624 efl_event_callback_legacy_call 1624 efl_event_callback_legacy_call
@@ -1629,7 +1629,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1629EOLIAN static Eina_Bool 1629EOLIAN static Eina_Bool
1630_efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED) 1630_efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED)
1631{ 1631{
1632 if (!elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL)) 1632 if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL))
1633 return EINA_TRUE; 1633 return EINA_TRUE;
1634 1634
1635 if (sd->img_obj) 1635 if (sd->img_obj)
@@ -5369,7 +5369,7 @@ _efl_ui_win_efl_object_constructor(Eo *obj, Efl_Ui_Win_Data *pd)
5369 * really bad and hacky. Needs fixing. */ 5369 * really bad and hacky. Needs fixing. */
5370 5370
5371 pd->obj = obj; 5371 pd->obj = obj;
5372 pd->manager = elm_obj_widget_focus_manager_create(obj, obj); 5372 pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
5373 pd->provider = efl_add(EFL_UI_FOCUS_PARENT_PROVIDER_STANDARD_CLASS, obj); 5373 pd->provider = efl_add(EFL_UI_FOCUS_PARENT_PROVIDER_STANDARD_CLASS, obj);
5374 pd->profile.available = eina_array_new(4); 5374 pd->profile.available = eina_array_new(4);
5375 5375
@@ -6084,7 +6084,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
6084 _elm_win_xwin_update(sd); 6084 _elm_win_xwin_update(sd);
6085#endif 6085#endif
6086 _elm_win_frame_obj_update(sd); 6086 _elm_win_frame_obj_update(sd);
6087 elm_obj_widget_on_orientation_update(obj, rotation); 6087 efl_ui_widget_on_orientation_update(obj, rotation);
6088 efl_event_callback_legacy_call 6088 efl_event_callback_legacy_call
6089 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL); 6089 (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL);
6090} 6090}
@@ -6352,7 +6352,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6352 efl_ui_scale_get(obj) * elm_config_scale_get()); 6352 efl_ui_scale_get(obj) * elm_config_scale_get());
6353 6353
6354 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); 6354 efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL);
6355 ret = elm_obj_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); 6355 ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj));
6356 6356
6357 if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED; 6357 if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED;
6358 6358
@@ -6369,7 +6369,7 @@ EOLIAN static Efl_Ui_Theme_Apply
6369_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 6369_efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
6370{ 6370{
6371 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 6371 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
6372 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 6372 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
6373 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 6373 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
6374 6374
6375 sd->focus_highlight.theme_changed = EINA_TRUE; 6375 sd->focus_highlight.theme_changed = EINA_TRUE;
@@ -8208,7 +8208,7 @@ elm_win_socket_listen(Efl_Ui_Win *obj, const char *svcname, int svcnum, Eina_Boo
8208EAPI Eina_Bool 8208EAPI Eina_Bool
8209elm_win_focus_get(const Efl_Ui_Win *obj) 8209elm_win_focus_get(const Efl_Ui_Win *obj)
8210{ 8210{
8211 return elm_obj_widget_focus_get(obj); 8211 return efl_ui_widget_focus_get(obj);
8212} 8212}
8213 8213
8214EAPI void 8214EAPI void
@@ -8232,19 +8232,19 @@ elm_win_focus_highlight_enabled_get(const Efl_Ui_Win *obj)
8232EAPI void 8232EAPI void
8233elm_win_focus_highlight_enabled_set(Efl_Ui_Win *obj, Eina_Bool enabled) 8233elm_win_focus_highlight_enabled_set(Efl_Ui_Win *obj, Eina_Bool enabled)
8234{ 8234{
8235 elm_obj_widget_focus_highlight_enabled_set(obj, enabled); 8235 efl_ui_widget_focus_highlight_enabled_set(obj, enabled);
8236} 8236}
8237 8237
8238EAPI void 8238EAPI void
8239elm_win_focus_highlight_animate_set(Elm_Win *obj, Eina_Bool animate) 8239elm_win_focus_highlight_animate_set(Elm_Win *obj, Eina_Bool animate)
8240{ 8240{
8241 elm_obj_widget_focus_highlight_animate_set(obj, animate); 8241 efl_ui_widget_focus_highlight_animate_set(obj, animate);
8242} 8242}
8243 8243
8244EAPI Eina_Bool 8244EAPI Eina_Bool
8245elm_win_focus_highlight_animate_get(const Elm_Win *obj) 8245elm_win_focus_highlight_animate_get(const Elm_Win *obj)
8246{ 8246{
8247 return elm_obj_widget_focus_highlight_animate_get(obj); 8247 return efl_ui_widget_focus_highlight_animate_get(obj);
8248} 8248}
8249 8249
8250EAPI Eina_Bool 8250EAPI Eina_Bool
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 32c3a05..ba39421 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -73,7 +73,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
73 /* combobox's style has no extra bit for orientation but could have... */ 73 /* combobox's style has no extra bit for orientation but could have... */
74 eina_stringshare_replace(&(wd->style), buf); 74 eina_stringshare_replace(&(wd->style), buf);
75 75
76 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 76 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
77 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 77 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
78 78
79 eina_stringshare_replace(&(wd->style), style); 79 eina_stringshare_replace(&(wd->style), style);
@@ -295,7 +295,7 @@ _elm_combobox_efl_canvas_group_group_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNU
295 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); 295 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
296 296
297 //What are you doing here? 297 //What are you doing here?
298 elm_obj_widget_theme_apply(obj); 298 efl_ui_widget_theme_apply(obj);
299} 299}
300 300
301EOLIAN static void 301EOLIAN static void
@@ -368,7 +368,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
368 //hover 368 //hover
369 sd->hover = efl_add(ELM_HOVER_CLASS, sd->hover_parent, 369 sd->hover = efl_add(ELM_HOVER_CLASS, sd->hover_parent,
370 _hover_ctor(obj, efl_added), 370 _hover_ctor(obj, efl_added),
371 elm_obj_widget_style_set(efl_added, buf)); 371 efl_ui_widget_style_set(efl_added, buf));
372 evas_object_layer_set(sd->hover, EVAS_LAYER_MAX); 372 evas_object_layer_set(sd->hover, EVAS_LAYER_MAX);
373 efl_ui_mirrored_automatic_set(sd->hover, EINA_FALSE); 373 efl_ui_mirrored_automatic_set(sd->hover, EINA_FALSE);
374 elm_hover_target_set(sd->hover, obj); 374 elm_hover_target_set(sd->hover, obj);
@@ -393,7 +393,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
393 393
394 // This is the genlist object that will take over the genlist call 394 // This is the genlist object that will take over the genlist call
395 sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj, 395 sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj,
396 elm_obj_widget_style_set(efl_added, buf)); 396 efl_ui_widget_style_set(efl_added, buf));
397 elm_genlist_filter_set(gl, NULL); 397 elm_genlist_filter_set(gl, NULL);
398 efl_ui_mirrored_automatic_set(gl, EINA_FALSE); 398 efl_ui_mirrored_automatic_set(gl, EINA_FALSE);
399 efl_ui_mirrored_set(gl, efl_ui_mirrored_get(obj)); 399 efl_ui_mirrored_set(gl, efl_ui_mirrored_get(obj));
@@ -408,7 +408,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
408 408
409 // This is the entry object that will take over the entry call 409 // This is the entry object that will take over the entry call
410 sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj, 410 sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj,
411 elm_obj_widget_style_set(efl_added, buf)); 411 efl_ui_widget_style_set(efl_added, buf));
412 efl_ui_mirrored_automatic_set(entry, EINA_FALSE); 412 efl_ui_mirrored_automatic_set(entry, EINA_FALSE);
413 efl_ui_mirrored_set(entry, efl_ui_mirrored_get(obj)); 413 efl_ui_mirrored_set(entry, efl_ui_mirrored_get(obj));
414 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF, 414 elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 7f63333..a440163 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -656,7 +656,7 @@ _elm_ctxpopup_elm_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
656{ 656{
657 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 657 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
658 658
659 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 659 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
660 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 660 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
661 661
662 elm_widget_theme_object_set 662 elm_widget_theme_object_set
@@ -1014,7 +1014,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it,
1014EOLIAN static Eina_Bool 1014EOLIAN static Eina_Bool
1015_elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled) 1015_elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled)
1016{ 1016{
1017 if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 1017 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
1018 return EINA_FALSE; 1018 return EINA_FALSE;
1019 1019
1020 if (sd->list) 1020 if (sd->list)
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 55f24ad..29fc647 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -235,7 +235,7 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
235 char buf[1024]; 235 char buf[1024];
236 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 236 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
237 237
238 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 238 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
239 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 239 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
240 240
241 style = elm_widget_style_get(obj); 241 style = elm_widget_style_get(obj);
@@ -2393,7 +2393,7 @@ _elm_fileselector_elm_interface_fileselector_mode_set(Eo *obj, Elm_Fileselector_
2393 2393
2394 sd->mode = mode; 2394 sd->mode = mode;
2395 2395
2396 elm_obj_widget_theme_apply(obj); 2396 efl_ui_widget_theme_apply(obj);
2397 if (sd->model) 2397 if (sd->model)
2398 { 2398 {
2399 _schedule_populate(obj, sd, sd->model, NULL); 2399 _schedule_populate(obj, sd, sd->model, NULL);
@@ -3067,7 +3067,7 @@ _elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED
3067EOLIAN static Eina_Bool 3067EOLIAN static Eina_Bool
3068_elm_fileselector_elm_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect) 3068_elm_fileselector_elm_widget_focus_state_apply(Eo *obj, Elm_Fileselector_Data *pd, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect)
3069{ 3069{
3070 Eina_Bool ret = elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); 3070 Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect);
3071 3071
3072 _focus_chain_update(obj, pd); 3072 _focus_chain_update(obj, pd);
3073 3073
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 4e31179..d26b842 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -59,7 +59,7 @@ _elm_fileselector_button_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Button
59 /* file selector button's style has an extra bit */ 59 /* file selector button's style has an extra bit */
60 eina_stringshare_replace(&(wd->style), buf); 60 eina_stringshare_replace(&(wd->style), buf);
61 61
62 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 62 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
63 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 63 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
64 64
65 eina_stringshare_replace(&(wd->style), style); 65 eina_stringshare_replace(&(wd->style), style);
@@ -232,7 +232,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu
232 232
233 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv); 233 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv);
234 234
235 elm_obj_widget_theme_apply(obj); 235 efl_ui_widget_theme_apply(obj);
236 elm_widget_can_focus_set(obj, EINA_TRUE); 236 elm_widget_can_focus_set(obj, EINA_TRUE);
237} 237}
238 238
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index ac49e18..361872c 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -168,7 +168,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
168 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 168 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
169 169
170 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 170 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
171 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 171 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
172 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 172 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
173 173
174 style = elm_widget_style_get(obj); 174 style = elm_widget_style_get(obj);
@@ -193,7 +193,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D
193EOLIAN static Eina_Bool 193EOLIAN static Eina_Bool
194_elm_fileselector_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled) 194_elm_fileselector_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled)
195{ 195{
196 if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 196 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
197 return EINA_FALSE; 197 return EINA_FALSE;
198 198
199 elm_widget_disabled_set(sd->button, disabled); 199 elm_widget_disabled_set(sd->button, disabled);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index fd20759..510a12b 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -83,7 +83,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
83 /* hoversel's style has an extra bit: orientation */ 83 /* hoversel's style has an extra bit: orientation */
84 eina_stringshare_replace(&(wd->style), buf); 84 eina_stringshare_replace(&(wd->style), buf);
85 85
86 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 86 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
87 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 87 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
88 88
89 eina_stringshare_replace(&(wd->style), style); 89 eina_stringshare_replace(&(wd->style), style);
@@ -630,7 +630,7 @@ _elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *pd)
630 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); 630 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj);
631 631
632 //What are you doing here? 632 //What are you doing here?
633 elm_obj_widget_theme_apply(obj); 633 efl_ui_widget_theme_apply(obj);
634 634
635 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_geometry_changed, pd); 635 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_geometry_changed, pd);
636 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_geometry_changed, pd); 636 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_geometry_changed, pd);
@@ -752,7 +752,7 @@ _elm_hoversel_horizontal_set(Eo *obj, Elm_Hoversel_Data *sd, Eina_Bool horizonta
752 } 752 }
753 } 753 }
754 754
755 elm_obj_widget_theme_apply(obj); 755 efl_ui_widget_theme_apply(obj);
756} 756}
757 757
758EOLIAN static Eina_Bool 758EOLIAN static Eina_Bool
@@ -1004,7 +1004,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data)
1004EOLIAN static Eina_Bool 1004EOLIAN static Eina_Bool
1005_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src) 1005_elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src)
1006{ 1006{
1007 if (elm_obj_widget_event(efl_super(obj, MY_CLASS), eo_event, src)) 1007 if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src))
1008 return EINA_TRUE; // note: this was FALSE but likely wrong 1008 return EINA_TRUE; // note: this was FALSE but likely wrong
1009 1009
1010 return _hoversel_elm_widget_widget_event(obj, sd, eo_event, src); 1010 return _hoversel_elm_widget_widget_event(obj, sd, eo_event, src);
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 125da1c..bb82ed6 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -95,7 +95,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data
95 double pad_scale; 95 double pad_scale;
96 96
97 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 97 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
98 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 98 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
99 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 99 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
100 100
101 str = elm_layout_data_get(obj, "horizontal_pad"); 101 str = elm_layout_data_get(obj, "horizontal_pad");
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index a544c59..a56c0cf 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -74,7 +74,7 @@ _elm_naviframe_elm_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA
74 wd->resize_obj = NULL; 74 wd->resize_obj = NULL;
75 75
76super: 76super:
77 elm_obj_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj); 77 efl_ui_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj);
78} 78}
79 79
80static void 80static void
@@ -397,11 +397,11 @@ _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
397 Elm_Naviframe_Item_Data *it; 397 Elm_Naviframe_Item_Data *it;
398 const char *style = NULL, *sstyle = NULL; 398 const char *style = NULL, *sstyle = NULL;
399 399
400 style = elm_obj_widget_style_get(obj); 400 style = efl_ui_widget_style_get(obj);
401 401
402 EINA_INLIST_FOREACH(sd->stack, it) 402 EINA_INLIST_FOREACH(sd->stack, it)
403 { 403 {
404 sstyle = elm_obj_widget_style_get(VIEW(it)); 404 sstyle = efl_ui_widget_style_get(VIEW(it));
405 if ((style && sstyle) && strcmp(style, sstyle)) 405 if ((style && sstyle) && strcmp(style, sstyle))
406 _item_style_set(it, it->style); 406 _item_style_set(it, it->style);
407 _item_signals_emit(it); 407 _item_signals_emit(it);
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index ae06fa7..27645a9 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -188,7 +188,7 @@ EOLIAN static Efl_Ui_Theme_Apply
188_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) 188_elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
189{ 189{
190 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 190 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
191 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 191 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
192 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 192 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
193 193
194 _update_theme_button(obj, sd->forward, "forward"); 194 _update_theme_button(obj, sd->forward, "forward");
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 698d8bb..f7ea011 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -122,7 +122,7 @@ _elm_actionslider_elm_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA
122 122
123 mirrored = elm_object_mirrored_get(obj); 123 mirrored = elm_object_mirrored_get(obj);
124 124
125 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 125 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
126 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 126 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
127 127
128 if (elm_object_mirrored_get(obj) != mirrored) 128 if (elm_object_mirrored_get(obj) != mirrored)
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index fd97093..07dee74 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -53,7 +53,7 @@ _elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
53{ 53{
54 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 54 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
55 55
56 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 56 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
57 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 57 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
58 58
59 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 59 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 4f6818b..915bf43 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -215,7 +215,7 @@ _elm_bubble_pos_set(Eo *obj, Elm_Bubble_Data *sd, Elm_Bubble_Pos pos)
215 eina_stringshare_replace 215 eina_stringshare_replace
216 (&ld->group, corner_string[sd->pos]); 216 (&ld->group, corner_string[sd->pos]);
217 217
218 elm_obj_widget_theme_apply(obj); 218 efl_ui_widget_theme_apply(obj);
219} 219}
220 220
221EOLIAN static Elm_Bubble_Pos 221EOLIAN static Elm_Bubble_Pos
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 42d1308..337d85b 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -907,7 +907,7 @@ _elm_calendar_elm_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
907{ 907{
908 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 908 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
909 909
910 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 910 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
911 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 911 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
912 912
913 _spinner_buttons_add(obj, sd); 913 _spinner_buttons_add(obj, sd);
@@ -1434,7 +1434,7 @@ _elm_calendar_elm_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Obj
1434{ 1434{
1435 Eina_Bool int_ret = EINA_FALSE; 1435 Eina_Bool int_ret = EINA_FALSE;
1436 1436
1437 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 1437 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
1438 if (!int_ret) return EINA_FALSE; 1438 if (!int_ret) return EINA_FALSE;
1439 1439
1440 if (elm_widget_focus_get(obj)) 1440 if (elm_widget_focus_get(obj))
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index 0d66802..4a2f528 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -609,7 +609,7 @@ _elm_clock_elm_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
609{ 609{
610 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 610 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
611 611
612 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 612 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
613 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 613 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
614 614
615 _time_update(obj, EINA_TRUE); 615 _time_update(obj, EINA_TRUE);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 9885fb5..933b79f 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1329,7 +1329,7 @@ _elm_colorselector_elm_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
1329 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 1329 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
1330 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 1330 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
1331 1331
1332 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 1332 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1333 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 1333 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
1334 1334
1335 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || 1335 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index ee4032e..e54bab4 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -574,7 +574,7 @@ _elm_conformant_elm_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UN
574{ 574{
575 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 575 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
576 576
577 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 577 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
578 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 578 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
579 579
580 _conformant_parts_swallow(obj); 580 _conformant_parts_swallow(obj);
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 3296c0f..ebd038f 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -131,7 +131,7 @@ _elm_dayselector_elm_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
131 char buf[1024]; 131 char buf[1024];
132 Elm_Dayselector_Item_Data *it; 132 Elm_Dayselector_Item_Data *it;
133 133
134 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 134 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
135 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 135 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
136 136
137 EINA_LIST_FOREACH(sd->items, l, it) 137 EINA_LIST_FOREACH(sd->items, l, it)
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index a2befbc..ee87733 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -821,7 +821,7 @@ _elm_diskselector_elm_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
821 Evas *evas; 821 Evas *evas;
822 const char *style = elm_widget_style_get(obj); 822 const char *style = elm_widget_style_get(obj);
823 823
824 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 824 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
825 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 825 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
826 826
827 evas = evas_object_evas_get(obj); 827 evas = evas_object_evas_get(obj);
@@ -902,7 +902,7 @@ _elm_diskselector_elm_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd
902 Eina_Bool int_ret = EINA_FALSE; 902 Eina_Bool int_ret = EINA_FALSE;
903 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 903 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
904 904
905 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 905 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
906 if (!int_ret) return EINA_FALSE; 906 if (!int_ret) return EINA_FALSE;
907 907
908 if (elm_widget_focus_get(obj)) 908 if (elm_widget_focus_get(obj))
@@ -1248,7 +1248,7 @@ _elm_diskselector_efl_canvas_group_group_add(Eo *obj, Elm_Diskselector_Data *pri
1248 priv->len_side = 3; 1248 priv->len_side = 3;
1249 1249
1250 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect); 1250 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
1251 elm_obj_widget_theme_apply(obj); 1251 efl_ui_widget_theme_apply(obj);
1252 elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 1252 elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
1253 elm_interface_scrollable_bounce_allow_set(obj, EINA_TRUE, EINA_FALSE); 1253 elm_interface_scrollable_bounce_allow_set(obj, EINA_TRUE, EINA_FALSE);
1254 elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb); 1254 elm_interface_scrollable_animate_start_cb_set(obj, _scroll_animate_start_cb);
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 9414202..3ebe26c 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -863,7 +863,7 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
863 863
864 // Note: We are skipping elm_layout here! This is by design. 864 // Note: We are skipping elm_layout here! This is by design.
865 // This assumes the following inheritance: my_class -> layout -> widget ... 865 // This assumes the following inheritance: my_class -> layout -> widget ...
866 theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); 866 theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS));
867 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; 867 if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED;
868 868
869 evas_event_freeze(evas_object_evas_get(obj)); 869 evas_event_freeze(evas_object_evas_get(obj));
@@ -4047,7 +4047,7 @@ EOLIAN static void
4047_elm_entry_text_style_user_push(Eo *obj, Elm_Entry_Data *sd, const char *style) 4047_elm_entry_text_style_user_push(Eo *obj, Elm_Entry_Data *sd, const char *style)
4048{ 4048{
4049 edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style); 4049 edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style);
4050 elm_obj_widget_theme_apply(obj); 4050 efl_ui_widget_theme_apply(obj);
4051} 4051}
4052 4052
4053EOLIAN static void 4053EOLIAN static void
@@ -4055,7 +4055,7 @@ _elm_entry_text_style_user_pop(Eo *obj, Elm_Entry_Data *sd)
4055{ 4055{
4056 edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text"); 4056 edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text");
4057 4057
4058 elm_obj_widget_theme_apply(obj); 4058 efl_ui_widget_theme_apply(obj);
4059} 4059}
4060 4060
4061EOLIAN static const char* 4061EOLIAN static const char*
@@ -4082,7 +4082,7 @@ _elm_entry_single_line_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool single_line)
4082 { 4082 {
4083 elm_entry_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL); 4083 elm_entry_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL);
4084 } 4084 }
4085 elm_obj_widget_theme_apply(obj); 4085 efl_ui_widget_theme_apply(obj);
4086 4086
4087 if (sd->scroll) 4087 if (sd->scroll)
4088 { 4088 {
@@ -4137,7 +4137,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password)
4137 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); 4137 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
4138 } 4138 }
4139 4139
4140 elm_obj_widget_theme_apply(obj); 4140 efl_ui_widget_theme_apply(obj);
4141} 4141}
4142 4142
4143EOLIAN static Eina_Bool 4143EOLIAN static Eina_Bool
@@ -4237,7 +4237,7 @@ _elm_entry_line_wrap_set(Eo *obj, Elm_Entry_Data *sd, Elm_Wrap_Type wrap)
4237 sd->line_wrap = wrap; 4237 sd->line_wrap = wrap;
4238 if (wrap == ELM_WRAP_NONE) 4238 if (wrap == ELM_WRAP_NONE)
4239 ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del); 4239 ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del);
4240 elm_obj_widget_theme_apply(obj); 4240 efl_ui_widget_theme_apply(obj);
4241} 4241}
4242 4242
4243EOLIAN static Elm_Wrap_Type 4243EOLIAN static Elm_Wrap_Type
@@ -4251,7 +4251,7 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable)
4251{ 4251{
4252 if (sd->editable == editable) return; 4252 if (sd->editable == editable) return;
4253 sd->editable = editable; 4253 sd->editable = editable;
4254 elm_obj_widget_theme_apply(obj); 4254 efl_ui_widget_theme_apply(obj);
4255 _elm_entry_focus_update(obj, sd); 4255 _elm_entry_focus_update(obj, sd);
4256 4256
4257 elm_drop_target_del(obj, sd->drop_format, 4257 elm_drop_target_del(obj, sd->drop_format,
@@ -5049,7 +5049,7 @@ _elm_entry_scrollable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool scroll)
5049 elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL); 5049 elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL);
5050 } 5050 }
5051 sd->last_w = -1; 5051 sd->last_w = -1;
5052 elm_obj_widget_theme_apply(obj); 5052 efl_ui_widget_theme_apply(obj);
5053} 5053}
5054 5054
5055EOLIAN static Eina_Bool 5055EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_factory.c b/src/lib/elementary/elm_factory.c
index c5040a3..7bbeccf 100644
--- a/src/lib/elementary/elm_factory.c
+++ b/src/lib/elementary/elm_factory.c
@@ -76,7 +76,7 @@ _focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **
76 76
77 if ((!wd) || (!wd->content)) return EINA_FALSE; 77 if ((!wd) || (!wd->content)) return EINA_FALSE;
78 cur = wd->content; 78 cur = wd->content;
79 return elm_obj_widget_focus_next_get(cur, dir, next); 79 return efl_ui_widget_focus_next_get(cur, dir, next);
80} 80}
81 81
82static void 82static void
@@ -293,7 +293,7 @@ elm_factory_add(Evas_Object *parent)
293 elm_widget_sub_object_add(parent, obj); 293 elm_widget_sub_object_add(parent, obj);
294 elm_widget_data_set(obj, wd); 294 elm_widget_data_set(obj, wd);
295 elm_widget_del_hook_set(obj, _del_hook); 295 elm_widget_del_hook_set(obj, _del_hook);
296 elm_obj_widget_focus_next_hook_set(obj, _focus_next_hook); 296 efl_ui_widget_focus_next_hook_set(obj, _focus_next_hook);
297 elm_widget_content_set_hook_set(obj, _content_set_hook); 297 elm_widget_content_set_hook_set(obj, _content_set_hook);
298 elm_widget_content_get_hook_set(obj, _content_get_hook); 298 elm_widget_content_get_hook_set(obj, _content_get_hook);
299 elm_widget_content_unset_hook_set(obj, _content_unset_hook); 299 elm_widget_content_unset_hook_set(obj, _content_unset_hook);
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 6ce9036..bce73f9 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -358,7 +358,7 @@ _elm_flipselector_elm_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
358 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 358 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
360 360
361 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 361 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
362 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 362 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
363 363
364 max_len = edje_object_data_get(wd->resize_obj, "max_len"); 364 max_len = edje_object_data_get(wd->resize_obj, "max_len");
@@ -631,7 +631,7 @@ _elm_flipselector_efl_canvas_group_group_add(Eo *obj, Elm_Flipselector_Data *pri
631 631
632 elm_widget_can_focus_set(obj, EINA_TRUE); 632 elm_widget_can_focus_set(obj, EINA_TRUE);
633 633
634 elm_obj_widget_theme_apply(obj); 634 efl_ui_widget_theme_apply(obj);
635} 635}
636 636
637EOLIAN static void 637EOLIAN static void
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index addcbea..7caad51 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -3501,7 +3501,7 @@ _elm_gengrid_elm_widget_on_focus_update(Eo *obj, Elm_Gengrid_Data *sd, Elm_Objec
3501 Eina_Bool int_ret = EINA_FALSE; 3501 Eina_Bool int_ret = EINA_FALSE;
3502 Elm_Object_Item *eo_it = NULL; 3502 Elm_Object_Item *eo_it = NULL;
3503 3503
3504 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 3504 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
3505 if (!int_ret) return EINA_FALSE; 3505 if (!int_ret) return EINA_FALSE;
3506 3506
3507 if (elm_widget_focus_get(obj) && (sd->selected) && 3507 if (elm_widget_focus_get(obj) && (sd->selected) &&
@@ -3571,7 +3571,7 @@ _elm_gengrid_elm_widget_interest_region_get(Eo *obj, Elm_Gengrid_Data *sd)
3571 } 3571 }
3572 3572
3573end: 3573end:
3574 return elm_obj_widget_interest_region_get(efl_super(obj, MY_CLASS)); 3574 return efl_ui_widget_interest_region_get(efl_super(obj, MY_CLASS));
3575} 3575}
3576 3576
3577static Eina_Bool _elm_gengrid_smart_focus_next_enable = EINA_FALSE; 3577static Eina_Bool _elm_gengrid_smart_focus_next_enable = EINA_FALSE;
@@ -3602,7 +3602,7 @@ EOLIAN static Efl_Ui_Theme_Apply
3602_elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) 3602_elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
3603{ 3603{
3604 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 3604 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
3605 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 3605 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3606 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 3606 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
3607 3607
3608 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 3608 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -5732,7 +5732,7 @@ _elm_gengrid_efl_ui_focus_composition_prepare(Eo *obj, Elm_Gengrid_Data *pd)
5732EOLIAN static Eina_Bool 5732EOLIAN static Eina_Bool
5733_elm_gengrid_elm_widget_focus_state_apply(Eo *obj, Elm_Gengrid_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) 5733_elm_gengrid_elm_widget_focus_state_apply(Eo *obj, Elm_Gengrid_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED)
5734{ 5734{
5735 return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); 5735 return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
5736} 5736}
5737 5737
5738EOLIAN static void 5738EOLIAN static void
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 9c1be93..c03ab10 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -2887,7 +2887,7 @@ _elm_genlist_item_content_focus_set(Elm_Gen_Item *it, Elm_Focus_Direction dir)
2887 { 2887 {
2888 Evas_Object *nextfocus; 2888 Evas_Object *nextfocus;
2889 Elm_Object_Item *nextfocus_item; 2889 Elm_Object_Item *nextfocus_item;
2890 if (elm_obj_widget_focus_next_get(focused_obj, dir, &nextfocus, &nextfocus_item)) 2890 if (efl_ui_widget_focus_next_get(focused_obj, dir, &nextfocus, &nextfocus_item))
2891 { 2891 {
2892 if (nextfocus_item) 2892 if (nextfocus_item)
2893 elm_object_item_focus_set(nextfocus_item, EINA_TRUE); 2893 elm_object_item_focus_set(nextfocus_item, EINA_TRUE);
@@ -3301,7 +3301,7 @@ _elm_genlist_elm_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd, Elm_Objec
3301 Elm_Object_Item *eo_it = NULL; 3301 Elm_Object_Item *eo_it = NULL;
3302 Eina_Bool is_sel = EINA_FALSE; 3302 Eina_Bool is_sel = EINA_FALSE;
3303 3303
3304 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 3304 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
3305 if (!int_ret) return EINA_FALSE; 3305 if (!int_ret) return EINA_FALSE;
3306 3306
3307 if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) && 3307 if (elm_widget_focus_get(obj) && (sd->items) && (sd->selected) &&
@@ -3375,7 +3375,7 @@ _elm_genlist_elm_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
3375 Eina_List *l; 3375 Eina_List *l;
3376 Elm_Gen_Item *it; 3376 Elm_Gen_Item *it;
3377 3377
3378 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 3378 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3379 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 3379 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
3380 3380
3381 evas_event_freeze(evas_object_evas_get(obj)); 3381 evas_event_freeze(evas_object_evas_get(obj));
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index 5069835..5424eb4 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -32,7 +32,7 @@ _elm_glview_elm_widget_on_focus_update(Eo *obj, Elm_Glview_Data *_pd EINA_UNUSED
32 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 32 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
33 Eina_Bool int_ret = EINA_FALSE; 33 Eina_Bool int_ret = EINA_FALSE;
34 34
35 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 35 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
36 if (!int_ret) return EINA_FALSE; 36 if (!int_ret) return EINA_FALSE;
37 37
38 if (elm_widget_focus_get(obj)) 38 if (elm_widget_focus_get(obj))
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index b8da1a3..bdfb4a5 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -36,7 +36,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
36{ 36{
37 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 37 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
38 38
39 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 39 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
40 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 40 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
41 41
42 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 42 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -60,7 +60,7 @@ _elm_grid_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
60 60
61 elm_widget_can_focus_set(obj, EINA_FALSE); 61 elm_widget_can_focus_set(obj, EINA_FALSE);
62 62
63 elm_obj_widget_theme_apply(obj); 63 efl_ui_widget_theme_apply(obj);
64} 64}
65 65
66EOLIAN static void 66EOLIAN static void
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index fdd9257..696a080 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -301,7 +301,7 @@ EOLIAN static Efl_Ui_Theme_Apply
301_elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) 301_elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
302{ 302{
303 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 303 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
304 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 304 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
305 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 305 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
306 306
307 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj); 307 if (sd->smt_sub) _elm_hover_smt_sub_re_eval(obj);
@@ -706,7 +706,7 @@ _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd)
706 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 706 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
707 efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); 707 efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
708 708
709 pd->manager = elm_obj_widget_focus_manager_create(obj, obj); 709 pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
710 710
711 efl_composite_attach(obj, pd->manager); 711 efl_composite_attach(obj, pd->manager);
712 712
@@ -747,7 +747,7 @@ elm_hover_parent_set(Evas_Object *obj,
747 Evas_Object *parent) 747 Evas_Object *parent)
748{ 748{
749 ELM_HOVER_CHECK(obj); 749 ELM_HOVER_CHECK(obj);
750 elm_obj_widget_parent_set(obj, parent); 750 efl_ui_widget_parent_set(obj, parent);
751} 751}
752 752
753EOLIAN static void 753EOLIAN static void
@@ -783,7 +783,7 @@ EAPI Evas_Object *
783elm_hover_parent_get(const Evas_Object *obj) 783elm_hover_parent_get(const Evas_Object *obj)
784{ 784{
785 ELM_HOVER_CHECK(obj) NULL; 785 ELM_HOVER_CHECK(obj) NULL;
786 return elm_obj_widget_parent_get((Eo *) obj); 786 return efl_ui_widget_parent_get((Eo *) obj);
787} 787}
788 788
789EOLIAN static Evas_Object* 789EOLIAN static Evas_Object*
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index 9ac0458..3515c42 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -371,7 +371,7 @@ _elm_icon_elm_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
371 if (sd->stdicon) 371 if (sd->stdicon)
372 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 372 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj));
373 373
374 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 374 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
375 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 375 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
376 376
377 return int_ret; 377 return int_ret;
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index bc60d68..72b8793 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -451,7 +451,7 @@ _elm_index_elm_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
451 else 451 else
452 eina_stringshare_replace(&ld->group, "base/vertical"); 452 eina_stringshare_replace(&ld->group, "base/vertical");
453 453
454 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 454 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
455 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 455 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
456 456
457 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 457 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
@@ -1583,7 +1583,7 @@ _elm_index_efl_ui_direction_direction_set(Eo *obj, Elm_Index_Data *sd, Efl_Ui_Di
1583 1583
1584 sd->dir = dir; 1584 sd->dir = dir;
1585 1585
1586 elm_obj_widget_theme_apply(obj); 1586 efl_ui_widget_theme_apply(obj);
1587} 1587}
1588 1588
1589EOLIAN static Efl_Ui_Dir 1589EOLIAN static Efl_Ui_Dir
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 77f480f..522deba 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -4672,7 +4672,7 @@ _elm_interface_scrollable_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, E
4672EOLIAN static Efl_Object* 4672EOLIAN static Efl_Object*
4673_elm_interface_scrollable_efl_object_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED) 4673_elm_interface_scrollable_efl_object_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED)
4674{ 4674{
4675 pd->manager = elm_obj_widget_focus_manager_create(obj, obj); 4675 pd->manager = efl_ui_widget_focus_manager_create(obj, obj);
4676 4676
4677 efl_composite_attach(obj, pd->manager); 4677 efl_composite_attach(obj, pd->manager);
4678 4678
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index cb222bb..b9b9887 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -190,7 +190,7 @@ _elm_label_elm_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
190 190
191 evas_event_freeze(evas_object_evas_get(obj)); 191 evas_event_freeze(evas_object_evas_get(obj));
192 192
193 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 193 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
194 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 194 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
195 195
196 _elm_label_horizontal_size_policy_update(obj, sd); 196 _elm_label_horizontal_size_policy_update(obj, sd);
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index a461c50..e343c06 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -296,7 +296,7 @@ _elm_list_item_content_focus_set(Elm_List_Item_Data *it, Elm_Focus_Direction dir
296 { 296 {
297 Evas_Object *nextfocus; 297 Evas_Object *nextfocus;
298 Elm_Object_Item *nextfocus_item; 298 Elm_Object_Item *nextfocus_item;
299 if (elm_obj_widget_focus_next_get(focused, dir, &nextfocus, &nextfocus_item)) 299 if (efl_ui_widget_focus_next_get(focused, dir, &nextfocus, &nextfocus_item))
300 { 300 {
301 if (nextfocus_item) 301 if (nextfocus_item)
302 elm_object_item_focus_set(nextfocus_item, EINA_TRUE); 302 elm_object_item_focus_set(nextfocus_item, EINA_TRUE);
@@ -1035,7 +1035,7 @@ _show_region_hook(void *data EINA_UNUSED, Evas_Object *obj, Eina_Rect r)
1035EOLIAN static Eina_Bool 1035EOLIAN static Eina_Bool
1036_elm_list_elm_widget_on_disabled_update(Eo *obj, Elm_List_Data *sd, Eina_Bool disabled) 1036_elm_list_elm_widget_on_disabled_update(Eo *obj, Elm_List_Data *sd, Eina_Bool disabled)
1037{ 1037{
1038 if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 1038 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
1039 return EINA_FALSE; 1039 return EINA_FALSE;
1040 1040
1041 if (disabled) 1041 if (disabled)
@@ -1080,7 +1080,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
1080 Eina_List *n; 1080 Eina_List *n;
1081 1081
1082 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 1082 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
1083 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 1083 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1084 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 1084 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
1085 1085
1086 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 1086 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -1242,7 +1242,7 @@ _elm_list_elm_widget_on_focus_update(Eo *obj, Elm_List_Data *sd, Elm_Object_Item
1242 Elm_Object_Item *eo_it = NULL; 1242 Elm_Object_Item *eo_it = NULL;
1243 Eina_Bool is_sel = EINA_FALSE; 1243 Eina_Bool is_sel = EINA_FALSE;
1244 1244
1245 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 1245 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
1246 if (!int_ret) return EINA_FALSE; 1246 if (!int_ret) return EINA_FALSE;
1247 1247
1248 if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item) 1248 if (elm_widget_focus_get(obj) && sd->selected && !sd->last_selected_item)
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 95317ae..1ce7d28 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1880,28 +1880,28 @@ elm_object_focus_move_policy_set(Evas_Object *obj,
1880 Elm_Focus_Move_Policy policy) 1880 Elm_Focus_Move_Policy policy)
1881{ 1881{
1882 EINA_SAFETY_ON_NULL_RETURN(obj); 1882 EINA_SAFETY_ON_NULL_RETURN(obj);
1883 elm_obj_widget_focus_move_policy_set(obj, policy); 1883 efl_ui_widget_focus_move_policy_set(obj, policy);
1884} 1884}
1885 1885
1886EAPI Elm_Focus_Move_Policy 1886EAPI Elm_Focus_Move_Policy
1887elm_object_focus_move_policy_get(const Evas_Object *obj) 1887elm_object_focus_move_policy_get(const Evas_Object *obj)
1888{ 1888{
1889 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 1889 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
1890 return elm_obj_widget_focus_move_policy_get(obj); 1890 return efl_ui_widget_focus_move_policy_get(obj);
1891} 1891}
1892 1892
1893EAPI Eina_Bool 1893EAPI Eina_Bool
1894elm_object_focus_move_policy_automatic_get(const Evas_Object *obj) 1894elm_object_focus_move_policy_automatic_get(const Evas_Object *obj)
1895{ 1895{
1896 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 1896 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
1897 return elm_obj_widget_focus_move_policy_automatic_get(obj); 1897 return efl_ui_widget_focus_move_policy_automatic_get(obj);
1898} 1898}
1899 1899
1900EAPI void 1900EAPI void
1901elm_object_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic) 1901elm_object_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic)
1902{ 1902{
1903 EINA_SAFETY_ON_NULL_RETURN(obj); 1903 EINA_SAFETY_ON_NULL_RETURN(obj);
1904 return elm_obj_widget_focus_move_policy_automatic_set(obj, automatic); 1904 return efl_ui_widget_focus_move_policy_automatic_set(obj, automatic);
1905} 1905}
1906 1906
1907EAPI void 1907EAPI void
@@ -2150,7 +2150,7 @@ EAPI Elm_Object_Item *
2150elm_object_focused_item_get(const Evas_Object *obj) 2150elm_object_focused_item_get(const Evas_Object *obj)
2151{ 2151{
2152 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); 2152 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
2153 return elm_obj_widget_focused_item_get(obj); 2153 return efl_ui_widget_focused_item_get(obj);
2154} 2154}
2155 2155
2156EAPI void 2156EAPI void
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index c4cbf23..bf01cc4 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -3948,7 +3948,7 @@ _elm_map_elm_widget_on_focus_update(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, Elm_
3948 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 3948 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
3949 Eina_Bool int_ret = EINA_FALSE; 3949 Eina_Bool int_ret = EINA_FALSE;
3950 3950
3951 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 3951 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
3952 if (!int_ret) return EINA_FALSE; 3952 if (!int_ret) return EINA_FALSE;
3953 3953
3954 if (elm_widget_focus_get(obj)) 3954 if (elm_widget_focus_get(obj))
@@ -3987,7 +3987,7 @@ _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
3987{ 3987{
3988 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 3988 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
3989 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 3989 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
3990 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 3990 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3991 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 3991 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
3992 3992
3993 3993
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 71adea5..98fa838 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -39,7 +39,7 @@ EOLIAN static Efl_Ui_Theme_Apply
39_elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) 39_elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
40{ 40{
41 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 41 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
42 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 42 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
43 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 43 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
44 44
45 _sizing_eval(obj); 45 _sizing_eval(obj);
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 771e596..7cffe95 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -241,7 +241,7 @@ _elm_menu_elm_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
241 const char *s; 241 const char *s;
242 char style[1024]; 242 char style[1024];
243 243
244 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 244 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
245 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 245 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
246 246
247 if (sd->menu_bar) 247 if (sd->menu_bar)
@@ -793,7 +793,7 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
793 } 793 }
794 } 794 }
795 795
796 elm_obj_widget_theme_apply(obj); 796 efl_ui_widget_theme_apply(obj);
797} 797}
798 798
799EAPI Evas_Object * 799EAPI Evas_Object *
@@ -821,7 +821,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd)
821 Eo *parent = NULL; 821 Eo *parent = NULL;
822 Efl_Ui_Focus_Manager *manager; 822 Efl_Ui_Focus_Manager *manager;
823 823
824 manager = elm_obj_widget_focus_manager_create(obj, obj); 824 manager = efl_ui_widget_focus_manager_create(obj, obj);
825 efl_composite_attach(obj, manager); 825 efl_composite_attach(obj, manager);
826 _efl_ui_focus_manager_redirect_events_add(manager, obj); 826 _efl_ui_focus_manager_redirect_events_add(manager, obj);
827 827
@@ -863,7 +863,7 @@ elm_menu_parent_set(Evas_Object *obj,
863 Evas_Object *parent) 863 Evas_Object *parent)
864{ 864{
865 ELM_MENU_CHECK(obj); 865 ELM_MENU_CHECK(obj);
866 elm_obj_widget_parent_set(obj, parent); 866 efl_ui_widget_parent_set(obj, parent);
867} 867}
868 868
869EOLIAN static void 869EOLIAN static void
@@ -913,7 +913,7 @@ EAPI Evas_Object *
913elm_menu_parent_get(const Evas_Object *obj) 913elm_menu_parent_get(const Evas_Object *obj)
914{ 914{
915 ELM_MENU_CHECK(obj) NULL; 915 ELM_MENU_CHECK(obj) NULL;
916 return elm_obj_widget_parent_get(obj); 916 return efl_ui_widget_parent_get(obj);
917} 917}
918 918
919EAPI Elm_Widget_Item * 919EAPI Elm_Widget_Item *
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 82d1725..7a80d83 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -144,7 +144,7 @@ EOLIAN static Efl_Ui_Theme_Apply
144_elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) 144_elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
145{ 145{
146 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 146 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
147 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 147 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
148 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 148 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
149 149
150 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 150 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -489,7 +489,7 @@ elm_notify_parent_set(Evas_Object *obj,
489 Evas_Object *parent) 489 Evas_Object *parent)
490{ 490{
491 ELM_NOTIFY_CHECK(obj); 491 ELM_NOTIFY_CHECK(obj);
492 elm_obj_widget_parent_set(obj, parent); 492 efl_ui_widget_parent_set(obj, parent);
493} 493}
494 494
495EOLIAN static void 495EOLIAN static void
@@ -535,7 +535,7 @@ elm_notify_parent_get(const Evas_Object *obj)
535{ 535{
536 ELM_NOTIFY_CHECK(obj) NULL; 536 ELM_NOTIFY_CHECK(obj) NULL;
537 Evas_Object *ret = NULL; 537 Evas_Object *ret = NULL;
538 ret = elm_obj_widget_parent_get((Eo *) obj); 538 ret = efl_ui_widget_parent_get((Eo *) obj);
539 return ret; 539 return ret;
540} 540}
541 541
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index c2fe4dc..d6d59ee 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -223,7 +223,7 @@ _elm_panel_elm_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
223 223
224 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); 224 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED);
225 225
226 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 226 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
227 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 227 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
228 228
229 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 229 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -811,7 +811,7 @@ _elm_panel_efl_canvas_group_group_add(Eo *obj, Elm_Panel_Data *priv)
811 811
812 priv->panel_edje = wd->resize_obj; 812 priv->panel_edje = wd->resize_obj;
813 813
814 elm_obj_widget_theme_apply(obj); 814 efl_ui_widget_theme_apply(obj);
815 815
816 priv->bx = evas_object_box_add(evas_object_evas_get(obj)); 816 priv->bx = evas_object_box_add(evas_object_evas_get(obj));
817 evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL); 817 evas_object_box_layout_set(priv->bx, _box_layout_cb, priv, NULL);
@@ -1222,7 +1222,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
1222EOLIAN static Eina_Bool 1222EOLIAN static Eina_Bool
1223_elm_panel_elm_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled) 1223_elm_panel_elm_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled)
1224{ 1224{
1225 if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 1225 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
1226 return EINA_FALSE; 1226 return EINA_FALSE;
1227 1227
1228 if (sd->scrollable) 1228 if (sd->scrollable)
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 3fc4cf0..47b7756 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -55,7 +55,7 @@ _elm_photo_elm_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
55 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 55 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
57 57
58 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 58 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
59 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 59 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
60 60
61 edje_object_mirrored_set 61 edje_object_mirrored_set
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 9855f51..de55ef3 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -65,7 +65,7 @@ _elm_plug_elm_widget_on_focus_update(Eo *obj, void *sd EINA_UNUSED, Elm_Object_I
65 65
66 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 66 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
67 67
68 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 68 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
69 if (!int_ret) return EINA_FALSE; 69 if (!int_ret) return EINA_FALSE;
70 70
71 if (elm_widget_focus_get(obj)) 71 if (elm_widget_focus_get(obj))
@@ -84,7 +84,7 @@ EOLIAN static Efl_Ui_Theme_Apply
84_elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 84_elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
85{ 85{
86 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 86 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
87 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 87 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
88 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 88 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
89 89
90 _sizing_eval(obj); 90 _sizing_eval(obj);
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index df8e24a..4a03775 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -90,7 +90,7 @@ EOLIAN static Efl_Ui_Theme_Apply
90_elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) 90_elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
91{ 91{
92 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 92 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
93 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 93 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
94 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 94 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
95 95
96 //TODO 96 //TODO
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 9842a91..833bd7e 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -390,7 +390,7 @@ EOLIAN static Efl_Ui_Theme_Apply
390_elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) 390_elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
391{ 391{
392 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 392 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
393 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 393 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
394 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 394 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
395 395
396 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 396 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -901,7 +901,7 @@ _elm_scroller_custom_widget_base_theme_set(Eo *obj, Elm_Scroller_Data *_pd EINA_
901 901
902 if (eina_stringshare_replace(&(ld->klass), klass) || 902 if (eina_stringshare_replace(&(ld->klass), klass) ||
903 eina_stringshare_replace(&(ld->group), group)) 903 eina_stringshare_replace(&(ld->group), group))
904 elm_obj_widget_theme_apply(obj); 904 efl_ui_widget_theme_apply(obj);
905} 905}
906 906
907EAPI void 907EAPI void
@@ -1341,7 +1341,7 @@ _elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_U
1341{ 1341{
1342 //undepended from logical or not we always reigster as full with ourself as redirect 1342 //undepended from logical or not we always reigster as full with ourself as redirect
1343 configured_state->logical = EINA_TRUE; 1343 configured_state->logical = EINA_TRUE;
1344 return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); 1344 return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
1345} 1345}
1346 1346
1347 1347
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 56a58f1..de995b4 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -224,7 +224,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
224 Elm_Object_Item *eo_item; 224 Elm_Object_Item *eo_item;
225 225
226 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 226 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
227 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 227 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
228 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 228 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
229 229
230 rtl = efl_ui_mirrored_get(obj); 230 rtl = efl_ui_mirrored_get(obj);
@@ -248,7 +248,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s
248EOLIAN static Eina_Bool 248EOLIAN static Eina_Bool
249_elm_segment_control_elm_widget_on_disabled_update(Eo *obj, Elm_Segment_Control_Data *sd, Eina_Bool disabled) 249_elm_segment_control_elm_widget_on_disabled_update(Eo *obj, Elm_Segment_Control_Data *sd, Eina_Bool disabled)
250{ 250{
251 if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) 251 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
252 return EINA_FALSE; 252 return EINA_FALSE;
253 253
254 _update_list(sd); 254 _update_list(sd);
@@ -281,7 +281,7 @@ _elm_segment_control_elm_widget_focus_next(Eo *obj, Elm_Segment_Control_Data *sd
281 void *(*list_data_get)(const Eina_List *list); 281 void *(*list_data_get)(const Eina_List *list);
282 282
283 /* Focus chain */ 283 /* Focus chain */
284 if ((items = elm_obj_widget_focus_custom_chain_get(obj))) 284 if ((items = efl_ui_widget_focus_custom_chain_get(obj)))
285 list_data_get = eina_list_data_get; 285 list_data_get = eina_list_data_get;
286 else 286 else
287 { 287 {
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index 4af76fc..3301445 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -27,7 +27,7 @@ _elm_separator_elm_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE
27 else 27 else
28 eina_stringshare_replace(&ld->group, "vertical"); 28 eina_stringshare_replace(&ld->group, "vertical");
29 29
30 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 30 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
31 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 31 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
32 32
33 return int_ret; 33 return int_ret;
@@ -84,7 +84,7 @@ _elm_separator_horizontal_set(Eo *obj, Elm_Separator_Data *sd, Eina_Bool horizon
84 84
85 sd->horizontal = horizontal; 85 sd->horizontal = horizontal;
86 86
87 elm_obj_widget_theme_apply(obj); 87 efl_ui_widget_theme_apply(obj);
88} 88}
89 89
90EOLIAN static Eina_Bool 90EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 4087de3..8df4b3d 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -934,7 +934,7 @@ _elm_spinner_elm_widget_on_focus_update(Eo *obj, Elm_Spinner_Data *sd, Elm_Objec
934{ 934{
935 Eina_Bool int_ret = EINA_FALSE; 935 Eina_Bool int_ret = EINA_FALSE;
936 936
937 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 937 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
938 if (!int_ret) return EINA_FALSE; 938 if (!int_ret) return EINA_FALSE;
939 939
940 if (!elm_widget_focus_get(obj)) 940 if (!elm_widget_focus_get(obj))
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 5552757..cd6c193 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -36,7 +36,7 @@ EOLIAN static Efl_Ui_Theme_Apply
36_elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 36_elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
37{ 37{
38 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 38 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
39 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 39 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
40 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 40 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
41 41
42 _mirrored_set(obj, efl_ui_mirrored_get(obj)); 42 _mirrored_set(obj, efl_ui_mirrored_get(obj));
@@ -95,7 +95,7 @@ _elm_table_efl_canvas_group_group_add(Eo *obj, void *_pd EINA_UNUSED)
95 elm_widget_can_focus_set(obj, EINA_FALSE); 95 elm_widget_can_focus_set(obj, EINA_FALSE);
96 elm_widget_highlight_ignore_set(obj, EINA_FALSE); 96 elm_widget_highlight_ignore_set(obj, EINA_FALSE);
97 97
98 elm_obj_widget_theme_apply(obj); 98 efl_ui_widget_theme_apply(obj);
99} 99}
100 100
101EOLIAN static void 101EOLIAN static void
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 1597c4d..64a3706 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -751,7 +751,7 @@ _elm_toolbar_elm_widget_on_focus_update(Eo *obj, Elm_Toolbar_Data *sd, Elm_Objec
751 Eina_Bool int_ret = EINA_FALSE; 751 Eina_Bool int_ret = EINA_FALSE;
752 Elm_Object_Item *eo_it = NULL; 752 Elm_Object_Item *eo_it = NULL;
753 753
754 int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); 754 int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL);
755 if (!int_ret) return EINA_FALSE; 755 if (!int_ret) return EINA_FALSE;
756 if (!sd->items) return EINA_FALSE; 756 if (!sd->items) return EINA_FALSE;
757 757
@@ -1470,7 +1470,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1470 if (sd->delete_me) return EFL_UI_THEME_APPLY_SUCCESS; 1470 if (sd->delete_me) return EFL_UI_THEME_APPLY_SUCCESS;
1471 1471
1472 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; 1472 Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED;
1473 int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); 1473 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1474 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 1474 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
1475 1475
1476 elm_widget_theme_object_set 1476 elm_widget_theme_object_set
@@ -2309,7 +2309,7 @@ _elm_toolbar_item_efl_object_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item
2309 _item_del(item); 2309 _item_del(item);
2310 2310
2311 if (item != sd->more_item) 2311 if (item != sd->more_item)
2312 elm_obj_widget_theme_apply(obj); 2312 efl_ui_widget_theme_apply(obj);
2313 2313
2314 efl_destructor(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); 2314 efl_destructor(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS));
2315} 2315}
@@ -2955,7 +2955,7 @@ EOLIAN static Eina_Bool
2955_elm_toolbar_elm_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED) 2955_elm_toolbar_elm_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED, Elm_Widget_Focus_State current_state, Elm_Widget_Focus_State *configured_state, Elm_Widget *redirect EINA_UNUSED)
2956{ 2956{
2957 configured_state->logical = EINA_TRUE; 2957 configured_state->logical = EINA_TRUE;
2958 return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); 2958 return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj);
2959} 2959}
2960 2960
2961EOLIAN static Eo * 2961EOLIAN static Eo *
@@ -2980,7 +2980,7 @@ _elm_toolbar_icon_size_set(Eo *obj, Elm_Toolbar_Data *sd, int icon_size)
2980 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; 2980 if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size;
2981 else sd->icon_size = sd->theme_icon_size; 2981 else sd->icon_size = sd->theme_icon_size;
2982 2982
2983 elm_obj_widget_theme_apply(obj); 2983 efl_ui_widget_theme_apply(obj);
2984} 2984}
2985 2985
2986EOLIAN static int 2986EOLIAN static int
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 13b073b..fae4803 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -239,7 +239,7 @@ _elm_widget_focus_highlight_style_set(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
239 Evas_Object *win = elm_widget_top_get(obj); 239 Evas_Object *win = elm_widget_top_get(obj);
240 240
241 if (win && efl_isa(win, EFL_UI_WIN_CLASS)) 241 if (win && efl_isa(win, EFL_UI_WIN_CLASS))
242 return elm_obj_widget_focus_highlight_style_set(win, style); 242 return efl_ui_widget_focus_highlight_style_set(win, style);
243 243
244 return EINA_FALSE; 244 return EINA_FALSE;
245} 245}
@@ -454,7 +454,7 @@ _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Boo
454 configuration.logical = EINA_FALSE; 454 configuration.logical = EINA_FALSE;
455 } 455 }
456 456
457 if (!elm_obj_widget_focus_state_apply(obj, pd->focus, &configuration, NULL)) 457 if (!efl_ui_widget_focus_state_apply(obj, pd->focus, &configuration, NULL))
458 { 458 {
459 //things went wrong or this thing is unregistered. Purge the current configuration. 459 //things went wrong or this thing is unregistered. Purge the current configuration.
460 pd->focus.manager = NULL; 460 pd->focus.manager = NULL;
@@ -1173,7 +1173,7 @@ elm_widget_access(Evas_Object *obj,
1173 ret &= elm_widget_access(child, is_access); 1173 ret &= elm_widget_access(child, is_access);
1174 } 1174 }
1175 1175
1176 elm_obj_widget_on_access_update(obj, is_access); 1176 efl_ui_widget_on_access_update(obj, is_access);
1177 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL); 1177 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL);
1178 1178
1179 return ret; 1179 return ret;
@@ -1206,7 +1206,7 @@ elm_widget_theme(Evas_Object *obj)
1206 EINA_LIST_FOREACH(sd->cursors, l, cur) 1206 EINA_LIST_FOREACH(sd->cursors, l, cur)
1207 elm_cursor_theme(cur); 1207 elm_cursor_theme(cur);
1208 1208
1209 ret &= elm_obj_widget_theme_apply(obj); 1209 ret &= efl_ui_widget_theme_apply(obj);
1210 1210
1211 return ret; 1211 return ret;
1212} 1212}
@@ -1253,7 +1253,7 @@ elm_widget_theme_specific(Evas_Object *obj,
1253 elm_tooltip_theme(tt); 1253 elm_tooltip_theme(tt);
1254 EINA_LIST_FOREACH(sd->cursors, l, cur) 1254 EINA_LIST_FOREACH(sd->cursors, l, cur)
1255 elm_cursor_theme(cur); 1255 elm_cursor_theme(cur);
1256 elm_obj_widget_theme_apply(obj); 1256 efl_ui_widget_theme_apply(obj);
1257} 1257}
1258 1258
1259EOLIAN static Efl_Ui_Theme_Apply 1259EOLIAN static Efl_Ui_Theme_Apply
@@ -1419,7 +1419,7 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
1419 _full_eval(sobj, sdc); 1419 _full_eval(sobj, sdc);
1420 1420
1421 if (!sdc->on_create) 1421 if (!sdc->on_create)
1422 elm_obj_widget_on_orientation_update(sobj, sd->orient_mode); 1422 efl_ui_widget_on_orientation_update(sobj, sd->orient_mode);
1423 else 1423 else
1424 sdc->orient_mode = sd->orient_mode; 1424 sdc->orient_mode = sd->orient_mode;
1425 1425
@@ -1427,7 +1427,7 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec
1427 { 1427 {
1428 if (!sdc->disabled && (elm_widget_disabled_get(obj))) 1428 if (!sdc->disabled && (elm_widget_disabled_get(obj)))
1429 { 1429 {
1430 elm_obj_widget_on_disabled_update(sobj, EINA_TRUE); 1430 efl_ui_widget_on_disabled_update(sobj, EINA_TRUE);
1431 } 1431 }
1432 } 1432 }
1433 1433
@@ -1919,7 +1919,7 @@ _elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd)
1919 if (sd->parent_obj) 1919 if (sd->parent_obj)
1920 { 1920 {
1921 if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL; 1921 if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL;
1922 return elm_obj_widget_top_get(sd->parent_obj); 1922 return efl_ui_widget_top_get(sd->parent_obj);
1923 } 1923 }
1924 return obj; 1924 return obj;
1925} 1925}
@@ -2017,7 +2017,7 @@ _propagate_event(void *data EINA_UNUSED, const Efl_Event *eo_event)
2017 continue; 2017 continue;
2018 } 2018 }
2019 2019
2020 if (elm_obj_widget_event(parent, eo_event, obj)) 2020 if (efl_ui_widget_event(parent, eo_event, obj))
2021 return; 2021 return;
2022 2022
2023 EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd) 2023 EINA_LIST_FOREACH_SAFE(sd->event_cb, l, l_prev, ecd)
@@ -2373,7 +2373,7 @@ _elm_widget_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool focus)
2373 focus_order++; 2373 focus_order++;
2374 sd->focus_order = focus_order; 2374 sd->focus_order = focus_order;
2375 sd->focused = EINA_TRUE; 2375 sd->focused = EINA_TRUE;
2376 elm_obj_widget_on_focus_update(obj, NULL); 2376 efl_ui_widget_on_focus_update(obj, NULL);
2377 } 2377 }
2378 2378
2379 if (focus) 2379 if (focus)
@@ -2448,7 +2448,7 @@ _elm_widget_top_win_focused_set(Evas_Object *obj,
2448 sd->top_win_focused = top_win_focused; 2448 sd->top_win_focused = top_win_focused;
2449 2449
2450 if (sd->focused && !sd->top_win_focused) 2450 if (sd->focused && !sd->top_win_focused)
2451 elm_obj_widget_on_focus_update(obj, NULL); 2451 efl_ui_widget_on_focus_update(obj, NULL);
2452} 2452}
2453 2453
2454Eina_Bool 2454Eina_Bool
@@ -2469,7 +2469,7 @@ _elm_widget_disabled_eval(const Evas_Object *obj, Eina_Bool disabled)
2469 { 2469 {
2470 if (elm_widget_is(child)) 2470 if (elm_widget_is(child))
2471 { 2471 {
2472 elm_obj_widget_on_disabled_update(child, disabled); 2472 efl_ui_widget_on_disabled_update(child, disabled);
2473 _elm_widget_disabled_eval(child, disabled); 2473 _elm_widget_disabled_eval(child, disabled);
2474 } 2474 }
2475 } 2475 }
@@ -2481,7 +2481,7 @@ elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled)
2481 if (!disabled && elm_widget_disabled_get(elm_widget_parent_get(obj))) 2481 if (!disabled && elm_widget_disabled_get(elm_widget_parent_get(obj)))
2482 return; 2482 return;
2483 2483
2484 elm_obj_widget_on_disabled_update(obj, disabled); 2484 efl_ui_widget_on_disabled_update(obj, disabled);
2485 _elm_widget_disabled_eval(obj, disabled); 2485 _elm_widget_disabled_eval(obj, disabled);
2486} 2486}
2487 2487
@@ -2600,7 +2600,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd)
2600 } 2600 }
2601 } 2601 }
2602 } 2602 }
2603 if (sd->parent_obj) elm_obj_widget_scroll_hold_push(sd->parent_obj); 2603 if (sd->parent_obj) efl_ui_widget_scroll_hold_push(sd->parent_obj);
2604 // FIXME: on delete/reparent hold pop 2604 // FIXME: on delete/reparent hold pop
2605} 2605}
2606 2606
@@ -2624,7 +2624,7 @@ _elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
2624 } 2624 }
2625 } 2625 }
2626 } 2626 }
2627 if (sd->parent_obj) elm_obj_widget_scroll_hold_pop(sd->parent_obj); 2627 if (sd->parent_obj) efl_ui_widget_scroll_hold_pop(sd->parent_obj);
2628 if (sd->scroll_hold < 0) sd->scroll_hold = 0; 2628 if (sd->scroll_hold < 0) sd->scroll_hold = 0;
2629} 2629}
2630 2630
@@ -2657,7 +2657,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd)
2657 } 2657 }
2658 } 2658 }
2659 } 2659 }
2660 if (sd->parent_obj) elm_obj_widget_scroll_freeze_push(sd->parent_obj); 2660 if (sd->parent_obj) efl_ui_widget_scroll_freeze_push(sd->parent_obj);
2661 // FIXME: on delete/reparent freeze pop 2661 // FIXME: on delete/reparent freeze pop
2662} 2662}
2663 2663
@@ -2681,7 +2681,7 @@ _elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd)
2681 } 2681 }
2682 } 2682 }
2683 } 2683 }
2684 if (sd->parent_obj) elm_obj_widget_scroll_freeze_pop(sd->parent_obj); 2684 if (sd->parent_obj) efl_ui_widget_scroll_freeze_pop(sd->parent_obj);
2685 if (sd->scroll_freeze < 0) sd->scroll_freeze = 0; 2685 if (sd->scroll_freeze < 0) sd->scroll_freeze = 0;
2686} 2686}
2687 2687
@@ -2741,7 +2741,7 @@ _elm_widget_theme_set(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Theme *th)
2741EAPI void 2741EAPI void
2742elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th) 2742elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th)
2743{ 2743{
2744 elm_obj_widget_theme_set(obj, th); 2744 efl_ui_widget_theme_set(obj, th);
2745} 2745}
2746 2746
2747EAPI void 2747EAPI void
@@ -2961,7 +2961,7 @@ _elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
2961EAPI Elm_Theme * 2961EAPI Elm_Theme *
2962elm_widget_theme_get(const Evas_Object *obj) 2962elm_widget_theme_get(const Evas_Object *obj)
2963{ 2963{
2964 return elm_obj_widget_theme_get(obj); 2964 return efl_ui_widget_theme_get(obj);
2965} 2965}
2966 2966
2967EOLIAN static Efl_Ui_Theme_Apply 2967EOLIAN static Efl_Ui_Theme_Apply
@@ -3098,7 +3098,7 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed
3098EAPI Efl_Ui_Theme_Apply 3098EAPI Efl_Ui_Theme_Apply
3099elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) 3099elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
3100{ 3100{
3101 return elm_obj_widget_theme_object_set(obj, edj, wname, welement, wstyle); 3101 return efl_ui_widget_theme_object_set(obj, edj, wname, welement, wstyle);
3102} 3102}
3103 3103
3104static void 3104static void
@@ -3512,7 +3512,7 @@ elm_widget_activate(Evas_Object *obj, Efl_Ui_Activate act)
3512 3512
3513 ret = EINA_FALSE; 3513 ret = EINA_FALSE;
3514 3514
3515 ret = elm_obj_widget_on_access_activate(obj, act); 3515 ret = efl_ui_widget_on_access_activate(obj, act);
3516 3516
3517 if (ret) return; 3517 if (ret) return;
3518 3518
@@ -3573,7 +3573,7 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei
3573 if (!sd_parent) orient_mode = 0; 3573 if (!sd_parent) orient_mode = 0;
3574 else orient_mode = sd_parent->orient_mode; 3574 else orient_mode = sd_parent->orient_mode;
3575 } 3575 }
3576 elm_obj_widget_on_orientation_update(obj, orient_mode); 3576 efl_ui_widget_on_orientation_update(obj, orient_mode);
3577} 3577}
3578 3578
3579EOLIAN static Eina_Bool 3579EOLIAN static Eina_Bool
@@ -3594,7 +3594,7 @@ _elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient
3594 EINA_LIST_FOREACH (sd->subobjs, l, child) 3594 EINA_LIST_FOREACH (sd->subobjs, l, child)
3595 { 3595 {
3596 if (elm_widget_is(child)) 3596 if (elm_widget_is(child))
3597 elm_obj_widget_on_orientation_update(child, orient_mode); 3597 efl_ui_widget_on_orientation_update(child, orient_mode);
3598 } 3598 }
3599 3599
3600 if (orient_mode != -1) 3600 if (orient_mode != -1)
@@ -3667,7 +3667,7 @@ _elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd,
3667 3667
3668 if (automatic) 3668 if (automatic)
3669 { 3669 {
3670 elm_obj_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get()); 3670 efl_ui_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get());
3671 } 3671 }
3672 } 3672 }
3673} 3673}
@@ -5121,7 +5121,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE
5121 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 5121 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
5122 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 5122 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
5123 parent = efl_parent_get(obj); 5123 parent = efl_parent_get(obj);
5124 elm_obj_widget_parent_set(obj, parent); 5124 efl_ui_widget_parent_set(obj, parent);
5125 sd->on_create = EINA_FALSE; 5125 sd->on_create = EINA_FALSE;
5126 5126
5127 efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN); 5127 efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
@@ -5176,7 +5176,7 @@ _elm_widget_efl_object_debug_name_override(Eo *obj, Elm_Widget_Smart_Data *sd EI
5176{ 5176{
5177 const char *focus = ""; 5177 const char *focus = "";
5178 5178
5179 if (elm_obj_widget_focus_get(obj)) focus = ":focused"; 5179 if (efl_ui_widget_focus_get(obj)) focus = ":focused";
5180 efl_debug_name_override(efl_super(obj, MY_CLASS), sb); 5180 efl_debug_name_override(efl_super(obj, MY_CLASS), sb);
5181 eina_strbuf_append_printf(sb, "%s", focus); 5181 eina_strbuf_append_printf(sb, "%s", focus);
5182} 5182}
@@ -5437,7 +5437,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei
5437 5437
5438 efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus); 5438 efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus);
5439 5439
5440 elm_obj_widget_on_focus_update(obj, NULL); 5440 efl_ui_widget_on_focus_update(obj, NULL);
5441} 5441}
5442 5442
5443EOLIAN static Efl_Ui_Focus_Manager* 5443EOLIAN static Efl_Ui_Focus_Manager*
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index aa05194..b46c4f5 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -24,7 +24,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
24{ 24{
25 [[Elementary widget abstract class]] 25 [[Elementary widget abstract class]]
26 legacy_prefix: elm_widget; 26 legacy_prefix: elm_widget;
27 eo_prefix: elm_obj_widget; 27 eo_prefix: efl_ui_widget;
28 event_prefix: elm_widget; 28 event_prefix: elm_widget;
29 data: Elm_Widget_Smart_Data; 29 data: Elm_Widget_Smart_Data;
30 methods { 30 methods {