jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2f465e1fbbe5af837b57c81305c74f3c6c87c3ba
commit 2f465e1fbbe5af837b57c81305c74f3c6c87c3ba Author: Jean-Philippe Andre <[email protected]> Date: Tue Oct 24 14:03:46 2017 +0900 widget: Rename EO APIs to efl_ui_widget_xxx This only changes the eo_prefix for APIs. Ref T5363 --- src/lib/elementary/efl_ui_bg.c | 2 +- src/lib/elementary/efl_ui_button.c | 2 +- src/lib/elementary/efl_ui_check.c | 2 +- src/lib/elementary/efl_ui_clock.c | 6 +-- src/lib/elementary/efl_ui_flip.c | 2 +- src/lib/elementary/efl_ui_focus_composition.c | 2 +- src/lib/elementary/efl_ui_focus_layer.c | 2 +- src/lib/elementary/efl_ui_grid.c | 4 +- src/lib/elementary/efl_ui_image.c | 2 +- src/lib/elementary/efl_ui_image_zoomable.c | 4 +- src/lib/elementary/efl_ui_layout.c | 4 +- src/lib/elementary/efl_ui_nstate.c | 2 +- src/lib/elementary/efl_ui_panes.c | 4 +- src/lib/elementary/efl_ui_progressbar.c | 10 ++--- src/lib/elementary/efl_ui_radio.c | 2 +- src/lib/elementary/efl_ui_slider.c | 8 ++-- src/lib/elementary/efl_ui_slider_interval.c | 2 +- src/lib/elementary/efl_ui_text.c | 10 ++--- src/lib/elementary/efl_ui_textpath.c | 2 +- src/lib/elementary/efl_ui_win.c | 22 +++++------ src/lib/elementary/elc_combobox.c | 10 ++--- src/lib/elementary/elc_ctxpopup.c | 4 +- src/lib/elementary/elc_fileselector.c | 6 +-- src/lib/elementary/elc_fileselector_button.c | 4 +- src/lib/elementary/elc_fileselector_entry.c | 4 +- src/lib/elementary/elc_hoversel.c | 8 ++-- src/lib/elementary/elc_multibuttonentry.c | 2 +- src/lib/elementary/elc_naviframe.c | 6 +-- src/lib/elementary/elc_player.c | 2 +- src/lib/elementary/elm_actionslider.c | 2 +- src/lib/elementary/elm_box.c | 2 +- src/lib/elementary/elm_bubble.c | 2 +- src/lib/elementary/elm_calendar.c | 4 +- src/lib/elementary/elm_clock.c | 2 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_conform.c | 2 +- src/lib/elementary/elm_dayselector.c | 2 +- src/lib/elementary/elm_diskselector.c | 6 +-- src/lib/elementary/elm_entry.c | 16 ++++---- src/lib/elementary/elm_factory.c | 4 +- src/lib/elementary/elm_flipselector.c | 4 +- src/lib/elementary/elm_gengrid.c | 8 ++-- src/lib/elementary/elm_genlist.c | 6 +-- src/lib/elementary/elm_glview.c | 2 +- src/lib/elementary/elm_grid.c | 4 +- src/lib/elementary/elm_hover.c | 8 ++-- src/lib/elementary/elm_icon.c | 2 +- src/lib/elementary/elm_index.c | 4 +- src/lib/elementary/elm_interface_scrollable.c | 2 +- src/lib/elementary/elm_label.c | 2 +- src/lib/elementary/elm_list.c | 8 ++-- src/lib/elementary/elm_main.c | 10 ++--- src/lib/elementary/elm_map.c | 4 +- src/lib/elementary/elm_mapbuf.c | 2 +- src/lib/elementary/elm_menu.c | 10 ++--- src/lib/elementary/elm_notify.c | 6 +-- src/lib/elementary/elm_panel.c | 6 +-- src/lib/elementary/elm_photo.c | 2 +- src/lib/elementary/elm_plug.c | 4 +- src/lib/elementary/elm_route.c | 2 +- src/lib/elementary/elm_scroller.c | 6 +-- src/lib/elementary/elm_segment_control.c | 6 +-- src/lib/elementary/elm_separator.c | 4 +- src/lib/elementary/elm_spinner.c | 2 +- src/lib/elementary/elm_table.c | 4 +- src/lib/elementary/elm_toolbar.c | 10 ++--- src/lib/elementary/elm_widget.c | 54 +++++++++++++-------------- src/lib/elementary/elm_widget.eo | 2 +- 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 4170702012..a1afbeed56 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) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_obj_widget_focus_allow_set(obj, EINA_FALSE); + efl_ui_widget_focus_allow_set(obj, EINA_FALSE); return obj; } diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index 578e70c039..45762380f0 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 { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _icon_signal_emit(obj); diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index bb25ea400b..0cce3e3951 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index f994d56b9c..bfa4d45987 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 { Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; 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 Clock_Field *field; unsigned int idx = 0; - if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) + if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 63b07ea5c5..cdaebad612 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 _efl_ui_flip_elm_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c index fe6af14367..5fa4950dde 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 configured_state->parent == current_state.parent) return !!current_state.manager; - registered = elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); + registered = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); if (registered) 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 e18b71e65a..9f9c9bc547 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 EOLIAN static Efl_Object* _efl_ui_focus_layer_efl_object_constructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd) { - pd->manager = elm_obj_widget_focus_manager_create(obj, obj); + pd->manager = efl_ui_widget_focus_manager_create(obj, obj); efl_composite_attach(obj, pd->manager); diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index ef41b21add..cec98482c0 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 _efl_ui_grid_elm_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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) elm_widget_can_focus_set(obj, EINA_FALSE); elm_widget_highlight_ignore_set(obj, EINA_FALSE); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static void diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index be0cef5b0d..871a268014 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) if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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 3b882a4808..84f348a6a2 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 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; 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 if (sd->stdicon) _internal_efl_ui_image_zoomable_icon_set(obj, sd->stdicon, &fdo, EINA_TRUE); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 2afd254e24..60e9aa468c 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, _efl_ui_layout_highlight_in_theme(obj); - ret = elm_obj_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); + ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); elm_layout_sizing_eval(obj); @@ -378,7 +378,7 @@ _efl_ui_layout_elm_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) { Efl_Ui_Theme_Apply theme_apply = EFL_UI_THEME_APPLY_FAILED; - theme_apply = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + theme_apply = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; 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 3d0a5b42fe..b1798cf774 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) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _state_active(obj, pd); diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index f196b0e674..dea1363cd5 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) elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(sd->event, minw, minh); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 dir = EFL_UI_DIR_VERTICAL; sd->dir = dir; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); if (elm_widget_is_legacy(obj)) _update_fixed_sides(obj); else _set_min_size_new(obj); diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 3f24cac4d7..90520bb584 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) EOLIAN static Eina_Bool _efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) { - if (!elm_obj_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj)) + if (!efl_ui_widget_sub_object_del(efl_super(obj, MY_CLASS), sobj)) return EINA_FALSE; _icon_signal_emit(obj); @@ -187,7 +187,7 @@ _efl_ui_progressbar_elm_widget_widget_sub_object_del(Eo *obj, Efl_Ui_Progressbar static Eina_Bool _efl_ui_progressbar_elm_widget_widget_sub_object_add(Eo *obj, Efl_Ui_Progressbar_Data *pd EINA_UNUSED, Evas_Object *sobj) { - if (!elm_obj_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj)) + if (!efl_ui_widget_sub_object_add(efl_super(obj, MY_CLASS), sobj)) return EINA_FALSE; _icon_signal_emit(obj); @@ -205,7 +205,7 @@ _efl_ui_progressbar_elm_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) eina_stringshare_replace(&ld->group, "horizontal"); else eina_stringshare_replace(&ld->group, "vertical"); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->pulse) @@ -366,7 +366,7 @@ _efl_ui_progressbar_pulse_mode_set(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data sd->pulse = pulse; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool @@ -380,7 +380,7 @@ _efl_ui_progressbar_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Progressbar_D { sd->dir = dir; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Efl_Ui_Dir diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 33ff0fc834..da7521ac5d 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) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 00a0a86ba0..0974e504f1 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) elm_widget_style_get(obj)); } - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->popup) @@ -1223,7 +1223,7 @@ _efl_ui_slider_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Slider_Data *sd, E { sd->dir = dir; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN 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 { Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if ((sd->indicator_visible_mode == ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) && elm_widget_focus_get(obj)) _popup_show(obj, NULL, NULL, NULL); @@ -1614,7 +1614,7 @@ elm_slider_range_enabled_set(Evas_Object *obj, Eina_Bool enable) if (sd->intvl_enable == enable) return; sd->intvl_enable = enable; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); if (sd->intvl_enable) { 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 a47f1c455f..c9bcca1d53 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 pd->intvl_enable = EINA_TRUE; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); elm_layout_signal_emit(obj, "elm,slider,range,enable", "elm"); if (pd->indicator_show) diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index afe06edb63..3fe012986b 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) // Note: We are skipping elm_layout here! This is by design. // This assumes the following inheritance: my_class -> layout -> widget ... - theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); + theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; efl_event_freeze(obj); @@ -2141,7 +2141,7 @@ _entry_changed_handle(void *data, if (sd->single_line != single_line) { sd->single_line = single_line; - elm_obj_widget_theme_apply(data); + efl_ui_widget_theme_apply(data); } elm_layout_sizing_eval(data); @@ -3429,7 +3429,7 @@ _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password) efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); } - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool @@ -3485,7 +3485,7 @@ _efl_ui_text_efl_ui_text_interactive_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, efl_ui_text_interactive_editable_set(efl_super(obj, MY_CLASS), editable); if (sd->editable == editable) return; sd->editable = editable; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); elm_drop_target_del(obj, sd->drop_format, _dnd_enter_cb, NULL, @@ -3799,7 +3799,7 @@ _efl_ui_text_scrollable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool scroll) elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL); } _update_decorations(obj); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index 5d4678d0b8..5ab8e8a966 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) { Efl_Ui_Theme_Apply ret = EFL_UI_THEME_APPLY_FAILED; - ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!ret) return EFL_UI_THEME_APPLY_FAILED; 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 5d294fe3bf..b05f3493a8 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) } Evas_Object *focused = efl_ui_focus_manager_focus_get(man); - elm_obj_widget_on_focus_update(focused, NULL); + efl_ui_widget_on_focus_update(focused, NULL); } evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL); @@ -1618,7 +1618,7 @@ _elm_win_state_change(Ecore_Evas *ee) _elm_win_xwin_update(sd); #endif ELM_WIN_DATA_ALIVE_CHECK(obj, sd); - elm_obj_widget_on_orientation_update(obj, sd->rot); + efl_ui_widget_on_orientation_update(obj, sd->rot); efl_event_callback_legacy_call (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL); efl_event_callback_legacy_call @@ -1629,7 +1629,7 @@ _elm_win_state_change(Ecore_Evas *ee) EOLIAN static Eina_Bool _efl_ui_win_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Object_Item *item EINA_UNUSED) { - if (!elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL)) + if (!efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL)) return EINA_TRUE; if (sd->img_obj) @@ -5369,7 +5369,7 @@ _efl_ui_win_efl_object_constructor(Eo *obj, Efl_Ui_Win_Data *pd) * really bad and hacky. Needs fixing. */ pd->obj = obj; - pd->manager = elm_obj_widget_focus_manager_create(obj, obj); + pd->manager = efl_ui_widget_focus_manager_create(obj, obj); pd->provider = efl_add(EFL_UI_FOCUS_PARENT_PROVIDER_STANDARD_CLASS, obj); pd->profile.available = eina_array_new(4); @@ -6084,7 +6084,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz _elm_win_xwin_update(sd); #endif _elm_win_frame_obj_update(sd); - elm_obj_widget_on_orientation_update(obj, rotation); + efl_ui_widget_on_orientation_update(obj, rotation); efl_event_callback_legacy_call (obj, EFL_UI_WIN_EVENT_ROTATION_CHANGED, NULL); } @@ -6352,7 +6352,7 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) efl_ui_scale_get(obj) * elm_config_scale_get()); efl_event_callback_legacy_call(obj, EFL_UI_WIN_EVENT_THEME_CHANGED, NULL); - ret = elm_obj_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); + ret = efl_ui_widget_on_disabled_update(obj, elm_widget_disabled_get(obj)); if (!ret) int_ret = EFL_UI_THEME_APPLY_FAILED; @@ -6369,7 +6369,7 @@ EOLIAN static Efl_Ui_Theme_Apply _efl_ui_win_elm_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 EAPI Eina_Bool elm_win_focus_get(const Efl_Ui_Win *obj) { - return elm_obj_widget_focus_get(obj); + return efl_ui_widget_focus_get(obj); } EAPI void @@ -8232,19 +8232,19 @@ elm_win_focus_highlight_enabled_get(const Efl_Ui_Win *obj) EAPI void elm_win_focus_highlight_enabled_set(Efl_Ui_Win *obj, Eina_Bool enabled) { - elm_obj_widget_focus_highlight_enabled_set(obj, enabled); + efl_ui_widget_focus_highlight_enabled_set(obj, enabled); } EAPI void elm_win_focus_highlight_animate_set(Elm_Win *obj, Eina_Bool animate) { - elm_obj_widget_focus_highlight_animate_set(obj, animate); + efl_ui_widget_focus_highlight_animate_set(obj, animate); } EAPI Eina_Bool elm_win_focus_highlight_animate_get(const Elm_Win *obj) { - return elm_obj_widget_focus_highlight_animate_get(obj); + return efl_ui_widget_focus_highlight_animate_get(obj); } EAPI Eina_Bool diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 32c3a05ec7..ba39421750 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) /* combobox's style has no extra bit for orientation but could have... */ eina_stringshare_replace(&(wd->style), buf); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); //What are you doing here? - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static void @@ -368,7 +368,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd) //hover sd->hover = efl_add(ELM_HOVER_CLASS, sd->hover_parent, _hover_ctor(obj, efl_added), - elm_obj_widget_style_set(efl_added, buf)); + efl_ui_widget_style_set(efl_added, buf)); evas_object_layer_set(sd->hover, EVAS_LAYER_MAX); efl_ui_mirrored_automatic_set(sd->hover, EINA_FALSE); elm_hover_target_set(sd->hover, obj); @@ -393,7 +393,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd) // This is the genlist object that will take over the genlist call sd->genlist = gl = efl_add(ELM_GENLIST_CLASS, obj, - elm_obj_widget_style_set(efl_added, buf)); + efl_ui_widget_style_set(efl_added, buf)); elm_genlist_filter_set(gl, NULL); efl_ui_mirrored_automatic_set(gl, EINA_FALSE); 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) // This is the entry object that will take over the entry call sd->entry = entry = efl_add(ELM_ENTRY_CLASS, obj, - elm_obj_widget_style_set(efl_added, buf)); + efl_ui_widget_style_set(efl_added, buf)); efl_ui_mirrored_automatic_set(entry, EINA_FALSE); efl_ui_mirrored_set(entry, efl_ui_mirrored_get(obj)); 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 7f633338b2..a440163544 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) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; elm_widget_theme_object_set @@ -1014,7 +1014,7 @@ _elm_ctxpopup_item_efl_object_destructor(Eo *eo_ctxpopup_it, EOLIAN static Eina_Bool _elm_ctxpopup_elm_widget_on_disabled_update(Eo *obj, Elm_Ctxpopup_Data *sd, Eina_Bool disabled) { - if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) + if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; if (sd->list) diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 55f24ad084..29fc64768e 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) char buf[1024]; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; style = elm_widget_style_get(obj); @@ -2393,7 +2393,7 @@ _elm_fileselector_elm_interface_fileselector_mode_set(Eo *obj, Elm_Fileselector_ sd->mode = mode; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); if (sd->model) { _schedule_populate(obj, sd, sd->model, NULL); @@ -3067,7 +3067,7 @@ _elm_fileselector_elm_interface_fileselector_sort_method_get(Eo *obj EINA_UNUSED EOLIAN static Eina_Bool _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) { - Eina_Bool ret = elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); + Eina_Bool ret = efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, redirect); _focus_chain_update(obj, pd); diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 4e31179951..d26b8429b5 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 /* file selector button's style has an extra bit */ eina_stringshare_replace(&(wd->style), buf); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; eina_stringshare_replace(&(wd->style), style); @@ -232,7 +232,7 @@ _elm_fileselector_button_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Bu efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _button_clicked, priv); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); elm_widget_can_focus_set(obj, EINA_TRUE); } diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index ac49e18219..361872ce88 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 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; style = elm_widget_style_get(obj); @@ -193,7 +193,7 @@ _elm_fileselector_entry_elm_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_D EOLIAN static Eina_Bool _elm_fileselector_entry_elm_widget_on_disabled_update(Eo *obj, Elm_Fileselector_Entry_Data *sd, Eina_Bool disabled) { - if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) + if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; elm_widget_disabled_set(sd->button, disabled); diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index fd20759814..510a12b8a1 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) /* hoversel's style has an extra bit: orientation */ eina_stringshare_replace(&(wd->style), buf); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; eina_stringshare_replace(&(wd->style), style); @@ -630,7 +630,7 @@ _elm_hoversel_efl_canvas_group_group_add(Eo *obj, Elm_Hoversel_Data *pd) efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _on_clicked, obj); //What are you doing here? - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _on_geometry_changed, pd); 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 } } - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool @@ -1004,7 +1004,7 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(hoversel, Elm_Hoversel_Data) EOLIAN static Eina_Bool _elm_hoversel_elm_widget_widget_event(Eo *obj, Elm_Hoversel_Data *sd, const Efl_Event *eo_event, Evas_Object *src) { - if (elm_obj_widget_event(efl_super(obj, MY_CLASS), eo_event, src)) + if (efl_ui_widget_event(efl_super(obj, MY_CLASS), eo_event, src)) return EINA_TRUE; // note: this was FALSE but likely wrong 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 125da1c228..bb82ed6c12 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 double pad_scale; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 a544c59f93..a56c0cfed4 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 wd->resize_obj = NULL; super: - elm_obj_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj); + efl_ui_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj); } static void @@ -397,11 +397,11 @@ _elm_naviframe_elm_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) Elm_Naviframe_Item_Data *it; const char *style = NULL, *sstyle = NULL; - style = elm_obj_widget_style_get(obj); + style = efl_ui_widget_style_get(obj); EINA_INLIST_FOREACH(sd->stack, it) { - sstyle = elm_obj_widget_style_get(VIEW(it)); + sstyle = efl_ui_widget_style_get(VIEW(it)); if ((style && sstyle) && strcmp(style, sstyle)) _item_style_set(it, it->style); _item_signals_emit(it); diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index ae06fa717d..27645a95b6 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 _elm_player_elm_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _update_theme_button(obj, sd->forward, "forward"); diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 698d8bba42..f7ea01126a 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 mirrored = elm_object_mirrored_get(obj); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (elm_object_mirrored_get(obj) != mirrored) diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index fd97093d09..07dee748ed 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) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 4f6818bd54..915bf433a2 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) eina_stringshare_replace (&ld->group, corner_string[sd->pos]); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Elm_Bubble_Pos diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index 42d1308d9e..337d85bfc6 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) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _spinner_buttons_add(obj, sd); @@ -1434,7 +1434,7 @@ _elm_calendar_elm_widget_on_focus_update(Eo *obj, Elm_Calendar_Data *sd, Elm_Obj { Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (elm_widget_focus_get(obj)) diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 0d66802e03..4a2f5288bd 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) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _time_update(obj, EINA_TRUE); diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 9885fb5ff7..933b79f328 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index ee4032eef1..e54bab47da 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 { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _conformant_parts_swallow(obj); diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 3296c0fe29..ebd038fcf4 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) char buf[1024]; Elm_Dayselector_Item_Data *it; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; EINA_LIST_FOREACH(sd->items, l, it) diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index a2befbcb35..ee877334e0 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) Evas *evas; const char *style = elm_widget_style_get(obj); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; evas = evas_object_evas_get(obj); @@ -902,7 +902,7 @@ _elm_diskselector_elm_widget_on_focus_update(Eo *obj, Elm_Diskselector_Data *_pd Eina_Bool int_ret = EINA_FALSE; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (elm_widget_focus_get(obj)) @@ -1248,7 +1248,7 @@ _elm_diskselector_efl_canvas_group_group_add(Eo *obj, Elm_Diskselector_Data *pri priv->len_side = 3; elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); elm_interface_scrollable_bounce_allow_set(obj, EINA_TRUE, EINA_FALSE); 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 9414202239..3ebe26cf20 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) // Note: We are skipping elm_layout here! This is by design. // This assumes the following inheritance: my_class -> layout -> widget ... - theme_apply = elm_obj_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); + theme_apply = efl_ui_widget_theme_apply(efl_cast(obj, ELM_WIDGET_CLASS)); if (!theme_apply) return EFL_UI_THEME_APPLY_FAILED; evas_event_freeze(evas_object_evas_get(obj)); @@ -4047,7 +4047,7 @@ EOLIAN static void _elm_entry_text_style_user_push(Eo *obj, Elm_Entry_Data *sd, const char *style) { edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static void @@ -4055,7 +4055,7 @@ _elm_entry_text_style_user_pop(Eo *obj, Elm_Entry_Data *sd) { edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text"); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static const char* @@ -4082,7 +4082,7 @@ _elm_entry_single_line_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool single_line) { elm_entry_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL); } - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); if (sd->scroll) { @@ -4137,7 +4137,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password) efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); } - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool @@ -4237,7 +4237,7 @@ _elm_entry_line_wrap_set(Eo *obj, Elm_Entry_Data *sd, Elm_Wrap_Type wrap) sd->line_wrap = wrap; if (wrap == ELM_WRAP_NONE) ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Elm_Wrap_Type @@ -4251,7 +4251,7 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable) { if (sd->editable == editable) return; sd->editable = editable; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); _elm_entry_focus_update(obj, sd); 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) elm_widget_on_show_region_hook_set(obj, NULL, NULL, NULL); } sd->last_w = -1; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/elm_factory.c b/src/lib/elementary/elm_factory.c index c5040a3a0c..7bbeccfb2e 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 ** if ((!wd) || (!wd->content)) return EINA_FALSE; cur = wd->content; - return elm_obj_widget_focus_next_get(cur, dir, next); + return efl_ui_widget_focus_next_get(cur, dir, next); } static void @@ -293,7 +293,7 @@ elm_factory_add(Evas_Object *parent) elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); - elm_obj_widget_focus_next_hook_set(obj, _focus_next_hook); + efl_ui_widget_focus_next_hook_set(obj, _focus_next_hook); elm_widget_content_set_hook_set(obj, _content_set_hook); elm_widget_content_get_hook_set(obj, _content_get_hook); 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 6ce90361e1..bce73f9b00 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) Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 elm_widget_can_focus_set(obj, EINA_TRUE); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static void diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index addcbeaf0d..7caad5170f 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 Eina_Bool int_ret = EINA_FALSE; Elm_Object_Item *eo_it = NULL; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; 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) } end: - return elm_obj_widget_interest_region_get(efl_super(obj, MY_CLASS)); + return efl_ui_widget_interest_region_get(efl_super(obj, MY_CLASS)); } static Eina_Bool _elm_gengrid_smart_focus_next_enable = EINA_FALSE; @@ -3602,7 +3602,7 @@ EOLIAN static Efl_Ui_Theme_Apply _elm_gengrid_elm_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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) EOLIAN static Eina_Bool _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) { - return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); + return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } EOLIAN static void diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 9c1be93333..c03ab105c6 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) { Evas_Object *nextfocus; Elm_Object_Item *nextfocus_item; - if (elm_obj_widget_focus_next_get(focused_obj, dir, &nextfocus, &nextfocus_item)) + if (efl_ui_widget_focus_next_get(focused_obj, dir, &nextfocus, &nextfocus_item)) { if (nextfocus_item) 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 Elm_Object_Item *eo_it = NULL; Eina_Bool is_sel = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; 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) Eina_List *l; Elm_Gen_Item *it; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 5069835a13..5424eb4437 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 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (elm_widget_focus_get(obj)) diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index b8da1a3c6d..bdfb4a56d7 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) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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) elm_widget_can_focus_set(obj, EINA_FALSE); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static void diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index fdd9257a2f..696a080bd6 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 _elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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) evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); - pd->manager = elm_obj_widget_focus_manager_create(obj, obj); + pd->manager = efl_ui_widget_focus_manager_create(obj, obj); efl_composite_attach(obj, pd->manager); @@ -747,7 +747,7 @@ elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent) { ELM_HOVER_CHECK(obj); - elm_obj_widget_parent_set(obj, parent); + efl_ui_widget_parent_set(obj, parent); } EOLIAN static void @@ -783,7 +783,7 @@ EAPI Evas_Object * elm_hover_parent_get(const Evas_Object *obj) { ELM_HOVER_CHECK(obj) NULL; - return elm_obj_widget_parent_get((Eo *) obj); + return efl_ui_widget_parent_get((Eo *) obj); } EOLIAN static Evas_Object* diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 9ac04585cb..3515c424c2 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) if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; return int_ret; diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index bc60d6868f..72b8793838 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) else eina_stringshare_replace(&ld->group, "base/vertical"); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 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 sd->dir = dir; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Efl_Ui_Dir diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 77f480f174..522deba236 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 EOLIAN static Efl_Object* _elm_interface_scrollable_efl_object_constructor(Eo *obj, Elm_Scrollable_Smart_Interface_Data *pd EINA_UNUSED) { - pd->manager = elm_obj_widget_focus_manager_create(obj, obj); + pd->manager = efl_ui_widget_focus_manager_create(obj, obj); efl_composite_attach(obj, pd->manager); diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index cb222bbc4e..b9b98875c8 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) evas_event_freeze(evas_object_evas_get(obj)); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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 a461c5038f..e343c06844 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 { Evas_Object *nextfocus; Elm_Object_Item *nextfocus_item; - if (elm_obj_widget_focus_next_get(focused, dir, &nextfocus, &nextfocus_item)) + if (efl_ui_widget_focus_next_get(focused, dir, &nextfocus, &nextfocus_item)) { if (nextfocus_item) 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) EOLIAN static Eina_Bool _elm_list_elm_widget_on_disabled_update(Eo *obj, Elm_List_Data *sd, Eina_Bool disabled) { - if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) + if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; if (disabled) @@ -1080,7 +1080,7 @@ _elm_list_elm_widget_theme_apply(Eo *obj, Elm_List_Data *sd) Eina_List *n; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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 Elm_Object_Item *eo_it = NULL; Eina_Bool is_sel = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; 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 95317aec5d..1ce7d28476 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, Elm_Focus_Move_Policy policy) { EINA_SAFETY_ON_NULL_RETURN(obj); - elm_obj_widget_focus_move_policy_set(obj, policy); + efl_ui_widget_focus_move_policy_set(obj, policy); } EAPI Elm_Focus_Move_Policy elm_object_focus_move_policy_get(const Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); - return elm_obj_widget_focus_move_policy_get(obj); + return efl_ui_widget_focus_move_policy_get(obj); } EAPI Eina_Bool elm_object_focus_move_policy_automatic_get(const Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); - return elm_obj_widget_focus_move_policy_automatic_get(obj); + return efl_ui_widget_focus_move_policy_automatic_get(obj); } EAPI void elm_object_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic) { EINA_SAFETY_ON_NULL_RETURN(obj); - return elm_obj_widget_focus_move_policy_automatic_set(obj, automatic); + return efl_ui_widget_focus_move_policy_automatic_set(obj, automatic); } EAPI void @@ -2150,7 +2150,7 @@ EAPI Elm_Object_Item * elm_object_focused_item_get(const Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - return elm_obj_widget_focused_item_get(obj); + return efl_ui_widget_focused_item_get(obj); } EAPI void diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index c4cbf2304e..bf01cc4991 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_ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (elm_widget_focus_get(obj)) @@ -3987,7 +3987,7 @@ _elm_map_elm_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 71adea505e..98fa8389cf 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 _elm_mapbuf_elm_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 771e596125..7cffe95344 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) const char *s; char style[1024]; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; if (sd->menu_bar) @@ -793,7 +793,7 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar) } } - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EAPI Evas_Object * @@ -821,7 +821,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd) Eo *parent = NULL; Efl_Ui_Focus_Manager *manager; - manager = elm_obj_widget_focus_manager_create(obj, obj); + manager = efl_ui_widget_focus_manager_create(obj, obj); efl_composite_attach(obj, manager); _efl_ui_focus_manager_redirect_events_add(manager, obj); @@ -863,7 +863,7 @@ elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent) { ELM_MENU_CHECK(obj); - elm_obj_widget_parent_set(obj, parent); + efl_ui_widget_parent_set(obj, parent); } EOLIAN static void @@ -913,7 +913,7 @@ EAPI Evas_Object * elm_menu_parent_get(const Evas_Object *obj) { ELM_MENU_CHECK(obj) NULL; - return elm_obj_widget_parent_get(obj); + return efl_ui_widget_parent_get(obj); } EAPI Elm_Widget_Item * diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 82d1725018..7a80d83663 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 _elm_notify_elm_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _mirrored_set(obj, efl_ui_mirrored_get(obj)); @@ -489,7 +489,7 @@ elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent) { ELM_NOTIFY_CHECK(obj); - elm_obj_widget_parent_set(obj, parent); + efl_ui_widget_parent_set(obj, parent); } EOLIAN static void @@ -535,7 +535,7 @@ elm_notify_parent_get(const Evas_Object *obj) { ELM_NOTIFY_CHECK(obj) NULL; Evas_Object *ret = NULL; - ret = elm_obj_widget_parent_get((Eo *) obj); + ret = efl_ui_widget_parent_get((Eo *) obj); return ret; } diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index c2fe4dc0dd..d6d59ee327 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) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_FAILED); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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) priv->panel_edje = wd->resize_obj; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); priv->bx = evas_object_box_add(evas_object_evas_get(obj)); 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) EOLIAN static Eina_Bool _elm_panel_elm_widget_on_disabled_update(Eo *obj, Elm_Panel_Data *sd, Eina_Bool disabled) { - if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) + if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; if (sd->scrollable) diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 3fc4cf0398..47b7756b5e 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) Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; edje_object_mirrored_set diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 9855f510f3..de55ef3f5b 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 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (elm_widget_focus_get(obj)) @@ -84,7 +84,7 @@ EOLIAN static Efl_Ui_Theme_Apply _elm_plug_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _sizing_eval(obj); diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index df8e24ab00..4a0377591c 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 _elm_route_elm_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; //TODO diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 9842a910d4..833bd7e36b 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 _elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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_ if (eina_stringshare_replace(&(ld->klass), klass) || eina_stringshare_replace(&(ld->group), group)) - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EAPI void @@ -1341,7 +1341,7 @@ _elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_U { //undepended from logical or not we always reigster as full with ourself as redirect configured_state->logical = EINA_TRUE; - return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); + return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 56a58f1179..de995b4169 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 Elm_Object_Item *eo_item; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; rtl = efl_ui_mirrored_get(obj); @@ -248,7 +248,7 @@ _elm_segment_control_elm_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *s EOLIAN static Eina_Bool _elm_segment_control_elm_widget_on_disabled_update(Eo *obj, Elm_Segment_Control_Data *sd, Eina_Bool disabled) { - if (!elm_obj_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) + if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled)) return EINA_FALSE; _update_list(sd); @@ -281,7 +281,7 @@ _elm_segment_control_elm_widget_focus_next(Eo *obj, Elm_Segment_Control_Data *sd void *(*list_data_get)(const Eina_List *list); /* Focus chain */ - if ((items = elm_obj_widget_focus_custom_chain_get(obj))) + if ((items = efl_ui_widget_focus_custom_chain_get(obj))) list_data_get = eina_list_data_get; else { diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index 4af76fc476..3301445cd9 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 else eina_stringshare_replace(&ld->group, "vertical"); - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; return int_ret; @@ -84,7 +84,7 @@ _elm_separator_horizontal_set(Eo *obj, Elm_Separator_Data *sd, Eina_Bool horizon sd->horizontal = horizontal; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Eina_Bool diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 4087de35b5..8df4b3db95 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 { Eina_Bool int_ret = EINA_FALSE; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (!elm_widget_focus_get(obj)) diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 55527574ad..cd6c193c68 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 _elm_table_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; _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) elm_widget_can_focus_set(obj, EINA_FALSE); elm_widget_highlight_ignore_set(obj, EINA_FALSE); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static void diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 1597c4d916..64a37065f3 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 Eina_Bool int_ret = EINA_FALSE; Elm_Object_Item *eo_it = NULL; - int_ret = elm_obj_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); + int_ret = efl_ui_widget_on_focus_update(efl_super(obj, MY_CLASS), NULL); if (!int_ret) return EINA_FALSE; if (!sd->items) return EINA_FALSE; @@ -1470,7 +1470,7 @@ _elm_toolbar_elm_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) if (sd->delete_me) return EFL_UI_THEME_APPLY_SUCCESS; Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; - int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); + int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; elm_widget_theme_object_set @@ -2309,7 +2309,7 @@ _elm_toolbar_item_efl_object_destructor(Eo *eo_item, Elm_Toolbar_Item_Data *item _item_del(item); if (item != sd->more_item) - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); efl_destructor(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); } @@ -2955,7 +2955,7 @@ EOLIAN static Eina_Bool _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) { configured_state->logical = EINA_TRUE; - return elm_obj_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); + return efl_ui_widget_focus_state_apply(efl_super(obj, MY_CLASS), current_state, configured_state, obj); } EOLIAN static Eo * @@ -2980,7 +2980,7 @@ _elm_toolbar_icon_size_set(Eo *obj, Elm_Toolbar_Data *sd, int icon_size) if (sd->priv_icon_size) sd->icon_size = sd->priv_icon_size; else sd->icon_size = sd->theme_icon_size; - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static int diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 13b073b45e..fae4803982 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 Evas_Object *win = elm_widget_top_get(obj); if (win && efl_isa(win, EFL_UI_WIN_CLASS)) - return elm_obj_widget_focus_highlight_style_set(win, style); + return efl_ui_widget_focus_highlight_style_set(win, style); return EINA_FALSE; } @@ -454,7 +454,7 @@ _focus_state_eval(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool should, Eina_Boo configuration.logical = EINA_FALSE; } - if (!elm_obj_widget_focus_state_apply(obj, pd->focus, &configuration, NULL)) + if (!efl_ui_widget_focus_state_apply(obj, pd->focus, &configuration, NULL)) { //things went wrong or this thing is unregistered. Purge the current configuration. pd->focus.manager = NULL; @@ -1173,7 +1173,7 @@ elm_widget_access(Evas_Object *obj, ret &= elm_widget_access(child, is_access); } - elm_obj_widget_on_access_update(obj, is_access); + efl_ui_widget_on_access_update(obj, is_access); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL); return ret; @@ -1206,7 +1206,7 @@ elm_widget_theme(Evas_Object *obj) EINA_LIST_FOREACH(sd->cursors, l, cur) elm_cursor_theme(cur); - ret &= elm_obj_widget_theme_apply(obj); + ret &= efl_ui_widget_theme_apply(obj); return ret; } @@ -1253,7 +1253,7 @@ elm_widget_theme_specific(Evas_Object *obj, elm_tooltip_theme(tt); EINA_LIST_FOREACH(sd->cursors, l, cur) elm_cursor_theme(cur); - elm_obj_widget_theme_apply(obj); + efl_ui_widget_theme_apply(obj); } EOLIAN static Efl_Ui_Theme_Apply @@ -1419,7 +1419,7 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec _full_eval(sobj, sdc); if (!sdc->on_create) - elm_obj_widget_on_orientation_update(sobj, sd->orient_mode); + efl_ui_widget_on_orientation_update(sobj, sd->orient_mode); else sdc->orient_mode = sd->orient_mode; @@ -1427,7 +1427,7 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec { if (!sdc->disabled && (elm_widget_disabled_get(obj))) { - elm_obj_widget_on_disabled_update(sobj, EINA_TRUE); + efl_ui_widget_on_disabled_update(sobj, EINA_TRUE); } } @@ -1919,7 +1919,7 @@ _elm_widget_widget_top_get(Eo *obj, Elm_Widget_Smart_Data *sd) if (sd->parent_obj) { if (!efl_isa(sd->parent_obj, ELM_WIDGET_CLASS)) return NULL; - return elm_obj_widget_top_get(sd->parent_obj); + return efl_ui_widget_top_get(sd->parent_obj); } return obj; } @@ -2017,7 +2017,7 @@ _propagate_event(void *data EINA_UNUSED, const Efl_Event *eo_event) continue; } - if (elm_obj_widget_event(parent, eo_event, obj)) + if (efl_ui_widget_event(parent, eo_event, obj)) return; 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) focus_order++; sd->focus_order = focus_order; sd->focused = EINA_TRUE; - elm_obj_widget_on_focus_update(obj, NULL); + efl_ui_widget_on_focus_update(obj, NULL); } if (focus) @@ -2448,7 +2448,7 @@ _elm_widget_top_win_focused_set(Evas_Object *obj, sd->top_win_focused = top_win_focused; if (sd->focused && !sd->top_win_focused) - elm_obj_widget_on_focus_update(obj, NULL); + efl_ui_widget_on_focus_update(obj, NULL); } Eina_Bool @@ -2469,7 +2469,7 @@ _elm_widget_disabled_eval(const Evas_Object *obj, Eina_Bool disabled) { if (elm_widget_is(child)) { - elm_obj_widget_on_disabled_update(child, disabled); + efl_ui_widget_on_disabled_update(child, disabled); _elm_widget_disabled_eval(child, disabled); } } @@ -2481,7 +2481,7 @@ elm_widget_disabled_internal(Eo *obj, Eina_Bool disabled) if (!disabled && elm_widget_disabled_get(elm_widget_parent_get(obj))) return; - elm_obj_widget_on_disabled_update(obj, disabled); + efl_ui_widget_on_disabled_update(obj, disabled); _elm_widget_disabled_eval(obj, disabled); } @@ -2600,7 +2600,7 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) } } } - if (sd->parent_obj) elm_obj_widget_scroll_hold_push(sd->parent_obj); + if (sd->parent_obj) efl_ui_widget_scroll_hold_push(sd->parent_obj); // FIXME: on delete/reparent hold pop } @@ -2624,7 +2624,7 @@ _elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd) } } } - if (sd->parent_obj) elm_obj_widget_scroll_hold_pop(sd->parent_obj); + if (sd->parent_obj) efl_ui_widget_scroll_hold_pop(sd->parent_obj); if (sd->scroll_hold < 0) sd->scroll_hold = 0; } @@ -2657,7 +2657,7 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) } } } - if (sd->parent_obj) elm_obj_widget_scroll_freeze_push(sd->parent_obj); + if (sd->parent_obj) efl_ui_widget_scroll_freeze_push(sd->parent_obj); // FIXME: on delete/reparent freeze pop } @@ -2681,7 +2681,7 @@ _elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd) } } } - if (sd->parent_obj) elm_obj_widget_scroll_freeze_pop(sd->parent_obj); + if (sd->parent_obj) efl_ui_widget_scroll_freeze_pop(sd->parent_obj); if (sd->scroll_freeze < 0) sd->scroll_freeze = 0; } @@ -2741,7 +2741,7 @@ _elm_widget_theme_set(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Theme *th) EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th) { - elm_obj_widget_theme_set(obj, th); + efl_ui_widget_theme_set(obj, th); } EAPI void @@ -2961,7 +2961,7 @@ _elm_widget_theme_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) EAPI Elm_Theme * elm_widget_theme_get(const Evas_Object *obj) { - return elm_obj_widget_theme_get(obj); + return efl_ui_widget_theme_get(obj); } EOLIAN static Efl_Ui_Theme_Apply @@ -3098,7 +3098,7 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed EAPI Efl_Ui_Theme_Apply elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) { - return elm_obj_widget_theme_object_set(obj, edj, wname, welement, wstyle); + return efl_ui_widget_theme_object_set(obj, edj, wname, welement, wstyle); } static void @@ -3512,7 +3512,7 @@ elm_widget_activate(Evas_Object *obj, Efl_Ui_Activate act) ret = EINA_FALSE; - ret = elm_obj_widget_on_access_activate(obj, act); + ret = efl_ui_widget_on_access_activate(obj, act); if (ret) return; @@ -3573,7 +3573,7 @@ _elm_widget_orientation_mode_disabled_set(Eo *obj, Elm_Widget_Smart_Data *sd, Ei if (!sd_parent) orient_mode = 0; else orient_mode = sd_parent->orient_mode; } - elm_obj_widget_on_orientation_update(obj, orient_mode); + efl_ui_widget_on_orientation_update(obj, orient_mode); } EOLIAN static Eina_Bool @@ -3594,7 +3594,7 @@ _elm_widget_on_orientation_update(Eo *obj, Elm_Widget_Smart_Data *sd, int orient EINA_LIST_FOREACH (sd->subobjs, l, child) { if (elm_widget_is(child)) - elm_obj_widget_on_orientation_update(child, orient_mode); + efl_ui_widget_on_orientation_update(child, orient_mode); } if (orient_mode != -1) @@ -3667,7 +3667,7 @@ _elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, if (automatic) { - elm_obj_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get()); + efl_ui_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get()); } } } @@ -5121,7 +5121,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = efl_parent_get(obj); - elm_obj_widget_parent_set(obj, parent); + efl_ui_widget_parent_set(obj, parent); sd->on_create = EINA_FALSE; 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 { const char *focus = ""; - if (elm_obj_widget_focus_get(obj)) focus = ":focused"; + if (efl_ui_widget_focus_get(obj)) focus = ":focused"; efl_debug_name_override(efl_super(obj, MY_CLASS), sb); eina_strbuf_append_printf(sb, "%s", focus); } @@ -5437,7 +5437,7 @@ _elm_widget_efl_ui_focus_object_focus_set(Eo *obj, Elm_Widget_Smart_Data *pd, Ei efl_ui_focus_object_focus_set(efl_super(obj, MY_CLASS), focus); - elm_obj_widget_on_focus_update(obj, NULL); + efl_ui_widget_on_focus_update(obj, NULL); } EOLIAN static Efl_Ui_Focus_Manager* diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index aa05194238..b46c4f5801 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, { [[Elementary widget abstract class]] legacy_prefix: elm_widget; - eo_prefix: elm_obj_widget; + eo_prefix: efl_ui_widget; event_prefix: elm_widget; data: Elm_Widget_Smart_Data; methods { --
