summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:37:07 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-03-04 13:37:07 -0500
commitbb6caaa471f94611c081af3dc9530fbe524cd5e9 (patch)
treebb73e450597a09ac5e91e56fc8c2072376a43228
parent6b046ec845b6e0dc5d87f8d6f6524d1794678727 (diff)
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
-rw-r--r--src/lib/elementary/efl_ui.eot16
-rw-r--r--src/lib/elementary/efl_ui_button.c4
-rw-r--r--src/lib/elementary/efl_ui_calendar.c4
-rw-r--r--src/lib/elementary/efl_ui_check.c8
-rw-r--r--src/lib/elementary/efl_ui_clock.c4
-rw-r--r--src/lib/elementary/efl_ui_flip.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c4
-rw-r--r--src/lib/elementary/efl_ui_grid_default_item.c2
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c12
-rw-r--r--src/lib/elementary/efl_ui_layout_base.eo4
-rw-r--r--src/lib/elementary/efl_ui_list.c6
-rw-r--r--src/lib/elementary/efl_ui_list_default_item.c2
-rw-r--r--src/lib/elementary/efl_ui_list_empty_item.c2
-rw-r--r--src/lib/elementary/efl_ui_nstate.c4
-rw-r--r--src/lib/elementary/efl_ui_panel.c4
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c8
-rw-r--r--src/lib/elementary/efl_ui_radio.c8
-rw-r--r--src/lib/elementary/efl_ui_scroller.c4
-rw-r--r--src/lib/elementary/efl_ui_slider.c4
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c4
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c2
-rw-r--r--src/lib/elementary/efl_ui_table.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c4
-rw-r--r--src/lib/elementary/efl_ui_textpath.c4
-rw-r--r--src/lib/elementary/efl_ui_widget.c56
-rw-r--r--src/lib/elementary/efl_ui_widget.eo6
-rw-r--r--src/lib/elementary/efl_ui_win.c10
-rw-r--r--src/lib/elementary/elc_combobox.c4
-rw-r--r--src/lib/elementary/elc_ctxpopup.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_hoversel.c4
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c4
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elc_player.c4
-rw-r--r--src/lib/elementary/elc_popup.c2
-rw-r--r--src/lib/elementary/elm_actionslider.c4
-rw-r--r--src/lib/elementary/elm_box.c4
-rw-r--r--src/lib/elementary/elm_calendar.c4
-rw-r--r--src/lib/elementary/elm_clock.c4
-rw-r--r--src/lib/elementary/elm_code_widget.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c4
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_diskselector.c4
-rw-r--r--src/lib/elementary/elm_entry.c6
-rw-r--r--src/lib/elementary/elm_flipselector.c4
-rw-r--r--src/lib/elementary/elm_gengrid.c6
-rw-r--r--src/lib/elementary/elm_genlist.c6
-rw-r--r--src/lib/elementary/elm_grid.c4
-rw-r--r--src/lib/elementary/elm_hover.c4
-rw-r--r--src/lib/elementary/elm_icon.c4
-rw-r--r--src/lib/elementary/elm_index.c4
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_list.c4
-rw-r--r--src/lib/elementary/elm_main.c14
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_mapbuf.c4
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_notify.c6
-rw-r--r--src/lib/elementary/elm_panel.c4
-rw-r--r--src/lib/elementary/elm_photo.c4
-rw-r--r--src/lib/elementary/elm_plug.c4
-rw-r--r--src/lib/elementary/elm_priv.h4
-rw-r--r--src/lib/elementary/elm_route.c4
-rw-r--r--src/lib/elementary/elm_scroller.c4
-rw-r--r--src/lib/elementary/elm_segment_control.c4
-rw-r--r--src/lib/elementary/elm_separator.c4
-rw-r--r--src/lib/elementary/elm_slider.c4
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_table.c4
-rw-r--r--src/lib/elementary/elm_theme.c4
-rw-r--r--src/lib/elementary/elm_toolbar.c4
-rw-r--r--src/lib/elementary/elm_widget.h8
78 files changed, 201 insertions, 211 deletions
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index 7f643fd..bc9c2bc 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -1,15 +1,11 @@
1/* Efl.Ui enum and struct types */ 1/* Efl.Ui enum and struct types */
2import eina_types;
2 3
3enum Efl.Ui.Theme_Apply_Error 4var Efl.Ui.Theme.Apply_Error.NONE: Eina.Error; [[Successfully applied the requested style from the current theme.]]
4{ 5var Efl.Ui.Theme.Apply_Error.DEFAULT: Eina.Error; [[Successfully applied the default style. The widget may
5 [[Return error code when setting the style on a widget.]] 6 look different from the rest of the UI if a custom theme
6 none = 0, [[Successfully applied the requested style from the current 7 is in use, but it should be usable.]]
7 theme.]] 8var Efl.Ui.Theme.Apply_Error.GENERIC: Eina.Error; [[Failed to apply theme. The widget may become unusable.]]
8 default = 1, [[Successfully applied the default style. The widget may
9 look different from the rest of the UI if a custom theme
10 is in use, but it should be usable.]]
11 generic = 2, [[Failed to apply theme. The widget may become unusable.]]
12}
13 9
14enum Efl.Ui.Focus.Direction 10enum Efl.Ui.Focus.Direction
15{ 11{
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index f854881..cae0dbd 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)
442/* FIXME: replicated from elm_layout just because button's icon spot 442/* FIXME: replicated from elm_layout just because button's icon spot
443 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 443 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
444 * can changed the theme API */ 444 * can changed the theme API */
445EOLIAN static Efl_Ui_Theme_Apply_Error 445EOLIAN static Eina_Error
446_efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 446_efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
447{ 447{
448 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 448 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
449 449
450 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS)); 450 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS));
451 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 451 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 b2602d3..a4df182 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)
510 } 510 }
511} 511}
512 512
513EOLIAN static Efl_Ui_Theme_Apply_Error 513EOLIAN static Eina_Error
514_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) 514_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd)
515{ 515{
516 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 516 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
517 517
518 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 518 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
519 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 519 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 b079796..175c47f 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)
135 return EINA_TRUE; 135 return EINA_TRUE;
136} 136}
137 137
138EOLIAN static Efl_Ui_Theme_Apply_Error 138EOLIAN static Eina_Error
139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) 139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
140{ 140{
141 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 141 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
142 142
143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
144 144
@@ -491,10 +491,10 @@ _icon_signal_emit(Evas_Object *obj)
491/* FIXME: replicated from elm_layout just because check's icon spot 491/* FIXME: replicated from elm_layout just because check's icon spot
492 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 492 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
493 * can changed the theme API */ 493 * can changed the theme API */
494EOLIAN static Efl_Ui_Theme_Apply_Error 494EOLIAN static Eina_Error
495_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 495_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
496{ 496{
497 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 497 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
498 498
499 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS)); 499 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS));
500 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 500 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 c44b47a..5c83d83 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)
514 evas_object_size_hint_max_set(obj, -1, -1); 514 evas_object_size_hint_max_set(obj, -1, -1);
515} 515}
516 516
517EOLIAN static Efl_Ui_Theme_Apply_Error 517EOLIAN static Eina_Error
518_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) 518_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
519{ 519{
520 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 520 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
521 521
522 Clock_Field *field; 522 Clock_Field *field;
523 char buf[BUFFER_SIZE]; 523 char buf[BUFFER_SIZE];
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 84b4683..34e492f 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)
97 evas_object_size_hint_max_set(obj, maxw, maxh); 97 evas_object_size_hint_max_set(obj, maxw, maxh);
98} 98}
99 99
100EOLIAN static Efl_Ui_Theme_Apply_Error 100EOLIAN static Eina_Error
101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 103 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
106 106
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 863a880..d70bf56 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
844} 844}
845 845
846 846
847EOLIAN static Efl_Ui_Theme_Apply_Error 847EOLIAN static Eina_Error
848_efl_ui_grid_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd) 848_efl_ui_grid_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Grid_Data *pd)
849{ 849{
850 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 850 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
851 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 851 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
852 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 852 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
853 853
diff --git a/src/lib/elementary/efl_ui_grid_default_item.c b/src/lib/elementary/efl_ui_grid_default_item.c
index d874823..d088429 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)
23 Eo *eo; 23 Eo *eo;
24 eo = efl_finalize(efl_super(obj, MY_CLASS)); 24 eo = efl_finalize(efl_super(obj, MY_CLASS));
25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
26 Efl_Ui_Theme_Apply_Error theme_apply = efl_ui_layout_theme_set(obj, "grid_item", NULL, NULL); 26 Eina_Error theme_apply = efl_ui_layout_theme_set(obj, "grid_item", NULL, NULL);
27 27
28 if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC) 28 if (theme_apply == EFL_UI_THEME_APPLY_ERROR_GENERIC)
29 CRI("Default Item(%p) failed to set theme [efl/grid_item]!", eo); 29 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 91b70a2..9a743c4 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
717 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip); 717 if (sd->prev_img) evas_object_clip_set(sd->prev_img, clip);
718} 718}
719 719
720EOLIAN static Efl_Ui_Theme_Apply_Error 720EOLIAN static Eina_Error
721_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED) 721_efl_ui_image_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED)
722{ 722{
723 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 723 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
724 724
725 if (sd->stdicon) 725 if (sd->stdicon)
726 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 726 _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 51506f5..fd25b6f 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
920 return EINA_TRUE; 920 return EINA_TRUE;
921} 921}
922 922
923EOLIAN static Efl_Ui_Theme_Apply_Error 923EOLIAN static Eina_Error
924_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd) 924_efl_ui_image_zoomable_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
925{ 925{
926 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 926 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
927 Eina_Bool fdo = EINA_FALSE; 927 Eina_Bool fdo = EINA_FALSE;
928 928
929 if (sd->stdicon) 929 if (sd->stdicon)
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index d4d2323..1662adc 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
445 _flush_mirrored_state(obj); 445 _flush_mirrored_state(obj);
446} 446}
447 447
448static Efl_Ui_Theme_Apply_Error 448static Eina_Error
449_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd) 449_efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
450{ 450{
451 Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 451 Eina_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
452 452
453 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 453 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
454 454
@@ -471,10 +471,10 @@ _efl_ui_layout_theme_internal(Eo *obj, Efl_Ui_Layout_Data *sd)
471 return ret; 471 return ret;
472} 472}
473 473
474EOLIAN static Efl_Ui_Theme_Apply_Error 474EOLIAN static Eina_Error
475_efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd) 475_efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Layout_Data *sd)
476{ 476{
477 Efl_Ui_Theme_Apply_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 477 Eina_Error theme_apply_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
478 478
479 theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 479 theme_apply_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
480 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC; 480 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,
920 if (style) *style = elm_widget_theme_style_get(obj); 920 if (style) *style = elm_widget_theme_style_get(obj);
921} 921}
922 922
923EOLIAN static Efl_Ui_Theme_Apply_Error 923EOLIAN static Eina_Error
924_efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style) 924_efl_ui_layout_base_theme_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *klass, const char *group, const char *style)
925{ 925{
926 Eina_Bool changed = EINA_FALSE; 926 Eina_Bool changed = EINA_FALSE;
@@ -2944,7 +2944,7 @@ elm_layout_data_get(const Evas_Object *obj, const char *key)
2944EAPI Eina_Bool 2944EAPI Eina_Bool
2945elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style) 2945elm_layout_theme_set(Evas_Object *obj, const char *klass, const char *group, const char *style)
2946{ 2946{
2947 Efl_Ui_Theme_Apply_Error theme_apply_ret; 2947 Eina_Error theme_apply_ret;
2948 2948
2949 theme_apply_ret = efl_ui_layout_theme_set(obj, klass, group, style); 2949 theme_apply_ret = efl_ui_layout_theme_set(obj, klass, group, style);
2950 return (theme_apply_ret != EFL_UI_THEME_APPLY_ERROR_GENERIC); 2950 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 e63d7dc..31cf703 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
30 If this returns $false the widget is very likely to become 30 If this returns $false the widget is very likely to become
31 non-functioning. 31 non-functioning.
32 ]] 32 ]]
33 return: Efl.Ui.Theme_Apply_Error(2); 33 return: Eina.Error;
34 [[Whether the style was successfully applied or not, see 34 [[Whether the style was successfully applied or not, see
35 the values of @Efl.Ui.Theme_Apply_Error for more information.]] 35 the values of Efl.Ui.Theme.Apply_Error for more information.]]
36 } 36 }
37 get { 37 get {
38 [[Get information about the current theme in use.]] 38 [[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 f27beb0..8c8cd03 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,
426 426
427 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 427 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
428 428
429 Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj)); 429 Eina_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list", "base", efl_ui_widget_style_get(obj));
430 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) 430 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
431 CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL"); 431 CRI("list(%p) failed to set theme [efl/list:%s]!", obj, efl_ui_widget_style_get(obj) ?: "NULL");
432 432
@@ -599,10 +599,10 @@ _efl_ui_list_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_List_Data
599 } 599 }
600 */ 600 */
601 601
602EOLIAN static Efl_Ui_Theme_Apply_Error 602EOLIAN static Eina_Error
603_efl_ui_list_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_List_Data *pd) 603_efl_ui_list_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_List_Data *pd)
604{ 604{
605 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 605 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
606 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 606 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
607 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 607 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
608 608
diff --git a/src/lib/elementary/efl_ui_list_default_item.c b/src/lib/elementary/efl_ui_list_default_item.c
index 2021d84..3fcf9e7 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)
23 Eo *eo; 23 Eo *eo;
24 eo = efl_finalize(efl_super(obj, MY_CLASS)); 24 eo = efl_finalize(efl_super(obj, MY_CLASS));
25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 25 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
26 Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL); 26 Eina_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, NULL);
27 27
28 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) 28 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
29 CRI("Default Item(%p) failed to set theme [efl/list_item]!", eo); 29 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 168be2d..bc4aab1 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)
21 Eo *eo; 21 Eo *eo;
22 eo = efl_finalize(efl_super(obj, MY_CLASS)); 22 eo = efl_finalize(efl_super(obj, MY_CLASS));
23 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo); 23 ELM_WIDGET_DATA_GET_OR_RETURN(eo, wd, eo);
24 Efl_Ui_Theme_Apply_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty"); 24 Eina_Error theme_apply_ret = efl_ui_layout_theme_set(obj, "list_item", NULL, "empty");
25 25
26 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) 26 if (theme_apply_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
27 CRI("Empty Item(%p) failed to set theme [efl/list_item:empty]!", eo); 27 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 341f2b3..a435c54 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)
116 _state_active(obj, pd); 116 _state_active(obj, pd);
117} 117}
118 118
119EOLIAN static Efl_Ui_Theme_Apply_Error 119EOLIAN static Eina_Error
120_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd) 120_efl_ui_nstate_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Nstate_Data *pd)
121{ 121{
122 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 122 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
123 123
124 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 124 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
125 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 125 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 48f854c..b92aeaf 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)
198 _access_obj_process(obj, EINA_TRUE); 198 _access_obj_process(obj, EINA_TRUE);
199} 199}
200 200
201EOLIAN static Efl_Ui_Theme_Apply_Error 201EOLIAN static Eina_Error
202_efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd) 202_efl_ui_panel_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panel_Data *sd)
203{ 203{
204 const char *str; 204 const char *str;
205 Evas_Coord minw = 0, minh = 0; 205 Evas_Coord minw = 0, minh = 0;
206 206
207 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 207 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
208 208
209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
210 210
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index d7a13b4..f732a01 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)
110 return eina_strbuf_release(new_group); 110 return eina_strbuf_release(new_group);
111} 111}
112 112
113EOLIAN static Efl_Ui_Theme_Apply_Error 113EOLIAN static Eina_Error
114_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd) 114_efl_ui_panes_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Panes_Data *sd)
115{ 115{
116 double size; 116 double size;
117 Evas_Coord minw = 0, minh = 0; 117 Evas_Coord minw = 0, minh = 0;
118 char *group; 118 char *group;
119 119
120 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 120 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
121 121
122 group = _efl_ui_panes_theme_group_get(obj, sd); 122 group = _efl_ui_panes_theme_group_get(obj, sd);
123 if (group) 123 if (group)
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index ecd6cc7..4977e10 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
232 return eina_strbuf_release(new_group); 232 return eina_strbuf_release(new_group);
233} 233}
234 234
235EOLIAN static Efl_Ui_Theme_Apply_Error 235EOLIAN static Eina_Error
236_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd) 236_efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *sd)
237{ 237{
238 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 238 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
239 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 239 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
240 char *group; 240 char *group;
241 241
@@ -819,10 +819,10 @@ _icon_signal_emit(Evas_Object *obj)
819/* FIXME: replicated from elm_layout just because progressbar's icon spot 819/* FIXME: replicated from elm_layout just because progressbar's icon spot
820 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 820 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
821 * can changed the theme API */ 821 * can changed the theme API */
822EOLIAN static Efl_Ui_Theme_Apply_Error 822EOLIAN static Eina_Error
823_efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 823_efl_ui_progressbar_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
824{ 824{
825 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 825 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
826 826
827 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS)); 827 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_PROGRESSBAR_LEGACY_CLASS));
828 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 828 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 cdb6678..e31ada9 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)
147 return EINA_TRUE; 147 return EINA_TRUE;
148} 148}
149 149
150EOLIAN static Efl_Ui_Theme_Apply_Error 150EOLIAN static Eina_Error
151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd) 151_efl_ui_radio_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Radio_Data *sd)
152{ 152{
153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 153 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
154 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 154 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
155 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS)); 155 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_CLASS));
156 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 156 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
157 157
@@ -414,10 +414,10 @@ _icon_signal_emit(Evas_Object *obj)
414 elm_layout_sizing_eval(obj); 414 elm_layout_sizing_eval(obj);
415} 415}
416 416
417EOLIAN static Efl_Ui_Theme_Apply_Error 417EOLIAN static Eina_Error
418_efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 418_efl_ui_radio_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
419{ 419{
420 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 420 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
421 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS)); 421 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_RADIO_LEGACY_CLASS));
422 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 422 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
423 423
diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c
index 72d1786..5891e42 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)
678 efl_gfx_hint_size_min_set(obj, size); 678 efl_gfx_hint_size_min_set(obj, size);
679} 679}
680 680
681EOLIAN static Efl_Ui_Theme_Apply_Error 681EOLIAN static Eina_Error
682_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd) 682_efl_ui_scroller_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Scroller_Data *sd)
683{ 683{
684 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 684 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
685 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 685 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
686 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 686 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
687 687
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index fbb11ed..14dcb87 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)
423 return eina_strbuf_release(new_group); 423 return eina_strbuf_release(new_group);
424} 424}
425 425
426EOLIAN static Efl_Ui_Theme_Apply_Error 426EOLIAN static Eina_Error
427_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd) 427_efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
428{ 428{
429 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 429 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
430 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 430 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
431 char *group; 431 char *group;
432 432
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 8a26509..e8e8d79 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
788} 788}
789 789
790 790
791EOLIAN static Efl_Ui_Theme_Apply_Error 791EOLIAN static Eina_Error
792_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED) 792_efl_ui_spin_button_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
793{ 793{
794 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 794 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
795 char *group; 795 char *group;
796 796
797 group = _efl_ui_spin_button_theme_group_get(obj, sd); 797 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 9d1a0f6..077212c 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)
213{ 213{
214 Eo *tab, *icon_obj; 214 Eo *tab, *icon_obj;
215 Tab_Info *ti; 215 Tab_Info *ti;
216 Efl_Ui_Theme_Apply_Error theme_apply; 216 Eina_Error theme_apply;
217 217
218 ti = calloc(1, sizeof(*ti)); 218 ti = calloc(1, sizeof(*ti));
219 219
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 197a69e..be666e8 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)
28 evas_object_table_mirrored_set(wd->resize_obj, rtl); 28 evas_object_table_mirrored_set(wd->resize_obj, rtl);
29} 29}
30 30
31EOLIAN static Efl_Ui_Theme_Apply_Error 31EOLIAN static Eina_Error
32_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED) 32_efl_ui_table_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Table_Data *pd EINA_UNUSED)
33{ 33{
34 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 34 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
35 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 35 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
36 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 36 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
37 37
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index aed0c99..1a50a74 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
733 733
734/* we can't issue the layout's theming code here, cause it assumes an 734/* we can't issue the layout's theming code here, cause it assumes an
735 * unique edje object, always */ 735 * unique edje object, always */
736EOLIAN static Efl_Ui_Theme_Apply_Error 736EOLIAN static Eina_Error
737_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd) 737_efl_ui_text_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Text_Data *sd)
738{ 738{
739 Efl_Ui_Theme_Apply_Error theme_apply; 739 Eina_Error theme_apply;
740 740
741 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 741 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
742 742
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index 1c39f11..423e258 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
653 return edje_object_part_text_get(pd->text_obj, "efl.text"); 653 return edje_object_part_text_get(pd->text_obj, "efl.text");
654} 654}
655 655
656EOLIAN static Efl_Ui_Theme_Apply_Error 656EOLIAN static Eina_Error
657_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd) 657_efl_ui_textpath_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Textpath_Data *pd)
658{ 658{
659 Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 659 Eina_Error ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
660 660
661 ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 661 ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
662 if (ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return EFL_UI_THEME_APPLY_ERROR_GENERIC; 662 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 473be09..6beffdd 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
1192{ 1192{
1193} 1193}
1194 1194
1195EAPI Efl_Ui_Theme_Apply_Error 1195static void
1196_elm_widget_theme_helper(Eina_Error err, Eina_Bool *err_default, Eina_Bool *err_generic)
1197{
1198 if (err == EFL_UI_THEME_APPLY_ERROR_DEFAULT)
1199 *err_default = EINA_TRUE;
1200 else if (err == EFL_UI_THEME_APPLY_ERROR_GENERIC)
1201 *err_generic = EINA_TRUE;
1202}
1203
1204EAPI Eina_Error
1196elm_widget_theme(Evas_Object *obj) 1205elm_widget_theme(Evas_Object *obj)
1197{ 1206{
1198 const Eina_List *l; 1207 const Eina_List *l;
@@ -1206,46 +1215,17 @@ elm_widget_theme(Evas_Object *obj)
1206 1215
1207 EINA_LIST_FOREACH(sd->subobjs, l, child) 1216 EINA_LIST_FOREACH(sd->subobjs, l, child)
1208 if (_elm_widget_is(child)) 1217 if (_elm_widget_is(child))
1209 { 1218 _elm_widget_theme_helper(elm_widget_theme(child), &err_default, &err_generic);
1210 switch (elm_widget_theme(child))
1211 {
1212 case EFL_UI_THEME_APPLY_ERROR_DEFAULT:
1213 err_default = EINA_TRUE;
1214 break;
1215 case EFL_UI_THEME_APPLY_ERROR_GENERIC:
1216 err_generic = EINA_TRUE;
1217 break;
1218 default: break;
1219 }
1220 }
1221 1219
1222 if (sd->hover_obj) 1220 if (sd->hover_obj)
1223 switch (elm_widget_theme(sd->hover_obj)) 1221 _elm_widget_theme_helper(elm_widget_theme(sd->hover_obj), &err_default, &err_generic);
1224 {
1225 case EFL_UI_THEME_APPLY_ERROR_DEFAULT:
1226 err_default = EINA_TRUE;
1227 break;
1228 case EFL_UI_THEME_APPLY_ERROR_GENERIC:
1229 err_generic = EINA_TRUE;
1230 break;
1231 default: break;
1232 }
1233 1222
1234 EINA_LIST_FOREACH(sd->tooltips, l, tt) 1223 EINA_LIST_FOREACH(sd->tooltips, l, tt)
1235 elm_tooltip_theme(tt); 1224 elm_tooltip_theme(tt);
1236 EINA_LIST_FOREACH(sd->cursors, l, cur) 1225 EINA_LIST_FOREACH(sd->cursors, l, cur)
1237 elm_cursor_theme(cur); 1226 elm_cursor_theme(cur);
1238 1227
1239 switch (efl_ui_widget_theme_apply(obj)) 1228 _elm_widget_theme_helper(efl_ui_widget_theme_apply(obj), &err_default, &err_generic);
1240 {
1241 case EFL_UI_THEME_APPLY_ERROR_DEFAULT:
1242 err_default = EINA_TRUE;
1243 break;
1244 case EFL_UI_THEME_APPLY_ERROR_GENERIC:
1245 err_generic = EINA_TRUE;
1246 break;
1247 default: break;
1248 }
1249 if (err_generic) return EFL_UI_THEME_APPLY_ERROR_GENERIC; 1229 if (err_generic) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
1250 if (err_default) return EFL_UI_THEME_APPLY_ERROR_DEFAULT; 1230 if (err_default) return EFL_UI_THEME_APPLY_ERROR_DEFAULT;
1251 return EFL_UI_THEME_APPLY_ERROR_NONE; 1231 return EFL_UI_THEME_APPLY_ERROR_NONE;
@@ -1296,7 +1276,7 @@ elm_widget_theme_specific(Evas_Object *obj,
1296 efl_ui_widget_theme_apply(obj); 1276 efl_ui_widget_theme_apply(obj);
1297} 1277}
1298 1278
1299EOLIAN static Efl_Ui_Theme_Apply_Error 1279EOLIAN static Eina_Error
1300_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) 1280_efl_ui_widget_theme_apply(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
1301{ 1281{
1302 _elm_widget_mirrored_reload(obj); 1282 _elm_widget_mirrored_reload(obj);
@@ -2827,7 +2807,7 @@ elm_widget_theme_get(const Evas_Object *obj)
2827 return sd->theme; 2807 return sd->theme;
2828} 2808}
2829 2809
2830EOLIAN static Efl_Ui_Theme_Apply_Error 2810EOLIAN static Eina_Error
2831_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style) 2811_efl_ui_widget_style_set(Eo *obj, Elm_Widget_Smart_Data *sd, const char *style)
2832{ 2812{
2833 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj)) 2813 if (!elm_widget_is_legacy(obj) && efl_finalized_get(obj))
@@ -2938,7 +2918,7 @@ elm_widget_scroll_child_locked_y_get(const Eo *obj)
2938 return sd->child_drag_y_locked; 2918 return sd->child_drag_y_locked;
2939} 2919}
2940 2920
2941EAPI Efl_Ui_Theme_Apply_Error 2921EAPI Eina_Error
2942elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle) 2922elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle)
2943{ 2923{
2944 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); 2924 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)
3554 * @param name An element name of sub object. 3534 * @param name An element name of sub object.
3555 * @return Whether the style was successfully applied or not. 3535 * @return Whether the style was successfully applied or not.
3556 */ 3536 */
3557EAPI Efl_Ui_Theme_Apply_Error 3537EAPI Eina_Error
3558elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name) 3538elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name)
3559{ 3539{
3560 Efl_Ui_Theme_Apply_Error ret = EFL_UI_THEME_APPLY_ERROR_NONE; 3540 Eina_Error ret = EFL_UI_THEME_APPLY_ERROR_NONE;
3561 Eina_Bool changed = EINA_FALSE; 3541 Eina_Bool changed = EINA_FALSE;
3562 const char *obj_group; 3542 const char *obj_group;
3563 Eina_Stringshare *group; 3543 Eina_Stringshare *group;
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 5547a0b..19e36a9 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
144 ]] 144 ]]
145 set @protected { 145 set @protected {
146 [[Can only be called during construction, before finalize.]] 146 [[Can only be called during construction, before finalize.]]
147 return: Efl.Ui.Theme_Apply_Error(2); 147 return: Eina.Error;
148 [[Whether the style was successfully applied or not, see 148 [[Whether the style was successfully applied or not, see
149 the values of @Efl.Ui.Theme_Apply_Error for more information.]] 149 the values of Efl.Ui.Theme.Apply_Error for more information.]]
150 } 150 }
151 get { 151 get {
152 [[Returns the current style of a widget.]] 152 [[Returns the current style of a widget.]]
@@ -298,7 +298,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
298 Note: even widgets not based on layouts may override this method 298 Note: even widgets not based on layouts may override this method
299 to handle widget updates (scale, mirrored mode, etc...). 299 to handle widget updates (scale, mirrored mode, etc...).
300 ]] 300 ]]
301 return: Efl.Ui.Theme_Apply_Error; [[Indicates success, and if the current 301 return: Eina.Error; [[Indicates success, and if the current
302 theme or default theme was used.]] 302 theme or default theme was used.]]
303 } 303 }
304 304
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 786c093..e5ebbd2 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,
378 void *event_info); 378 void *event_info);
379static void 379static void
380_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj); 380_elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj);
381static Efl_Ui_Theme_Apply_Error _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd); 381static Eina_Error _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd);
382static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style); 382static void _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style);
383static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc); 383static void _elm_win_frame_style_update(Efl_Ui_Win_Data *sd, Eina_Bool force_emit, Eina_Bool calc);
384static inline void _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine); 384static 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
6959 return sd->focus_highlight.enabled; 6959 return sd->focus_highlight.enabled;
6960} 6960}
6961 6961
6962static Efl_Ui_Theme_Apply_Error 6962static Eina_Error
6963_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd) 6963_elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6964{ 6964{
6965 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 6965 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
6966 Eina_Bool prev_alpha; 6966 Eina_Bool prev_alpha;
6967 const char *s; 6967 const char *s;
6968 6968
@@ -6985,10 +6985,10 @@ _elm_win_theme_internal(Eo *obj, Efl_Ui_Win_Data *sd)
6985 return int_ret; 6985 return int_ret;
6986} 6986}
6987 6987
6988EOLIAN static Efl_Ui_Theme_Apply_Error 6988EOLIAN static Eina_Error
6989_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd) 6989_efl_ui_win_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Win_Data *sd)
6990{ 6990{
6991 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 6991 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
6992 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 6992 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
6993 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 6993 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
6994 6994
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 532f707..c6a5792 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
79 efl_ui_l10n_translation_update(sd->hover); 79 efl_ui_l10n_translation_update(sd->hover);
80} 80}
81 81
82EOLIAN static Efl_Ui_Theme_Apply_Error 82EOLIAN static Eina_Error
83_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd) 83_elm_combobox_efl_ui_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
84{ 84{
85 const char *style; 85 const char *style;
86 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 86 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
87 Eina_Bool mirrored; 87 Eina_Bool mirrored;
88 char buf[128]; 88 char buf[128];
89 89
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 11ee0f4..1d10e82 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -666,10 +666,10 @@ _on_content_resized(void *data,
666} 666}
667 667
668//FIXME: lost the content size when theme hook is called. 668//FIXME: lost the content size when theme hook is called.
669EOLIAN static Efl_Ui_Theme_Apply_Error 669EOLIAN static Eina_Error
670_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd) 670_elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
671{ 671{
672 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 672 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
673 673
674 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 674 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
675 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 675 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 41aa86b..096f02c 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
226 return efl_model_property_set(model, property_name, eina_value_string_new(property_value)); 226 return efl_model_property_set(model, property_name, eina_value_string_new(property_value));
227} 227}
228 228
229EOLIAN static Efl_Ui_Theme_Apply_Error 229EOLIAN static Eina_Error
230_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd) 230_elm_fileselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Data *sd)
231{ 231{
232 const char *style; 232 const char *style;
233 const char *data; 233 const char *data;
234 char buf[1024]; 234 char buf[1024];
235 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 235 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
236 236
237 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 237 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
238 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 238 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 abbf8bd..8f2b763 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[] = {
38}; 38};
39#undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS 39#undef ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS
40 40
41EOLIAN static Efl_Ui_Theme_Apply_Error 41EOLIAN static Eina_Error
42_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED) 42_elm_fileselector_button_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Button_Data *sd EINA_UNUSED)
43{ 43{
44 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 44 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
45 45
46 char buf[4096]; 46 char buf[4096];
47 const char *style; 47 const char *style;
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index c9ec1ac..4b84254 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
127 evas_object_size_hint_max_set(obj, -1, -1); 127 evas_object_size_hint_max_set(obj, -1, -1);
128} 128}
129 129
130EOLIAN static Efl_Ui_Theme_Apply_Error 130EOLIAN static Eina_Error
131_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd) 131_elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entry_Data *sd)
132{ 132{
133 const char *style; 133 const char *style;
@@ -135,7 +135,7 @@ _elm_fileselector_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Fileselector_Entr
135 135
136 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 136 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
137 137
138 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 138 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
139 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 139 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
140 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 140 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
141 141
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 25df36a..54679aa 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
63 efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS)); 63 efl_ui_l10n_translation_update(efl_super(obj, MY_CLASS));
64} 64}
65 65
66EOLIAN static Efl_Ui_Theme_Apply_Error 66EOLIAN static Eina_Error
67_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd) 67_elm_hoversel_efl_ui_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
68{ 68{
69 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 69 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
70 Eina_List *l; 70 Eina_List *l;
71 Elm_Object_Item *eo_item; 71 Elm_Object_Item *eo_item;
72 72
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 89b34de..8858cf6 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)
91 return strdup(buf); 91 return strdup(buf);
92} 92}
93 93
94EOLIAN static Efl_Ui_Theme_Apply_Error 94EOLIAN static Eina_Error
95_elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd) 95_elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Data *sd)
96{ 96{
97 const char *str; 97 const char *str;
@@ -100,7 +100,7 @@ _elm_multibuttonentry_efl_ui_widget_theme_apply(Eo *obj, Elm_Multibuttonentry_Da
100 Elm_Object_Item *eo_item; 100 Elm_Object_Item *eo_item;
101 double pad_scale; 101 double pad_scale;
102 102
103 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 103 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
106 106
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 40b97c2..a04f98d 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)
366 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit))); 366 edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit)));
367} 367}
368 368
369EOLIAN static Efl_Ui_Theme_Apply_Error 369EOLIAN static Eina_Error
370_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd) 370_elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
371{ 371{
372 Elm_Naviframe_Item_Data *it; 372 Elm_Naviframe_Item_Data *it;
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index a28d92d..4b41566 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
185 elm_object_disabled_set(sl, elm_widget_disabled_get(obj)); 185 elm_object_disabled_set(sl, elm_widget_disabled_get(obj));
186} 186}
187 187
188EOLIAN static Efl_Ui_Theme_Apply_Error 188EOLIAN static Eina_Error
189_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd) 189_elm_player_efl_ui_widget_theme_apply(Eo *obj, Elm_Player_Data *sd)
190{ 190{
191 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 191 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
192 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 192 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
193 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 193 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
194 194
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 6c934ee..c452575 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)
365 sd->theme_scroll = EINA_FALSE; 365 sd->theme_scroll = EINA_FALSE;
366} 366}
367 367
368EOLIAN static Efl_Ui_Theme_Apply_Error 368EOLIAN static Eina_Error
369_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) 369_elm_popup_efl_ui_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd)
370{ 370{
371 Elm_Popup_Item_Data *it; 371 Elm_Popup_Item_Data *it;
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 889e4ad..b7b98f1 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)
113 (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5); 113 (wd->resize_obj, "elm.drag_button_base", 1.0 - pos, 0.5);
114} 114}
115 115
116EOLIAN static Efl_Ui_Theme_Apply_Error 116EOLIAN static Eina_Error
117_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED) 117_elm_actionslider_efl_ui_widget_theme_apply(Eo *obj, Elm_Actionslider_Data *sd EINA_UNUSED)
118{ 118{
119 Eina_Bool mirrored; 119 Eina_Bool mirrored;
120 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 120 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
121 121
122 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 122 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
123 123
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index b08a25b..24a4526 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)
57 efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); 57 efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
58} 58}
59 59
60EOLIAN static Efl_Ui_Theme_Apply_Error 60EOLIAN static Eina_Error
61_elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) 61_elm_box_efl_ui_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED)
62{ 62{
63 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 63 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
64 64
65 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 65 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
66 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 66 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 600f9d6..32a7bb9 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)
842 } 842 }
843} 843}
844 844
845EOLIAN static Efl_Ui_Theme_Apply_Error 845EOLIAN static Eina_Error
846_elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd) 846_elm_calendar_efl_ui_widget_theme_apply(Eo *obj, Elm_Calendar_Data *sd)
847{ 847{
848 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 848 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
849 849
850 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 850 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
851 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 851 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 7b57b2b..529a280 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)
627 sd->cur.ampm = -1; 627 sd->cur.ampm = -1;
628} 628}
629 629
630EOLIAN static Efl_Ui_Theme_Apply_Error 630EOLIAN static Eina_Error
631_elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED) 631_elm_clock_efl_ui_widget_theme_apply(Eo *obj, Elm_Clock_Data *sd EINA_UNUSED)
632{ 632{
633 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 633 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
634 634
635 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 635 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
636 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 636 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 e22ddf2..6a4d8ee 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)
2341 } 2341 }
2342} 2342}
2343 2343
2344EOLIAN static Efl_Ui_Theme_Apply_Error 2344EOLIAN static Eina_Error
2345_elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd) 2345_elm_code_widget_efl_ui_widget_theme_apply(Eo *obj, Elm_Code_Widget_Data *pd)
2346{ 2346{
2347 if (efl_ui_widget_theme_apply(efl_cast(obj, EFL_UI_WIDGET_CLASS)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) 2347 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 8c12e5b..7a442d6 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)
1317 } 1317 }
1318} 1318}
1319 1319
1320EOLIAN static Efl_Ui_Theme_Apply_Error 1320EOLIAN static Eina_Error
1321_elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd) 1321_elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd)
1322{ 1322{
1323 int i; 1323 int i;
@@ -1329,7 +1329,7 @@ _elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd
1329 unsigned int v_pad = DEFAULT_VER_PAD; 1329 unsigned int v_pad = DEFAULT_VER_PAD;
1330 1330
1331 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 1331 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
1332 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 1332 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
1333 1333
1334 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1334 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1335 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 1335 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 5a3ad49..67d55b6 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)
573 } 573 }
574} 574}
575 575
576EOLIAN static Efl_Ui_Theme_Apply_Error 576EOLIAN static Eina_Error
577_elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) 577_elm_conformant_efl_ui_widget_theme_apply(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
578{ 578{
579 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 579 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
580 580
581 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 581 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
582 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 582 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 cd39c5a..a2cf481 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,
123 ELM_DAYSELECTOR_MAX; 123 ELM_DAYSELECTOR_MAX;
124} 124}
125 125
126EOLIAN static Efl_Ui_Theme_Apply_Error 126EOLIAN static Eina_Error
127_elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd) 127_elm_dayselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Dayselector_Data *sd)
128{ 128{
129 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 129 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
130 130
131 Eina_List *l; 131 Eina_List *l;
132 char buf[1024]; 132 char buf[1024];
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index d789295..3fce2c9 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)
811 else sd->minh = -1; 811 else sd->minh = -1;
812} 812}
813 813
814EOLIAN static Efl_Ui_Theme_Apply_Error 814EOLIAN static Eina_Error
815_elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd) 815_elm_diskselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Diskselector_Data *sd)
816{ 816{
817 Eina_List *l; 817 Eina_List *l;
818 Elm_Diskselector_Item_Data *it; 818 Elm_Diskselector_Item_Data *it;
819 Evas_Object *blank; 819 Evas_Object *blank;
820 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 820 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
821 Evas *evas; 821 Evas *evas;
822 const char *style = elm_widget_style_get(obj); 822 const char *style = elm_widget_style_get(obj);
823 823
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 06fb546..4c4990f 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)
872 872
873/* we can't issue the layout's theming code here, cause it assumes an 873/* we can't issue the layout's theming code here, cause it assumes an
874 * unique edje object, always */ 874 * unique edje object, always */
875EOLIAN static Efl_Ui_Theme_Apply_Error 875EOLIAN static Eina_Error
876_elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd) 876_elm_entry_efl_ui_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
877{ 877{
878 const char *str; 878 const char *str;
879 const char *t; 879 const char *t;
880 const char *stl_user; 880 const char *stl_user;
881 const char *style = elm_widget_style_get(obj); 881 const char *style = elm_widget_style_get(obj);
882 Efl_Ui_Theme_Apply_Error theme_apply; 882 Eina_Error theme_apply;
883 int cursor_pos; 883 int cursor_pos;
884 884
885 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 885 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)
974 974
975 if (sd->scroll) 975 if (sd->scroll)
976 { 976 {
977 Efl_Ui_Theme_Apply_Error err = EFL_UI_THEME_APPLY_ERROR_GENERIC; 977 Eina_Error err = EFL_UI_THEME_APPLY_ERROR_GENERIC;
978 978
979 efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj)); 979 efl_ui_mirrored_set(obj, efl_ui_mirrored_get(obj));
980 980
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 99c1f94..86f66e0 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -350,12 +350,12 @@ _item_new(Evas_Object *obj,
350 return eo_item; 350 return eo_item;
351} 351}
352 352
353EOLIAN static Efl_Ui_Theme_Apply_Error 353EOLIAN static Eina_Error
354_elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd) 354_elm_flipselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Flipselector_Data *sd)
355{ 355{
356 const char *max_len; 356 const char *max_len;
357 357
358 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 358 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 359 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
360 360
361 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 361 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 243e5d6..d51a15a 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)
1170 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd); 1170 ELM_GENGRID_DATA_GET_FROM_ITEM(it, sd);
1171 snprintf(buf, sizeof(buf), "item/%s", style ? style : "default"); 1171 snprintf(buf, sizeof(buf), "item/%s", style ? style : "default");
1172 1172
1173 Efl_Ui_Theme_Apply_Error th_ret = 1173 Eina_Error th_ret =
1174 elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf, 1174 elm_widget_theme_object_set(WIDGET(it), view, "gengrid", buf,
1175 elm_widget_style_get(WIDGET(it))); 1175 elm_widget_style_get(WIDGET(it)));
1176 if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) 1176 if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
@@ -3589,10 +3589,10 @@ _mirrored_set(Evas_Object *obj,
3589 } 3589 }
3590} 3590}
3591 3591
3592EOLIAN static Efl_Ui_Theme_Apply_Error 3592EOLIAN static Eina_Error
3593_elm_gengrid_efl_ui_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) 3593_elm_gengrid_efl_ui_widget_theme_apply(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
3594{ 3594{
3595 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 3595 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
3596 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 3596 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
3597 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 3597 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
3598 3598
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 164deaa..86f9748 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)
566 "",style ? : "default"); 566 "",style ? : "default");
567 } 567 }
568 568
569 Efl_Ui_Theme_Apply_Error th_ret = 569 Eina_Error th_ret =
570 elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf, 570 elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
571 elm_widget_style_get(WIDGET(it))); 571 elm_widget_style_get(WIDGET(it)));
572 if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) 572 if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
@@ -3533,11 +3533,11 @@ _mirrored_set(Evas_Object *obj,
3533 efl_ui_mirrored_set(obj, rtl); 3533 efl_ui_mirrored_set(obj, rtl);
3534} 3534}
3535 3535
3536EOLIAN static Efl_Ui_Theme_Apply_Error 3536EOLIAN static Eina_Error
3537_elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd) 3537_elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
3538{ 3538{
3539 Item_Block *itb; 3539 Item_Block *itb;
3540 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 3540 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
3541 Eina_List *l; 3541 Eina_List *l;
3542 Elm_Gen_Item *it; 3542 Elm_Gen_Item *it;
3543 Evas *e; 3543 Evas *e;
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 453da6c..16b3e2d 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)
40 evas_object_grid_mirrored_set(wd->resize_obj, rtl); 40 evas_object_grid_mirrored_set(wd->resize_obj, rtl);
41} 41}
42 42
43EOLIAN static Efl_Ui_Theme_Apply_Error 43EOLIAN static Eina_Error
44_elm_grid_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 44_elm_grid_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
45{ 45{
46 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 46 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
47 47
48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
49 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 49 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 ddd711b..682c968 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)
298 } 298 }
299} 299}
300 300
301EOLIAN static Efl_Ui_Theme_Apply_Error 301EOLIAN static Eina_Error
302_elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) 302_elm_hover_efl_ui_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd)
303{ 303{
304 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 304 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
305 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 305 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
306 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 306 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
307 307
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index e326553..e7bed43 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)
366 return 0; 366 return 0;
367} 367}
368 368
369EOLIAN static Efl_Ui_Theme_Apply_Error 369EOLIAN static Eina_Error
370_elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd) 370_elm_icon_efl_ui_widget_theme_apply(Eo *obj, Elm_Icon_Data *sd)
371{ 371{
372 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 372 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
373 373
374 if (sd->stdicon) 374 if (sd->stdicon)
375 _elm_theme_object_icon_set(obj, sd->stdicon, elm_widget_style_get(obj)); 375 _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 67ee93e..2631875 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)
432 } 432 }
433} 433}
434 434
435EOLIAN static Efl_Ui_Theme_Apply_Error 435EOLIAN static Eina_Error
436_elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd) 436_elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
437{ 437{
438 Evas_Coord minw = 0, minh = 0; 438 Evas_Coord minw = 0, minh = 0;
439 Elm_Object_Item *eo_item; 439 Elm_Object_Item *eo_item;
440 440
441 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 441 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
442 442
443 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 443 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
444 444
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 9e2dbae..06f6ba3 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)
182 edje_object_message_signal_process(wd->resize_obj); 182 edje_object_message_signal_process(wd->resize_obj);
183} 183}
184 184
185EOLIAN static Efl_Ui_Theme_Apply_Error 185EOLIAN static Eina_Error
186_elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd) 186_elm_label_efl_ui_widget_theme_apply(Eo *obj, Elm_Label_Data *sd)
187{ 187{
188 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 188 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
189 189
190 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 190 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
191 191
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 686a04b..74db37f 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1115,13 +1115,13 @@ _mirrored_set(Evas_Object *obj,
1115 } 1115 }
1116} 1116}
1117 1117
1118EOLIAN static Efl_Ui_Theme_Apply_Error 1118EOLIAN static Eina_Error
1119_elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd) 1119_elm_list_efl_ui_widget_theme_apply(Eo *obj, Elm_List_Data *sd)
1120{ 1120{
1121 Elm_Object_Item *eo_it; 1121 Elm_Object_Item *eo_it;
1122 Eina_List *n; 1122 Eina_List *n;
1123 1123
1124 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 1124 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
1125 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1125 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1126 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 1126 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1127 1127
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 3cb2318..e470600 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
398 return ECORE_CALLBACK_PASS_ON; 398 return ECORE_CALLBACK_PASS_ON;
399} 399}
400 400
401EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_NONE = 0;
402EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_DEFAULT = 0;
403EAPI Eina_Error EFL_UI_THEME_APPLY_ERROR_GENERIC = 0;
404
405static void
406_efl_ui_theme_apply_error_init(void)
407{
408 if (EFL_UI_THEME_APPLY_ERROR_DEFAULT) return;
409 /* NONE should always be 0 */
410 EFL_UI_THEME_APPLY_ERROR_DEFAULT = eina_error_msg_static_register("Fallback to default style was enabled for this widget");
411 EFL_UI_THEME_APPLY_ERROR_GENERIC = eina_error_msg_static_register("An error occurred and no theme could be set for this widget");
412}
413
401// This is necessary to keep backward compatibility 414// This is necessary to keep backward compatibility
402static const char *bcargv[] = { "exe" }; 415static const char *bcargv[] = { "exe" };
403 416
@@ -436,6 +449,7 @@ elm_init(int argc, char **argv)
436 if (_efl_startup_time <= 0) 449 if (_efl_startup_time <= 0)
437 _efl_startup_time = _elm_startup_time; 450 _efl_startup_time = _elm_startup_time;
438 _elm_startup_time = _efl_startup_time; 451 _elm_startup_time = _efl_startup_time;
452 _efl_ui_theme_apply_error_init();
439 453
440 return _elm_init_count; 454 return _elm_init_count;
441shutdown_ql: 455shutdown_ql:
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index fb61438..b54f9ba 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)
3997 3997
3998#include "elm_map_pan.eo.c" 3998#include "elm_map_pan.eo.c"
3999 3999
4000EOLIAN static Efl_Ui_Theme_Apply_Error 4000EOLIAN static Eina_Error
4001_elm_map_efl_ui_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED) 4001_elm_map_efl_ui_widget_theme_apply(Eo *obj, Elm_Map_Data *sd EINA_UNUSED)
4002{ 4002{
4003 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 4003 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
4004 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 4004 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
4005 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 4005 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
4006 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 4006 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
4007 4007
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index 7b45fbb..12b13fa 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -36,10 +36,10 @@ _sizing_eval(Evas_Object *obj)
36 evas_object_size_hint_max_set(obj, maxw, maxh); 36 evas_object_size_hint_max_set(obj, maxw, maxh);
37} 37}
38 38
39EOLIAN static Efl_Ui_Theme_Apply_Error 39EOLIAN static Eina_Error
40_elm_mapbuf_efl_ui_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) 40_elm_mapbuf_efl_ui_widget_theme_apply(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
41{ 41{
42 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 42 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
43 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 43 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
44 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 44 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
45 45
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index bd97969..774a6d7 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -231,10 +231,10 @@ _sizing_eval(Evas_Object *obj)
231 } 231 }
232} 232}
233 233
234EOLIAN static Efl_Ui_Theme_Apply_Error 234EOLIAN static Eina_Error
235_elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd) 235_elm_menu_efl_ui_widget_theme_apply(Eo *obj, Elm_Menu_Data *sd)
236{ 236{
237 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 237 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
238 238
239 Eina_List *l, *_l, *_ll, *ll = NULL; 239 Eina_List *l, *_l, *_ll, *ll = NULL;
240 Elm_Object_Item *eo_item; 240 Elm_Object_Item *eo_item;
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index fe091b9..e107227 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -20,7 +20,7 @@
20#define MY_CLASS_NAME "Elm_Notify" 20#define MY_CLASS_NAME "Elm_Notify"
21#define MY_CLASS_NAME_LEGACY "elm_notify" 21#define MY_CLASS_NAME_LEGACY "elm_notify"
22 22
23static Efl_Ui_Theme_Apply_Error 23static Eina_Error
24_notify_theme_apply(Evas_Object *obj) 24_notify_theme_apply(Evas_Object *obj)
25{ 25{
26 const char *style = elm_widget_style_get(obj); 26 const char *style = elm_widget_style_get(obj);
@@ -139,10 +139,10 @@ _sizing_eval(Evas_Object *obj)
139 evas_object_geometry_set(obj, x, y, w, h); 139 evas_object_geometry_set(obj, x, y, w, h);
140} 140}
141 141
142EOLIAN static Efl_Ui_Theme_Apply_Error 142EOLIAN static Eina_Error
143_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd) 143_elm_notify_efl_ui_widget_theme_apply(Eo *obj, Elm_Notify_Data *sd)
144{ 144{
145 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 145 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
146 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 146 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
147 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 147 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
148 148
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index b3c9ed5..cd5802c 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)
216 _access_obj_process(obj, EINA_TRUE); 216 _access_obj_process(obj, EINA_TRUE);
217} 217}
218 218
219EOLIAN static Efl_Ui_Theme_Apply_Error 219EOLIAN static Eina_Error
220_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd) 220_elm_panel_efl_ui_widget_theme_apply(Eo *obj, Elm_Panel_Data *sd)
221{ 221{
222 const char *str; 222 const char *str;
223 Evas_Coord minw = 0, minh = 0; 223 Evas_Coord minw = 0, minh = 0;
224 224
225 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 225 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
226 226
227 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 227 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
228 228
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index fdb2ac5..6ec12a5 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -49,10 +49,10 @@ _sizing_eval(Evas_Object *obj)
49 evas_object_size_hint_max_set(obj, maxw, maxh); 49 evas_object_size_hint_max_set(obj, maxw, maxh);
50} 50}
51 51
52EOLIAN static Efl_Ui_Theme_Apply_Error 52EOLIAN static Eina_Error
53_elm_photo_efl_ui_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd) 53_elm_photo_efl_ui_widget_theme_apply(Eo *obj, Elm_Photo_Data *sd)
54{ 54{
55 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 55 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
57 57
58 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 58 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 c851c8a..8eec937 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)
80 return EINA_TRUE; 80 return EINA_TRUE;
81} 81}
82 82
83EOLIAN static Efl_Ui_Theme_Apply_Error 83EOLIAN static Eina_Error
84_elm_plug_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 84_elm_plug_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
85{ 85{
86 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 86 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
87 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 87 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
88 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 88 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
89 89
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 73c4769..782ff32 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);
589 589
590Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee); 590Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee);
591 591
592Efl_Ui_Theme_Apply_Error _elm_theme_object_set(Evas_Object *parent, 592Eina_Error _elm_theme_object_set(Evas_Object *parent,
593 Evas_Object *o, 593 Evas_Object *o,
594 const char *clas, 594 const char *clas,
595 const char *group, 595 const char *group,
@@ -597,7 +597,7 @@ Efl_Ui_Theme_Apply_Error _elm_theme_object_set(Evas_Object *parent,
597Eina_Bool _elm_theme_object_icon_set(Evas_Object *o, 597Eina_Bool _elm_theme_object_icon_set(Evas_Object *o,
598 const char *group, 598 const char *group,
599 const char *style); 599 const char *style);
600Efl_Ui_Theme_Apply_Error _elm_theme_set(Elm_Theme *th, 600Eina_Error _elm_theme_set(Elm_Theme *th,
601 Evas_Object *o, 601 Evas_Object *o,
602 const char *clas, 602 const char *clas,
603 const char *group, 603 const char *group,
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 6b28cd2..6b52ef1 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,
86 _sizing_eval(obj); 86 _sizing_eval(obj);
87} 87}
88 88
89EOLIAN static Efl_Ui_Theme_Apply_Error 89EOLIAN static Eina_Error
90_elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED) 90_elm_route_efl_ui_widget_theme_apply(Eo *obj, Elm_Route_Data *sd EINA_UNUSED)
91{ 91{
92 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 92 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
93 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 93 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
94 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 94 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
95 95
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index c42a3af..ab53acc 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -398,10 +398,10 @@ _mirrored_set(Evas_Object *obj,
398 efl_ui_mirrored_set(obj, mirrored); 398 efl_ui_mirrored_set(obj, mirrored);
399} 399}
400 400
401EOLIAN static Efl_Ui_Theme_Apply_Error 401EOLIAN static Eina_Error
402_elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED) 402_elm_scroller_efl_ui_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
403{ 403{
404 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 404 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
405 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 405 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
406 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 406 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
407 407
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 4d05c2d..01719c0 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)
215 } 215 }
216} 216}
217 217
218EOLIAN static Efl_Ui_Theme_Apply_Error 218EOLIAN static Eina_Error
219_elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd) 219_elm_segment_control_efl_ui_widget_theme_apply(Eo *obj, Elm_Segment_Control_Data *sd)
220{ 220{
221 Eina_List *l; 221 Eina_List *l;
222 Eina_Bool rtl; 222 Eina_Bool rtl;
223 Elm_Object_Item *eo_item; 223 Elm_Object_Item *eo_item;
224 224
225 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 225 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
226 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 226 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
227 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 227 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
228 228
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index c6ad9e3..8d94d05 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -16,10 +16,10 @@
16#define MY_CLASS_NAME "Elm_Separator" 16#define MY_CLASS_NAME "Elm_Separator"
17#define MY_CLASS_NAME_LEGACY "elm_separator" 17#define MY_CLASS_NAME_LEGACY "elm_separator"
18 18
19EOLIAN static Efl_Ui_Theme_Apply_Error 19EOLIAN static Eina_Error
20_elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) 20_elm_separator_efl_ui_widget_theme_apply(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
21{ 21{
22 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 22 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
23 23
24 if (sd->horizontal) 24 if (sd->horizontal)
25 elm_widget_theme_element_set(obj, "horizontal"); 25 elm_widget_theme_element_set(obj, "horizontal");
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 4810f1b..049d664 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)
804 return eina_strbuf_release(new_group); 804 return eina_strbuf_release(new_group);
805} 805}
806 806
807EOLIAN static Efl_Ui_Theme_Apply_Error 807EOLIAN static Eina_Error
808_elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd) 808_elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
809{ 809{
810 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 810 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
811 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 811 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
812 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2, EFL_UI_THEME_APPLY_ERROR_GENERIC); 812 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2, EFL_UI_THEME_APPLY_ERROR_GENERIC);
813 char *group; 813 char *group;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 246f08b..e242fa8 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)
1299 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 1299 efl_canvas_group_del(efl_super(obj, MY_CLASS));
1300} 1300}
1301 1301
1302EOLIAN static Efl_Ui_Theme_Apply_Error 1302EOLIAN static Eina_Error
1303_elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd) 1303_elm_spinner_efl_ui_widget_theme_apply(Eo *obj, Elm_Spinner_Data *sd)
1304{ 1304{
1305 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); 1305 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 f3f20b7..5849d7d 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)
41 evas_object_table_mirrored_set(wd->resize_obj, rtl); 41 evas_object_table_mirrored_set(wd->resize_obj, rtl);
42} 42}
43 43
44EOLIAN static Efl_Ui_Theme_Apply_Error 44EOLIAN static Eina_Error
45_elm_table_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) 45_elm_table_efl_ui_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
46{ 46{
47 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 47 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 48 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
49 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 49 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
50 50
diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index c397e90..3295f12 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)
302 return NULL; 302 return NULL;
303} 303}
304 304
305Efl_Ui_Theme_Apply_Error 305Eina_Error
306_elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style) 306_elm_theme_object_set(Evas_Object *parent, Evas_Object *o, const char *clas, const char *group, const char *style)
307{ 307{
308 Elm_Theme *th = NULL; 308 Elm_Theme *th = NULL;
@@ -323,7 +323,7 @@ _elm_theme_object_icon_set(Evas_Object *o,
323 return _elm_theme_icon_set(th, o, group, style); 323 return _elm_theme_icon_set(th, o, group, style);
324} 324}
325 325
326Efl_Ui_Theme_Apply_Error 326Eina_Error
327_elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style, Eina_Bool is_legacy) 327_elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *group, const char *style, Eina_Bool is_legacy)
328{ 328{
329 Eina_File *file; 329 Eina_File *file;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index bf21b81..46414b8 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)
1480 elm_widget_highlight_in_theme_set(obj, EINA_FALSE); 1480 elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
1481} 1481}
1482 1482
1483EOLIAN static Efl_Ui_Theme_Apply_Error 1483EOLIAN static Eina_Error
1484_elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd) 1484_elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1485{ 1485{
1486 Elm_Toolbar_Item_Data *it; 1486 Elm_Toolbar_Item_Data *it;
@@ -1489,7 +1489,7 @@ _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1489 1489
1490 if (sd->delete_me) return EFL_UI_THEME_APPLY_ERROR_NONE; 1490 if (sd->delete_me) return EFL_UI_THEME_APPLY_ERROR_NONE;
1491 1491
1492 Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; 1492 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
1493 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1493 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1494 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 1494 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1495 1495
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index a2e4756..015c100 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -579,7 +579,7 @@ struct _Elm_Widget_Item_Data
579 579
580EAPI Eina_Bool elm_widget_api_check(int ver); 580EAPI Eina_Bool elm_widget_api_check(int ver);
581EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access); 581EAPI Eina_Bool elm_widget_access(Evas_Object *obj, Eina_Bool is_access);
582EAPI Efl_Ui_Theme_Apply_Error elm_widget_theme(Evas_Object *obj); 582EAPI Eina_Error elm_widget_theme(Evas_Object *obj);
583EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force); 583EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
584EAPI 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); 584EAPI 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);
585EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj); 585EAPI 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);
646EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj); 646EAPI int elm_widget_scroll_freeze_get(const Evas_Object *obj);
647EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th); 647EAPI void elm_widget_theme_set(Evas_Object *obj, Elm_Theme *th);
648EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj); 648EAPI Elm_Theme *elm_widget_theme_get(const Evas_Object *obj);
649EAPI Efl_Ui_Theme_Apply_Error elm_widget_style_set(Evas_Object *obj, const char *style); 649EAPI Eina_Error elm_widget_style_set(Evas_Object *obj, const char *style);
650EAPI const char *elm_widget_style_get(const Evas_Object *obj); 650EAPI const char *elm_widget_style_get(const Evas_Object *obj);
651EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); 651EAPI void elm_widget_type_set(Evas_Object *obj, const char *type);
652EAPI const char *elm_widget_type_get(const Evas_Object *obj); 652EAPI 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
658EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj); 658EAPI Efl_Ui_Scroll_Block elm_widget_scroll_lock_get(const Evas_Object *obj);
659EAPI int elm_widget_scroll_child_locked_x_get(const Evas_Object *obj); 659EAPI int elm_widget_scroll_child_locked_x_get(const Evas_Object *obj);
660EAPI int elm_widget_scroll_child_locked_y_get(const Evas_Object *obj); 660EAPI int elm_widget_scroll_child_locked_y_get(const Evas_Object *obj);
661EAPI 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); 661EAPI Eina_Error elm_widget_theme_object_set(Evas_Object *obj, Evas_Object *edj, const char *wname, const char *welement, const char *wstyle);
662EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func); 662EAPI Eina_Bool elm_widget_type_check(const Evas_Object *obj, const char *type, const char *func);
663EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse); 663EAPI Evas_Object *elm_widget_name_find(const Evas_Object *obj, const char *name, int recurse);
664EAPI Eina_List *elm_widget_stringlist_get(const char *str); 664EAPI 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
687EAPI const char *elm_widget_theme_element_get(const Evas_Object *obj); 687EAPI const char *elm_widget_theme_element_get(const Evas_Object *obj);
688EAPI Eina_Bool elm_widget_theme_style_set(Evas_Object *obj, const char *name); 688EAPI Eina_Bool elm_widget_theme_style_set(Evas_Object *obj, const char *name);
689EAPI const char *elm_widget_theme_style_get(const Evas_Object *obj); 689EAPI const char *elm_widget_theme_style_get(const Evas_Object *obj);
690EAPI Efl_Ui_Theme_Apply_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name); 690EAPI Eina_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
691 691
692/* debug function. don't use it unless you are tracking parenting issues */ 692/* debug function. don't use it unless you are tracking parenting issues */
693EAPI void elm_widget_tree_dump(const Evas_Object *top); 693EAPI void elm_widget_tree_dump(const Evas_Object *top);