zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bb6caaa471f94611c081af3dc9530fbe524cd5e9
commit bb6caaa471f94611c081af3dc9530fbe524cd5e9 Author: Mike Blumenkrantz <[email protected]> Date: Mon Mar 4 13:37:07 2019 -0500 efl.ui: remove Efl.Ui.Theme_Apply_Error Summary: now that the error codes have been change to be compatible with eina_error, this can be removed and will work through eina_error naturally fix T7718 Depends on D8067 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7718 Differential Revision: https://phab.enlightenment.org/D8068 --- src/lib/elementary/efl_ui.eot | 16 +++----- src/lib/elementary/efl_ui_button.c | 4 +- src/lib/elementary/efl_ui_calendar.c | 4 +- src/lib/elementary/efl_ui_check.c | 8 ++-- src/lib/elementary/efl_ui_clock.c | 4 +- src/lib/elementary/efl_ui_flip.c | 4 +- src/lib/elementary/efl_ui_grid.c | 4 +- src/lib/elementary/efl_ui_grid_default_item.c | 2 +- src/lib/elementary/efl_ui_image.c | 4 +- src/lib/elementary/efl_ui_image_zoomable.c | 4 +- src/lib/elementary/efl_ui_layout.c | 12 +++--- src/lib/elementary/efl_ui_layout_base.eo | 4 +- src/lib/elementary/efl_ui_list.c | 6 +-- src/lib/elementary/efl_ui_list_default_item.c | 2 +- src/lib/elementary/efl_ui_list_empty_item.c | 2 +- src/lib/elementary/efl_ui_nstate.c | 4 +- src/lib/elementary/efl_ui_panel.c | 4 +- src/lib/elementary/efl_ui_panes.c | 4 +- src/lib/elementary/efl_ui_progressbar.c | 8 ++-- src/lib/elementary/efl_ui_radio.c | 8 ++-- src/lib/elementary/efl_ui_scroller.c | 4 +- src/lib/elementary/efl_ui_slider.c | 4 +- src/lib/elementary/efl_ui_spin_button.c | 4 +- src/lib/elementary/efl_ui_tab_bar.c | 2 +- src/lib/elementary/efl_ui_table.c | 4 +- src/lib/elementary/efl_ui_text.c | 4 +- src/lib/elementary/efl_ui_textpath.c | 4 +- src/lib/elementary/efl_ui_widget.c | 56 +++++++++------------------ src/lib/elementary/efl_ui_widget.eo | 6 +-- src/lib/elementary/efl_ui_win.c | 10 ++--- src/lib/elementary/elc_combobox.c | 4 +- src/lib/elementary/elc_ctxpopup.c | 4 +- src/lib/elementary/elc_fileselector.c | 4 +- src/lib/elementary/elc_fileselector_button.c | 4 +- src/lib/elementary/elc_fileselector_entry.c | 4 +- src/lib/elementary/elc_hoversel.c | 4 +- src/lib/elementary/elc_multibuttonentry.c | 4 +- src/lib/elementary/elc_naviframe.c | 2 +- src/lib/elementary/elc_player.c | 4 +- src/lib/elementary/elc_popup.c | 2 +- src/lib/elementary/elm_actionslider.c | 4 +- src/lib/elementary/elm_box.c | 4 +- src/lib/elementary/elm_calendar.c | 4 +- src/lib/elementary/elm_clock.c | 4 +- src/lib/elementary/elm_code_widget.c | 2 +- src/lib/elementary/elm_colorselector.c | 4 +- src/lib/elementary/elm_conform.c | 4 +- src/lib/elementary/elm_dayselector.c | 4 +- src/lib/elementary/elm_diskselector.c | 4 +- src/lib/elementary/elm_entry.c | 6 +-- src/lib/elementary/elm_flipselector.c | 4 +- src/lib/elementary/elm_gengrid.c | 6 +-- src/lib/elementary/elm_genlist.c | 6 +-- src/lib/elementary/elm_grid.c | 4 +- src/lib/elementary/elm_hover.c | 4 +- src/lib/elementary/elm_icon.c | 4 +- src/lib/elementary/elm_index.c | 4 +- src/lib/elementary/elm_label.c | 4 +- src/lib/elementary/elm_list.c | 4 +- src/lib/elementary/elm_main.c | 14 +++++++ src/lib/elementary/elm_map.c | 4 +- src/lib/elementary/elm_mapbuf.c | 4 +- src/lib/elementary/elm_menu.c | 4 +- src/lib/elementary/elm_notify.c | 6 +-- src/lib/elementary/elm_panel.c | 4 +- src/lib/elementary/elm_photo.c | 4 +- src/lib/elementary/elm_plug.c | 4 +- src/lib/elementary/elm_priv.h | 4 +- src/lib/elementary/elm_route.c | 4 +- src/lib/elementary/elm_scroller.c | 4 +- src/lib/elementary/elm_segment_control.c | 4 +- src/lib/elementary/elm_separator.c | 4 +- src/lib/elementary/elm_slider.c | 4 +- src/lib/elementary/elm_spinner.c | 2 +- src/lib/elementary/elm_table.c | 4 +- src/lib/elementary/elm_theme.c | 4 +- src/lib/elementary/elm_toolbar.c | 4 +- src/lib/elementary/elm_widget.h | 8 ++-- 78 files changed, 201 insertions(+), 211 deletions(-) diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot index 7f643fd173..bc9c2bcce7 100644 --- a/src/lib/elementary/efl_ui.eot +++ b/src/lib/elementary/efl_ui.eot @@ -1,15 +1,11 @@ /* Efl.Ui enum and struct types */ +import eina_types; -enum Efl.Ui.Theme_Apply_Error -{ - [[Return error code when setting the style on a widget.]] - none = 0, [[Successfully applied the requested style from the current - theme.]] - default = 1, [[Successfully applied the default style. The widget may - look different from the rest of the UI if a custom theme - is in use, but it should be usable.]] - generic = 2, [[Failed to apply theme. The widget may become unusable.]] -} +var Efl.Ui.Theme.Apply_Error.NONE: Eina.Error; [[Successfully applied the requested style from the current theme.]] +var Efl.Ui.Theme.Apply_Error.DEFAULT: Eina.Error; [[Successfully applied the default style. The widget may + look different from the rest of the UI if a custom theme + is in use, but it should be usable.]] +var Efl.Ui.Theme.Apply_Error.GENERIC: Eina.Error; [[Failed to apply theme. The widget may become unusable.]] enum Efl.Ui.Focus.Direction { diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index f854881482..cae0dbd8e0 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -442,10 +442,10 @@ _icon_signal_emit(Evas_Object *obj) /* FIXME: replicated from elm_layout just because button's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c index b2602d3c09..a4df1829a8 100644 --- a/src/lib/elementary/efl_ui_calendar.c +++ b/src/lib/elementary/efl_ui_calendar.c @@ -510,10 +510,10 @@ _spinner_buttons_add(Evas_Object *obj, Efl_Ui_Calendar_Data *sd) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index b079796fd7..175c47fb0f 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -135,10 +135,10 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) return EINA_TRUE; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); @@ -491,10 +491,10 @@ _icon_signal_emit(Evas_Object *obj) /* FIXME: replicated from elm_layout just because check's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index c44b47a3a1..5c83d83774 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -514,10 +514,10 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd) evas_object_size_hint_max_set(obj, -1, -1); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Clock_Field *field; char buf[BUFFER_SIZE]; diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 84b46834f9..34e492fa74 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -97,10 +97,10 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 863a8801d5..d70bf565ac 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -844,10 +844,10 @@ _efl_ui_grid_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Gr } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_grid_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_grid_default_item.c b/src/lib/elementary/efl_ui_grid_default_item.c index d874823a7b..d0884296b4 100644 --- a/src/lib/elementary/efl_ui_grid_default_item.c +++ b/src/lib/elementary/efl_ui_grid_default_item.c @@ -23,7 +23,7 @@ _efl_ui_grid_default_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED) Eo *eo; eo = efl_finalize(efl_super(obj, MY_CLASS)); ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); - Efl_Ui_Theme_Apply_Error theme_apply = efl_ui_layout_theme_set(obj, "grid_item", NULL, NULL); + Eina_Error theme_apply = efl_ui_layout_theme_set(obj, "grid_item", NULL, NULL); if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("Default Item(%p) failed to set theme [efl/grid_item]!", eo); diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 91b70a260d..9a743c4602 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -717,10 +717,10 @@ _efl_ui_image_efl_canvas_object_clipper_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 51506f5e5f..fd25b6f864 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -920,10 +920,10 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image return EINA_TRUE; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_Bool fdo = EINA_FALSE; if (sd->stdicon) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index d4d2323096..1662adca69 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -445,10 +445,10 @@ _efl_ui_layout_base_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Layout_Data *_pd _flush_mirrored_state(obj); } -static Efl_Ui_Theme_Apply_Error +static Eina_Error _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) { - Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); @@ -471,10 +471,10 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) return ret; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) { - Efl_Ui_Theme_Apply_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC; @@ -920,7 +920,7 @@ _efl_ui_layout_base_theme_get(const Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, if (style) *style = elm_widget_theme_style_get(obj); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style) { Eina_Bool changed = EINA_FALSE; @@ -2944,7 +2944,7 @@ elm_layout_data_get(const Evas_Object *obj, const char *key) EAPI Eina_Bool elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style) { - Efl_Ui_Theme_Apply_Error theme_apply_ret; + Eina_Error theme_apply_ret; theme_apply_ret = efl_ui_layout_theme_set(obj, klass, group, style); return (theme_apply_ret != EFL_UI_THEME_APPLY_ERROR_GENERIC); diff --git a/src/lib/elementary/efl_ui_layout_base.eo b/src/lib/elementary/efl_ui_layout_base.eo index e63d7dc999..31cf7034cd 100644 --- a/src/lib/elementary/efl_ui_layout_base.eo +++ b/src/lib/elementary/efl_ui_layout_base.eo @@ -30,9 +30,9 @@ abstract @beta Efl.Ui.Layout_Base extends Efl.Ui.Widget implements Efl.Container If this returns $false the widget is very likely to become non-functioning. ]] - return: Efl.Ui.Theme_Apply_Error(2); + return: Eina.Error; [[Whether the style was successfully applied or not, see - the values of @Efl.Ui.Theme_Apply_Error for more information.]] + the values of Efl.Ui.Theme.Apply_Error for more information.]] } get { [[Get information about the current theme in use.]] diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c index f27beb0d14..8c8cd0362c 100644 --- a/src/lib/elementary/efl_ui_list.c +++ b/src/lib/elementary/efl_ui_list.c @@ -426,7 +426,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj, ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); - Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj)); + Eina_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj)); if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL"); @@ -599,10 +599,10 @@ _efl_ui_list_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_List_Data } */ -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_list_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_List_Data *pd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_list_default_item.c b/src/lib/elementary/efl_ui_list_default_item.c index 2021d84ae5..3fcf9e7521 100644 --- a/src/lib/elementary/efl_ui_list_default_item.c +++ b/src/lib/elementary/efl_ui_list_default_item.c @@ -23,7 +23,7 @@ _efl_ui_list_default_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED) Eo *eo; eo = efl_finalize(efl_super(obj, MY_CLASS)); ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); - Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL); + Eina_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL); if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo); diff --git a/src/lib/elementary/efl_ui_list_empty_item.c b/src/lib/elementary/efl_ui_list_empty_item.c index 168be2db96..bc4aab1b95 100644 --- a/src/lib/elementary/efl_ui_list_empty_item.c +++ b/src/lib/elementary/efl_ui_list_empty_item.c @@ -21,7 +21,7 @@ _efl_ui_list_empty_item_efl_object_finalize(Eo *obj, void *pd EINA_UNUSED) Eo *eo; eo = efl_finalize(efl_super(obj, MY_CLASS)); ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); - Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty"); + Eina_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty"); if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo); diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index 341f2b351b..a435c543e4 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -116,10 +116,10 @@ _efl_ui_nstate_value_set(Eo *obj, Efl_Ui_Nstate_Data *pd, int state) _state_active(obj, pd); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_panel.c b/src/lib/elementary/efl_ui_panel.c index 48f854cb98..b92aeafac6 100644 --- a/src/lib/elementary/efl_ui_panel.c +++ b/src/lib/elementary/efl_ui_panel.c @@ -198,13 +198,13 @@ _scrollable_layout_theme_set(Eo *obj, Efl_Ui_Panel_Data *sd) _access_obj_process(obj, EINA_TRUE); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd) { const char *str; Evas_Coord minw = 0, minh = 0; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index d7a13b414d..f732a01a08 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -110,14 +110,14 @@ _efl_ui_panes_theme_group_get(Evas_Object *obj, Efl_Ui_Panes_Data *sd) return eina_strbuf_release(new_group); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) { double size; Evas_Coord minw = 0, minh = 0; char *group; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; group = _efl_ui_panes_theme_group_get(obj, sd); if (group) diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index ecd6cc7a86..4977e10435 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -232,10 +232,10 @@ _efl_ui_progressbar_theme_group_get(Evas_Object *obj, Efl_Ui_Progressbar_Data *s return eina_strbuf_release(new_group); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); char *group; @@ -819,10 +819,10 @@ _icon_signal_emit(Evas_Object *obj) /* FIXME: replicated from elm_layout just because progressbar's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index cdb6678ae0..e31ada969c 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -147,11 +147,11 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) return EINA_TRUE; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; @@ -414,10 +414,10 @@ _icon_signal_emit(Evas_Object *obj) elm_layout_sizing_eval(obj); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c index 72d1786291..5891e422f9 100644 --- a/src/lib/elementary/efl_ui_scroller.c +++ b/src/lib/elementary/efl_ui_scroller.c @@ -678,10 +678,10 @@ _efl_ui_scroller_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Scroller_Data *sd) efl_gfx_hint_size_min_set(obj, size); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index fbb11ed669..14dcb87b44 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -423,10 +423,10 @@ _efl_ui_slider_theme_group_get(Evas_Object *obj, Efl_Ui_Slider_Data *sd) return eina_strbuf_release(new_group); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); char *group; diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index 8a26509d65..e8e8d79685 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -788,10 +788,10 @@ _efl_ui_spin_button_theme_group_get(Evas_Object *obj, Efl_Ui_Spin_Button_Data *s } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; char *group; group = _efl_ui_spin_button_theme_group_get(obj, sd); diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c index 9d1a0f6895..077212cb1c 100644 --- a/src/lib/elementary/efl_ui_tab_bar.c +++ b/src/lib/elementary/efl_ui_tab_bar.c @@ -213,7 +213,7 @@ _tab_add(Eo *obj, const char *label, const char *icon) { Eo *tab, *icon_obj; Tab_Info *ti; - Efl_Ui_Theme_Apply_Error theme_apply; + Eina_Error theme_apply; ti = calloc(1, sizeof(*ti)); diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c index 197a69e4d3..be666e858c 100644 --- a/src/lib/elementary/efl_ui_table.c +++ b/src/lib/elementary/efl_ui_table.c @@ -28,10 +28,10 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) evas_object_table_mirrored_set(wd->resize_obj, rtl); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index aed0c99e04..1a50a7494d 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -733,10 +733,10 @@ _efl_ui_text_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool /* we can't issue the layout's theming code here, cause it assumes an * unique edje object, always */ -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) { - Efl_Ui_Theme_Apply_Error theme_apply; + Eina_Error theme_apply; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index 1c39f11915..423e258b33 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -653,10 +653,10 @@ _efl_ui_textpath_efl_text_text_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Da return edje_object_part_text_get(pd->text_obj, "efl.text"); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd) { - Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC; diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 473be09b2c..6beffdde34 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -1192,7 +1192,16 @@ _efl_ui_widget_on_access_update(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd { } -EAPI Efl_Ui_Theme_Apply_Error +static void +_elm_widget_theme_helper(Eina_Error err, Eina_Bool *err_default, Eina_Bool *err_generic) +{ + if (err == EFL_UI_THEME_APPLY_ERROR_DEFAULT) + *err_default = EINA_TRUE; + else if (err == EFL_UI_THEME_APPLY_ERROR_GENERIC) + *err_generic = EINA_TRUE; +} + +EAPI Eina_Error elm_widget_theme(Evas_Object *obj) { const Eina_List *l; @@ -1206,46 +1215,17 @@ elm_widget_theme(Evas_Object *obj) EINA_LIST_FOREACH(sd->subobjs, l, child) if (_elm_widget_is(child)) - { - switch (elm_widget_theme(child)) - { - case EFL_UI_THEME_APPLY_ERROR_DEFAULT: - err_default = EINA_TRUE; - break; - case EFL_UI_THEME_APPLY_ERROR_GENERIC: - err_generic = EINA_TRUE; - break; - default: break; - } - } + _elm_widget_theme_helper(elm_widget_theme(child), &err_default, &err_generic); if (sd->hover_obj) - switch (elm_widget_theme(sd->hover_obj)) - { - case EFL_UI_THEME_APPLY_ERROR_DEFAULT: - err_default = EINA_TRUE; - break; - case EFL_UI_THEME_APPLY_ERROR_GENERIC: - err_generic = EINA_TRUE; - break; - default: break; - } + _elm_widget_theme_helper(elm_widget_theme(sd->hover_obj), &err_default, &err_generic); EINA_LIST_FOREACH(sd->tooltips, l, tt) elm_tooltip_theme(tt); EINA_LIST_FOREACH(sd->cursors, l, cur) elm_cursor_theme(cur); - switch (efl_ui_widget_theme_apply(obj)) - { - case EFL_UI_THEME_APPLY_ERROR_DEFAULT: - err_default = EINA_TRUE; - break; - case EFL_UI_THEME_APPLY_ERROR_GENERIC: - err_generic = EINA_TRUE; - break; - default: break; - } + _elm_widget_theme_helper(efl_ui_widget_theme_apply(obj), &err_default, &err_generic); if (err_generic) return EFL_UI_THEME_APPLY_ERROR_GENERIC; if (err_default) return EFL_UI_THEME_APPLY_ERROR_DEFAULT; return EFL_UI_THEME_APPLY_ERROR_NONE; @@ -1296,7 +1276,7 @@ elm_widget_theme_specific(Evas_Object *obj, efl_ui_widget_theme_apply(obj); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { _elm_widget_mirrored_reload(obj); @@ -2827,7 +2807,7 @@ elm_widget_theme_get(const Evas_Object *obj) return sd->theme; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) { if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) @@ -2938,7 +2918,7 @@ elm_widget_scroll_child_locked_y_get(const Eo *obj) return sd->child_drag_y_locked; } -EAPI Efl_Ui_Theme_Apply_Error +EAPI Eina_Error elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) { Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); @@ -3554,10 +3534,10 @@ elm_widget_theme_style_get(const Evas_Object *obj) * @param name An element name of sub object. * @return Whether the style was successfully applied or not. */ -EAPI Efl_Ui_Theme_Apply_Error +EAPI Eina_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name) { - Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_NONE; + Eina_Error ret = EFL_UI_THEME_APPLY_ERROR_NONE; Eina_Bool changed = EINA_FALSE; const char *obj_group; Eina_Stringshare *group; diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 5547a0bc3a..19e36a9da2 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -144,9 +144,9 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje ]] set @protected { [[Can only be called during construction, before finalize.]] - return: Efl.Ui.Theme_Apply_Error(2); + return: Eina.Error; [[Whether the style was successfully applied or not, see - the values of @Efl.Ui.Theme_Apply_Error for more information.]] + the values of Efl.Ui.Theme.Apply_Error for more information.]] } get { [[Returns the current style of a widget.]] @@ -298,7 +298,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje Note: even widgets not based on layouts may override this method to handle widget updates (scale, mirrored mode, etc...). ]] - return: Efl.Ui.Theme_Apply_Error; [[Indicates success, and if the current + return: Eina.Error; [[Indicates success, and if the current theme or default theme was used.]] } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 786c0932ef..e5ebbd2dcd 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -378,7 +378,7 @@ _elm_win_on_resize_obj_changed_size_hints(void *data, void *event_info); static void _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); -static Efl_Ui_Theme_Apply_Error _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); +static Eina_Error _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style); static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine); @@ -6959,10 +6959,10 @@ _efl_ui_win_focus_highlight_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Da return sd->focus_highlight.enabled; } -static Efl_Ui_Theme_Apply_Error +static Eina_Error _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_Bool prev_alpha; const char *s; @@ -6985,10 +6985,10 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) return int_ret; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 532f707b2c..c6a57923fe 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -79,11 +79,11 @@ _elm_combobox_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Combobox_D efl_ui_l10n_translation_update(sd->hover); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) { const char *style; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_Bool mirrored; char buf[128]; diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 11ee0f4c73..1d10e820d6 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -666,10 +666,10 @@ _on_content_resized(void *data, } //FIXME: lost the content size when theme hook is called. -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 41aa86b8bd..096f02ca0a 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -226,13 +226,13 @@ _model_str_property_set(Efl_Model *model, const char *property_name, const char return efl_model_property_set(model, property_name, eina_value_string_new(property_value)); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) { const char *style; const char *data; char buf[1024]; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index abbf8bd21b..8f2b763889 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -38,10 +38,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { }; #undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; char buf[4096]; const char *style; diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index c9ec1acd7f..4b84254e93 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -127,7 +127,7 @@ _elm_fileselector_entry_elm_layout_sizing_eval(Eo *obj, Elm_Fileselector_Entry_D evas_object_size_hint_max_set(obj, -1, -1); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) { const char *style; @@ -135,7 +135,7 @@ _elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entr ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 25df36a913..54679aa3e0 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -63,10 +63,10 @@ _elm_hoversel_efl_ui_l10n_translation_update(Eo *obj EINA_UNUSED, Elm_Hoversel_D efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_List *l; Elm_Object_Item *eo_item; diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 89b34def53..8858cf633e 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -91,7 +91,7 @@ _format_count(int count, void *data EINA_UNUSED) return strdup(buf); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) { const char *str; @@ -100,7 +100,7 @@ _elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Da Elm_Object_Item *eo_item; double pad_scale; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 40b97c2bcd..a04f98d9fd 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -366,7 +366,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, Eina_Bool transition) edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit))); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item_Data *it; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index a28d92da6a..4b41566644 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -185,10 +185,10 @@ _update_theme_slider(Evas_Object *obj, Evas_Object *sl, const char *name, const elm_object_disabled_set(sl, elm_widget_disabled_get(obj)); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 6c934eeaa3..c4525759b6 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -365,7 +365,7 @@ _populate_theme_scroll(Elm_Popup_Data *sd) sd->theme_scroll = EINA_FALSE; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) { Elm_Popup_Item_Data *it; diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 889e4adf8b..b7b98f178a 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -113,11 +113,11 @@ _mirroredness_change_eval(Evas_Object *obj) (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) { Eina_Bool mirrored; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index b08a25b318..24a452618f 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -57,10 +57,10 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event) efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index 600f9d64f1..32a7bb96df 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -842,10 +842,10 @@ _spinner_buttons_add(Evas_Object *obj, Elm_Calendar_Data *sd) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 7b57b2b159..529a280651 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -627,10 +627,10 @@ _time_update(Evas_Object *obj, Eina_Bool theme_update) sd->cur.ampm = -1; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index e22ddf2f03..6a4d8ee868 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -2341,7 +2341,7 @@ _elm_code_widget_theme_refresh(Eo *obj, Elm_Code_Widget_Data *pd) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd) { if (efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 8c12e5bf02..7a442d6d73 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1317,7 +1317,7 @@ _color_bars_add(Evas_Object *obj) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) { int i; @@ -1329,7 +1329,7 @@ _elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd unsigned int v_pad = DEFAULT_VER_PAD; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 5a3ad4984c..67d55b6af0 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -573,10 +573,10 @@ _on_rotation_changed(void *data, const Efl_Event *event EINA_UNUSED) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index cd39c5a285..a2cf481bcf 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -123,10 +123,10 @@ _item_location_get(Elm_Dayselector_Data *sd, ELM_DAYSELECTOR_MAX; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_List *l; char buf[1024]; diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index d789295f5b..3fce2c9296 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -811,13 +811,13 @@ _theme_data_get(Evas_Object *obj) else sd->minh = -1; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) { Eina_List *l; Elm_Diskselector_Item_Data *it; Evas_Object *blank; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Evas *evas; const char *style = elm_widget_style_get(obj); diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 06fb54683f..4c4990fb5f 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -872,14 +872,14 @@ _elm_entry_background_switch(Evas_Object *from_edje, Evas_Object *to_edje) /* we can't issue the layout's theming code here, cause it assumes an * unique edje object, always */ -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) { const char *str; const char *t; const char *stl_user; const char *style = elm_widget_style_get(obj); - Efl_Ui_Theme_Apply_Error theme_apply; + Eina_Error theme_apply; int cursor_pos; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); @@ -974,7 +974,7 @@ _elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) if (sd->scroll) { - Efl_Ui_Theme_Apply_Error err = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error err = EFL_UI_THEME_APPLY_ERROR_GENERIC; efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj)); diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 99c1f94fc5..86f66e03d0 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -350,12 +350,12 @@ _item_new(Evas_Object *obj, return eo_item; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) { const char *max_len; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index 243e5d6216..d51a15a3cf 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -1170,7 +1170,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style) ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); snprintf(buf, sizeof(buf), "item/%s", style ? style : "default"); - Efl_Ui_Theme_Apply_Error th_ret = + Eina_Error th_ret = elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf, elm_widget_style_get(WIDGET(it))); if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) @@ -3589,10 +3589,10 @@ _mirrored_set(Evas_Object *obj, } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_gengrid_efl_ui_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 164deaa0fb..86f97484b0 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -566,7 +566,7 @@ _view_style_update(Elm_Gen_Item *it, Evas_Object *view, const char *style) "",style ? : "default"); } - Efl_Ui_Theme_Apply_Error th_ret = + Eina_Error th_ret = elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf, elm_widget_style_get(WIDGET(it))); if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) @@ -3533,11 +3533,11 @@ _mirrored_set(Evas_Object *obj, efl_ui_mirrored_set(obj, rtl); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) { Item_Block *itb; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_List *l; Elm_Gen_Item *it; Evas *e; diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 453da6c9d0..16b3e2ddce 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -40,10 +40,10 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) evas_object_grid_mirrored_set(wd->resize_obj, rtl); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_grid_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index ddd711b213..682c968b39 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -298,10 +298,10 @@ _hov_show_do(Evas_Object *obj) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index e32655344b..e7bed4392f 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -366,10 +366,10 @@ _elm_icon_efl_file_load(Eo *obj, Elm_Icon_Data *sd) return 0; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; if (sd->stdicon) _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 67ee93e8e5..2631875008 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -432,13 +432,13 @@ _index_priority_change(void *data, Elm_Index_Item_Data *it) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) { Evas_Coord minw = 0, minh = 0; Elm_Object_Item *eo_item; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index 9e2dbae67b..06f6ba3f35 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -182,10 +182,10 @@ _elm_label_horizontal_size_policy_update(Eo *obj, Elm_Label_Data *sd) edje_object_message_signal_process(wd->resize_obj); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 686a04b836..74db37fb5b 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -1115,13 +1115,13 @@ _mirrored_set(Evas_Object *obj, } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd) { Elm_Object_Item *eo_it; Eina_List *n; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 3cb2318588..e470600e59 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -398,6 +398,19 @@ _sys_lang_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA return ECORE_CALLBACK_PASS_ON; } +EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE = 0; +EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_DEFAULT = 0; +EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_GENERIC = 0; + +static void +_efl_ui_theme_apply_error_init(void) +{ + if (EFL_UI_THEME_APPLY_ERROR_DEFAULT) return; + /* NONE should always be 0 */ + EFL_UI_THEME_APPLY_ERROR_DEFAULT = eina_error_msg_static_register("Fallback to default style was enabled for this widget"); + EFL_UI_THEME_APPLY_ERROR_GENERIC = eina_error_msg_static_register("An error occurred and no theme could be set for this widget"); +} + // This is necessary to keep backward compatibility static const char *bcargv[] = { "exe" }; @@ -436,6 +449,7 @@ elm_init(int argc, char **argv) if (_efl_startup_time <= 0) _efl_startup_time = _elm_startup_time; _elm_startup_time = _efl_startup_time; + _efl_ui_theme_apply_error_init(); return _elm_init_count; shutdown_ql: diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index fb61438335..b54f9bac26 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -3997,11 +3997,11 @@ _elm_map_pan_class_constructor(Efl_Class *klass) #include "elm_map_pan.eo.c" -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_map_efl_ui_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 7b45fbbb18..12b13fad17 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -36,10 +36,10 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_mapbuf_efl_ui_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index bd979695b4..774a6d749e 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -231,10 +231,10 @@ _sizing_eval(Evas_Object *obj) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; Eina_List *l, *_l, *_ll, *ll = NULL; Elm_Object_Item *eo_item; diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index fe091b947e..e107227fd0 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -20,7 +20,7 @@ #define MY_CLASS_NAME "Elm_Notify" #define MY_CLASS_NAME_LEGACY "elm_notify" -static Efl_Ui_Theme_Apply_Error +static Eina_Error _notify_theme_apply(Evas_Object *obj) { const char *style = elm_widget_style_get(obj); @@ -139,10 +139,10 @@ _sizing_eval(Evas_Object *obj) evas_object_geometry_set(obj, x, y, w, h); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index b3c9ed553a..cd5802cf69 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -216,13 +216,13 @@ _scrollable_layout_theme_set(Eo *obj, Elm_Panel_Data *sd) _access_obj_process(obj, EINA_TRUE); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) { const char *str; Evas_Coord minw = 0, minh = 0; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index fdb2ac5e64..6ec12a5938 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -49,10 +49,10 @@ _sizing_eval(Evas_Object *obj) evas_object_size_hint_max_set(obj, maxw, maxh); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_photo_efl_ui_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index c851c8a10b..8eec937773 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -80,10 +80,10 @@ _elm_plug_efl_ui_focus_object_on_focus_update(Eo *obj, void *sd EINA_UNUSED) return EINA_TRUE; } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_plug_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 73c4769bfe..782ff325f0 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -589,7 +589,7 @@ void _elm_win_standard_init(Eo *win); Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee); -Efl_Ui_Theme_Apply_Error _elm_theme_object_set(Evas_Object *parent, +Eina_Error _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, @@ -597,7 +597,7 @@ Efl_Ui_Theme_Apply_Error _elm_theme_object_set(Evas_Object *parent, Eina_Bool _elm_theme_object_icon_set(Evas_Object *o, const char *group, const char *style); -Efl_Ui_Theme_Apply_Error _elm_theme_set(Elm_Theme *th, +Eina_Error _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index 6b28cd2738..6b52ef17cc 100644 --- a/src/lib/elementary/elm_route.c +++ b/src/lib/elementary/elm_route.c @@ -86,10 +86,10 @@ _move_resize_cb(void *data EINA_UNUSED, _sizing_eval(obj); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index c42a3af58a..ab53acc2b7 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -398,10 +398,10 @@ _mirrored_set(Evas_Object *obj, efl_ui_mirrored_set(obj, mirrored); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 4d05c2d2fd..01719c0b9f 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -215,14 +215,14 @@ _update_list(Elm_Segment_Control_Data *sd) } } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) { Eina_List *l; Eina_Bool rtl; Elm_Object_Item *eo_item; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index c6ad9e34c1..8d94d05ed6 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -16,10 +16,10 @@ #define MY_CLASS_NAME "Elm_Separator" #define MY_CLASS_NAME_LEGACY "elm_separator" -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; if (sd->horizontal) elm_widget_theme_element_set(obj, "horizontal"); diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index 4810f1bfb7..049d664c46 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -804,10 +804,10 @@ _elm_slider_theme_group_get(Evas_Object *obj, Elm_Slider_Data *sd) return eina_strbuf_release(new_group); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2, EFL_UI_THEME_APPLY_ERROR_GENERIC); char *group; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 246f08b140..e242fa8a55 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1299,7 +1299,7 @@ _elm_spinner_efl_canvas_group_group_del(Eo *obj, Elm_Spinner_Data *sd) efl_canvas_group_del(efl_super(obj, MY_CLASS)); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index f3f20b7cf3..5849d7d7c8 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -41,10 +41,10 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) evas_object_table_mirrored_set(wd->resize_obj, rtl); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_table_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c index c397e90626..3295f122af 100644 --- a/src/lib/elementary/elm_theme.c +++ b/src/lib/elementary/elm_theme.c @@ -302,7 +302,7 @@ _elm_theme_data_find(Elm_Theme *th, const char *key) return NULL; } -Efl_Ui_Theme_Apply_Error +Eina_Error _elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style) { Elm_Theme *th = NULL; @@ -323,7 +323,7 @@ _elm_theme_object_icon_set(Evas_Object *o, return _elm_theme_icon_set(th, o, group, style); } -Efl_Ui_Theme_Apply_Error +Eina_Error _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style, Eina_Bool is_legacy) { Eina_File *file; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index bf21b81717..46414b84e9 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -1480,7 +1480,7 @@ _elm_toolbar_highlight_in_theme(Evas_Object *obj) elm_widget_highlight_in_theme_set(obj, EINA_FALSE); } -EOLIAN static Efl_Ui_Theme_Apply_Error +EOLIAN static Eina_Error _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) { Elm_Toolbar_Item_Data *it; @@ -1489,7 +1489,7 @@ _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) if (sd->delete_me) return EFL_UI_THEME_APPLY_ERROR_NONE; - Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; + Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index a2e4756ec6..015c100e30 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -579,7 +579,7 @@ struct _Elm_Widget_Item_Data EAPI Eina_Bool elm_widget_api_check(int ver); EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); -EAPI Efl_Ui_Theme_Apply_Error elm_widget_theme(Evas_Object *obj); +EAPI Eina_Error elm_widget_theme(Evas_Object *obj); EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void *data, Efl_Ui_Scrollable_On_Show_Region func, Eina_Free_Cb data_free); EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj); @@ -646,7 +646,7 @@ EAPI void elm_widget_scroll_freeze_pop(Evas_Object *obj); EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj); EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th); EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj); -EAPI Efl_Ui_Theme_Apply_Error elm_widget_style_set(Evas_Object *obj, const char *style); +EAPI Eina_Error elm_widget_style_set(Evas_Object *obj, const char *style); EAPI const char *elm_widget_style_get(const Evas_Object *obj); EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); EAPI const char *elm_widget_type_get(const Evas_Object *obj); @@ -658,7 +658,7 @@ EAPI void elm_widget_scroll_lock_set(Evas_Object *obj, Efl_Ui_Scroll EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj); EAPI int elm_widget_scroll_child_locked_x_get(const Evas_Object *obj); EAPI int elm_widget_scroll_child_locked_y_get(const Evas_Object *obj); -EAPI Efl_Ui_Theme_Apply_Error elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle); +EAPI Eina_Error elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle); EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func); EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse); EAPI Eina_List *elm_widget_stringlist_get(const char *str); @@ -687,7 +687,7 @@ EAPI Eina_Bool elm_widget_theme_element_set(Evas_Object *obj, const char EAPI const char *elm_widget_theme_element_get(const Evas_Object *obj); EAPI Eina_Bool elm_widget_theme_style_set(Evas_Object *obj, const char *name); EAPI const char *elm_widget_theme_style_get(const Evas_Object *obj); -EAPI Efl_Ui_Theme_Apply_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name); +EAPI Eina_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name); /* debug function. don't use it unless you are tracking parenting issues */ EAPI void elm_widget_tree_dump(const Evas_Object *top); --
