diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-06-17 14:57:31 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-06-17 19:25:48 +0900 |
| commit | 42b63f55074fe63066a8046c6211dbb82dbe36cb (patch) | |
| tree | ccaaf90810b2193102d5fd6f87233c2a32ce2780 /src/lib/elementary | |
| parent | 2a0bb33f1d049f35914cc4597022702f297bdc3c (diff) | |
| download | efl-42b63f55074fe63066a8046c6211dbb82dbe36cb.tar.gz | |
Evas: Add smart_ prefix to all smart functions (eo)
This is a first step at separating legacy smart
object features away from standard efl interfaces.
Diffstat (limited to 'src/lib/elementary')
149 files changed, 479 insertions, 479 deletions
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index 4229871225..fb4da38691 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -189,7 +189,7 @@ _efl_ui_box_efl_pack_layout_layout_engine_get(Eo *obj EINA_UNUSED, Efl_Ui_Box_Da } EOLIAN static void -_efl_ui_box_evas_object_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd) +_efl_ui_box_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd) { if (pd->recalc) return; @@ -201,7 +201,7 @@ _efl_ui_box_evas_object_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd) } EOLIAN static void -_efl_ui_box_evas_object_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED) +_efl_ui_box_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED) { Evas *e = evas_object_evas_get(obj); @@ -226,7 +226,7 @@ _efl_ui_box_evas_object_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED) } EOLIAN static void -_efl_ui_box_evas_object_smart_del(Eo *obj, Efl_Ui_Box_Data *sd) +_efl_ui_box_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Box_Data *sd) { Eina_List *l; Evas_Object *child; diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo index dc45b9a521..de805f0904 100644 --- a/src/lib/elementary/efl_ui_box.eo +++ b/src/lib/elementary/efl_ui_box.eo @@ -3,9 +3,9 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout, { implements { Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.calculate; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_calculate; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index b8f86ba6bb..849ca3e77d 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -1809,7 +1809,7 @@ _efl_ui_flip_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *_pd EINA_UNUSE } EOLIAN static void -_efl_ui_flip_evas_object_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv) +_efl_ui_flip_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -1852,7 +1852,7 @@ _efl_ui_flip_evas_object_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv) } EOLIAN static void -_efl_ui_flip_evas_object_smart_del(Eo *obj, Efl_Ui_Flip_Data *sd) +_efl_ui_flip_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Flip_Data *sd) { ecore_animator_del(sd->animator); _state_slices_clear(sd); diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo index cd9b972246..0df3b27089 100644 --- a/src/lib/elementary/efl_ui_flip.eo +++ b/src/lib/elementary/efl_ui_flip.eo @@ -225,8 +225,8 @@ class Efl.Ui.Flip (Elm.Widget, Efl.Pack.Linear, Efl.Part) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.focus_direction; Elm.Widget.sub_object_add; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 0828caece9..90737cf0a4 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -225,7 +225,7 @@ _efl_ui_grid_efl_pack_layout_layout_do(Eo *klass EINA_UNUSED, } EOLIAN void -_efl_ui_grid_evas_object_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) +_efl_ui_grid_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -233,7 +233,7 @@ _efl_ui_grid_evas_object_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUS } EOLIAN static void -_efl_ui_grid_evas_object_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd) +_efl_ui_grid_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd) { Custom_Table_Data *custom; Evas_Object *table; @@ -262,7 +262,7 @@ _efl_ui_grid_evas_object_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd) } EOLIAN static void -_efl_ui_grid_evas_object_smart_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) +_efl_ui_grid_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) { Eina_List *l; Evas_Object *child; diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo index ff86585acf..b3e148d6b4 100644 --- a/src/lib/elementary/efl_ui_grid.eo +++ b/src/lib/elementary/efl_ui_grid.eo @@ -3,9 +3,9 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout, { implements { Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.calculate; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_calculate; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index 1b946e60d1..80028a7892 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -573,7 +573,7 @@ _efl_ui_image_drag_n_drop_cb(void *elm_obj, } EOLIAN static void -_efl_ui_image_evas_object_smart_add(Eo *obj, Efl_Ui_Image_Data *priv) +_efl_ui_image_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Image_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -612,7 +612,7 @@ _efl_ui_image_evas_object_smart_add(Eo *obj, Efl_Ui_Image_Data *priv) } EOLIAN static void -_efl_ui_image_evas_object_smart_del(Eo *obj, Efl_Ui_Image_Data *sd) +_efl_ui_image_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Image_Data *sd) { ecore_timer_del(sd->anim_timer); evas_object_del(sd->img); @@ -643,7 +643,7 @@ _efl_ui_image_evas_object_smart_del(Eo *obj, Efl_Ui_Image_Data *sd) } EOLIAN static void -_efl_ui_image_evas_object_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y) +_efl_ui_image_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -656,7 +656,7 @@ _efl_ui_image_evas_object_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord } EOLIAN static void -_efl_ui_image_evas_object_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h) +_efl_ui_image_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -670,7 +670,7 @@ _efl_ui_image_evas_object_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coor } EOLIAN static void -_efl_ui_image_evas_object_smart_show(Eo *obj, Efl_Ui_Image_Data *sd) +_efl_ui_image_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Image_Data *sd) { sd->show = EINA_TRUE; if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return; @@ -683,7 +683,7 @@ _efl_ui_image_evas_object_smart_show(Eo *obj, Efl_Ui_Image_Data *sd) } EOLIAN static void -_efl_ui_image_evas_object_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd) +_efl_ui_image_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd) { evas_obj_smart_hide(eo_super(obj, MY_CLASS)); @@ -694,7 +694,7 @@ _efl_ui_image_evas_object_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd) } EOLIAN static void -_efl_ui_image_evas_object_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member) +_efl_ui_image_evas_object_smart_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); @@ -703,7 +703,7 @@ _efl_ui_image_evas_object_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_ } EOLIAN static void -_efl_ui_image_evas_object_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a) +_efl_ui_image_evas_object_smart_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a) { evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a); @@ -713,7 +713,7 @@ _efl_ui_image_evas_object_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, } EOLIAN static void -_efl_ui_image_evas_object_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip) +_efl_ui_image_evas_object_smart_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip) { evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip); @@ -722,7 +722,7 @@ _efl_ui_image_evas_object_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Ob } EOLIAN static void -_efl_ui_image_evas_object_smart_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd) +_efl_ui_image_evas_object_smart_smart_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd) { evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index ad382f53b1..fd1d3b4451 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -153,16 +153,16 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Edje.Object.size_max.get; Edje.Object.size_min_calc; Edje.Object.calc_force; - Evas.Object.Smart.hide; - Evas.Object.Smart.clip.set; - Evas.Object.Smart.clip_unset; - Evas.Object.Smart.show; - Evas.Object.Smart.color.set; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_clip.set; + Evas.Object.Smart.smart_clip_unset; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_color.set; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Efl.Ui.Draggable.drag_target.set; Efl.Ui.Draggable.drag_target.get; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index b760f64580..69fb435b04 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -71,7 +71,7 @@ _on_state_changed(void *data, } EOLIAN static void -_efl_ui_nstate_evas_object_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd) +_efl_ui_nstate_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -90,7 +90,7 @@ _efl_ui_nstate_evas_object_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd) } EOLIAN static void -_efl_ui_nstate_evas_object_smart_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) +_efl_ui_nstate_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) { evas_obj_smart_del(eo_super(obj, MY_CLASS)); } diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo index 981ae6e1ec..e16d703cd0 100644 --- a/src/lib/elementary/efl_ui_nstate.eo +++ b/src/lib/elementary/efl_ui_nstate.eo @@ -33,8 +33,8 @@ class Efl.Ui.Nstate(Elm.Button) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.event; } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 417d0cde7e..16dc5962ab 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -3717,7 +3717,7 @@ _end_handler_mouse_move_cb(void *data, } EOLIAN static void -_efl_ui_text_evas_object_smart_add(Eo *obj, Efl_Ui_Text_Data *priv) +_efl_ui_text_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Text_Data *priv) { Eo *text_obj; @@ -3926,7 +3926,7 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd) } EOLIAN static void -_efl_ui_text_evas_object_smart_del(Eo *obj, Efl_Ui_Text_Data *sd) +_efl_ui_text_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Text_Data *sd) { Elm_Entry_Context_Menu_Item *it; Elm_Entry_Item_Provider *ip; @@ -3999,7 +3999,7 @@ _efl_ui_text_evas_object_smart_del(Eo *obj, Efl_Ui_Text_Data *sd) } EOLIAN static void -_efl_ui_text_evas_object_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y) +_efl_ui_text_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -4012,7 +4012,7 @@ _efl_ui_text_evas_object_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, } EOLIAN static void -_efl_ui_text_evas_object_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h) +_efl_ui_text_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -4022,7 +4022,7 @@ _efl_ui_text_evas_object_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord } EOLIAN static void -_efl_ui_text_evas_object_smart_show(Eo *obj, Efl_Ui_Text_Data *sd) +_efl_ui_text_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Text_Data *sd) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); @@ -4031,7 +4031,7 @@ _efl_ui_text_evas_object_smart_show(Eo *obj, Efl_Ui_Text_Data *sd) } EOLIAN static void -_efl_ui_text_evas_object_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd) +_efl_ui_text_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd) { evas_obj_smart_hide(eo_super(obj, MY_CLASS)); @@ -4040,7 +4040,7 @@ _efl_ui_text_evas_object_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd) } EOLIAN static void -_efl_ui_text_evas_object_smart_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member) +_efl_ui_text_evas_object_smart_smart_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index c02aeaec0a..0ca6614f68 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -387,13 +387,13 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.move; - Evas.Object.Smart.member_add; - Evas.Object.Smart.add; - Evas.Object.Smart.resize; - Evas.Object.Smart.del; - Evas.Object.Smart.show; - Evas.Object.Smart.hide; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_resize; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_hide; Elm.Widget.activate; Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index d1b469b95e..0e6c186090 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2060,7 +2060,7 @@ _deferred_ecore_evas_free(void *data) } EOLIAN static void -_efl_ui_win_evas_object_smart_show(Eo *obj, Efl_Ui_Win_Data *sd) +_efl_ui_win_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Win_Data *sd) { if (sd->modal_count) return; const Eina_List *l; @@ -2103,7 +2103,7 @@ _efl_ui_win_evas_object_smart_show(Eo *obj, Efl_Ui_Win_Data *sd) } EOLIAN static void -_efl_ui_win_evas_object_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd) +_efl_ui_win_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd) { if (sd->modal_count) return; const Eina_List *l; @@ -2458,7 +2458,7 @@ _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj) } EOLIAN static void -_efl_ui_win_evas_object_smart_del(Eo *obj, Efl_Ui_Win_Data *sd) +_efl_ui_win_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Win_Data *sd) { const Eina_List *l; Evas_Object *current; @@ -2612,7 +2612,7 @@ _elm_win_obj_intercept_show(void *data, } EOLIAN static void -_efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y) +_efl_ui_win_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y) { if (sd->img_obj) { @@ -2655,7 +2655,7 @@ _efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, E } EOLIAN static void -_efl_ui_win_evas_object_smart_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h) +_efl_ui_win_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h) { if (sd->img_obj) { @@ -3802,7 +3802,7 @@ _elm_win_on_icon_del(void *data, } EOLIAN static void -_efl_ui_win_evas_object_smart_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED) +_efl_ui_win_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index c5497a827c..cd24a5cfb0 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -763,12 +763,12 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, class.constructor; Eo.Base.constructor; Eo.Base.finalize; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index 5cb144a68b..9c793cc32b 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -271,7 +271,7 @@ _on_clicked(void *data, const Eo_Event *event EINA_UNUSED) } EOLIAN static void -_elm_combobox_evas_object_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) +_elm_combobox_evas_object_smart_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -285,21 +285,21 @@ _elm_combobox_evas_object_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) } EOLIAN static void -_elm_combobox_evas_object_smart_del(Eo *obj, Elm_Combobox_Data *sd) +_elm_combobox_evas_object_smart_smart_del(Eo *obj, Elm_Combobox_Data *sd) { sd->hover_parent = NULL; evas_obj_smart_del(eo_super(obj, MY_CLASS)); } EOLIAN static void -_elm_combobox_evas_object_smart_show(Eo *obj, Elm_Combobox_Data *sd) +_elm_combobox_evas_object_smart_smart_show(Eo *obj, Elm_Combobox_Data *sd) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); if (sd->expanded) evas_object_show(sd->hover); } EOLIAN static void -_elm_combobox_evas_object_smart_hide(Eo *obj, Elm_Combobox_Data *sd) +_elm_combobox_evas_object_smart_smart_hide(Eo *obj, Elm_Combobox_Data *sd) { evas_obj_smart_hide(eo_super(obj, MY_CLASS)); if (sd->hover) evas_object_hide(sd->hover); @@ -630,7 +630,7 @@ _elm_combobox_elm_widget_part_text_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *p } EOLIAN static void -_elm_combobox_evas_object_smart_resize(Eo *obj, Elm_Combobox_Data *pd, +_elm_combobox_evas_object_smart_smart_resize(Eo *obj, Elm_Combobox_Data *pd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index 26aa9a457d..07db589ea6 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1079,7 +1079,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd) } EOLIAN static void -_elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) +_elm_ctxpopup_evas_object_smart_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1134,7 +1134,7 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) } EOLIAN static void -_elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) +_elm_ctxpopup_evas_object_smart_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) { Elm_Object_Item *it; diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 6a3b33bdc8..26bf20f763 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -1848,7 +1848,7 @@ _preedit_cb(void *data, const Eo_Event *event) } EOLIAN static void -_elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv) +_elm_fileselector_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Data *priv) { Evas_Object *ic, *bt, *en, *pb; const char *data; @@ -1982,7 +1982,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv) } EOLIAN static void -_elm_fileselector_evas_object_smart_del(Eo *obj, Elm_Fileselector_Data *sd) +_elm_fileselector_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Data *sd) { Elm_Fileselector_Filter *filter; diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index cea3268b53..2a5a74185e 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -218,7 +218,7 @@ _button_clicked(void *data, const Eo_Event *event EINA_UNUSED) } EOLIAN static void -_elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) +_elm_fileselector_button_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) { const char *path; @@ -246,7 +246,7 @@ _elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_ } EOLIAN static void -_elm_fileselector_button_evas_object_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) +_elm_fileselector_button_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) { if (sd->fsd.model) eo_unref(sd->fsd.model); diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 1198e749ed..befa79dcad 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -317,7 +317,7 @@ _elm_fileselector_entry_content_unset(Eo *obj, Elm_Fileselector_Entry_Data *sd, } EOLIAN static void -_elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) +_elm_fileselector_entry_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -377,7 +377,7 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da } EOLIAN static void -_elm_fileselector_entry_evas_object_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) +_elm_fileselector_entry_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) { free(sd->path); diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 60ade3fe0a..8dee8039fc 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -561,7 +561,7 @@ _on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED) } EOLIAN static void -_elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv) +_elm_hoversel_evas_object_smart_smart_add(Eo *obj, Elm_Hoversel_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -576,7 +576,7 @@ _elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv) } EOLIAN static void -_elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_evas_object_smart_smart_del(Eo *obj, Elm_Hoversel_Data *sd) { Elm_Object_Item *eo_item; @@ -592,14 +592,14 @@ _elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd) } EOLIAN static void -_elm_hoversel_evas_object_smart_show(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_evas_object_smart_smart_show(Eo *obj, Elm_Hoversel_Data *sd) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); evas_object_show(sd->hover); } EOLIAN static void -_elm_hoversel_evas_object_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) +_elm_hoversel_evas_object_smart_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) { evas_obj_smart_hide(eo_super(obj, MY_CLASS)); evas_object_hide(sd->hover); diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 3e54270ba8..de16569af1 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -1558,7 +1558,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) +_elm_multibuttonentry_evas_object_smart_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1588,7 +1588,7 @@ _elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data * } EOLIAN static void -_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) +_elm_multibuttonentry_evas_object_smart_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) { Elm_Object_Item *eo_item; Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 13baf83692..8f8f32b885 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -1389,7 +1389,7 @@ _elm_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Naviframe_Dat } EOLIAN static void -_elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv) +_elm_naviframe_evas_object_smart_smart_add(Eo *obj, Elm_Naviframe_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1446,7 +1446,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED) } EOLIAN static void -_elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd) +_elm_naviframe_evas_object_smart_smart_del(Eo *obj, Elm_Naviframe_Data *sd) { Elm_Naviframe_Item_Data *it; Elm_Naviframe_Op *nfo; @@ -1472,7 +1472,7 @@ _elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd) //Show only the top item view EOLIAN static void -_elm_naviframe_evas_object_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) +_elm_naviframe_evas_object_smart_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) { Elm_Object_Item *eo_top; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index e7659d30df..2785cb3309 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -646,7 +646,7 @@ end: EOLIAN static void -_elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv) +_elm_player_evas_object_smart_smart_add(Eo *obj, Elm_Player_Data *priv) { char buf[256]; @@ -709,7 +709,7 @@ _elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv) } EOLIAN static void -_elm_player_evas_object_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) +_elm_player_evas_object_smart_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) { evas_obj_smart_del(eo_super(obj, MY_CLASS)); } diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 4ff0709376..494cebd6da 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -234,7 +234,7 @@ _items_remove(Elm_Popup_Data *sd) } EOLIAN static void -_elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd) +_elm_popup_evas_object_smart_smart_del(Eo *obj, Elm_Popup_Data *sd) { unsigned int i; @@ -1504,7 +1504,7 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec } EOLIAN static void -_elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) +_elm_popup_evas_object_smart_smart_add(Eo *obj, Elm_Popup_Data *priv) { char style[1024]; diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index 6e9a82967a..dcba5d5949 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -35,7 +35,7 @@ static Evas_Object * _elm_access_add(Evas_Object *parent); static void _access_object_unregister(Evas_Object *obj); EOLIAN static void -_elm_access_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_access_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo index d1821da09c..416df84396 100644 --- a/src/lib/elementary/elm_access.eo +++ b/src/lib/elementary/elm_access.eo @@ -7,7 +7,7 @@ class Elm.Access (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.activate; Elm.Widget.on_focus; } diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index c38bcef097..5df01e10ac 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -470,7 +470,7 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U } EOLIAN static void -_elm_actionslider_evas_object_smart_add(Eo *obj, Elm_Actionslider_Data *priv) +_elm_actionslider_evas_object_smart_smart_add(Eo *obj, Elm_Actionslider_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo index 3683fbf982..4f0e366acb 100644 --- a/src/lib/elementary/elm_actionslider.eo +++ b/src/lib/elementary/elm_actionslider.eo @@ -71,7 +71,7 @@ class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c index a5c7fbaebf..a9783a3dfb 100644 --- a/src/lib/elementary/elm_bg.c +++ b/src/lib/elementary/elm_bg.c @@ -89,7 +89,7 @@ _on_resize(void *data, } EOLIAN static void -_elm_bg_evas_object_smart_add(Eo *obj, Elm_Bg_Data *priv) +_elm_bg_evas_object_smart_smart_add(Eo *obj, Elm_Bg_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/elm_bg.eo b/src/lib/elementary/elm_bg.eo index b8a8cf840c..d97aa05df6 100644 --- a/src/lib/elementary/elm_bg.eo +++ b/src/lib/elementary/elm_bg.eo @@ -96,7 +96,7 @@ class Elm.Bg (Elm.Layout, Efl.File) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Layout.content_aliases.get; Elm.Layout.sizing_eval; Efl.File.file.set; diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index a2579b2482..0803815966 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -371,7 +371,7 @@ _transition_layout_animation_exec(Evas_Object *obj, } EOLIAN static void -_elm_box_evas_object_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) +_elm_box_evas_object_smart_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -379,7 +379,7 @@ _elm_box_evas_object_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) +_elm_box_evas_object_smart_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); elm_widget_resize_object_set(obj, @@ -406,7 +406,7 @@ _elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_box_evas_object_smart_del(Eo *obj, Elm_Box_Data *sd) +_elm_box_evas_object_smart_smart_del(Eo *obj, Elm_Box_Data *sd) { Eina_List *l; Evas_Object *child; diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo index 985e7a3285..dfd075dedc 100644 --- a/src/lib/elementary/elm_box.eo +++ b/src/lib/elementary/elm_box.eo @@ -285,9 +285,9 @@ class Elm.Box (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.calculate; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_calculate; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index be75efa268..4de641e0f6 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -174,7 +174,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_bubble_evas_object_smart_add(Eo *obj, Elm_Bubble_Data *priv) +_elm_bubble_evas_object_smart_smart_add(Eo *obj, Elm_Bubble_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo index 1b2b307fb3..9a5f842743 100644 --- a/src/lib/elementary/elm_bubble.eo +++ b/src/lib/elementary/elm_bubble.eo @@ -38,7 +38,7 @@ class Elm.Bubble (Elm.Layout, Efl.Ui.Clickable) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c index cc5ee5ff89..5f1ed84061 100644 --- a/src/lib/elementary/elm_button.c +++ b/src/lib/elementary/elm_button.c @@ -281,7 +281,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_button_evas_object_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) +_elm_button_evas_object_smart_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo index 51251c4541..c15e38e0eb 100644 --- a/src/lib/elementary/elm_button.eo +++ b/src/lib/elementary/elm_button.eo @@ -75,7 +75,7 @@ class Elm.Button (Elm.Layout, Efl.Ui.Clickable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.activate; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index ef4937c115..b406591f10 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -1343,7 +1343,7 @@ _elm_calendar_elm_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_ } EOLIAN static void -_elm_calendar_evas_object_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED) +_elm_calendar_evas_object_smart_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED) { elm_layout_freeze(obj); @@ -1370,7 +1370,7 @@ _style_changed(void *data, } EOLIAN static void -_elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv) +_elm_calendar_evas_object_smart_smart_add(Eo *obj, Elm_Calendar_Data *priv) { time_t current_time; int t; @@ -1437,7 +1437,7 @@ _elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv) } EOLIAN static void -_elm_calendar_evas_object_smart_del(Eo *obj, Elm_Calendar_Data *sd) +_elm_calendar_evas_object_smart_smart_del(Eo *obj, Elm_Calendar_Data *sd) { int i; Elm_Calendar_Mark *mark; diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index 7ac57ab6f3..c569c32c74 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -383,9 +383,9 @@ class Elm.Calendar (Elm.Layout, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c index c03dba9bd2..f8ce9d4aa9 100644 --- a/src/lib/elementary/elm_check.c +++ b/src/lib/elementary/elm_check.c @@ -290,7 +290,7 @@ _on_check_toggle(void *data, } EOLIAN static void -_elm_check_evas_object_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) +_elm_check_evas_object_smart_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_check.eo b/src/lib/elementary/elm_check.eo index 266c1ee194..6a9cdebac1 100644 --- a/src/lib/elementary/elm_check.eo +++ b/src/lib/elementary/elm_check.eo @@ -24,7 +24,7 @@ class Elm.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.activate; Elm.Widget.theme_apply; Elm.Widget.sub_object_del; diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index 53e74dcfa9..21c8e39908 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -650,7 +650,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv) +_elm_clock_evas_object_smart_smart_add(Eo *obj, Elm_Clock_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -688,7 +688,7 @@ _elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv) } EOLIAN static void -_elm_clock_evas_object_smart_del(Eo *obj, Elm_Clock_Data *sd) +_elm_clock_evas_object_smart_smart_del(Eo *obj, Elm_Clock_Data *sd) { ecore_timer_del(sd->ticker); diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo index 0b9610a9b5..8959183060 100644 --- a/src/lib/elementary/elm_clock.eo +++ b/src/lib/elementary/elm_clock.eo @@ -163,8 +163,8 @@ class Elm.Clock (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.access; diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index dd72f6d445..61bb49398f 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -1817,7 +1817,7 @@ _elm_code_widget_cursor_position_get(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data * } EOLIAN static void -_elm_code_widget_evas_object_smart_add(Eo *obj, Elm_Code_Widget_Data *pd) +_elm_code_widget_evas_object_smart_smart_add(Eo *obj, Elm_Code_Widget_Data *pd) { Evas_Object *background, *gridrows, *scroller; diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo index 2a977ab9ea..d876dca764 100644 --- a/src/lib/elementary/elm_code_widget.eo +++ b/src/lib/elementary/elm_code_widget.eo @@ -246,7 +246,7 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text) class.constructor; Eo.Base.constructor; Eo.Base.finalize; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.event; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 83cf498851..124b20e5f7 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1861,7 +1861,7 @@ _create_colorcomponents(Evas_Object *obj) } EOLIAN static void -_elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv) +_elm_colorselector_evas_object_smart_smart_add(Eo *obj, Elm_Colorselector_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1901,7 +1901,7 @@ _elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv) } EOLIAN static void -_elm_colorselector_evas_object_smart_del(Eo *obj, Elm_Colorselector_Data *sd) +_elm_colorselector_evas_object_smart_smart_del(Eo *obj, Elm_Colorselector_Data *sd) { int i = 0; void *tmp[4]; diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index 12dec40bb3..6d0415ce8e 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -108,8 +108,8 @@ selected.]] implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index 24679c844f..c988d77602 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -55,11 +55,11 @@ class Elm.Combobox (Elm.Button, Efl.Ui.Selectable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.part_text.set; Elm.Widget.part_text.get; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index 1a2fc5b4af..49c5c14dd4 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -917,7 +917,7 @@ _on_prop_change(void *data, #endif EOLIAN static void -_elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) +_elm_conformant_evas_object_smart_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -938,7 +938,7 @@ _elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNU } EOLIAN static void -_elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd) +_elm_conformant_evas_object_smart_smart_del(Eo *obj, Elm_Conformant_Data *sd) { #ifdef HAVE_ELEMENTARY_X ecore_event_handler_del(sd->prop_hdl); diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo index d28013ee87..3746cb5ac5 100644 --- a/src/lib/elementary/elm_conformant.eo +++ b/src/lib/elementary/elm_conformant.eo @@ -6,8 +6,8 @@ class Elm.Conformant (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.widget_parent.set; Elm.Widget.theme_apply; Elm.Layout.content_aliases.get; diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 638004c337..28c4d40d93 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -203,8 +203,8 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.del; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_add; Elm.Widget.widget_parent.set; Elm.Widget.focus_direction; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c index f35db88533..675408c025 100644 --- a/src/lib/elementary/elm_datetime.c +++ b/src/lib/elementary/elm_datetime.c @@ -796,7 +796,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED) } EOLIAN static void -_elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv) +_elm_datetime_evas_object_smart_smart_add(Eo *obj, Elm_Datetime_Data *priv) { Datetime_Field *field; int idx; @@ -862,7 +862,7 @@ _elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv) } EOLIAN static void -_elm_datetime_evas_object_smart_del(Eo *obj, Elm_Datetime_Data *sd) +_elm_datetime_evas_object_smart_smart_del(Eo *obj, Elm_Datetime_Data *sd) { Datetime_Field *tmp; unsigned int idx; diff --git a/src/lib/elementary/elm_datetime.eo b/src/lib/elementary/elm_datetime.eo index 7d3c879065..6e1fad16ec 100644 --- a/src/lib/elementary/elm_datetime.eo +++ b/src/lib/elementary/elm_datetime.eo @@ -292,8 +292,8 @@ class Elm.Datetime (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 47040505b1..ace82813f7 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -415,7 +415,7 @@ _items_create(Evas_Object *obj) } EOLIAN static void -_elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv) +_elm_dayselector_evas_object_smart_smart_add(Eo *obj, Elm_Dayselector_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -436,7 +436,7 @@ _elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv) } EOLIAN static void -_elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd) +_elm_dayselector_evas_object_smart_smart_del(Eo *obj, Elm_Dayselector_Data *sd) { Elm_Dayselector_Item_Data *it; diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo index 1fe6afdeaa..ae3f1789d8 100644 --- a/src/lib/elementary/elm_dayselector.eo +++ b/src/lib/elementary/elm_dayselector.eo @@ -150,8 +150,8 @@ class Elm.Dayselector (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_direction_manager_is; Elm.Widget.translate; diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index b69169c06f..fcdbf9f93a 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -1269,7 +1269,7 @@ _round_items_add(Elm_Diskselector_Data *sd) } EOLIAN static void -_elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv) +_elm_diskselector_evas_object_smart_smart_add(Eo *obj, Elm_Diskselector_Data *priv) { Evas *evas; Evas_Object *blank, *edje; @@ -1345,7 +1345,7 @@ _elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv) } EOLIAN static void -_elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) +_elm_diskselector_evas_object_smart_smart_del(Eo *obj, Elm_Diskselector_Data *sd) { Elm_Diskselector_Item_Data *it; Eina_List *l, *l2; @@ -1421,7 +1421,7 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) } EOLIAN static void -_elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_diskselector_evas_object_smart_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -1429,7 +1429,7 @@ _elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Eva } EOLIAN static void -_elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_diskselector_evas_object_smart_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -1437,7 +1437,7 @@ _elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, E } EOLIAN static void -_elm_diskselector_evas_object_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member) +_elm_diskselector_evas_object_smart_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index f2da9db71a..4a44860901 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -197,11 +197,11 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.member_add; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.focus_next_manager_is; Elm.Widget.access; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 37483f57eb..565031706b 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -3594,7 +3594,7 @@ _end_handler_mouse_move_cb(void *data, } EOLIAN static void -_elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv) +_elm_entry_evas_object_smart_smart_add(Eo *obj, Elm_Entry_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -3785,7 +3785,7 @@ _create_selection_handlers(Evas_Object *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_evas_object_smart_smart_del(Eo *obj, Elm_Entry_Data *sd) { Elm_Entry_Context_Menu_Item *it; Elm_Entry_Item_Provider *ip; @@ -3858,7 +3858,7 @@ _elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_entry_evas_object_smart_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -3871,7 +3871,7 @@ _elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Eva } EOLIAN static void -_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_entry_evas_object_smart_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -3881,7 +3881,7 @@ _elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, E } EOLIAN static void -_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_evas_object_smart_smart_show(Eo *obj, Elm_Entry_Data *sd) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); @@ -3890,7 +3890,7 @@ _elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_evas_object_smart_smart_hide(Eo *obj, Elm_Entry_Data *sd) { evas_obj_smart_hide(eo_super(obj, MY_CLASS)); @@ -3899,7 +3899,7 @@ _elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd) } EOLIAN static void -_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) +_elm_entry_evas_object_smart_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index bf6ce86afe..1260d58e9d 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -935,13 +935,13 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.move; - Evas.Object.Smart.member_add; - Evas.Object.Smart.add; - Evas.Object.Smart.resize; - Evas.Object.Smart.del; - Evas.Object.Smart.show; - Evas.Object.Smart.hide; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_resize; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_hide; Elm.Widget.activate; Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index 186dab3e08..5d00a38938 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -34,8 +34,8 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector, class.constructor; class.destructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.focus_next; Elm.Widget.focus_direction_manager_is; Elm.Widget.focus_direction; diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo index 5cdd97e3c9..9ab1acf90e 100644 --- a/src/lib/elementary/elm_fileselector_button.eo +++ b/src/lib/elementary/elm_fileselector_button.eo @@ -3,8 +3,8 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector) event_prefix: elm_fileselector_button; implements { Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Button.admits_autorepeat.get; Elm.Interface.Fileselector.selected_models.get; diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index 30841a205e..16593afe8d 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -6,8 +6,8 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.del; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_add; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 494725ab1c..4a91947736 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -604,7 +604,7 @@ _signal_val_change_stop(void *data, } EOLIAN static void -_elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv) +_elm_flipselector_evas_object_smart_smart_add(Eo *obj, Elm_Flipselector_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -631,7 +631,7 @@ _elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv) } EOLIAN static void -_elm_flipselector_evas_object_smart_del(Eo *obj, Elm_Flipselector_Data *sd) +_elm_flipselector_evas_object_smart_smart_del(Eo *obj, Elm_Flipselector_Data *sd) { sd->deleting = EINA_TRUE; diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index 23441b96ee..82ff09e68e 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -126,8 +126,8 @@ class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c index 5631700e10..38d4f216cb 100644 --- a/src/lib/elementary/elm_frame.c +++ b/src/lib/elementary/elm_frame.c @@ -145,7 +145,7 @@ _on_frame_clicked(void *data, /* using deferred sizing evaluation, just like the parent */ EOLIAN static void -_elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd) +_elm_frame_evas_object_smart_smart_calculate(Eo *obj, Elm_Frame_Data *sd) { ELM_LAYOUT_DATA_GET(obj, ld); @@ -158,7 +158,7 @@ _elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd) } EOLIAN static void -_elm_frame_evas_object_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) +_elm_frame_evas_object_smart_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_frame.eo b/src/lib/elementary/elm_frame.eo index d08fb7e408..e4d51d09a6 100644 --- a/src/lib/elementary/elm_frame.eo +++ b/src/lib/elementary/elm_frame.eo @@ -51,8 +51,8 @@ class Elm.Frame (Elm.Layout, Efl.Ui.Clickable) implements { Eo.Base.constructor; class.constructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_add; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index a36818164f..8be8782750 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -481,14 +481,14 @@ _elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd) } EOLIAN static void -_elm_gengrid_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) +_elm_gengrid_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) { ecore_job_del(psd->wsd->calc_job); psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj); } EOLIAN static void -_elm_gengrid_pan_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_gengrid_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; @@ -1854,7 +1854,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd) } EOLIAN static void -_elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd) +_elm_gengrid_pan_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd) { Evas_Coord cx = 0, cy = 0; Elm_Gen_Item *it; @@ -4218,7 +4218,7 @@ _elm_gengrid_elm_layout_sizing_eval(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *_pd E } EOLIAN static void -_elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv) +_elm_gengrid_evas_object_smart_smart_add(Eo *obj, Elm_Gengrid_Data *priv) { Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; Elm_Gengrid_Pan_Data *pan_data; @@ -4284,7 +4284,7 @@ _elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv) } EOLIAN static void -_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_evas_object_smart_smart_del(Eo *obj, Elm_Gengrid_Data *sd) { elm_gengrid_clear(obj); ELM_SAFE_FREE(sd->pan_obj, evas_object_del); @@ -4297,7 +4297,7 @@ _elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd) } EOLIAN static void -_elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_gengrid_evas_object_smart_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -4305,7 +4305,7 @@ _elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, } EOLIAN static void -_elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_gengrid_evas_object_smart_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -4313,7 +4313,7 @@ _elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord } EOLIAN static void -_elm_gengrid_evas_object_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member) +_elm_gengrid_evas_object_smart_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index fd4df55fd4..02775c856b 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -540,11 +540,11 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo index f88623f975..0d34a3ab39 100644 --- a/src/lib/elementary/elm_gengrid_pan.eo +++ b/src/lib/elementary/elm_gengrid_pan.eo @@ -6,9 +6,9 @@ class Elm.Gengrid.Pan (Elm.Pan) implements { class.constructor; Eo.Base.destructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.move; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_resize; Elm.Pan.content_size.get; Elm.Pan.pos; Elm.Pan.pos_min.get; diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index e8bd69aea0..4de6210ae4 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -259,7 +259,7 @@ _elm_genlist_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_D } EOLIAN static void -_elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) +_elm_genlist_pan_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) { ecore_job_del(psd->resize_job); @@ -267,7 +267,7 @@ _elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) } EOLIAN static void -_elm_genlist_pan_evas_object_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) +_elm_genlist_pan_evas_object_smart_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) { psd->wsd->pan_changed = EINA_TRUE; evas_object_smart_changed(obj); @@ -284,7 +284,7 @@ _elm_genlist_pan_smart_resize_job(void *data) } EOLIAN static void -_elm_genlist_pan_evas_object_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_genlist_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; @@ -2452,7 +2452,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd) } EOLIAN static void -_elm_genlist_pan_evas_object_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd) +_elm_genlist_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd) { Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh; Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0; @@ -5525,7 +5525,7 @@ _evas_viewport_resize_cb(void *d, Evas *e EINA_UNUSED, void *ei EINA_UNUSED) } EOLIAN static void -_elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv) +_elm_genlist_evas_object_smart_smart_add(Eo *obj, Elm_Genlist_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Elm_Genlist_Pan_Data *pan_data; @@ -5610,7 +5610,7 @@ _elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv) } EOLIAN static void -_elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Data *sd) { int i; @@ -5637,7 +5637,7 @@ _elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd) } EOLIAN static void -_elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_genlist_evas_object_smart_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -5645,7 +5645,7 @@ _elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, } EOLIAN static void -_elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_genlist_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -5655,7 +5655,7 @@ _elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord } EOLIAN static void -_elm_genlist_evas_object_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member) +_elm_genlist_evas_object_smart_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index f6d76868a6..95852db18b 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -526,11 +526,11 @@ class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.member_add; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.sub_object_add; diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo index 9df361666e..b1bfc8d9fd 100644 --- a/src/lib/elementary/elm_genlist_pan.eo +++ b/src/lib/elementary/elm_genlist_pan.eo @@ -6,10 +6,10 @@ class Elm.Genlist.Pan (Elm.Pan) implements { class.constructor; Eo.Base.destructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.move; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Pan.content_size.get; Elm.Pan.pos; Elm.Pan.pos_min.get; diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index 27d60b72c9..5307d19770 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -3734,7 +3734,7 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_ } EOLIAN static void -_elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) +_elm_gesture_layer_evas_object_smart_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -3767,7 +3767,7 @@ _elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type); EOLIAN static void -_elm_gesture_layer_evas_object_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd) +_elm_gesture_layer_evas_object_smart_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd) { Pointer_Event *data; int i; diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo index 3281e1446c..e4e042649d 100644 --- a/src/lib/elementary/elm_gesture_layer.eo +++ b/src/lib/elementary/elm_gesture_layer.eo @@ -155,8 +155,8 @@ class Elm.Gesture_Layer (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.disable; } diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 15bb8acd83..3aaba7b916 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -86,7 +86,7 @@ _glview_update_surface(Evas_Object *obj) } EOLIAN static void -_elm_glview_evas_object_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_glview_evas_object_smart_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -220,7 +220,7 @@ _set_render_policy_callback(Evas_Object *obj) } EOLIAN static void -_elm_glview_evas_object_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED) +_elm_glview_evas_object_smart_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED) { Evas_Object *img; @@ -287,7 +287,7 @@ _elm_glview_constructor(Eo *obj, Elm_Glview_Data *priv) } EOLIAN static void -_elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd) +_elm_glview_evas_object_smart_smart_del(Eo *obj, Elm_Glview_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo index a3bd087744..09be477fde 100644 --- a/src/lib/elementary/elm_glview.eo +++ b/src/lib/elementary/elm_glview.eo @@ -184,9 +184,9 @@ class Elm.Glview (Elm.Widget, Efl.Gfx.View) implements { class.constructor; Eo.Base.finalize; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.on_focus; Efl.Gfx.View.view_size.get; Efl.Gfx.View.view_size.set; diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index f28a16165c..a787ea3d00 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -116,7 +116,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED) } EOLIAN static void -_elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_grid_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Object *grid; @@ -135,7 +135,7 @@ _elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) } EOLIAN static void -_elm_grid_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED) +_elm_grid_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED) { Eina_List *l; Evas_Object *child; diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo index d04e661176..e820c6cbf2 100644 --- a/src/lib/elementary/elm_grid.eo +++ b/src/lib/elementary/elm_grid.eo @@ -54,8 +54,8 @@ class Elm.Grid (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index dec8cbab61..c73e3fe0f6 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -564,7 +564,7 @@ _hov_dismiss_cb(void *data, } EOLIAN static void -_elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *sd) +_elm_hover_evas_object_smart_smart_add(Eo *obj, Elm_Hover_Data *sd) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -595,7 +595,7 @@ _elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *sd) } EOLIAN static void -_elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd) +_elm_hover_evas_object_smart_smart_del(Eo *obj, Elm_Hover_Data *sd) { sd->on_del = EINA_TRUE; @@ -616,7 +616,7 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd) } EOLIAN static void -_elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) +_elm_hover_evas_object_smart_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -624,7 +624,7 @@ _elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas } EOLIAN static void -_elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) +_elm_hover_evas_object_smart_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -632,7 +632,7 @@ _elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Ev } EOLIAN static void -_elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) +_elm_hover_evas_object_smart_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); @@ -640,7 +640,7 @@ _elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) +_elm_hover_evas_object_smart_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) { const char *dismissstr; diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index 64fa0850a4..df440d2ae7 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -60,12 +60,12 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.del; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.sub_object_add; Elm.Widget.widget_parent; diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index 81a270d50d..225cdaad54 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -92,10 +92,10 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable, class.constructor; Eo.Base.constructor; Eo.Base.destructor; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.widget_parent.set; Elm.Widget.theme_apply; Elm.Widget.translate; diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 18e92861db..81d0c562c5 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -490,7 +490,7 @@ _elm_icon_thumb_resize_cb(void *data, } EOLIAN static void -_elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv) +_elm_icon_evas_object_smart_smart_add(Eo *obj, Elm_Icon_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -499,7 +499,7 @@ _elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv) } EOLIAN static void -_elm_icon_evas_object_smart_del(Eo *obj, Elm_Icon_Data *sd) +_elm_icon_evas_object_smart_smart_del(Eo *obj, Elm_Icon_Data *sd) { eina_stringshare_del(sd->stdicon); diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo index fe4daecc5f..f0a1bc6ea6 100644 --- a/src/lib/elementary/elm_icon.eo +++ b/src/lib/elementary/elm_icon.eo @@ -16,8 +16,8 @@ class Elm.Icon (Efl.Ui.Image) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Efl.File.file.set; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 137e978004..6124929f85 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1032,7 +1032,7 @@ _sort_cb(const void *d1, const void *d2) EOLIAN static void -_elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv) +_elm_index_evas_object_smart_smart_add(Eo *obj, Elm_Index_Data *priv) { Evas_Object *o; Evas_Coord minw = 0, minh = 0; @@ -1110,7 +1110,7 @@ _elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv) } EOLIAN static void -_elm_index_evas_object_smart_del(Eo *obj, Elm_Index_Data *sd) +_elm_index_evas_object_smart_smart_del(Eo *obj, Elm_Index_Data *sd) { Elm_Index_Omit *o; diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo index db84d59ffb..db0b6f2cb9 100644 --- a/src/lib/elementary/elm_index.eo +++ b/src/lib/elementary/elm_index.eo @@ -220,8 +220,8 @@ class Elm.Index (Elm.Layout, Efl.Orientation, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 8eaf35560b..66f77aefde 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -104,7 +104,7 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd) } EOLIAN static void -_elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) +_elm_pan_evas_object_smart_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_PAN_CLASS)); @@ -112,7 +112,7 @@ _elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) } EOLIAN static void -_elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) +_elm_pan_evas_object_smart_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) { _elm_pan_content_set(obj, NULL); @@ -120,7 +120,7 @@ _elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y) +_elm_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y) { psd->x = x; psd->y = y; @@ -129,7 +129,7 @@ _elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Ev } EOLIAN static void -_elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_pan_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h) { psd->w = w; psd->h = h; @@ -139,7 +139,7 @@ _elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, } EOLIAN static void -_elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) +_elm_pan_evas_object_smart_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) { evas_obj_smart_show(eo_super(obj, MY_PAN_CLASS)); @@ -148,7 +148,7 @@ _elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) } EOLIAN static void -_elm_pan_evas_object_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd) +_elm_pan_evas_object_smart_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd) { evas_obj_smart_hide(eo_super(obj, MY_PAN_CLASS)); @@ -4485,7 +4485,7 @@ _elm_interface_scrollable_loop_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Int } EOLIAN static void -_elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) +_elm_interface_scrollable_evas_object_smart_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) { memset(sid, 0, sizeof(*sid)); @@ -4522,7 +4522,7 @@ _elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_In } EOLIAN static void -_elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) +_elm_interface_scrollable_evas_object_smart_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) { evas_obj_smart_del(eo_super(obj, MY_SCROLLABLE_INTERFACE)); diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index becf50b045..706172fc00 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -662,8 +662,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Evas.Object.Smart) } implements { class.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; } events { changed; diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index 8018aca25b..f077c5b943 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -66,7 +66,7 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm } EOLIAN static void -_elm_inwin_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_inwin_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo index 552d0d46fc..acd71092a9 100644 --- a/src/lib/elementary/elm_inwin.eo +++ b/src/lib/elementary/elm_inwin.eo @@ -21,7 +21,7 @@ class Elm.Inwin (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.widget_parent.set; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index 81e806c377..3e0d120179 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -365,7 +365,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED, } EOLIAN static void -_elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv) +_elm_label_evas_object_smart_smart_add(Eo *obj, Elm_Label_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo index 569bd74ff8..2e9018f889 100644 --- a/src/lib/elementary/elm_label.eo +++ b/src/lib/elementary/elm_label.eo @@ -123,7 +123,7 @@ class Elm.Label (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c index e0c6ec9e2b..66677baeb9 100644 --- a/src/lib/elementary/elm_layout.c +++ b/src/lib/elementary/elm_layout.c @@ -758,7 +758,7 @@ _on_size_evaluate_signal(void *data, } EOLIAN static void -_elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) +_elm_layout_evas_object_smart_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) { Evas_Object *edje; @@ -779,7 +779,7 @@ _elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSE } EOLIAN static void -_elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) +_elm_layout_evas_object_smart_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) { Elm_Layout_Sub_Object_Data *sub_d; Elm_Layout_Sub_Object_Cursor *pc; @@ -837,7 +837,7 @@ _elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) /* rewrite or extend this one on your derived class as to suit your * needs */ EOLIAN static void -_elm_layout_evas_object_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) +_elm_layout_evas_object_smart_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) { if (sd->needs_size_calc) { diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo index 8788da4871..2ddbbeb567 100644 --- a/src/lib/elementary/elm_layout.eo +++ b/src/lib/elementary/elm_layout.eo @@ -331,9 +331,9 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File) Eo.Base.dbg_info_get; Efl.File.file.set; Efl.File.file.get; - Evas.Object.Smart.del; - Evas.Object.Smart.add; - Evas.Object.Smart.calculate; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_calculate; Elm.Widget.focus_direction; Elm.Widget.sub_object_add; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 7925a72fed..f361f44d09 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2387,7 +2387,7 @@ _elm_list_elm_widget_focus_next(Eo *obj, Elm_List_Data *sd, Elm_Focus_Direction } EOLIAN static void -_elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv) +_elm_list_evas_object_smart_smart_add(Eo *obj, Elm_List_Data *priv) { Evas_Coord minw, minh; @@ -2453,7 +2453,7 @@ _elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv) } EOLIAN static void -_elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd) +_elm_list_evas_object_smart_smart_del(Eo *obj, Elm_List_Data *sd) { const Eina_List *l; Elm_Object_Item *eo_it; @@ -2503,7 +2503,7 @@ _elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd) } EOLIAN static void -_elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_list_evas_object_smart_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -2511,7 +2511,7 @@ _elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_ } EOLIAN static void -_elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_list_evas_object_smart_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -2519,7 +2519,7 @@ _elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Eva } EOLIAN static void -_elm_list_evas_object_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member) +_elm_list_evas_object_smart_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index b5ea675467..22795496a8 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -429,11 +429,11 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.member_add; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index c0a44a95a8..445e787c36 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -3861,7 +3861,7 @@ _elm_map_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Map_Pan_Data *psd } EOLIAN static void -_elm_map_pan_evas_object_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) +_elm_map_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) { _sizing_eval(psd->wsd->obj); elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode); @@ -3869,7 +3869,7 @@ _elm_map_pan_evas_object_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord } EOLIAN static void -_elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) +_elm_map_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) { Evas_Coord w, h; @@ -3883,7 +3883,7 @@ _elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) } EOLIAN static void -_elm_map_pan_evas_object_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) +_elm_map_pan_evas_object_smart_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { evas_object_smart_changed(obj); } @@ -4032,7 +4032,7 @@ _elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *sr } EOLIAN static void -_elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv) +_elm_map_evas_object_smart_smart_add(Eo *obj, Elm_Map_Data *priv) { Evas_Coord minw, minh; Elm_Map_Pan_Data *pan_data; @@ -4141,7 +4141,7 @@ _elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv) } EOLIAN static void -_elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd) +_elm_map_evas_object_smart_smart_del(Eo *obj, Elm_Map_Data *sd) { Elm_Map_Route *r; Elm_Map_Name *na; @@ -4201,7 +4201,7 @@ _elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd) } EOLIAN static void -_elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_map_evas_object_smart_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -4209,7 +4209,7 @@ _elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Co } EOLIAN static void -_elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_map_evas_object_smart_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -4217,7 +4217,7 @@ _elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_ } EOLIAN static void -_elm_map_evas_object_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member) +_elm_map_evas_object_smart_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index eae739e836..a099d0b2a3 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -626,11 +626,11 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.on_focus; Elm.Widget.event; diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo index 8c6672b1bf..3a4eb53186 100644 --- a/src/lib/elementary/elm_map_pan.eo +++ b/src/lib/elementary/elm_map_pan.eo @@ -6,9 +6,9 @@ class Elm.Map.Pan (Elm.Pan) implements { class.constructor; Eo.Base.destructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.move; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_resize; Elm.Pan.content_size.get; Elm.Pan.pos; Elm.Pan.pos_min.get; diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 4667cea6ef..bb725c7648 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -156,7 +156,7 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd) } EOLIAN static void -_elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_mapbuf_evas_object_smart_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -166,7 +166,7 @@ _elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, E } EOLIAN static void -_elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_mapbuf_evas_object_smart_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -176,7 +176,7 @@ _elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, } EOLIAN static void -_elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) +_elm_mapbuf_evas_object_smart_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); @@ -185,7 +185,7 @@ _elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) } EOLIAN static void -_elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd) +_elm_mapbuf_evas_object_smart_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd) { evas_obj_smart_hide(eo_super(obj, MY_CLASS)); @@ -264,7 +264,7 @@ _elm_mapbuf_efl_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd) } EOLIAN static void -_elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) +_elm_mapbuf_evas_object_smart_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) { ELM_SAFE_FREE(priv->idler, ecore_idler_del); ELM_SAFE_FREE(priv->map, evas_map_free); @@ -273,7 +273,7 @@ _elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) } EOLIAN static void -_elm_mapbuf_evas_object_smart_add(Eo *obj, Elm_Mapbuf_Data *priv) +_elm_mapbuf_evas_object_smart_smart_add(Eo *obj, Elm_Mapbuf_Data *priv) { Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj)); int i; diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo index e5c4d95025..c9592420cb 100644 --- a/src/lib/elementary/elm_mapbuf.eo +++ b/src/lib/elementary/elm_mapbuf.eo @@ -129,12 +129,12 @@ class Elm.Mapbuf (Elm.Widget, Efl.Container, Efl.Part) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.sub_object_del; Efl.Container.content.get; diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 726a50cf60..a8072ab5a9 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -556,7 +556,7 @@ _unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED) } EOLIAN static void -_elm_menu_evas_object_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) +_elm_menu_evas_object_smart_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) { evas_object_show(sd->hv); } @@ -672,7 +672,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item) } EOLIAN static void -_elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv) +_elm_menu_evas_object_smart_smart_add(Eo *obj, Elm_Menu_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -701,7 +701,7 @@ _elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv) } EOLIAN static void -_elm_menu_evas_object_smart_del(Eo *obj, Elm_Menu_Data *sd) +_elm_menu_evas_object_smart_smart_del(Eo *obj, Elm_Menu_Data *sd) { Elm_Object_Item *eo_item; diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo index d2a6688b4d..6c055b218c 100644 --- a/src/lib/elementary/elm_menu.eo +++ b/src/lib/elementary/elm_menu.eo @@ -72,9 +72,9 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Elm.Interface.Atspi.Selection) class.constructor; Eo.Base.constructor; Eo.Base.destructor; - Evas.Object.Smart.show; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.widget_parent; Elm.Widget.theme_apply; Elm.Widget.translate; diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index d98caf7a38..df0560f1d6 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -176,8 +176,8 @@ class Elm.Multibuttonentry (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index ea8d5a7621..7a48fb5ad8 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -142,9 +142,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.del; - Evas.Object.Smart.show; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_add; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 552252a219..c57a1a4769 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -226,7 +226,7 @@ _block_area_clicked_cb(void *data, } EOLIAN static void -_elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_notify_evas_object_smart_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, Evas_Coord h) { Evas_Coord x, y; @@ -240,7 +240,7 @@ _elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, } EOLIAN static void -_elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_notify_evas_object_smart_smart_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord x, Evas_Coord y) { Evas_Coord w, h; @@ -282,7 +282,7 @@ _timer_init(Evas_Object *obj, } EOLIAN static void -_elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_evas_object_smart_smart_show(Eo *obj, Elm_Notify_Data *sd) { sd->had_hidden = EINA_FALSE; sd->in_timeout = EINA_FALSE; @@ -295,7 +295,7 @@ _elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd) } EOLIAN static void -_elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_evas_object_smart_smart_hide(Eo *obj, Elm_Notify_Data *sd) { const char *hide_signal; @@ -452,7 +452,7 @@ _hide_finished_cb(void *data, } EOLIAN static void -_elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv) +_elm_notify_evas_object_smart_smart_add(Eo *obj, Elm_Notify_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -470,7 +470,7 @@ _elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv) } EOLIAN static void -_elm_notify_evas_object_smart_del(Eo *obj, Elm_Notify_Data *sd) +_elm_notify_evas_object_smart_smart_del(Eo *obj, Elm_Notify_Data *sd) { edje_object_signal_callback_del_full (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj); diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo index 981e2178c4..3edcdf134b 100644 --- a/src/lib/elementary/elm_notify.eo +++ b/src/lib/elementary/elm_notify.eo @@ -79,12 +79,12 @@ class Elm.Notify (Elm.Widget, Efl.Container, Efl.Part) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; Elm.Widget.focus_direction; Elm.Widget.widget_parent; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo index 26cec489c7..8d88101c6c 100644 --- a/src/lib/elementary/elm_pan.eo +++ b/src/lib/elementary/elm_pan.eo @@ -53,12 +53,12 @@ class Elm.Pan (Evas.Smart.Clipped) implements { Eo.Base.constructor; class.constructor; - Evas.Object.Smart.hide; - Evas.Object.Smart.show; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; } events { changed; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 4544f5f3ca..da6b727852 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1001,7 +1001,7 @@ _elm_panel_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *part) } EOLIAN static void -_elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv) +_elm_panel_evas_object_smart_smart_add(Eo *obj, Elm_Panel_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1049,7 +1049,7 @@ _elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv) } EOLIAN static void -_elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd) +_elm_panel_evas_object_smart_smart_del(Eo *obj, Elm_Panel_Data *sd) { Evas_Object *child; Eina_List *l; @@ -1076,7 +1076,7 @@ _elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd) } EOLIAN static void -_elm_panel_evas_object_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_panel_evas_object_smart_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -1101,7 +1101,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) } EOLIAN static void -_elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_panel_evas_object_smart_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -1131,7 +1131,7 @@ _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, E } EOLIAN static void -_elm_panel_evas_object_smart_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member) +_elm_panel_evas_object_smart_smart_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index 27f118b0be..62fe3595f9 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -68,11 +68,11 @@ class Elm.Panel (Elm.Layout, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.member_add; - Evas.Object.Smart.del; - Evas.Object.Smart.resize; - Evas.Object.Smart.move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_resize; + Evas.Object.Smart.smart_move; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c index 227eb8fca9..401a652c84 100644 --- a/src/lib/elementary/elm_panes.c +++ b/src/lib/elementary/elm_panes.c @@ -262,7 +262,7 @@ _on_resize(void *data, } EOLIAN static void -_elm_panes_evas_object_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) +_elm_panes_evas_object_smart_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_PANES_DATA_GET(obj, sd); diff --git a/src/lib/elementary/elm_panes.eo b/src/lib/elementary/elm_panes.eo index 3e4b88e741..da6266e64d 100644 --- a/src/lib/elementary/elm_panes.eo +++ b/src/lib/elementary/elm_panes.eo @@ -117,7 +117,7 @@ class Elm.Panes (Elm.Layout, Efl.Orientation, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index d18f62152e..3a72e3a3db 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -243,7 +243,7 @@ _on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED) } EOLIAN static void -_elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv) +_elm_photo_evas_object_smart_smart_add(Eo *obj, Elm_Photo_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -287,7 +287,7 @@ _elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv) } EOLIAN static void -_elm_photo_evas_object_smart_del(Eo *obj, Elm_Photo_Data *sd) +_elm_photo_evas_object_smart_smart_del(Eo *obj, Elm_Photo_Data *sd) { ecore_timer_del(sd->long_press_timer); diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo index 9d438b8580..a2f661ddcc 100644 --- a/src/lib/elementary/elm_photo.eo +++ b/src/lib/elementary/elm_photo.eo @@ -6,8 +6,8 @@ class Elm.Photo (Elm.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable) class.constructor; Eo.Base.constructor; Efl.File.file.set; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; } diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 1e8a32acee..4bda0a923e 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -145,14 +145,14 @@ _calc_job_cb(void *data) } EOLIAN static void -_elm_photocam_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) +_elm_photocam_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) { ecore_job_del(psd->wsd->calc_job); psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); } EOLIAN static void -_elm_photocam_pan_evas_object_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) +_elm_photocam_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) { Evas_Coord ow, oh; @@ -345,7 +345,7 @@ _grid_place(Evas_Object *obj, } EOLIAN static void -_elm_photocam_pan_evas_object_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd) +_elm_photocam_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd) { Elm_Phocam_Grid *g; Eina_List *l; @@ -1376,7 +1376,7 @@ _elm_photocam_image_orient_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd) } EOLIAN static void -_elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv) +_elm_photocam_evas_object_smart_smart_add(Eo *obj, Elm_Photocam_Data *priv) { Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; Elm_Photocam_Pan_Data *pan_data; @@ -1452,7 +1452,7 @@ _elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv) } EOLIAN static void -_elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd) +_elm_photocam_evas_object_smart_smart_del(Eo *obj, Elm_Photocam_Data *sd) { Elm_Phocam_Grid *g; @@ -1477,7 +1477,7 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd) } EOLIAN static void -_elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_photocam_evas_object_smart_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -1485,7 +1485,7 @@ _elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord } EOLIAN static void -_elm_photocam_evas_object_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_photocam_evas_object_smart_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -1493,7 +1493,7 @@ _elm_photocam_evas_object_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coor } EOLIAN static void -_elm_photocam_evas_object_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member) +_elm_photocam_evas_object_smart_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index 2e2e61e632..e3143fb78c 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -189,11 +189,11 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.on_focus; Elm.Widget.event; diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo index d22efa9305..93d3505b97 100644 --- a/src/lib/elementary/elm_photocam_pan.eo +++ b/src/lib/elementary/elm_photocam_pan.eo @@ -6,9 +6,9 @@ class Elm.Photocam.Pan (Elm.Pan) implements { class.constructor; Eo.Base.destructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.move; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_resize; Elm.Pan.content_size.get; Elm.Pan.pos; Elm.Pan.pos_min.get; diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index c8381abfab..d8831991c4 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -6,8 +6,8 @@ class Elm.Player (Elm.Layout, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.event; Elm.Layout.sizing_eval; diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 02adddeac5..5b359bc5cb 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -107,7 +107,7 @@ _on_mouse_up(void *data, } EOLIAN static void -_elm_plug_evas_object_smart_add(Eo *obj, void *sd EINA_UNUSED) +_elm_plug_evas_object_smart_smart_add(Eo *obj, void *sd EINA_UNUSED) { Evas_Object *p_obj; Ecore_Evas *ee; diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo index 1f7eecff59..830f4ed2cc 100644 --- a/src/lib/elementary/elm_plug.eo +++ b/src/lib/elementary/elm_plug.eo @@ -32,7 +32,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.theme_apply; Elm.Widget.on_focus; } diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 0f8ac58948..68001920f8 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -167,8 +167,8 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.del; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_add; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index 1088e903ba..038bf562d8 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -46,7 +46,7 @@ static Eina_Bool _prefs_item_widget_value_from_self(Elm_Prefs_Item_Node *, Eina_Bool); EOLIAN static void -_elm_prefs_evas_object_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) +_elm_prefs_evas_object_smart_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); @@ -447,7 +447,7 @@ _elm_prefs_data_cbs_del(Eo *obj) } EOLIAN static void -_elm_prefs_evas_object_smart_del(Eo *obj, Elm_Prefs_Data *sd) +_elm_prefs_evas_object_smart_smart_del(Eo *obj, Elm_Prefs_Data *sd) { sd->delete_me = EINA_TRUE; diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo index b2cc065dac..3232406811 100644 --- a/src/lib/elementary/elm_prefs.eo +++ b/src/lib/elementary/elm_prefs.eo @@ -216,8 +216,8 @@ class Elm.Prefs (Elm.Widget, Efl.File) Eo.Base.constructor; Efl.File.file.set; Efl.File.file.get; - Evas.Object.Smart.del; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_add; Elm.Widget.focus_next; } events { diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c index a2bb18eaa6..631080efd9 100644 --- a/src/lib/elementary/elm_progressbar.c +++ b/src/lib/elementary/elm_progressbar.c @@ -279,7 +279,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_progressbar_evas_object_smart_add(Eo *obj, Elm_Progressbar_Data *priv) +_elm_progressbar_evas_object_smart_smart_add(Eo *obj, Elm_Progressbar_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -318,7 +318,7 @@ _elm_progressbar_evas_object_smart_add(Eo *obj, Elm_Progressbar_Data *priv) } EOLIAN static void -_elm_progressbar_evas_object_smart_del(Eo *obj, Elm_Progressbar_Data *sd) +_elm_progressbar_evas_object_smart_smart_del(Eo *obj, Elm_Progressbar_Data *sd) { Elm_Progress_Status *progress_obj; diff --git a/src/lib/elementary/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo index 6f4424006b..f40c0224a2 100644 --- a/src/lib/elementary/elm_progressbar.eo +++ b/src/lib/elementary/elm_progressbar.eo @@ -57,8 +57,8 @@ class Elm.Progressbar (Elm.Layout, Efl.Ui.Progress, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c index 5d04bd24d3..5fcf9389f6 100644 --- a/src/lib/elementary/elm_radio.c +++ b/src/lib/elementary/elm_radio.c @@ -220,7 +220,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) } EOLIAN static void -_elm_radio_evas_object_smart_add(Eo *obj, Elm_Radio_Data *priv) +_elm_radio_evas_object_smart_smart_add(Eo *obj, Elm_Radio_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -250,7 +250,7 @@ _elm_radio_evas_object_smart_add(Eo *obj, Elm_Radio_Data *priv) } EOLIAN static void -_elm_radio_evas_object_smart_del(Eo *obj, Elm_Radio_Data *sd) +_elm_radio_evas_object_smart_smart_del(Eo *obj, Elm_Radio_Data *sd) { sd->group->radios = eina_list_remove(sd->group->radios, obj); if (!sd->group->radios) free(sd->group); diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo index 78a5d7788f..6a482422e5 100644 --- a/src/lib/elementary/elm_radio.eo +++ b/src/lib/elementary/elm_radio.eo @@ -78,8 +78,8 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.activate; Elm.Widget.event; diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index 80d714ca95..b7e755809e 100644 --- a/src/lib/elementary/elm_route.c +++ b/src/lib/elementary/elm_route.c @@ -134,7 +134,7 @@ _update_lon_lat_min_max(Evas_Object *obj, #endif EOLIAN static void -_elm_route_evas_object_smart_add(Eo *obj, Elm_Route_Data *priv) +_elm_route_evas_object_smart_smart_add(Eo *obj, Elm_Route_Data *priv) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); @@ -159,7 +159,7 @@ _elm_route_evas_object_smart_add(Eo *obj, Elm_Route_Data *priv) } EOLIAN static void -_elm_route_evas_object_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) +_elm_route_evas_object_smart_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) { _clear_route(obj); diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo index c51f42e354..b3b46b3825 100644 --- a/src/lib/elementary/elm_route.eo +++ b/src/lib/elementary/elm_route.eo @@ -41,8 +41,8 @@ class Elm.Route (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; } diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 27a0c1c8f4..3b06b4ffed 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -858,7 +858,7 @@ _elm_scroller_content_viewport_resize_cb(Evas_Object *obj, } EOLIAN static void -_elm_scroller_evas_object_smart_add(Eo *obj, Elm_Scroller_Data *priv) +_elm_scroller_evas_object_smart_smart_add(Eo *obj, Elm_Scroller_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Coord minw, minh; @@ -915,7 +915,7 @@ _elm_scroller_evas_object_smart_add(Eo *obj, Elm_Scroller_Data *priv) } EOLIAN static void -_elm_scroller_evas_object_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_scroller_evas_object_smart_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -923,7 +923,7 @@ _elm_scroller_evas_object_smart_move(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord } EOLIAN static void -_elm_scroller_evas_object_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_scroller_evas_object_smart_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -931,7 +931,7 @@ _elm_scroller_evas_object_smart_resize(Eo *obj, Elm_Scroller_Data *sd, Evas_Coor } EOLIAN static void -_elm_scroller_evas_object_smart_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member) +_elm_scroller_evas_object_smart_smart_member_add(Eo *obj, Elm_Scroller_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index 62d2246dce..81841c85c1 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -60,10 +60,10 @@ class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Elm.Widget.theme_apply; Elm.Widget.activate; Elm.Widget.focus_next_manager_is; diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index c3b179bbf8..98c8cc8064 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -608,7 +608,7 @@ _elm_segment_control_item_eo_base_constructor(Eo *obj, Elm_Segment_Control_Item_ } EOLIAN static void -_elm_segment_control_evas_object_smart_add(Eo *obj, Elm_Segment_Control_Data *sd) +_elm_segment_control_evas_object_smart_smart_add(Eo *obj, Elm_Segment_Control_Data *sd) { sd->obj = obj; evas_obj_smart_add(eo_super(obj, MY_CLASS)); @@ -627,7 +627,7 @@ _elm_segment_control_evas_object_smart_add(Eo *obj, Elm_Segment_Control_Data *sd } EOLIAN static void -_elm_segment_control_evas_object_smart_del(Eo *obj, Elm_Segment_Control_Data *sd) +_elm_segment_control_evas_object_smart_smart_del(Eo *obj, Elm_Segment_Control_Data *sd) { Elm_Object_Item *eo_it; diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo index d699f6847b..324a141b39 100644 --- a/src/lib/elementary/elm_segment_control.eo +++ b/src/lib/elementary/elm_segment_control.eo @@ -135,8 +135,8 @@ class Elm.Segment_Control (Elm.Layout) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index 6c5ca2fb2e..d70ae0ed4a 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -45,7 +45,7 @@ _elm_separator_elm_layout_sizing_eval(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE } EOLIAN static void -_elm_separator_evas_object_smart_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) +_elm_separator_evas_object_smart_smart_add(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { evas_obj_smart_add(eo_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo index a0cbf516d1..497f0b6885 100644 --- a/src/lib/elementary/elm_separator.eo +++ b/src/lib/elementary/elm_separator.eo @@ -5,7 +5,7 @@ class Elm.Separator (Elm.Layout, Efl.Orientation) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; + Evas.Object.Smart.smart_add; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index 8b40aab618..6b8a3b3096 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -1072,7 +1072,7 @@ _min_max_set(Evas_Object *obj) } EOLIAN static void -_elm_slider_evas_object_smart_calculate(Eo *obj, Elm_Slider_Data *sd) +_elm_slider_evas_object_smart_smart_calculate(Eo *obj, Elm_Slider_Data *sd) { elm_layout_freeze(obj); @@ -1137,7 +1137,7 @@ _on_show(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, } EOLIAN static void -_elm_slider_evas_object_smart_add(Eo *obj, Elm_Slider_Data *priv) +_elm_slider_evas_object_smart_smart_add(Eo *obj, Elm_Slider_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -1202,7 +1202,7 @@ _elm_slider_evas_object_smart_add(Eo *obj, Elm_Slider_Data *priv) } EOLIAN static void -_elm_slider_evas_object_smart_del(Eo *obj, Elm_Slider_Data *sd) +_elm_slider_evas_object_smart_smart_del(Eo *obj, Elm_Slider_Data *sd) { eina_stringshare_del(sd->indicator); eina_stringshare_del(sd->units); diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo index 61dd1cb6d9..d029c03460 100644 --- a/src/lib/elementary/elm_slider.eo +++ b/src/lib/elementary/elm_slider.eo @@ -171,9 +171,9 @@ class Elm.Slider (Elm.Layout, Efl.Ui.Progress, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.activate; Elm.Widget.focus_next_manager_is; diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index 02197ca5df..10ffa28f43 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -319,7 +319,7 @@ _elm_slideshow_item_eo_base_destructor(Eo *eo_item, Elm_Slideshow_Item_Data *ite } EOLIAN static void -_elm_slideshow_evas_object_smart_add(Eo *obj, Elm_Slideshow_Data *priv) +_elm_slideshow_evas_object_smart_smart_add(Eo *obj, Elm_Slideshow_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -363,7 +363,7 @@ _elm_slideshow_evas_object_smart_add(Eo *obj, Elm_Slideshow_Data *priv) } EOLIAN static void -_elm_slideshow_evas_object_smart_del(Eo *obj, Elm_Slideshow_Data *sd) +_elm_slideshow_evas_object_smart_smart_del(Eo *obj, Elm_Slideshow_Data *sd) { const char *layout; diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index 80456337c7..923b3e2248 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -303,8 +303,8 @@ class Elm.Slideshow (Elm.Layout, Elm.Interface.Atspi_Widget_Action) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.event; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index e6212c23f3..b7bec1821c 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1154,7 +1154,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access) } EOLIAN static void -_elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) +_elm_spinner_evas_object_smart_smart_add(Eo *obj, Elm_Spinner_Data *priv) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_SPINNER_DATA_GET(obj, sd); @@ -1237,7 +1237,7 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) } EOLIAN static void -_elm_spinner_evas_object_smart_del(Eo *obj, Elm_Spinner_Data *sd) +_elm_spinner_evas_object_smart_smart_del(Eo *obj, Elm_Spinner_Data *sd) { Elm_Spinner_Special_Value *sv; diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index eb1fe42936..074a720373 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -145,8 +145,8 @@ class Elm.Spinner (Elm.Layout, Efl.Ui.Spin, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 6fe588ac9f..fd4dee2a15 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -163,7 +163,7 @@ _elm_table_elm_widget_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, Evas_Object } EOLIAN static void -_elm_table_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) +_elm_table_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED) { Evas_Object *table; @@ -184,7 +184,7 @@ _elm_table_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) } EOLIAN static void -_elm_table_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED) +_elm_table_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED) { Eina_List *l; Evas_Object *child; @@ -407,7 +407,7 @@ _elm_table_class_constructor(Eo_Class *klass) } EOLIAN void -_elm_table_evas_object_smart_calculate(Eo *obj, void *pd EINA_UNUSED) +_elm_table_evas_object_smart_smart_calculate(Eo *obj, void *pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo index 08e398af27..637c330549 100644 --- a/src/lib/elementary/elm_table.eo +++ b/src/lib/elementary/elm_table.eo @@ -119,9 +119,9 @@ class Elm.Table (Elm.Widget) implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.calculate; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_calculate; Elm.Widget.focus_direction; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index fc1f17ff8c..2d9b3159e9 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -453,7 +453,7 @@ _thumb_show(Elm_Thumb_Data *sd) } EOLIAN static void -_elm_thumb_evas_object_smart_show(Eo *obj, Elm_Thumb_Data *sd) +_elm_thumb_evas_object_smart_smart_show(Eo *obj, Elm_Thumb_Data *sd) { evas_obj_smart_show(eo_super(obj, MY_CLASS)); @@ -461,7 +461,7 @@ _elm_thumb_evas_object_smart_show(Eo *obj, Elm_Thumb_Data *sd) } EOLIAN static void -_elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data *sd) +_elm_thumb_evas_object_smart_smart_hide(Eo *obj, Elm_Thumb_Data *sd) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -524,7 +524,7 @@ elm_need_ethumb(void) } EOLIAN static void -_elm_thumb_evas_object_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED) +_elm_thumb_evas_object_smart_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -543,7 +543,7 @@ _elm_thumb_evas_object_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED) } EOLIAN static void -_elm_thumb_evas_object_smart_del(Eo *obj, Elm_Thumb_Data *sd) +_elm_thumb_evas_object_smart_smart_del(Eo *obj, Elm_Thumb_Data *sd) { if (sd->thumb.request) { diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo index 3ce1336f92..b3d7837cfc 100644 --- a/src/lib/elementary/elm_thumb.eo +++ b/src/lib/elementary/elm_thumb.eo @@ -10,10 +10,10 @@ class Elm.Thumb (Elm.Layout, Efl.File, Efl.Ui.Clickable, Eo.Base.constructor; Efl.File.file.set; Efl.File.file.get; - Evas.Object.Smart.hide; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.show; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_show; Efl.Ui.Draggable.drag_target.set; Efl.Ui.Draggable.drag_target.get; } diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 3e6f199fc2..4f0d3aa82a 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2807,7 +2807,7 @@ _elm_toolbar_action_down_cb(void *data, } EOLIAN static void -_elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv) +_elm_toolbar_evas_object_smart_smart_add(Eo *obj, Elm_Toolbar_Data *priv) { Evas_Object *edje; @@ -2909,7 +2909,7 @@ _elm_toolbar_evas_object_smart_add(Eo *obj, Elm_Toolbar_Data *priv) } EOLIAN static void -_elm_toolbar_evas_object_smart_del(Eo *obj, Elm_Toolbar_Data *sd) +_elm_toolbar_evas_object_smart_smart_del(Eo *obj, Elm_Toolbar_Data *sd) { Elm_Toolbar_Item_Data *it, *next; @@ -2932,7 +2932,7 @@ _elm_toolbar_evas_object_smart_del(Eo *obj, Elm_Toolbar_Data *sd) } EOLIAN static void -_elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_toolbar_evas_object_smart_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, Evas_Coord y) { evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); @@ -2940,7 +2940,7 @@ _elm_toolbar_evas_object_smart_move(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord x, } EOLIAN static void -_elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_toolbar_evas_object_smart_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord w, Evas_Coord h) { evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); @@ -2948,7 +2948,7 @@ _elm_toolbar_evas_object_smart_resize(Eo *obj, Elm_Toolbar_Data *sd, Evas_Coord } EOLIAN static void -_elm_toolbar_evas_object_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member) +_elm_toolbar_evas_object_smart_smart_member_add(Eo *obj, Elm_Toolbar_Data *sd, Evas_Object *member) { evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); @@ -4118,7 +4118,7 @@ _elm_toolbar_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E } EOLIAN void -_elm_toolbar_evas_object_smart_calculate(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED) +_elm_toolbar_evas_object_smart_smart_calculate(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUSED) { _sizing_eval(obj); } diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index c749a05e79..4978281437 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -345,12 +345,12 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation, implements { class.constructor; Eo.Base.constructor; - Evas.Object.Smart.calculate; - Evas.Object.Smart.move; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Elm.Widget.focus_next_manager_is; Elm.Widget.access; Elm.Widget.focus_next; diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c index a0dbd10f96..99b21ed5c6 100644 --- a/src/lib/elementary/elm_video.c +++ b/src/lib/elementary/elm_video.c @@ -248,7 +248,7 @@ _elm_video_check(Evas_Object *video) } EOLIAN static void -_elm_video_evas_object_smart_add(Eo *obj, Elm_Video_Data *priv) +_elm_video_evas_object_smart_smart_add(Eo *obj, Elm_Video_Data *priv) { _elm_emotion_init(); @@ -274,7 +274,7 @@ _elm_video_evas_object_smart_add(Eo *obj, Elm_Video_Data *priv) } EOLIAN static void -_elm_video_evas_object_smart_del(Eo *obj, Elm_Video_Data *sd) +_elm_video_evas_object_smart_smart_del(Eo *obj, Elm_Video_Data *sd) { ecore_timer_del(sd->timer); if (sd->remember) emotion_object_last_position_save(sd->emotion); diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo index 8a88c366b3..b76deb94a7 100644 --- a/src/lib/elementary/elm_video.eo +++ b/src/lib/elementary/elm_video.eo @@ -65,8 +65,8 @@ class Elm.Video (Elm.Layout, Efl.File, Eo.Base.constructor; Efl.File.file.set; Efl.File.file.get; - Evas.Object.Smart.add; - Evas.Object.Smart.del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; Elm.Widget.focus_next_manager_is; Elm.Widget.focus_direction_manager_is; Elm.Widget.event; diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 1ab15c1081..f55fcfdf34 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -348,7 +348,7 @@ _obj_mouse_in(void *data, } EOLIAN static void -_elm_widget_evas_object_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv) +_elm_widget_evas_object_smart_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv) { priv->obj = obj; @@ -428,7 +428,7 @@ _if_focused_revert(Evas_Object *obj, } EOLIAN static void -_elm_widget_evas_object_smart_del(Eo *obj, Elm_Widget_Smart_Data *sd) +_elm_widget_evas_object_smart_smart_del(Eo *obj, Elm_Widget_Smart_Data *sd) { Evas_Object *sobj; Elm_Translate_String_Data *ts; @@ -495,7 +495,7 @@ _smart_reconfigure(Elm_Widget_Smart_Data *sd) } EOLIAN static void -_elm_widget_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y) +_elm_widget_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord x, Evas_Coord y) { sd->x = x; sd->y = y; @@ -504,7 +504,7 @@ _elm_widget_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *s } EOLIAN static void -_elm_widget_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h) +_elm_widget_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Evas_Coord w, Evas_Coord h) { sd->w = w; sd->h = h; @@ -513,7 +513,7 @@ _elm_widget_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data } EOLIAN static void -_elm_widget_evas_object_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd) +_elm_widget_evas_object_smart_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd) { Eina_Iterator *it; Evas_Object *o; @@ -535,7 +535,7 @@ _elm_widget_evas_object_smart_show(Eo *obj, Elm_Widget_Smart_Data *_pd) } EOLIAN static void -_elm_widget_evas_object_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd) +_elm_widget_evas_object_smart_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd) { Eina_Iterator *it; Evas_Object *o; @@ -553,7 +553,7 @@ _elm_widget_evas_object_smart_hide(Eo *obj, Elm_Widget_Smart_Data *_pd) } EOLIAN static void -_elm_widget_evas_object_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a) +_elm_widget_evas_object_smart_smart_color_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, int r, int g, int b, int a) { Eina_Iterator *it; Evas_Object *o; @@ -583,7 +583,7 @@ _elm_widget_evas_object_smart_smart_no_render_set(Eo *obj, Elm_Widget_Smart_Data } EOLIAN static void -_elm_widget_evas_object_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) +_elm_widget_evas_object_smart_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *clip) { Eina_Iterator *it; Evas_Object *o; @@ -598,7 +598,7 @@ _elm_widget_evas_object_smart_clip_set(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_ } EOLIAN static void -_elm_widget_evas_object_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_evas_object_smart_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { Eina_Iterator *it; Evas_Object *o; @@ -613,13 +613,13 @@ _elm_widget_evas_object_smart_clip_unset(Eo *obj, Elm_Widget_Smart_Data *_pd EIN } EOLIAN static void -_elm_widget_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { /* a NO-OP, on the base */ } EOLIAN static void -_elm_widget_evas_object_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) +_elm_widget_evas_object_smart_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { int r, g, b, a; evas_obj_smart_member_add(eo_super(obj, MY_CLASS), child); @@ -639,7 +639,7 @@ _elm_widget_evas_object_smart_member_add(Eo *obj, Elm_Widget_Smart_Data *_pd EIN } EOLIAN static void -_elm_widget_evas_object_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) +_elm_widget_evas_object_smart_smart_member_del(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Evas_Object *child) { if (!evas_object_data_get(child, "_elm_leaveme")) evas_object_clip_unset(child); diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index ccf3799bdd..72a2e5b831 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -37,7 +37,7 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte the focus from this object, passing it back to the previous element in the focus chain list. - Warning: Only visible object can get a focus. Call @Evas.Object.Smart.show + Warning: Only visible object can get a focus. Call @Evas.Object.Smart.smart_show before calling this API, if you want to give a focus to the evas object.]] set { [[$true set the focus to the object, @@ -851,18 +851,18 @@ abstract Elm.Widget (Evas.Object.Smart, Elm.Interface.Atspi_Accessible, Elm.Inte Eo.Base.destructor; Eo.Base.dbg_info_get; Eo.Base.provider_find; - Evas.Object.Smart.hide; - Evas.Object.Smart.calculate; - Evas.Object.Smart.clip_unset; - Evas.Object.Smart.show; - Evas.Object.Smart.color.set; - Evas.Object.Smart.move; - Evas.Object.Smart.member_del; - Evas.Object.Smart.add; - Evas.Object.Smart.del; - Evas.Object.Smart.clip.set; - Evas.Object.Smart.member_add; - Evas.Object.Smart.resize; + Evas.Object.Smart.smart_hide; + Evas.Object.Smart.smart_calculate; + Evas.Object.Smart.smart_clip_unset; + Evas.Object.Smart.smart_show; + Evas.Object.Smart.smart_color.set; + Evas.Object.Smart.smart_move; + Evas.Object.Smart.smart_member_del; + Evas.Object.Smart.smart_add; + Evas.Object.Smart.smart_del; + Evas.Object.Smart.smart_clip.set; + Evas.Object.Smart.smart_member_add; + Evas.Object.Smart.smart_resize; Evas.Object.Smart.smart_no_render.set; Elm.Interface.Atspi_Accessible.name.get; Elm.Interface.Atspi_Accessible.state_set.get; |