summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 14:57:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-17 19:25:48 +0900
commit42b63f55074fe63066a8046c6211dbb82dbe36cb (patch)
treeccaaf90810b2193102d5fd6f87233c2a32ce2780 /src/lib
parent2a0bb33f1d049f35914cc4597022702f297bdc3c (diff)
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 '')
-rw-r--r--src/lib/edje/edje_edit.c2
-rw-r--r--src/lib/edje/edje_edit.eo2
-rw-r--r--src/lib/edje/edje_object.eo14
-rw-r--r--src/lib/edje/edje_smart.c14
-rw-r--r--src/lib/elementary/efl_ui_box.c6
-rw-r--r--src/lib/elementary/efl_ui_box.eo6
-rw-r--r--src/lib/elementary/efl_ui_flip.c4
-rw-r--r--src/lib/elementary/efl_ui_flip.eo4
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_grid.eo6
-rw-r--r--src/lib/elementary/efl_ui_image.c20
-rw-r--r--src/lib/elementary/efl_ui_image.eo20
-rw-r--r--src/lib/elementary/efl_ui_nstate.c4
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo4
-rw-r--r--src/lib/elementary/efl_ui_text.c14
-rw-r--r--src/lib/elementary/efl_ui_text.eo14
-rw-r--r--src/lib/elementary/efl_ui_win.c12
-rw-r--r--src/lib/elementary/efl_ui_win.eo12
-rw-r--r--src/lib/elementary/elc_combobox.c10
-rw-r--r--src/lib/elementary/elc_ctxpopup.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_hoversel.c8
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c4
-rw-r--r--src/lib/elementary/elc_naviframe.c6
-rw-r--r--src/lib/elementary/elc_player.c4
-rw-r--r--src/lib/elementary/elc_popup.c4
-rw-r--r--src/lib/elementary/elm_access.c2
-rw-r--r--src/lib/elementary/elm_access.eo2
-rw-r--r--src/lib/elementary/elm_actionslider.c2
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_bg.c2
-rw-r--r--src/lib/elementary/elm_bg.eo2
-rw-r--r--src/lib/elementary/elm_box.c6
-rw-r--r--src/lib/elementary/elm_box.eo6
-rw-r--r--src/lib/elementary/elm_bubble.c2
-rw-r--r--src/lib/elementary/elm_bubble.eo2
-rw-r--r--src/lib/elementary/elm_button.c2
-rw-r--r--src/lib/elementary/elm_button.eo2
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_calendar.eo6
-rw-r--r--src/lib/elementary/elm_check.c2
-rw-r--r--src/lib/elementary/elm_check.eo2
-rw-r--r--src/lib/elementary/elm_clock.c4
-rw-r--r--src/lib/elementary/elm_clock.eo4
-rw-r--r--src/lib/elementary/elm_code_widget.c2
-rw-r--r--src/lib/elementary/elm_code_widget.eo2
-rw-r--r--src/lib/elementary/elm_colorselector.c4
-rw-r--r--src/lib/elementary/elm_colorselector.eo4
-rw-r--r--src/lib/elementary/elm_combobox.eo10
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_conformant.eo4
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo4
-rw-r--r--src/lib/elementary/elm_datetime.c4
-rw-r--r--src/lib/elementary/elm_datetime.eo4
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_dayselector.eo4
-rw-r--r--src/lib/elementary/elm_diskselector.c10
-rw-r--r--src/lib/elementary/elm_diskselector.eo10
-rw-r--r--src/lib/elementary/elm_entry.c14
-rw-r--r--src/lib/elementary/elm_entry.eo14
-rw-r--r--src/lib/elementary/elm_fileselector.eo4
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo4
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c4
-rw-r--r--src/lib/elementary/elm_flipselector.eo4
-rw-r--r--src/lib/elementary/elm_frame.c4
-rw-r--r--src/lib/elementary/elm_frame.eo4
-rw-r--r--src/lib/elementary/elm_gengrid.c16
-rw-r--r--src/lib/elementary/elm_gengrid.eo10
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo6
-rw-r--r--src/lib/elementary/elm_genlist.c18
-rw-r--r--src/lib/elementary/elm_genlist.eo10
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo8
-rw-r--r--src/lib/elementary/elm_gesture_layer.c4
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo4
-rw-r--r--src/lib/elementary/elm_glview.c6
-rw-r--r--src/lib/elementary/elm_glview.eo6
-rw-r--r--src/lib/elementary/elm_grid.c4
-rw-r--r--src/lib/elementary/elm_grid.eo4
-rw-r--r--src/lib/elementary/elm_hover.c12
-rw-r--r--src/lib/elementary/elm_hover.eo12
-rw-r--r--src/lib/elementary/elm_hoversel.eo8
-rw-r--r--src/lib/elementary/elm_icon.c4
-rw-r--r--src/lib/elementary/elm_icon.eo4
-rw-r--r--src/lib/elementary/elm_index.c4
-rw-r--r--src/lib/elementary/elm_index.eo4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c16
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo4
-rw-r--r--src/lib/elementary/elm_inwin.c2
-rw-r--r--src/lib/elementary/elm_inwin.eo2
-rw-r--r--src/lib/elementary/elm_label.c2
-rw-r--r--src/lib/elementary/elm_label.eo2
-rw-r--r--src/lib/elementary/elm_layout.c6
-rw-r--r--src/lib/elementary/elm_layout.eo6
-rw-r--r--src/lib/elementary/elm_list.c10
-rw-r--r--src/lib/elementary/elm_list.eo10
-rw-r--r--src/lib/elementary/elm_map.c16
-rw-r--r--src/lib/elementary/elm_map.eo10
-rw-r--r--src/lib/elementary/elm_map_pan.eo6
-rw-r--r--src/lib/elementary/elm_mapbuf.c12
-rw-r--r--src/lib/elementary/elm_mapbuf.eo12
-rw-r--r--src/lib/elementary/elm_menu.c6
-rw-r--r--src/lib/elementary/elm_menu.eo6
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo4
-rw-r--r--src/lib/elementary/elm_naviframe.eo6
-rw-r--r--src/lib/elementary/elm_notify.c12
-rw-r--r--src/lib/elementary/elm_notify.eo12
-rw-r--r--src/lib/elementary/elm_pan.eo12
-rw-r--r--src/lib/elementary/elm_panel.c10
-rw-r--r--src/lib/elementary/elm_panel.eo10
-rw-r--r--src/lib/elementary/elm_panes.c2
-rw-r--r--src/lib/elementary/elm_panes.eo2
-rw-r--r--src/lib/elementary/elm_photo.c4
-rw-r--r--src/lib/elementary/elm_photo.eo4
-rw-r--r--src/lib/elementary/elm_photocam.c16
-rw-r--r--src/lib/elementary/elm_photocam.eo10
-rw-r--r--src/lib/elementary/elm_photocam_pan.eo6
-rw-r--r--src/lib/elementary/elm_player.eo4
-rw-r--r--src/lib/elementary/elm_plug.c2
-rw-r--r--src/lib/elementary/elm_plug.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo4
-rw-r--r--src/lib/elementary/elm_prefs.c4
-rw-r--r--src/lib/elementary/elm_prefs.eo4
-rw-r--r--src/lib/elementary/elm_progressbar.c4
-rw-r--r--src/lib/elementary/elm_progressbar.eo4
-rw-r--r--src/lib/elementary/elm_radio.c4
-rw-r--r--src/lib/elementary/elm_radio.eo4
-rw-r--r--src/lib/elementary/elm_route.c4
-rw-r--r--src/lib/elementary/elm_route.eo4
-rw-r--r--src/lib/elementary/elm_scroller.c8
-rw-r--r--src/lib/elementary/elm_scroller.eo8
-rw-r--r--src/lib/elementary/elm_segment_control.c4
-rw-r--r--src/lib/elementary/elm_segment_control.eo4
-rw-r--r--src/lib/elementary/elm_separator.c2
-rw-r--r--src/lib/elementary/elm_separator.eo2
-rw-r--r--src/lib/elementary/elm_slider.c6
-rw-r--r--src/lib/elementary/elm_slider.eo6
-rw-r--r--src/lib/elementary/elm_slideshow.c4
-rw-r--r--src/lib/elementary/elm_slideshow.eo4
-rw-r--r--src/lib/elementary/elm_spinner.c4
-rw-r--r--src/lib/elementary/elm_spinner.eo4
-rw-r--r--src/lib/elementary/elm_table.c6
-rw-r--r--src/lib/elementary/elm_table.eo6
-rw-r--r--src/lib/elementary/elm_thumb.c8
-rw-r--r--src/lib/elementary/elm_thumb.eo8
-rw-r--r--src/lib/elementary/elm_toolbar.c12
-rw-r--r--src/lib/elementary/elm_toolbar.eo12
-rw-r--r--src/lib/elementary/elm_video.c4
-rw-r--r--src/lib/elementary/elm_video.eo4
-rw-r--r--src/lib/elementary/elm_widget.c24
-rw-r--r--src/lib/elementary/elm_widget.eo26
-rw-r--r--src/lib/emotion/emotion_object.eo18
-rw-r--r--src/lib/emotion/emotion_smart.c18
-rw-r--r--src/lib/evas/Evas_Legacy.h4
-rw-r--r--src/lib/evas/canvas/evas_box.eo8
-rw-r--r--src/lib/evas/canvas/evas_object_box.c8
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c58
-rw-r--r--src/lib/evas/canvas/evas_object_smart.eo54
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c24
-rw-r--r--src/lib/evas/canvas/evas_object_table.c8
-rw-r--r--src/lib/evas/canvas/evas_smart_clipped.eo22
-rw-r--r--src/lib/evas/canvas/evas_table.eo8
-rw-r--r--src/lib/evas/include/evas_private.h2
165 files changed, 613 insertions, 609 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 916ed70412..7141853fd6 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -148,7 +148,7 @@ _edje_edit_data_clean(Edje_Edit *eed)
148} 148}
149 149
150EOLIAN static void 150EOLIAN static void
151_edje_edit_evas_object_smart_del(Eo *obj, Edje_Edit *eed) 151_edje_edit_evas_object_smart_smart_del(Eo *obj, Edje_Edit *eed)
152{ 152{
153 _edje_edit_data_clean(eed); 153 _edje_edit_data_clean(eed);
154 154
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index f201b6495a..e11c9219b1 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -10,7 +10,7 @@ class Edje.Edit (Edje.Object)
10 implements { 10 implements {
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
13 Evas.Object.Smart.del; 13 Evas.Object.Smart.smart_del;
14 Efl.File.file.set; 14 Efl.File.file.set;
15 } 15 }
16} 16}
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index a348b30200..b7fd085085 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -1991,13 +1991,13 @@ class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container, Efl.Part)
1991 Eo.Base.destructor; 1991 Eo.Base.destructor;
1992 Eo.Base.dbg_info_get; 1992 Eo.Base.dbg_info_get;
1993 Evas.Object.paragraph_direction.set; 1993 Evas.Object.paragraph_direction.set;
1994 Evas.Object.Smart.hide; 1994 Evas.Object.Smart.smart_hide;
1995 Evas.Object.Smart.calculate; 1995 Evas.Object.Smart.smart_calculate;
1996 Evas.Object.Smart.show; 1996 Evas.Object.Smart.smart_show;
1997 Evas.Object.Smart.move; 1997 Evas.Object.Smart.smart_move;
1998 Evas.Object.Smart.add; 1998 Evas.Object.Smart.smart_add;
1999 Evas.Object.Smart.del; 1999 Evas.Object.Smart.smart_del;
2000 Evas.Object.Smart.resize; 2000 Evas.Object.Smart.smart_resize;
2001 Evas.Object.Smart.smart_no_render.set; 2001 Evas.Object.Smart.smart_no_render.set;
2002 Efl.File.file.set; 2002 Efl.File.file.set;
2003 Efl.File.file.get; 2003 Efl.File.file.get;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index ebfcf0cf23..d9995e80b6 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -109,7 +109,7 @@ _edje_size_class_free(void *data)
109 109
110/* Private Routines */ 110/* Private Routines */
111EOLIAN static void 111EOLIAN static void
112_edje_object_evas_object_smart_add(Eo *obj, Edje *ed) 112_edje_object_evas_object_smart_smart_add(Eo *obj, Edje *ed)
113{ 113{
114 Evas *tev = evas_object_evas_get(obj); 114 Evas *tev = evas_object_evas_get(obj);
115 115
@@ -147,7 +147,7 @@ _edje_object_evas_object_smart_add(Eo *obj, Edje *ed)
147} 147}
148 148
149EOLIAN static void 149EOLIAN static void
150_edje_object_evas_object_smart_del(Eo *obj, Edje *ed) 150_edje_object_evas_object_smart_smart_del(Eo *obj, Edje *ed)
151{ 151{
152 _edje_block_violate(ed); 152 _edje_block_violate(ed);
153 ed->delete_me = 1; 153 ed->delete_me = 1;
@@ -170,7 +170,7 @@ _edje_object_evas_object_smart_del(Eo *obj, Edje *ed)
170} 170}
171 171
172EOLIAN static void 172EOLIAN static void
173_edje_object_evas_object_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y) 173_edje_object_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord x, Evas_Coord y)
174{ 174{
175 unsigned int i; 175 unsigned int i;
176 176
@@ -260,7 +260,7 @@ _edje_limit_get(Edje *ed, Edje_Limit **limits, unsigned int length, Evas_Coord s
260} 260}
261 261
262EOLIAN static void 262EOLIAN static void
263_edje_object_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h) 263_edje_object_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord w, Evas_Coord h)
264{ 264{
265 if ((w == ed->w) && (h == ed->h)) return; 265 if ((w == ed->w) && (h == ed->h)) return;
266 if (ed->collection) 266 if (ed->collection)
@@ -291,7 +291,7 @@ _edje_object_evas_object_smart_resize(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord
291} 291}
292 292
293EOLIAN static void 293EOLIAN static void
294_edje_object_evas_object_smart_show(Eo *obj, Edje *ed) 294_edje_object_evas_object_smart_smart_show(Eo *obj, Edje *ed)
295{ 295{
296 Eina_List *l; 296 Eina_List *l;
297 Edje *edg; 297 Edje *edg;
@@ -319,7 +319,7 @@ _edje_object_evas_object_smart_show(Eo *obj, Edje *ed)
319} 319}
320 320
321EOLIAN static void 321EOLIAN static void
322_edje_object_evas_object_smart_hide(Eo *obj, Edje *ed) 322_edje_object_evas_object_smart_smart_hide(Eo *obj, Edje *ed)
323{ 323{
324 Eina_List *l; 324 Eina_List *l;
325 Edje *edg; 325 Edje *edg;
@@ -350,7 +350,7 @@ _edje_object_evas_object_smart_smart_no_render_set(Eo *obj, Edje *ed, Eina_Bool
350} 350}
351 351
352EOLIAN static void 352EOLIAN static void
353_edje_object_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed) 353_edje_object_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Edje *ed)
354{ 354{
355 _edje_recalc_do(ed); 355 _edje_recalc_do(ed);
356} 356}
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
189} 189}
190 190
191EOLIAN static void 191EOLIAN static void
192_efl_ui_box_evas_object_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd) 192_efl_ui_box_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd)
193{ 193{
194 if (pd->recalc) return; 194 if (pd->recalc) return;
195 195
@@ -201,7 +201,7 @@ _efl_ui_box_evas_object_smart_calculate(Eo *obj, Efl_Ui_Box_Data *pd)
201} 201}
202 202
203EOLIAN static void 203EOLIAN static void
204_efl_ui_box_evas_object_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED) 204_efl_ui_box_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED)
205{ 205{
206 Evas *e = evas_object_evas_get(obj); 206 Evas *e = evas_object_evas_get(obj);
207 207
@@ -226,7 +226,7 @@ _efl_ui_box_evas_object_smart_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED)
226} 226}
227 227
228EOLIAN static void 228EOLIAN static void
229_efl_ui_box_evas_object_smart_del(Eo *obj, Efl_Ui_Box_Data *sd) 229_efl_ui_box_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Box_Data *sd)
230{ 230{
231 Eina_List *l; 231 Eina_List *l;
232 Evas_Object *child; 232 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,
3{ 3{
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Eo.Base.constructor;
6 Evas.Object.Smart.add; 6 Evas.Object.Smart.smart_add;
7 Evas.Object.Smart.del; 7 Evas.Object.Smart.smart_del;
8 Evas.Object.Smart.calculate; 8 Evas.Object.Smart.smart_calculate;
9 Elm.Widget.focus_direction; 9 Elm.Widget.focus_direction;
10 Elm.Widget.focus_next_manager_is; 10 Elm.Widget.focus_next_manager_is;
11 Elm.Widget.focus_direction_manager_is; 11 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
1809} 1809}
1810 1810
1811EOLIAN static void 1811EOLIAN static void
1812_efl_ui_flip_evas_object_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv) 1812_efl_ui_flip_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Flip_Data *priv)
1813{ 1813{
1814 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 1814 evas_obj_smart_add(eo_super(obj, MY_CLASS));
1815 elm_widget_sub_object_parent_add(obj); 1815 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)
1852} 1852}
1853 1853
1854EOLIAN static void 1854EOLIAN static void
1855_efl_ui_flip_evas_object_smart_del(Eo *obj, Efl_Ui_Flip_Data *sd) 1855_efl_ui_flip_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Flip_Data *sd)
1856{ 1856{
1857 ecore_animator_del(sd->animator); 1857 ecore_animator_del(sd->animator);
1858 _state_slices_clear(sd); 1858 _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)
225 implements { 225 implements {
226 class.constructor; 226 class.constructor;
227 Eo.Base.constructor; 227 Eo.Base.constructor;
228 Evas.Object.Smart.add; 228 Evas.Object.Smart.smart_add;
229 Evas.Object.Smart.del; 229 Evas.Object.Smart.smart_del;
230 Elm.Widget.focus_direction; 230 Elm.Widget.focus_direction;
231 Elm.Widget.sub_object_add; 231 Elm.Widget.sub_object_add;
232 Elm.Widget.theme_apply; 232 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,
225} 225}
226 226
227EOLIAN void 227EOLIAN void
228_efl_ui_grid_evas_object_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) 228_efl_ui_grid_evas_object_smart_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
229{ 229{
230 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 230 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
231 231
@@ -233,7 +233,7 @@ _efl_ui_grid_evas_object_smart_calculate(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUS
233} 233}
234 234
235EOLIAN static void 235EOLIAN static void
236_efl_ui_grid_evas_object_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd) 236_efl_ui_grid_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd)
237{ 237{
238 Custom_Table_Data *custom; 238 Custom_Table_Data *custom;
239 Evas_Object *table; 239 Evas_Object *table;
@@ -262,7 +262,7 @@ _efl_ui_grid_evas_object_smart_add(Eo *obj, Efl_Ui_Grid_Data *pd)
262} 262}
263 263
264EOLIAN static void 264EOLIAN static void
265_efl_ui_grid_evas_object_smart_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED) 265_efl_ui_grid_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
266{ 266{
267 Eina_List *l; 267 Eina_List *l;
268 Evas_Object *child; 268 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,
3{ 3{
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Eo.Base.constructor;
6 Evas.Object.Smart.add; 6 Evas.Object.Smart.smart_add;
7 Evas.Object.Smart.del; 7 Evas.Object.Smart.smart_del;
8 Evas.Object.Smart.calculate; 8 Evas.Object.Smart.smart_calculate;
9 Elm.Widget.focus_direction; 9 Elm.Widget.focus_direction;
10 Elm.Widget.focus_next_manager_is; 10 Elm.Widget.focus_next_manager_is;
11 Elm.Widget.focus_direction_manager_is; 11 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,
573} 573}
574 574
575EOLIAN static void 575EOLIAN static void
576_efl_ui_image_evas_object_smart_add(Eo *obj, Efl_Ui_Image_Data *priv) 576_efl_ui_image_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Image_Data *priv)
577{ 577{
578 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 578 evas_obj_smart_add(eo_super(obj, MY_CLASS));
579 elm_widget_sub_object_parent_add(obj); 579 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)
612} 612}
613 613
614EOLIAN static void 614EOLIAN static void
615_efl_ui_image_evas_object_smart_del(Eo *obj, Efl_Ui_Image_Data *sd) 615_efl_ui_image_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Image_Data *sd)
616{ 616{
617 ecore_timer_del(sd->anim_timer); 617 ecore_timer_del(sd->anim_timer);
618 evas_object_del(sd->img); 618 evas_object_del(sd->img);
@@ -643,7 +643,7 @@ _efl_ui_image_evas_object_smart_del(Eo *obj, Efl_Ui_Image_Data *sd)
643} 643}
644 644
645EOLIAN static void 645EOLIAN static void
646_efl_ui_image_evas_object_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y) 646_efl_ui_image_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord x, Evas_Coord y)
647{ 647{
648 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 648 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
649 649
@@ -656,7 +656,7 @@ _efl_ui_image_evas_object_smart_move(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord
656} 656}
657 657
658EOLIAN static void 658EOLIAN static void
659_efl_ui_image_evas_object_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h) 659_efl_ui_image_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coord w, Evas_Coord h)
660{ 660{
661 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 661 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
662 662
@@ -670,7 +670,7 @@ _efl_ui_image_evas_object_smart_resize(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Coor
670} 670}
671 671
672EOLIAN static void 672EOLIAN static void
673_efl_ui_image_evas_object_smart_show(Eo *obj, Efl_Ui_Image_Data *sd) 673_efl_ui_image_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Image_Data *sd)
674{ 674{
675 sd->show = EINA_TRUE; 675 sd->show = EINA_TRUE;
676 if (sd->preload_status == EFL_UI_IMAGE_PRELOADING) return; 676 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)
683} 683}
684 684
685EOLIAN static void 685EOLIAN static void
686_efl_ui_image_evas_object_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd) 686_efl_ui_image_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd)
687{ 687{
688 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 688 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
689 689
@@ -694,7 +694,7 @@ _efl_ui_image_evas_object_smart_hide(Eo *obj, Efl_Ui_Image_Data *sd)
694} 694}
695 695
696EOLIAN static void 696EOLIAN static void
697_efl_ui_image_evas_object_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member) 697_efl_ui_image_evas_object_smart_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *member)
698{ 698{
699 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 699 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
700 700
@@ -703,7 +703,7 @@ _efl_ui_image_evas_object_smart_member_add(Eo *obj, Efl_Ui_Image_Data *sd, Evas_
703} 703}
704 704
705EOLIAN static void 705EOLIAN static void
706_efl_ui_image_evas_object_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a) 706_efl_ui_image_evas_object_smart_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r, int g, int b, int a)
707{ 707{
708 evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a); 708 evas_obj_smart_color_set(eo_super(obj, MY_CLASS), r, g, b, a);
709 709
@@ -713,7 +713,7 @@ _efl_ui_image_evas_object_smart_color_set(Eo *obj, Efl_Ui_Image_Data *sd, int r,
713} 713}
714 714
715EOLIAN static void 715EOLIAN static void
716_efl_ui_image_evas_object_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip) 716_efl_ui_image_evas_object_smart_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *clip)
717{ 717{
718 evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip); 718 evas_obj_smart_clip_set(eo_super(obj, MY_CLASS), clip);
719 719
@@ -722,7 +722,7 @@ _efl_ui_image_evas_object_smart_clip_set(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Ob
722} 722}
723 723
724EOLIAN static void 724EOLIAN static void
725_efl_ui_image_evas_object_smart_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd) 725_efl_ui_image_evas_object_smart_smart_clip_unset(Eo *obj, Efl_Ui_Image_Data *sd)
726{ 726{
727 evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS)); 727 evas_obj_smart_clip_unset(eo_super(obj, MY_CLASS));
728 728
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,
153 Edje.Object.size_max.get; 153 Edje.Object.size_max.get;
154 Edje.Object.size_min_calc; 154 Edje.Object.size_min_calc;
155 Edje.Object.calc_force; 155 Edje.Object.calc_force;
156 Evas.Object.Smart.hide; 156 Evas.Object.Smart.smart_hide;
157 Evas.Object.Smart.clip.set; 157 Evas.Object.Smart.smart_clip.set;
158 Evas.Object.Smart.clip_unset; 158 Evas.Object.Smart.smart_clip_unset;
159 Evas.Object.Smart.show; 159 Evas.Object.Smart.smart_show;
160 Evas.Object.Smart.color.set; 160 Evas.Object.Smart.smart_color.set;
161 Evas.Object.Smart.move; 161 Evas.Object.Smart.smart_move;
162 Evas.Object.Smart.add; 162 Evas.Object.Smart.smart_add;
163 Evas.Object.Smart.del; 163 Evas.Object.Smart.smart_del;
164 Evas.Object.Smart.member_add; 164 Evas.Object.Smart.smart_member_add;
165 Evas.Object.Smart.resize; 165 Evas.Object.Smart.smart_resize;
166 Efl.Ui.Draggable.drag_target.set; 166 Efl.Ui.Draggable.drag_target.set;
167 Efl.Ui.Draggable.drag_target.get; 167 Efl.Ui.Draggable.drag_target.get;
168 Elm.Widget.theme_apply; 168 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,
71} 71}
72 72
73EOLIAN static void 73EOLIAN static void
74_efl_ui_nstate_evas_object_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd) 74_efl_ui_nstate_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
75{ 75{
76 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 76 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
77 77
@@ -90,7 +90,7 @@ _efl_ui_nstate_evas_object_smart_add(Eo *obj, Efl_Ui_Nstate_Data *pd)
90} 90}
91 91
92EOLIAN static void 92EOLIAN static void
93_efl_ui_nstate_evas_object_smart_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) 93_efl_ui_nstate_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
94{ 94{
95 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 95 evas_obj_smart_del(eo_super(obj, MY_CLASS));
96} 96}
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)
33 implements { 33 implements {
34 class.constructor; 34 class.constructor;
35 Eo.Base.constructor; 35 Eo.Base.constructor;
36 Evas.Object.Smart.add; 36 Evas.Object.Smart.smart_add;
37 Evas.Object.Smart.del; 37 Evas.Object.Smart.smart_del;
38 Elm.Widget.theme_apply; 38 Elm.Widget.theme_apply;
39 Elm.Widget.event; 39 Elm.Widget.event;
40 } 40 }
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,
3717} 3717}
3718 3718
3719EOLIAN static void 3719EOLIAN static void
3720_efl_ui_text_evas_object_smart_add(Eo *obj, Efl_Ui_Text_Data *priv) 3720_efl_ui_text_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Text_Data *priv)
3721{ 3721{
3722 Eo *text_obj; 3722 Eo *text_obj;
3723 3723
@@ -3926,7 +3926,7 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd)
3926} 3926}
3927 3927
3928EOLIAN static void 3928EOLIAN static void
3929_efl_ui_text_evas_object_smart_del(Eo *obj, Efl_Ui_Text_Data *sd) 3929_efl_ui_text_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Text_Data *sd)
3930{ 3930{
3931 Elm_Entry_Context_Menu_Item *it; 3931 Elm_Entry_Context_Menu_Item *it;
3932 Elm_Entry_Item_Provider *ip; 3932 Elm_Entry_Item_Provider *ip;
@@ -3999,7 +3999,7 @@ _efl_ui_text_evas_object_smart_del(Eo *obj, Efl_Ui_Text_Data *sd)
3999} 3999}
4000 4000
4001EOLIAN static void 4001EOLIAN static void
4002_efl_ui_text_evas_object_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y) 4002_efl_ui_text_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x, Evas_Coord y)
4003{ 4003{
4004 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 4004 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
4005 4005
@@ -4012,7 +4012,7 @@ _efl_ui_text_evas_object_smart_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord x,
4012} 4012}
4013 4013
4014EOLIAN static void 4014EOLIAN static void
4015_efl_ui_text_evas_object_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h) 4015_efl_ui_text_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord w, Evas_Coord h)
4016{ 4016{
4017 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 4017 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
4018 4018
@@ -4022,7 +4022,7 @@ _efl_ui_text_evas_object_smart_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coord
4022} 4022}
4023 4023
4024EOLIAN static void 4024EOLIAN static void
4025_efl_ui_text_evas_object_smart_show(Eo *obj, Efl_Ui_Text_Data *sd) 4025_efl_ui_text_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Text_Data *sd)
4026{ 4026{
4027 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 4027 evas_obj_smart_show(eo_super(obj, MY_CLASS));
4028 4028
@@ -4031,7 +4031,7 @@ _efl_ui_text_evas_object_smart_show(Eo *obj, Efl_Ui_Text_Data *sd)
4031} 4031}
4032 4032
4033EOLIAN static void 4033EOLIAN static void
4034_efl_ui_text_evas_object_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd) 4034_efl_ui_text_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd)
4035{ 4035{
4036 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 4036 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
4037 4037
@@ -4040,7 +4040,7 @@ _efl_ui_text_evas_object_smart_hide(Eo *obj, Efl_Ui_Text_Data *sd)
4040} 4040}
4041 4041
4042EOLIAN static void 4042EOLIAN static void
4043_efl_ui_text_evas_object_smart_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member) 4043_efl_ui_text_evas_object_smart_smart_member_add(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *member)
4044{ 4044{
4045 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 4045 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
4046 4046
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,
387 implements { 387 implements {
388 class.constructor; 388 class.constructor;
389 Eo.Base.constructor; 389 Eo.Base.constructor;
390 Evas.Object.Smart.move; 390 Evas.Object.Smart.smart_move;
391 Evas.Object.Smart.member_add; 391 Evas.Object.Smart.smart_member_add;
392 Evas.Object.Smart.add; 392 Evas.Object.Smart.smart_add;
393 Evas.Object.Smart.resize; 393 Evas.Object.Smart.smart_resize;
394 Evas.Object.Smart.del; 394 Evas.Object.Smart.smart_del;
395 Evas.Object.Smart.show; 395 Evas.Object.Smart.smart_show;
396 Evas.Object.Smart.hide; 396 Evas.Object.Smart.smart_hide;
397 Elm.Widget.activate; 397 Elm.Widget.activate;
398 Elm.Widget.focus_direction_manager_is; 398 Elm.Widget.focus_direction_manager_is;
399 Elm.Widget.theme_apply; 399 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)
2060} 2060}
2061 2061
2062EOLIAN static void 2062EOLIAN static void
2063_efl_ui_win_evas_object_smart_show(Eo *obj, Efl_Ui_Win_Data *sd) 2063_efl_ui_win_evas_object_smart_smart_show(Eo *obj, Efl_Ui_Win_Data *sd)
2064{ 2064{
2065 if (sd->modal_count) return; 2065 if (sd->modal_count) return;
2066 const Eina_List *l; 2066 const Eina_List *l;
@@ -2103,7 +2103,7 @@ _efl_ui_win_evas_object_smart_show(Eo *obj, Efl_Ui_Win_Data *sd)
2103} 2103}
2104 2104
2105EOLIAN static void 2105EOLIAN static void
2106_efl_ui_win_evas_object_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd) 2106_efl_ui_win_evas_object_smart_smart_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2107{ 2107{
2108 if (sd->modal_count) return; 2108 if (sd->modal_count) return;
2109 const Eina_List *l; 2109 const Eina_List *l;
@@ -2458,7 +2458,7 @@ _elm_win_img_callbacks_del(Evas_Object *obj, Evas_Object *imgobj)
2458} 2458}
2459 2459
2460EOLIAN static void 2460EOLIAN static void
2461_efl_ui_win_evas_object_smart_del(Eo *obj, Efl_Ui_Win_Data *sd) 2461_efl_ui_win_evas_object_smart_smart_del(Eo *obj, Efl_Ui_Win_Data *sd)
2462{ 2462{
2463 const Eina_List *l; 2463 const Eina_List *l;
2464 Evas_Object *current; 2464 Evas_Object *current;
@@ -2612,7 +2612,7 @@ _elm_win_obj_intercept_show(void *data,
2612} 2612}
2613 2613
2614EOLIAN static void 2614EOLIAN static void
2615_efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y) 2615_efl_ui_win_evas_object_smart_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, Evas_Coord y)
2616{ 2616{
2617 if (sd->img_obj) 2617 if (sd->img_obj)
2618 { 2618 {
@@ -2655,7 +2655,7 @@ _efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, E
2655} 2655}
2656 2656
2657EOLIAN static void 2657EOLIAN static void
2658_efl_ui_win_evas_object_smart_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h) 2658_efl_ui_win_evas_object_smart_smart_resize(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord w, Evas_Coord h)
2659{ 2659{
2660 if (sd->img_obj) 2660 if (sd->img_obj)
2661 { 2661 {
@@ -3802,7 +3802,7 @@ _elm_win_on_icon_del(void *data,
3802} 3802}
3803 3803
3804EOLIAN static void 3804EOLIAN static void
3805_efl_ui_win_evas_object_smart_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED) 3805_efl_ui_win_evas_object_smart_smart_add(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
3806{ 3806{
3807 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 3807 evas_obj_smart_add(eo_super(obj, MY_CLASS));
3808 3808
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,
763 class.constructor; 763 class.constructor;
764 Eo.Base.constructor; 764 Eo.Base.constructor;
765 Eo.Base.finalize; 765 Eo.Base.finalize;
766 Evas.Object.Smart.hide; 766 Evas.Object.Smart.smart_hide;
767 Evas.Object.Smart.show; 767 Evas.Object.Smart.smart_show;
768 Evas.Object.Smart.move; 768 Evas.Object.Smart.smart_move;
769 Evas.Object.Smart.add; 769 Evas.Object.Smart.smart_add;
770 Evas.Object.Smart.del; 770 Evas.Object.Smart.smart_del;
771 Evas.Object.Smart.resize; 771 Evas.Object.Smart.smart_resize;
772 Elm.Widget.focus_direction; 772 Elm.Widget.focus_direction;
773 Elm.Widget.focus_next_manager_is; 773 Elm.Widget.focus_next_manager_is;
774 Elm.Widget.focus_direction_manager_is; 774 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)
271} 271}
272 272
273EOLIAN static void 273EOLIAN static void
274_elm_combobox_evas_object_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED) 274_elm_combobox_evas_object_smart_smart_add(Eo *obj, Elm_Combobox_Data *sd EINA_UNUSED)
275{ 275{
276 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 276 evas_obj_smart_add(eo_super(obj, MY_CLASS));
277 elm_widget_sub_object_parent_add(obj); 277 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)
285} 285}
286 286
287EOLIAN static void 287EOLIAN static void
288_elm_combobox_evas_object_smart_del(Eo *obj, Elm_Combobox_Data *sd) 288_elm_combobox_evas_object_smart_smart_del(Eo *obj, Elm_Combobox_Data *sd)
289{ 289{
290 sd->hover_parent = NULL; 290 sd->hover_parent = NULL;
291 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 291 evas_obj_smart_del(eo_super(obj, MY_CLASS));
292} 292}
293 293
294EOLIAN static void 294EOLIAN static void
295_elm_combobox_evas_object_smart_show(Eo *obj, Elm_Combobox_Data *sd) 295_elm_combobox_evas_object_smart_smart_show(Eo *obj, Elm_Combobox_Data *sd)
296{ 296{
297 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 297 evas_obj_smart_show(eo_super(obj, MY_CLASS));
298 if (sd->expanded) evas_object_show(sd->hover); 298 if (sd->expanded) evas_object_show(sd->hover);
299} 299}
300 300
301EOLIAN static void 301EOLIAN static void
302_elm_combobox_evas_object_smart_hide(Eo *obj, Elm_Combobox_Data *sd) 302_elm_combobox_evas_object_smart_smart_hide(Eo *obj, Elm_Combobox_Data *sd)
303{ 303{
304 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 304 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
305 if (sd->hover) evas_object_hide(sd->hover); 305 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
630} 630}
631 631
632EOLIAN static void 632EOLIAN static void
633_elm_combobox_evas_object_smart_resize(Eo *obj, Elm_Combobox_Data *pd, 633_elm_combobox_evas_object_smart_smart_resize(Eo *obj, Elm_Combobox_Data *pd,
634 Evas_Coord w, Evas_Coord h) 634 Evas_Coord w, Evas_Coord h)
635{ 635{
636 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 636 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)
1079} 1079}
1080 1080
1081EOLIAN static void 1081EOLIAN static void
1082_elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) 1082_elm_ctxpopup_evas_object_smart_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1083{ 1083{
1084 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1084 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1085 1085
@@ -1134,7 +1134,7 @@ _elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1134} 1134}
1135 1135
1136EOLIAN static void 1136EOLIAN static void
1137_elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) 1137_elm_ctxpopup_evas_object_smart_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
1138{ 1138{
1139 Elm_Object_Item *it; 1139 Elm_Object_Item *it;
1140 1140
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)
1848} 1848}
1849 1849
1850EOLIAN static void 1850EOLIAN static void
1851_elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv) 1851_elm_fileselector_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
1852{ 1852{
1853 Evas_Object *ic, *bt, *en, *pb; 1853 Evas_Object *ic, *bt, *en, *pb;
1854 const char *data; 1854 const char *data;
@@ -1982,7 +1982,7 @@ _elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
1982} 1982}
1983 1983
1984EOLIAN static void 1984EOLIAN static void
1985_elm_fileselector_evas_object_smart_del(Eo *obj, Elm_Fileselector_Data *sd) 1985_elm_fileselector_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Data *sd)
1986{ 1986{
1987 Elm_Fileselector_Filter *filter; 1987 Elm_Fileselector_Filter *filter;
1988 1988
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)
218} 218}
219 219
220EOLIAN static void 220EOLIAN static void
221_elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) 221_elm_fileselector_button_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv)
222{ 222{
223 const char *path; 223 const char *path;
224 224
@@ -246,7 +246,7 @@ _elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_
246} 246}
247 247
248EOLIAN static void 248EOLIAN static void
249_elm_fileselector_button_evas_object_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) 249_elm_fileselector_button_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
250{ 250{
251 if (sd->fsd.model) 251 if (sd->fsd.model)
252 eo_unref(sd->fsd.model); 252 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,
317} 317}
318 318
319EOLIAN static void 319EOLIAN static void
320_elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) 320_elm_fileselector_entry_evas_object_smart_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
321{ 321{
322 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 322 evas_obj_smart_add(eo_super(obj, MY_CLASS));
323 elm_widget_sub_object_parent_add(obj); 323 elm_widget_sub_object_parent_add(obj);
@@ -377,7 +377,7 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
377} 377}
378 378
379EOLIAN static void 379EOLIAN static void
380_elm_fileselector_entry_evas_object_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) 380_elm_fileselector_entry_evas_object_smart_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd)
381{ 381{
382 free(sd->path); 382 free(sd->path);
383 383
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)
561} 561}
562 562
563EOLIAN static void 563EOLIAN static void
564_elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv) 564_elm_hoversel_evas_object_smart_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
565{ 565{
566 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 566 evas_obj_smart_add(eo_super(obj, MY_CLASS));
567 elm_widget_sub_object_parent_add(obj); 567 elm_widget_sub_object_parent_add(obj);
@@ -576,7 +576,7 @@ _elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *priv)
576} 576}
577 577
578EOLIAN static void 578EOLIAN static void
579_elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd) 579_elm_hoversel_evas_object_smart_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
580{ 580{
581 Elm_Object_Item *eo_item; 581 Elm_Object_Item *eo_item;
582 582
@@ -592,14 +592,14 @@ _elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
592} 592}
593 593
594EOLIAN static void 594EOLIAN static void
595_elm_hoversel_evas_object_smart_show(Eo *obj, Elm_Hoversel_Data *sd) 595_elm_hoversel_evas_object_smart_smart_show(Eo *obj, Elm_Hoversel_Data *sd)
596{ 596{
597 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 597 evas_obj_smart_show(eo_super(obj, MY_CLASS));
598 evas_object_show(sd->hover); 598 evas_object_show(sd->hover);
599} 599}
600 600
601EOLIAN static void 601EOLIAN static void
602_elm_hoversel_evas_object_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) 602_elm_hoversel_evas_object_smart_smart_hide(Eo *obj, Elm_Hoversel_Data *sd)
603{ 603{
604 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 604 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
605 evas_object_hide(sd->hover); 605 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)
1558} 1558}
1559 1559
1560EOLIAN static void 1560EOLIAN static void
1561_elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) 1561_elm_multibuttonentry_evas_object_smart_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
1562{ 1562{
1563 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1563 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1564 1564
@@ -1588,7 +1588,7 @@ _elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *
1588} 1588}
1589 1589
1590EOLIAN static void 1590EOLIAN static void
1591_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) 1591_elm_multibuttonentry_evas_object_smart_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd)
1592{ 1592{
1593 Elm_Object_Item *eo_item; 1593 Elm_Object_Item *eo_item;
1594 Elm_Multibuttonentry_Item_Filter *_item_filter = NULL; 1594 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
1389} 1389}
1390 1390
1391EOLIAN static void 1391EOLIAN static void
1392_elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv) 1392_elm_naviframe_evas_object_smart_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
1393{ 1393{
1394 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1394 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1395 1395
@@ -1446,7 +1446,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
1446} 1446}
1447 1447
1448EOLIAN static void 1448EOLIAN static void
1449_elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd) 1449_elm_naviframe_evas_object_smart_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
1450{ 1450{
1451 Elm_Naviframe_Item_Data *it; 1451 Elm_Naviframe_Item_Data *it;
1452 Elm_Naviframe_Op *nfo; 1452 Elm_Naviframe_Op *nfo;
@@ -1472,7 +1472,7 @@ _elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
1472 1472
1473//Show only the top item view 1473//Show only the top item view
1474EOLIAN static void 1474EOLIAN static void
1475_elm_naviframe_evas_object_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) 1475_elm_naviframe_evas_object_smart_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
1476{ 1476{
1477 Elm_Object_Item *eo_top; 1477 Elm_Object_Item *eo_top;
1478 1478
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:
646 646
647 647
648EOLIAN static void 648EOLIAN static void
649_elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv) 649_elm_player_evas_object_smart_smart_add(Eo *obj, Elm_Player_Data *priv)
650{ 650{
651 char buf[256]; 651 char buf[256];
652 652
@@ -709,7 +709,7 @@ _elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
709} 709}
710 710
711EOLIAN static void 711EOLIAN static void
712_elm_player_evas_object_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) 712_elm_player_evas_object_smart_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
713{ 713{
714 evas_obj_smart_del(eo_super(obj, MY_CLASS)); 714 evas_obj_smart_del(eo_super(obj, MY_CLASS));
715} 715}
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)
234} 234}
235 235
236EOLIAN static void 236EOLIAN static void
237_elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd) 237_elm_popup_evas_object_smart_smart_del(Eo *obj, Elm_Popup_Data *sd)
238{ 238{
239 unsigned int i; 239 unsigned int i;
240 240
@@ -1504,7 +1504,7 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec
1504} 1504}
1505 1505
1506EOLIAN static void 1506EOLIAN static void
1507_elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv) 1507_elm_popup_evas_object_smart_smart_add(Eo *obj, Elm_Popup_Data *priv)
1508{ 1508{
1509 char style[1024]; 1509 char style[1024];
1510 1510
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);
35static void _access_object_unregister(Evas_Object *obj); 35static void _access_object_unregister(Evas_Object *obj);
36 36
37EOLIAN static void 37EOLIAN static void
38_elm_access_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) 38_elm_access_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
39{ 39{
40 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 40 evas_obj_smart_add(eo_super(obj, MY_CLASS));
41 elm_widget_sub_object_parent_add(obj); 41 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)
7 implements { 7 implements {
8 class.constructor; 8 class.constructor;
9 Eo.Base.constructor; 9 Eo.Base.constructor;
10 Evas.Object.Smart.add; 10 Evas.Object.Smart.smart_add;
11 Elm.Widget.activate; 11 Elm.Widget.activate;
12 Elm.Widget.on_focus; 12 Elm.Widget.on_focus;
13 } 13 }
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
470} 470}
471 471
472EOLIAN static void 472EOLIAN static void
473_elm_actionslider_evas_object_smart_add(Eo *obj, Elm_Actionslider_Data *priv) 473_elm_actionslider_evas_object_smart_smart_add(Eo *obj, Elm_Actionslider_Data *priv)
474{ 474{
475 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 475 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
476 476
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)
71 implements { 71 implements {
72 class.constructor; 72 class.constructor;
73 Eo.Base.constructor; 73 Eo.Base.constructor;
74 Evas.Object.Smart.add; 74 Evas.Object.Smart.smart_add;
75 Elm.Widget.focus_next_manager_is; 75 Elm.Widget.focus_next_manager_is;
76 Elm.Widget.focus_direction_manager_is; 76 Elm.Widget.focus_direction_manager_is;
77 Elm.Widget.theme_apply; 77 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,
89} 89}
90 90
91EOLIAN static void 91EOLIAN static void
92_elm_bg_evas_object_smart_add(Eo *obj, Elm_Bg_Data *priv) 92_elm_bg_evas_object_smart_smart_add(Eo *obj, Elm_Bg_Data *priv)
93{ 93{
94 94
95 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 95 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)
96 implements { 96 implements {
97 class.constructor; 97 class.constructor;
98 Eo.Base.constructor; 98 Eo.Base.constructor;
99 Evas.Object.Smart.add; 99 Evas.Object.Smart.smart_add;
100 Elm.Layout.content_aliases.get; 100 Elm.Layout.content_aliases.get;
101 Elm.Layout.sizing_eval; 101 Elm.Layout.sizing_eval;
102 Efl.File.file.set; 102 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,
371} 371}
372 372
373EOLIAN static void 373EOLIAN static void
374_elm_box_evas_object_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) 374_elm_box_evas_object_smart_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
375{ 375{
376 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 376 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
377 377
@@ -379,7 +379,7 @@ _elm_box_evas_object_smart_calculate(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
379} 379}
380 380
381EOLIAN static void 381EOLIAN static void
382_elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) 382_elm_box_evas_object_smart_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
383{ 383{
384 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 384 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
385 elm_widget_resize_object_set(obj, 385 elm_widget_resize_object_set(obj,
@@ -406,7 +406,7 @@ _elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
406} 406}
407 407
408EOLIAN static void 408EOLIAN static void
409_elm_box_evas_object_smart_del(Eo *obj, Elm_Box_Data *sd) 409_elm_box_evas_object_smart_smart_del(Eo *obj, Elm_Box_Data *sd)
410{ 410{
411 Eina_List *l; 411 Eina_List *l;
412 Evas_Object *child; 412 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)
285 implements { 285 implements {
286 class.constructor; 286 class.constructor;
287 Eo.Base.constructor; 287 Eo.Base.constructor;
288 Evas.Object.Smart.add; 288 Evas.Object.Smart.smart_add;
289 Evas.Object.Smart.del; 289 Evas.Object.Smart.smart_del;
290 Evas.Object.Smart.calculate; 290 Evas.Object.Smart.smart_calculate;
291 Elm.Widget.focus_direction; 291 Elm.Widget.focus_direction;
292 Elm.Widget.focus_next_manager_is; 292 Elm.Widget.focus_next_manager_is;
293 Elm.Widget.focus_direction_manager_is; 293 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)
174} 174}
175 175
176EOLIAN static void 176EOLIAN static void
177_elm_bubble_evas_object_smart_add(Eo *obj, Elm_Bubble_Data *priv) 177_elm_bubble_evas_object_smart_smart_add(Eo *obj, Elm_Bubble_Data *priv)
178{ 178{
179 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 179 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
180 180
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)
38 implements { 38 implements {
39 class.constructor; 39 class.constructor;
40 Eo.Base.constructor; 40 Eo.Base.constructor;
41 Evas.Object.Smart.add; 41 Evas.Object.Smart.smart_add;
42 Elm.Widget.focus_direction; 42 Elm.Widget.focus_direction;
43 Elm.Widget.focus_next_manager_is; 43 Elm.Widget.focus_next_manager_is;
44 Elm.Widget.focus_next; 44 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)
281} 281}
282 282
283EOLIAN static void 283EOLIAN static void
284_elm_button_evas_object_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 284_elm_button_evas_object_smart_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
285{ 285{
286 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 286 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
287 287
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,
75 implements { 75 implements {
76 class.constructor; 76 class.constructor;
77 Eo.Base.constructor; 77 Eo.Base.constructor;
78 Evas.Object.Smart.add; 78 Evas.Object.Smart.smart_add;
79 Elm.Widget.activate; 79 Elm.Widget.activate;
80 Elm.Widget.focus_next_manager_is; 80 Elm.Widget.focus_next_manager_is;
81 Elm.Widget.focus_direction_manager_is; 81 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_
1343} 1343}
1344 1344
1345EOLIAN static void 1345EOLIAN static void
1346_elm_calendar_evas_object_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED) 1346_elm_calendar_evas_object_smart_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED)
1347{ 1347{
1348 elm_layout_freeze(obj); 1348 elm_layout_freeze(obj);
1349 1349
@@ -1370,7 +1370,7 @@ _style_changed(void *data,
1370} 1370}
1371 1371
1372EOLIAN static void 1372EOLIAN static void
1373_elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv) 1373_elm_calendar_evas_object_smart_smart_add(Eo *obj, Elm_Calendar_Data *priv)
1374{ 1374{
1375 time_t current_time; 1375 time_t current_time;
1376 int t; 1376 int t;
@@ -1437,7 +1437,7 @@ _elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv)
1437} 1437}
1438 1438
1439EOLIAN static void 1439EOLIAN static void
1440_elm_calendar_evas_object_smart_del(Eo *obj, Elm_Calendar_Data *sd) 1440_elm_calendar_evas_object_smart_smart_del(Eo *obj, Elm_Calendar_Data *sd)
1441{ 1441{
1442 int i; 1442 int i;
1443 Elm_Calendar_Mark *mark; 1443 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)
383 implements { 383 implements {
384 class.constructor; 384 class.constructor;
385 Eo.Base.constructor; 385 Eo.Base.constructor;
386 Evas.Object.Smart.calculate; 386 Evas.Object.Smart.smart_calculate;
387 Evas.Object.Smart.add; 387 Evas.Object.Smart.smart_add;
388 Evas.Object.Smart.del; 388 Evas.Object.Smart.smart_del;
389 Elm.Widget.theme_apply; 389 Elm.Widget.theme_apply;
390 Elm.Widget.focus_next_manager_is; 390 Elm.Widget.focus_next_manager_is;
391 Elm.Widget.focus_direction_manager_is; 391 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,
290} 290}
291 291
292EOLIAN static void 292EOLIAN static void
293_elm_check_evas_object_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) 293_elm_check_evas_object_smart_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
294{ 294{
295 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 295 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
296 296
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)
24 implements { 24 implements {
25 class.constructor; 25 class.constructor;
26 Eo.Base.constructor; 26 Eo.Base.constructor;
27 Evas.Object.Smart.add; 27 Evas.Object.Smart.smart_add;
28 Elm.Widget.activate; 28 Elm.Widget.activate;
29 Elm.Widget.theme_apply; 29 Elm.Widget.theme_apply;
30 Elm.Widget.sub_object_del; 30 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)
650} 650}
651 651
652EOLIAN static void 652EOLIAN static void
653_elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv) 653_elm_clock_evas_object_smart_smart_add(Eo *obj, Elm_Clock_Data *priv)
654{ 654{
655 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 655 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
656 656
@@ -688,7 +688,7 @@ _elm_clock_evas_object_smart_add(Eo *obj, Elm_Clock_Data *priv)
688} 688}
689 689
690EOLIAN static void 690EOLIAN static void
691_elm_clock_evas_object_smart_del(Eo *obj, Elm_Clock_Data *sd) 691_elm_clock_evas_object_smart_smart_del(Eo *obj, Elm_Clock_Data *sd)
692{ 692{
693 693
694 ecore_timer_del(sd->ticker); 694 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)
163 implements { 163 implements {
164 class.constructor; 164 class.constructor;
165 Eo.Base.constructor; 165 Eo.Base.constructor;
166 Evas.Object.Smart.add; 166 Evas.Object.Smart.smart_add;
167 Evas.Object.Smart.del; 167 Evas.Object.Smart.smart_del;
168 Elm.Widget.focus_next_manager_is; 168 Elm.Widget.focus_next_manager_is;
169 Elm.Widget.focus_direction_manager_is; 169 Elm.Widget.focus_direction_manager_is;
170 Elm.Widget.access; 170 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 *
1817} 1817}
1818 1818
1819EOLIAN static void 1819EOLIAN static void
1820_elm_code_widget_evas_object_smart_add(Eo *obj, Elm_Code_Widget_Data *pd) 1820_elm_code_widget_evas_object_smart_smart_add(Eo *obj, Elm_Code_Widget_Data *pd)
1821{ 1821{
1822 Evas_Object *background, *gridrows, *scroller; 1822 Evas_Object *background, *gridrows, *scroller;
1823 1823
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)
246 class.constructor; 246 class.constructor;
247 Eo.Base.constructor; 247 Eo.Base.constructor;
248 Eo.Base.finalize; 248 Eo.Base.finalize;
249 Evas.Object.Smart.add; 249 Evas.Object.Smart.smart_add;
250 Elm.Widget.event; 250 Elm.Widget.event;
251 Elm.Widget.focus_next_manager_is; 251 Elm.Widget.focus_next_manager_is;
252 Elm.Widget.focus_direction_manager_is; 252 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)
1861} 1861}
1862 1862
1863EOLIAN static void 1863EOLIAN static void
1864_elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv) 1864_elm_colorselector_evas_object_smart_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
1865{ 1865{
1866 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1866 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1867 1867
@@ -1901,7 +1901,7 @@ _elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
1901} 1901}
1902 1902
1903EOLIAN static void 1903EOLIAN static void
1904_elm_colorselector_evas_object_smart_del(Eo *obj, Elm_Colorselector_Data *sd) 1904_elm_colorselector_evas_object_smart_smart_del(Eo *obj, Elm_Colorselector_Data *sd)
1905{ 1905{
1906 int i = 0; 1906 int i = 0;
1907 void *tmp[4]; 1907 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.]]
108 implements { 108 implements {
109 class.constructor; 109 class.constructor;
110 Eo.Base.constructor; 110 Eo.Base.constructor;
111 Evas.Object.Smart.add; 111 Evas.Object.Smart.smart_add;
112 Evas.Object.Smart.del; 112 Evas.Object.Smart.smart_del;
113 Elm.Widget.theme_apply; 113 Elm.Widget.theme_apply;
114 Elm.Widget.focus_next_manager_is; 114 Elm.Widget.focus_next_manager_is;
115 Elm.Widget.focus_next; 115 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,
55 implements { 55 implements {
56 class.constructor; 56 class.constructor;
57 Eo.Base.constructor; 57 Eo.Base.constructor;
58 Evas.Object.Smart.hide; 58 Evas.Object.Smart.smart_hide;
59 Evas.Object.Smart.show; 59 Evas.Object.Smart.smart_show;
60 Evas.Object.Smart.add; 60 Evas.Object.Smart.smart_add;
61 Evas.Object.Smart.del; 61 Evas.Object.Smart.smart_del;
62 Evas.Object.Smart.resize; 62 Evas.Object.Smart.smart_resize;
63 Elm.Widget.part_text.set; 63 Elm.Widget.part_text.set;
64 Elm.Widget.part_text.get; 64 Elm.Widget.part_text.get;
65 Elm.Widget.theme_apply; 65 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,
917#endif 917#endif
918 918
919EOLIAN static void 919EOLIAN static void
920_elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) 920_elm_conformant_evas_object_smart_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
921{ 921{
922 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 922 evas_obj_smart_add(eo_super(obj, MY_CLASS));
923 elm_widget_sub_object_parent_add(obj); 923 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
938} 938}
939 939
940EOLIAN static void 940EOLIAN static void
941_elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd) 941_elm_conformant_evas_object_smart_smart_del(Eo *obj, Elm_Conformant_Data *sd)
942{ 942{
943#ifdef HAVE_ELEMENTARY_X 943#ifdef HAVE_ELEMENTARY_X
944 ecore_event_handler_del(sd->prop_hdl); 944 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)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.constructor; 8 Eo.Base.constructor;
9 Evas.Object.Smart.add; 9 Evas.Object.Smart.smart_add;
10 Evas.Object.Smart.del; 10 Evas.Object.Smart.smart_del;
11 Elm.Widget.widget_parent.set; 11 Elm.Widget.widget_parent.set;
12 Elm.Widget.theme_apply; 12 Elm.Widget.theme_apply;
13 Elm.Layout.content_aliases.get; 13 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
203 implements { 203 implements {
204 class.constructor; 204 class.constructor;
205 Eo.Base.constructor; 205 Eo.Base.constructor;
206 Evas.Object.Smart.del; 206 Evas.Object.Smart.smart_del;
207 Evas.Object.Smart.add; 207 Evas.Object.Smart.smart_add;
208 Elm.Widget.widget_parent.set; 208 Elm.Widget.widget_parent.set;
209 Elm.Widget.focus_direction; 209 Elm.Widget.focus_direction;
210 Elm.Widget.focus_direction_manager_is; 210 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)
796} 796}
797 797
798EOLIAN static void 798EOLIAN static void
799_elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv) 799_elm_datetime_evas_object_smart_smart_add(Eo *obj, Elm_Datetime_Data *priv)
800{ 800{
801 Datetime_Field *field; 801 Datetime_Field *field;
802 int idx; 802 int idx;
@@ -862,7 +862,7 @@ _elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv)
862} 862}
863 863
864EOLIAN static void 864EOLIAN static void
865_elm_datetime_evas_object_smart_del(Eo *obj, Elm_Datetime_Data *sd) 865_elm_datetime_evas_object_smart_smart_del(Eo *obj, Elm_Datetime_Data *sd)
866{ 866{
867 Datetime_Field *tmp; 867 Datetime_Field *tmp;
868 unsigned int idx; 868 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)
292 implements { 292 implements {
293 class.constructor; 293 class.constructor;
294 Eo.Base.constructor; 294 Eo.Base.constructor;
295 Evas.Object.Smart.add; 295 Evas.Object.Smart.smart_add;
296 Evas.Object.Smart.del; 296 Evas.Object.Smart.smart_del;
297 Elm.Widget.theme_apply; 297 Elm.Widget.theme_apply;
298 Elm.Widget.focus_next_manager_is; 298 Elm.Widget.focus_next_manager_is;
299 Elm.Widget.focus_next; 299 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)
415} 415}
416 416
417EOLIAN static void 417EOLIAN static void
418_elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv) 418_elm_dayselector_evas_object_smart_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
419{ 419{
420 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 420 evas_obj_smart_add(eo_super(obj, MY_CLASS));
421 elm_widget_sub_object_parent_add(obj); 421 elm_widget_sub_object_parent_add(obj);
@@ -436,7 +436,7 @@ _elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
436} 436}
437 437
438EOLIAN static void 438EOLIAN static void
439_elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd) 439_elm_dayselector_evas_object_smart_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
440{ 440{
441 Elm_Dayselector_Item_Data *it; 441 Elm_Dayselector_Item_Data *it;
442 442
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)
150 implements { 150 implements {
151 class.constructor; 151 class.constructor;
152 Eo.Base.constructor; 152 Eo.Base.constructor;
153 Evas.Object.Smart.add; 153 Evas.Object.Smart.smart_add;
154 Evas.Object.Smart.del; 154 Evas.Object.Smart.smart_del;
155 Elm.Widget.theme_apply; 155 Elm.Widget.theme_apply;
156 Elm.Widget.focus_direction_manager_is; 156 Elm.Widget.focus_direction_manager_is;
157 Elm.Widget.translate; 157 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)
1269} 1269}
1270 1270
1271EOLIAN static void 1271EOLIAN static void
1272_elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv) 1272_elm_diskselector_evas_object_smart_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
1273{ 1273{
1274 Evas *evas; 1274 Evas *evas;
1275 Evas_Object *blank, *edje; 1275 Evas_Object *blank, *edje;
@@ -1345,7 +1345,7 @@ _elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
1345} 1345}
1346 1346
1347EOLIAN static void 1347EOLIAN static void
1348_elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd) 1348_elm_diskselector_evas_object_smart_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1349{ 1349{
1350 Elm_Diskselector_Item_Data *it; 1350 Elm_Diskselector_Item_Data *it;
1351 Eina_List *l, *l2; 1351 Eina_List *l, *l2;
@@ -1421,7 +1421,7 @@ _elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1421} 1421}
1422 1422
1423EOLIAN static void 1423EOLIAN static void
1424_elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y) 1424_elm_diskselector_evas_object_smart_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
1425{ 1425{
1426 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 1426 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
1427 1427
@@ -1429,7 +1429,7 @@ _elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Eva
1429} 1429}
1430 1430
1431EOLIAN static void 1431EOLIAN static void
1432_elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h) 1432_elm_diskselector_evas_object_smart_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
1433{ 1433{
1434 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 1434 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
1435 1435
@@ -1437,7 +1437,7 @@ _elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, E
1437} 1437}
1438 1438
1439EOLIAN static void 1439EOLIAN static void
1440_elm_diskselector_evas_object_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member) 1440_elm_diskselector_evas_object_smart_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
1441{ 1441{
1442 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 1442 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
1443 1443
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,
197 implements { 197 implements {
198 class.constructor; 198 class.constructor;
199 Eo.Base.constructor; 199 Eo.Base.constructor;
200 Evas.Object.Smart.member_add; 200 Evas.Object.Smart.smart_member_add;
201 Evas.Object.Smart.move; 201 Evas.Object.Smart.smart_move;
202 Evas.Object.Smart.add; 202 Evas.Object.Smart.smart_add;
203 Evas.Object.Smart.del; 203 Evas.Object.Smart.smart_del;
204 Evas.Object.Smart.resize; 204 Evas.Object.Smart.smart_resize;
205 Elm.Widget.focus_next_manager_is; 205 Elm.Widget.focus_next_manager_is;
206 Elm.Widget.access; 206 Elm.Widget.access;
207 Elm.Widget.focus_next; 207 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,
3594} 3594}
3595 3595
3596EOLIAN static void 3596EOLIAN static void
3597_elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv) 3597_elm_entry_evas_object_smart_smart_add(Eo *obj, Elm_Entry_Data *priv)
3598{ 3598{
3599 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 3599 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
3600 3600
@@ -3785,7 +3785,7 @@ _create_selection_handlers(Evas_Object *obj, Elm_Entry_Data *sd)
3785} 3785}
3786 3786
3787EOLIAN static void 3787EOLIAN static void
3788_elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd) 3788_elm_entry_evas_object_smart_smart_del(Eo *obj, Elm_Entry_Data *sd)
3789{ 3789{
3790 Elm_Entry_Context_Menu_Item *it; 3790 Elm_Entry_Context_Menu_Item *it;
3791 Elm_Entry_Item_Provider *ip; 3791 Elm_Entry_Item_Provider *ip;
@@ -3858,7 +3858,7 @@ _elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd)
3858} 3858}
3859 3859
3860EOLIAN static void 3860EOLIAN static void
3861_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) 3861_elm_entry_evas_object_smart_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
3862{ 3862{
3863 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 3863 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
3864 3864
@@ -3871,7 +3871,7 @@ _elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Eva
3871} 3871}
3872 3872
3873EOLIAN static void 3873EOLIAN static void
3874_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) 3874_elm_entry_evas_object_smart_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
3875{ 3875{
3876 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 3876 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
3877 3877
@@ -3881,7 +3881,7 @@ _elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, E
3881} 3881}
3882 3882
3883EOLIAN static void 3883EOLIAN static void
3884_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd) 3884_elm_entry_evas_object_smart_smart_show(Eo *obj, Elm_Entry_Data *sd)
3885{ 3885{
3886 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 3886 evas_obj_smart_show(eo_super(obj, MY_CLASS));
3887 3887
@@ -3890,7 +3890,7 @@ _elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd)
3890} 3890}
3891 3891
3892EOLIAN static void 3892EOLIAN static void
3893_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd) 3893_elm_entry_evas_object_smart_smart_hide(Eo *obj, Elm_Entry_Data *sd)
3894{ 3894{
3895 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 3895 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
3896 3896
@@ -3899,7 +3899,7 @@ _elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd)
3899} 3899}
3900 3900
3901EOLIAN static void 3901EOLIAN static void
3902_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) 3902_elm_entry_evas_object_smart_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
3903{ 3903{
3904 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 3904 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
3905 3905
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,
935 implements { 935 implements {
936 class.constructor; 936 class.constructor;
937 Eo.Base.constructor; 937 Eo.Base.constructor;
938 Evas.Object.Smart.move; 938 Evas.Object.Smart.smart_move;
939 Evas.Object.Smart.member_add; 939 Evas.Object.Smart.smart_member_add;
940 Evas.Object.Smart.add; 940 Evas.Object.Smart.smart_add;
941 Evas.Object.Smart.resize; 941 Evas.Object.Smart.smart_resize;
942 Evas.Object.Smart.del; 942 Evas.Object.Smart.smart_del;
943 Evas.Object.Smart.show; 943 Evas.Object.Smart.smart_show;
944 Evas.Object.Smart.hide; 944 Evas.Object.Smart.smart_hide;
945 Elm.Widget.activate; 945 Elm.Widget.activate;
946 Elm.Widget.focus_direction_manager_is; 946 Elm.Widget.focus_direction_manager_is;
947 Elm.Widget.theme_apply; 947 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,
34 class.constructor; 34 class.constructor;
35 class.destructor; 35 class.destructor;
36 Eo.Base.constructor; 36 Eo.Base.constructor;
37 Evas.Object.Smart.add; 37 Evas.Object.Smart.smart_add;
38 Evas.Object.Smart.del; 38 Evas.Object.Smart.smart_del;
39 Elm.Widget.focus_next; 39 Elm.Widget.focus_next;
40 Elm.Widget.focus_direction_manager_is; 40 Elm.Widget.focus_direction_manager_is;
41 Elm.Widget.focus_direction; 41 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)
3 event_prefix: elm_fileselector_button; 3 event_prefix: elm_fileselector_button;
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Eo.Base.constructor;
6 Evas.Object.Smart.add; 6 Evas.Object.Smart.smart_add;
7 Evas.Object.Smart.del; 7 Evas.Object.Smart.smart_del;
8 Elm.Widget.theme_apply; 8 Elm.Widget.theme_apply;
9 Elm.Button.admits_autorepeat.get; 9 Elm.Button.admits_autorepeat.get;
10 Elm.Interface.Fileselector.selected_models.get; 10 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,
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.constructor; 8 Eo.Base.constructor;
9 Evas.Object.Smart.del; 9 Evas.Object.Smart.smart_del;
10 Evas.Object.Smart.add; 10 Evas.Object.Smart.smart_add;
11 Elm.Widget.theme_apply; 11 Elm.Widget.theme_apply;
12 Elm.Widget.focus_next_manager_is; 12 Elm.Widget.focus_next_manager_is;
13 Elm.Widget.focus_next; 13 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,
604} 604}
605 605
606EOLIAN static void 606EOLIAN static void
607_elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv) 607_elm_flipselector_evas_object_smart_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
608{ 608{
609 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 609 evas_obj_smart_add(eo_super(obj, MY_CLASS));
610 elm_widget_sub_object_parent_add(obj); 610 elm_widget_sub_object_parent_add(obj);
@@ -631,7 +631,7 @@ _elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
631} 631}
632 632
633EOLIAN static void 633EOLIAN static void
634_elm_flipselector_evas_object_smart_del(Eo *obj, Elm_Flipselector_Data *sd) 634_elm_flipselector_evas_object_smart_smart_del(Eo *obj, Elm_Flipselector_Data *sd)
635{ 635{
636 sd->deleting = EINA_TRUE; 636 sd->deleting = EINA_TRUE;
637 637
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,
126 implements { 126 implements {
127 class.constructor; 127 class.constructor;
128 Eo.Base.constructor; 128 Eo.Base.constructor;
129 Evas.Object.Smart.add; 129 Evas.Object.Smart.smart_add;
130 Evas.Object.Smart.del; 130 Evas.Object.Smart.smart_del;
131 Elm.Widget.theme_apply; 131 Elm.Widget.theme_apply;
132 Elm.Widget.focus_next_manager_is; 132 Elm.Widget.focus_next_manager_is;
133 Elm.Widget.focus_direction_manager_is; 133 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,
145 145
146/* using deferred sizing evaluation, just like the parent */ 146/* using deferred sizing evaluation, just like the parent */
147EOLIAN static void 147EOLIAN static void
148_elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd) 148_elm_frame_evas_object_smart_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
149{ 149{
150 ELM_LAYOUT_DATA_GET(obj, ld); 150 ELM_LAYOUT_DATA_GET(obj, ld);
151 151
@@ -158,7 +158,7 @@ _elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
158} 158}
159 159
160EOLIAN static void 160EOLIAN static void
161_elm_frame_evas_object_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) 161_elm_frame_evas_object_smart_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
162{ 162{
163 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 163 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
164 164
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)
51 implements { 51 implements {
52 Eo.Base.constructor; 52 Eo.Base.constructor;
53 class.constructor; 53 class.constructor;
54 Evas.Object.Smart.calculate; 54 Evas.Object.Smart.smart_calculate;
55 Evas.Object.Smart.add; 55 Evas.Object.Smart.smart_add;
56 Elm.Widget.focus_direction; 56 Elm.Widget.focus_direction;
57 Elm.Widget.focus_next_manager_is; 57 Elm.Widget.focus_next_manager_is;
58 Elm.Widget.focus_next; 58 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)
481} 481}
482 482
483EOLIAN static void 483EOLIAN static void
484_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) 484_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)
485{ 485{
486 ecore_job_del(psd->wsd->calc_job); 486 ecore_job_del(psd->wsd->calc_job);
487 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj); 487 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
488} 488}
489 489
490EOLIAN static void 490EOLIAN static void
491_elm_gengrid_pan_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 491_elm_gengrid_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
492{ 492{
493 Evas_Coord ow, oh; 493 Evas_Coord ow, oh;
494 494
@@ -1854,7 +1854,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
1854} 1854}
1855 1855
1856EOLIAN static void 1856EOLIAN static void
1857_elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd) 1857_elm_gengrid_pan_evas_object_smart_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd)
1858{ 1858{
1859 Evas_Coord cx = 0, cy = 0; 1859 Evas_Coord cx = 0, cy = 0;
1860 Elm_Gen_Item *it; 1860 Elm_Gen_Item *it;
@@ -4218,7 +4218,7 @@ _elm_gengrid_elm_layout_sizing_eval(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *_pd E
4218} 4218}
4219 4219
4220EOLIAN static void 4220EOLIAN static void
4221_elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv) 4221_elm_gengrid_evas_object_smart_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
4222{ 4222{
4223 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; 4223 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
4224 Elm_Gengrid_Pan_Data *pan_data; 4224 Elm_Gengrid_Pan_Data *pan_data;
@@ -4284,7 +4284,7 @@ _elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
4284} 4284}
4285 4285
4286EOLIAN static void 4286EOLIAN static void
4287_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd) 4287_elm_gengrid_evas_object_smart_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
4288{ 4288{
4289 elm_gengrid_clear(obj); 4289 elm_gengrid_clear(obj);
4290 ELM_SAFE_FREE(sd->pan_obj, evas_object_del); 4290 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)
4297} 4297}
4298 4298
4299EOLIAN static void 4299EOLIAN static void
4300_elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y) 4300_elm_gengrid_evas_object_smart_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
4301{ 4301{
4302 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 4302 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
4303 4303
@@ -4305,7 +4305,7 @@ _elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x,
4305} 4305}
4306 4306
4307EOLIAN static void 4307EOLIAN static void
4308_elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h) 4308_elm_gengrid_evas_object_smart_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
4309{ 4309{
4310 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 4310 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
4311 4311
@@ -4313,7 +4313,7 @@ _elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord
4313} 4313}
4314 4314
4315EOLIAN static void 4315EOLIAN static void
4316_elm_gengrid_evas_object_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member) 4316_elm_gengrid_evas_object_smart_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
4317{ 4317{
4318 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 4318 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
4319 4319
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,
540 implements { 540 implements {
541 class.constructor; 541 class.constructor;
542 Eo.Base.constructor; 542 Eo.Base.constructor;
543 Evas.Object.Smart.move; 543 Evas.Object.Smart.smart_move;
544 Evas.Object.Smart.add; 544 Evas.Object.Smart.smart_add;
545 Evas.Object.Smart.del; 545 Evas.Object.Smart.smart_del;
546 Evas.Object.Smart.member_add; 546 Evas.Object.Smart.smart_member_add;
547 Evas.Object.Smart.resize; 547 Evas.Object.Smart.smart_resize;
548 Elm.Widget.theme_apply; 548 Elm.Widget.theme_apply;
549 Elm.Widget.focus_next_manager_is; 549 Elm.Widget.focus_next_manager_is;
550 Elm.Widget.focus_direction_manager_is; 550 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)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.destructor; 8 Eo.Base.destructor;
9 Evas.Object.Smart.calculate; 9 Evas.Object.Smart.smart_calculate;
10 Evas.Object.Smart.move; 10 Evas.Object.Smart.smart_move;
11 Evas.Object.Smart.resize; 11 Evas.Object.Smart.smart_resize;
12 Elm.Pan.content_size.get; 12 Elm.Pan.content_size.get;
13 Elm.Pan.pos; 13 Elm.Pan.pos;
14 Elm.Pan.pos_min.get; 14 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
259} 259}
260 260
261EOLIAN static void 261EOLIAN static void
262_elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) 262_elm_genlist_pan_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
263{ 263{
264 ecore_job_del(psd->resize_job); 264 ecore_job_del(psd->resize_job);
265 265
@@ -267,7 +267,7 @@ _elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
267} 267}
268 268
269EOLIAN static void 269EOLIAN static void
270_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) 270_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)
271{ 271{
272 psd->wsd->pan_changed = EINA_TRUE; 272 psd->wsd->pan_changed = EINA_TRUE;
273 evas_object_smart_changed(obj); 273 evas_object_smart_changed(obj);
@@ -284,7 +284,7 @@ _elm_genlist_pan_smart_resize_job(void *data)
284} 284}
285 285
286EOLIAN static void 286EOLIAN static void
287_elm_genlist_pan_evas_object_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 287_elm_genlist_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
288{ 288{
289 Evas_Coord ow, oh; 289 Evas_Coord ow, oh;
290 290
@@ -2452,7 +2452,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
2452} 2452}
2453 2453
2454EOLIAN static void 2454EOLIAN static void
2455_elm_genlist_pan_evas_object_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd) 2455_elm_genlist_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Genlist_Pan_Data *psd)
2456{ 2456{
2457 Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh; 2457 Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
2458 Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0; 2458 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)
5525} 5525}
5526 5526
5527EOLIAN static void 5527EOLIAN static void
5528_elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv) 5528_elm_genlist_evas_object_smart_smart_add(Eo *obj, Elm_Genlist_Data *priv)
5529{ 5529{
5530 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 5530 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
5531 Elm_Genlist_Pan_Data *pan_data; 5531 Elm_Genlist_Pan_Data *pan_data;
@@ -5610,7 +5610,7 @@ _elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
5610} 5610}
5611 5611
5612EOLIAN static void 5612EOLIAN static void
5613_elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd) 5613_elm_genlist_evas_object_smart_smart_del(Eo *obj, Elm_Genlist_Data *sd)
5614{ 5614{
5615 int i; 5615 int i;
5616 5616
@@ -5637,7 +5637,7 @@ _elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd)
5637} 5637}
5638 5638
5639EOLIAN static void 5639EOLIAN static void
5640_elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y) 5640_elm_genlist_evas_object_smart_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
5641{ 5641{
5642 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 5642 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
5643 5643
@@ -5645,7 +5645,7 @@ _elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x,
5645} 5645}
5646 5646
5647EOLIAN static void 5647EOLIAN static void
5648_elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h) 5648_elm_genlist_evas_object_smart_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
5649{ 5649{
5650 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 5650 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
5651 5651
@@ -5655,7 +5655,7 @@ _elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord
5655} 5655}
5656 5656
5657EOLIAN static void 5657EOLIAN static void
5658_elm_genlist_evas_object_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member) 5658_elm_genlist_evas_object_smart_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
5659{ 5659{
5660 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 5660 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
5661 5661
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,
526 implements { 526 implements {
527 class.constructor; 527 class.constructor;
528 Eo.Base.constructor; 528 Eo.Base.constructor;
529 Evas.Object.Smart.member_add; 529 Evas.Object.Smart.smart_member_add;
530 Evas.Object.Smart.move; 530 Evas.Object.Smart.smart_move;
531 Evas.Object.Smart.add; 531 Evas.Object.Smart.smart_add;
532 Evas.Object.Smart.del; 532 Evas.Object.Smart.smart_del;
533 Evas.Object.Smart.resize; 533 Evas.Object.Smart.smart_resize;
534 Elm.Widget.theme_apply; 534 Elm.Widget.theme_apply;
535 Elm.Widget.focus_next_manager_is; 535 Elm.Widget.focus_next_manager_is;
536 Elm.Widget.sub_object_add; 536 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)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.destructor; 8 Eo.Base.destructor;
9 Evas.Object.Smart.calculate; 9 Evas.Object.Smart.smart_calculate;
10 Evas.Object.Smart.move; 10 Evas.Object.Smart.smart_move;
11 Evas.Object.Smart.del; 11 Evas.Object.Smart.smart_del;
12 Evas.Object.Smart.resize; 12 Evas.Object.Smart.smart_resize;
13 Elm.Pan.content_size.get; 13 Elm.Pan.content_size.get;
14 Elm.Pan.pos; 14 Elm.Pan.pos;
15 Elm.Pan.pos_min.get; 15 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_
3734} 3734}
3735 3735
3736EOLIAN static void 3736EOLIAN static void
3737_elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) 3737_elm_gesture_layer_evas_object_smart_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
3738{ 3738{
3739 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 3739 evas_obj_smart_add(eo_super(obj, MY_CLASS));
3740 elm_widget_sub_object_parent_add(obj); 3740 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)
3767static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type); 3767static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type);
3768 3768
3769EOLIAN static void 3769EOLIAN static void
3770_elm_gesture_layer_evas_object_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd) 3770_elm_gesture_layer_evas_object_smart_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
3771{ 3771{
3772 Pointer_Event *data; 3772 Pointer_Event *data;
3773 int i; 3773 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)
155 implements { 155 implements {
156 class.constructor; 156 class.constructor;
157 Eo.Base.constructor; 157 Eo.Base.constructor;
158 Evas.Object.Smart.add; 158 Evas.Object.Smart.smart_add;
159 Evas.Object.Smart.del; 159 Evas.Object.Smart.smart_del;
160 Elm.Widget.disable; 160 Elm.Widget.disable;
161 } 161 }
162 162
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)
86} 86}
87 87
88EOLIAN static void 88EOLIAN static void
89_elm_glview_evas_object_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h) 89_elm_glview_evas_object_smart_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
90{ 90{
91 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 91 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
92 92
@@ -220,7 +220,7 @@ _set_render_policy_callback(Evas_Object *obj)
220} 220}
221 221
222EOLIAN static void 222EOLIAN static void
223_elm_glview_evas_object_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED) 223_elm_glview_evas_object_smart_smart_add(Eo *obj, Elm_Glview_Data *priv EINA_UNUSED)
224{ 224{
225 Evas_Object *img; 225 Evas_Object *img;
226 226
@@ -287,7 +287,7 @@ _elm_glview_constructor(Eo *obj, Elm_Glview_Data *priv)
287} 287}
288 288
289EOLIAN static void 289EOLIAN static void
290_elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd) 290_elm_glview_evas_object_smart_smart_del(Eo *obj, Elm_Glview_Data *sd)
291{ 291{
292 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 292 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
293 293
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)
184 implements { 184 implements {
185 class.constructor; 185 class.constructor;
186 Eo.Base.finalize; 186 Eo.Base.finalize;
187 Evas.Object.Smart.add; 187 Evas.Object.Smart.smart_add;
188 Evas.Object.Smart.del; 188 Evas.Object.Smart.smart_del;
189 Evas.Object.Smart.resize; 189 Evas.Object.Smart.smart_resize;
190 Elm.Widget.on_focus; 190 Elm.Widget.on_focus;
191 Efl.Gfx.View.view_size.get; 191 Efl.Gfx.View.view_size.get;
192 Efl.Gfx.View.view_size.set; 192 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)
116} 116}
117 117
118EOLIAN static void 118EOLIAN static void
119_elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) 119_elm_grid_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
120{ 120{
121 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 121 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
122 Evas_Object *grid; 122 Evas_Object *grid;
@@ -135,7 +135,7 @@ _elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
135} 135}
136 136
137EOLIAN static void 137EOLIAN static void
138_elm_grid_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED) 138_elm_grid_evas_object_smart_smart_del(Eo *obj, void *_pd EINA_UNUSED)
139{ 139{
140 Eina_List *l; 140 Eina_List *l;
141 Evas_Object *child; 141 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)
54 implements { 54 implements {
55 class.constructor; 55 class.constructor;
56 Eo.Base.constructor; 56 Eo.Base.constructor;
57 Evas.Object.Smart.add; 57 Evas.Object.Smart.smart_add;
58 Evas.Object.Smart.del; 58 Evas.Object.Smart.smart_del;
59 Elm.Widget.focus_direction; 59 Elm.Widget.focus_direction;
60 Elm.Widget.focus_next_manager_is; 60 Elm.Widget.focus_next_manager_is;
61 Elm.Widget.focus_next; 61 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,
564} 564}
565 565
566EOLIAN static void 566EOLIAN static void
567_elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *sd) 567_elm_hover_evas_object_smart_smart_add(Eo *obj, Elm_Hover_Data *sd)
568{ 568{
569 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 569 evas_obj_smart_add(eo_super(obj, MY_CLASS));
570 elm_widget_sub_object_parent_add(obj); 570 elm_widget_sub_object_parent_add(obj);
@@ -595,7 +595,7 @@ _elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *sd)
595} 595}
596 596
597EOLIAN static void 597EOLIAN static void
598_elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd) 598_elm_hover_evas_object_smart_smart_del(Eo *obj, Elm_Hover_Data *sd)
599{ 599{
600 600
601 sd->on_del = EINA_TRUE; 601 sd->on_del = EINA_TRUE;
@@ -616,7 +616,7 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
616} 616}
617 617
618EOLIAN static void 618EOLIAN static void
619_elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) 619_elm_hover_evas_object_smart_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
620{ 620{
621 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 621 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
622 622
@@ -624,7 +624,7 @@ _elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas
624} 624}
625 625
626EOLIAN static void 626EOLIAN static void
627_elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) 627_elm_hover_evas_object_smart_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
628{ 628{
629 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 629 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
630 630
@@ -632,7 +632,7 @@ _elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Ev
632} 632}
633 633
634EOLIAN static void 634EOLIAN static void
635_elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) 635_elm_hover_evas_object_smart_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
636{ 636{
637 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 637 evas_obj_smart_show(eo_super(obj, MY_CLASS));
638 638
@@ -640,7 +640,7 @@ _elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
640} 640}
641 641
642EOLIAN static void 642EOLIAN static void
643_elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) 643_elm_hover_evas_object_smart_smart_hide(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
644{ 644{
645 const char *dismissstr; 645 const char *dismissstr;
646 646
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
60 implements { 60 implements {
61 class.constructor; 61 class.constructor;
62 Eo.Base.constructor; 62 Eo.Base.constructor;
63 Evas.Object.Smart.del; 63 Evas.Object.Smart.smart_del;
64 Evas.Object.Smart.hide; 64 Evas.Object.Smart.smart_hide;
65 Evas.Object.Smart.show; 65 Evas.Object.Smart.smart_show;
66 Evas.Object.Smart.move; 66 Evas.Object.Smart.smart_move;
67 Evas.Object.Smart.add; 67 Evas.Object.Smart.smart_add;
68 Evas.Object.Smart.resize; 68 Evas.Object.Smart.smart_resize;
69 Elm.Widget.theme_apply; 69 Elm.Widget.theme_apply;
70 Elm.Widget.sub_object_add; 70 Elm.Widget.sub_object_add;
71 Elm.Widget.widget_parent; 71 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,
92 class.constructor; 92 class.constructor;
93 Eo.Base.constructor; 93 Eo.Base.constructor;
94 Eo.Base.destructor; 94 Eo.Base.destructor;
95 Evas.Object.Smart.hide; 95 Evas.Object.Smart.smart_hide;
96 Evas.Object.Smart.show; 96 Evas.Object.Smart.smart_show;
97 Evas.Object.Smart.add; 97 Evas.Object.Smart.smart_add;
98 Evas.Object.Smart.del; 98 Evas.Object.Smart.smart_del;
99 Elm.Widget.widget_parent.set; 99 Elm.Widget.widget_parent.set;
100 Elm.Widget.theme_apply; 100 Elm.Widget.theme_apply;
101 Elm.Widget.translate; 101 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,
490} 490}
491 491
492EOLIAN static void 492EOLIAN static void
493_elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv) 493_elm_icon_evas_object_smart_smart_add(Eo *obj, Elm_Icon_Data *priv)
494{ 494{
495 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 495 evas_obj_smart_add(eo_super(obj, MY_CLASS));
496 elm_widget_sub_object_parent_add(obj); 496 elm_widget_sub_object_parent_add(obj);
@@ -499,7 +499,7 @@ _elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv)
499} 499}
500 500
501EOLIAN static void 501EOLIAN static void
502_elm_icon_evas_object_smart_del(Eo *obj, Elm_Icon_Data *sd) 502_elm_icon_evas_object_smart_smart_del(Eo *obj, Elm_Icon_Data *sd)
503{ 503{
504 eina_stringshare_del(sd->stdicon); 504 eina_stringshare_del(sd->stdicon);
505 505
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)
16 implements { 16 implements {
17 class.constructor; 17 class.constructor;
18 Eo.Base.constructor; 18 Eo.Base.constructor;
19 Evas.Object.Smart.add; 19 Evas.Object.Smart.smart_add;
20 Evas.Object.Smart.del; 20 Evas.Object.Smart.smart_del;
21 Elm.Widget.theme_apply; 21 Elm.Widget.theme_apply;
22 Efl.File.file.set; 22 Efl.File.file.set;
23 } 23 }
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)
1032 1032
1033 1033
1034EOLIAN static void 1034EOLIAN static void
1035_elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv) 1035_elm_index_evas_object_smart_smart_add(Eo *obj, Elm_Index_Data *priv)
1036{ 1036{
1037 Evas_Object *o; 1037 Evas_Object *o;
1038 Evas_Coord minw = 0, minh = 0; 1038 Evas_Coord minw = 0, minh = 0;
@@ -1110,7 +1110,7 @@ _elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv)
1110} 1110}
1111 1111
1112EOLIAN static void 1112EOLIAN static void
1113_elm_index_evas_object_smart_del(Eo *obj, Elm_Index_Data *sd) 1113_elm_index_evas_object_smart_smart_del(Eo *obj, Elm_Index_Data *sd)
1114{ 1114{
1115 Elm_Index_Omit *o; 1115 Elm_Index_Omit *o;
1116 1116
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,
220 implements { 220 implements {
221 class.constructor; 221 class.constructor;
222 Eo.Base.constructor; 222 Eo.Base.constructor;
223 Evas.Object.Smart.add; 223 Evas.Object.Smart.smart_add;
224 Evas.Object.Smart.del; 224 Evas.Object.Smart.smart_del;
225 Elm.Widget.theme_apply; 225 Elm.Widget.theme_apply;
226 Elm.Widget.focus_next_manager_is; 226 Elm.Widget.focus_next_manager_is;
227 Elm.Widget.focus_direction_manager_is; 227 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)
104} 104}
105 105
106EOLIAN static void 106EOLIAN static void
107_elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) 107_elm_pan_evas_object_smart_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
108{ 108{
109 evas_obj_smart_add(eo_super(obj, MY_PAN_CLASS)); 109 evas_obj_smart_add(eo_super(obj, MY_PAN_CLASS));
110 110
@@ -112,7 +112,7 @@ _elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
112} 112}
113 113
114EOLIAN static void 114EOLIAN static void
115_elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) 115_elm_pan_evas_object_smart_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
116{ 116{
117 _elm_pan_content_set(obj, NULL); 117 _elm_pan_content_set(obj, NULL);
118 118
@@ -120,7 +120,7 @@ _elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
120} 120}
121 121
122EOLIAN static void 122EOLIAN static void
123_elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y) 123_elm_pan_evas_object_smart_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y)
124{ 124{
125 psd->x = x; 125 psd->x = x;
126 psd->y = y; 126 psd->y = y;
@@ -129,7 +129,7 @@ _elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Ev
129} 129}
130 130
131EOLIAN static void 131EOLIAN static void
132_elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h) 132_elm_pan_evas_object_smart_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h)
133{ 133{
134 psd->w = w; 134 psd->w = w;
135 psd->h = h; 135 psd->h = h;
@@ -139,7 +139,7 @@ _elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd,
139} 139}
140 140
141EOLIAN static void 141EOLIAN static void
142_elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) 142_elm_pan_evas_object_smart_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
143{ 143{
144 evas_obj_smart_show(eo_super(obj, MY_PAN_CLASS)); 144 evas_obj_smart_show(eo_super(obj, MY_PAN_CLASS));
145 145
@@ -148,7 +148,7 @@ _elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
148} 148}
149 149
150EOLIAN static void 150EOLIAN static void
151_elm_pan_evas_object_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd) 151_elm_pan_evas_object_smart_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
152{ 152{
153 evas_obj_smart_hide(eo_super(obj, MY_PAN_CLASS)); 153 evas_obj_smart_hide(eo_super(obj, MY_PAN_CLASS));
154 154
@@ -4485,7 +4485,7 @@ _elm_interface_scrollable_loop_get(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Int
4485} 4485}
4486 4486
4487EOLIAN static void 4487EOLIAN static void
4488_elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) 4488_elm_interface_scrollable_evas_object_smart_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
4489{ 4489{
4490 memset(sid, 0, sizeof(*sid)); 4490 memset(sid, 0, sizeof(*sid));
4491 4491
@@ -4522,7 +4522,7 @@ _elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_In
4522} 4522}
4523 4523
4524EOLIAN static void 4524EOLIAN static void
4525_elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) 4525_elm_interface_scrollable_evas_object_smart_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
4526{ 4526{
4527 4527
4528 evas_obj_smart_del(eo_super(obj, MY_SCROLLABLE_INTERFACE)); 4528 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)
662 } 662 }
663 implements { 663 implements {
664 class.constructor; 664 class.constructor;
665 Evas.Object.Smart.add; 665 Evas.Object.Smart.smart_add;
666 Evas.Object.Smart.del; 666 Evas.Object.Smart.smart_del;
667 } 667 }
668 events { 668 events {
669 changed; 669 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
66} 66}
67 67
68EOLIAN static void 68EOLIAN static void
69_elm_inwin_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED) 69_elm_inwin_evas_object_smart_smart_add(Eo *obj, void *_pd EINA_UNUSED)
70{ 70{
71 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 71 evas_obj_smart_add(eo_super(obj, MY_CLASS));
72 elm_widget_sub_object_parent_add(obj); 72 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)
21 implements { 21 implements {
22 class.constructor; 22 class.constructor;
23 Eo.Base.constructor; 23 Eo.Base.constructor;
24 Evas.Object.Smart.add; 24 Evas.Object.Smart.smart_add;
25 Elm.Widget.widget_parent.set; 25 Elm.Widget.widget_parent.set;
26 Elm.Widget.focus_next_manager_is; 26 Elm.Widget.focus_next_manager_is;
27 Elm.Widget.focus_next; 27 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,
365} 365}
366 366
367EOLIAN static void 367EOLIAN static void
368_elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv) 368_elm_label_evas_object_smart_smart_add(Eo *obj, Elm_Label_Data *priv)
369{ 369{
370 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 370 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
371 371
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)
123 implements { 123 implements {
124 class.constructor; 124 class.constructor;
125 Eo.Base.constructor; 125 Eo.Base.constructor;
126 Evas.Object.Smart.add; 126 Evas.Object.Smart.smart_add;
127 Elm.Widget.focus_next_manager_is; 127 Elm.Widget.focus_next_manager_is;
128 Elm.Widget.focus_direction_manager_is; 128 Elm.Widget.focus_direction_manager_is;
129 Elm.Widget.theme_apply; 129 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,
758} 758}
759 759
760EOLIAN static void 760EOLIAN static void
761_elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 761_elm_layout_evas_object_smart_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
762{ 762{
763 Evas_Object *edje; 763 Evas_Object *edje;
764 764
@@ -779,7 +779,7 @@ _elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSE
779} 779}
780 780
781EOLIAN static void 781EOLIAN static void
782_elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) 782_elm_layout_evas_object_smart_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
783{ 783{
784 Elm_Layout_Sub_Object_Data *sub_d; 784 Elm_Layout_Sub_Object_Data *sub_d;
785 Elm_Layout_Sub_Object_Cursor *pc; 785 Elm_Layout_Sub_Object_Cursor *pc;
@@ -837,7 +837,7 @@ _elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
837/* rewrite or extend this one on your derived class as to suit your 837/* rewrite or extend this one on your derived class as to suit your
838 * needs */ 838 * needs */
839EOLIAN static void 839EOLIAN static void
840_elm_layout_evas_object_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) 840_elm_layout_evas_object_smart_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
841{ 841{
842 if (sd->needs_size_calc) 842 if (sd->needs_size_calc)
843 { 843 {
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)
331 Eo.Base.dbg_info_get; 331 Eo.Base.dbg_info_get;
332 Efl.File.file.set; 332 Efl.File.file.set;
333 Efl.File.file.get; 333 Efl.File.file.get;
334 Evas.Object.Smart.del; 334 Evas.Object.Smart.smart_del;
335 Evas.Object.Smart.add; 335 Evas.Object.Smart.smart_add;
336 Evas.Object.Smart.calculate; 336 Evas.Object.Smart.smart_calculate;
337 Elm.Widget.focus_direction; 337 Elm.Widget.focus_direction;
338 Elm.Widget.sub_object_add; 338 Elm.Widget.sub_object_add;
339 Elm.Widget.theme_apply; 339 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
2387} 2387}
2388 2388
2389EOLIAN static void 2389EOLIAN static void
2390_elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv) 2390_elm_list_evas_object_smart_smart_add(Eo *obj, Elm_List_Data *priv)
2391{ 2391{
2392 Evas_Coord minw, minh; 2392 Evas_Coord minw, minh;
2393 2393
@@ -2453,7 +2453,7 @@ _elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv)
2453} 2453}
2454 2454
2455EOLIAN static void 2455EOLIAN static void
2456_elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd) 2456_elm_list_evas_object_smart_smart_del(Eo *obj, Elm_List_Data *sd)
2457{ 2457{
2458 const Eina_List *l; 2458 const Eina_List *l;
2459 Elm_Object_Item *eo_it; 2459 Elm_Object_Item *eo_it;
@@ -2503,7 +2503,7 @@ _elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd)
2503} 2503}
2504 2504
2505EOLIAN static void 2505EOLIAN static void
2506_elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y) 2506_elm_list_evas_object_smart_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
2507{ 2507{
2508 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 2508 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
2509 2509
@@ -2511,7 +2511,7 @@ _elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_
2511} 2511}
2512 2512
2513EOLIAN static void 2513EOLIAN static void
2514_elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h) 2514_elm_list_evas_object_smart_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
2515{ 2515{
2516 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 2516 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
2517 2517
@@ -2519,7 +2519,7 @@ _elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Eva
2519} 2519}
2520 2520
2521EOLIAN static void 2521EOLIAN static void
2522_elm_list_evas_object_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member) 2522_elm_list_evas_object_smart_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
2523{ 2523{
2524 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 2524 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
2525 2525
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,
429 implements { 429 implements {
430 class.constructor; 430 class.constructor;
431 Eo.Base.constructor; 431 Eo.Base.constructor;
432 Evas.Object.Smart.member_add; 432 Evas.Object.Smart.smart_member_add;
433 Evas.Object.Smart.move; 433 Evas.Object.Smart.smart_move;
434 Evas.Object.Smart.add; 434 Evas.Object.Smart.smart_add;
435 Evas.Object.Smart.del; 435 Evas.Object.Smart.smart_del;
436 Evas.Object.Smart.resize; 436 Evas.Object.Smart.smart_resize;
437 Elm.Widget.theme_apply; 437 Elm.Widget.theme_apply;
438 Elm.Widget.focus_next_manager_is; 438 Elm.Widget.focus_next_manager_is;
439 Elm.Widget.focus_direction_manager_is; 439 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
3861} 3861}
3862 3862
3863EOLIAN static void 3863EOLIAN static void
3864_elm_map_pan_evas_object_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) 3864_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)
3865{ 3865{
3866 _sizing_eval(psd->wsd->obj); 3866 _sizing_eval(psd->wsd->obj);
3867 elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode); 3867 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
3869} 3869}
3870 3870
3871EOLIAN static void 3871EOLIAN static void
3872_elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) 3872_elm_map_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
3873{ 3873{
3874 Evas_Coord w, h; 3874 Evas_Coord w, h;
3875 3875
@@ -3883,7 +3883,7 @@ _elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
3883} 3883}
3884 3884
3885EOLIAN static void 3885EOLIAN static void
3886_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) 3886_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)
3887{ 3887{
3888 evas_object_smart_changed(obj); 3888 evas_object_smart_changed(obj);
3889} 3889}
@@ -4032,7 +4032,7 @@ _elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *sr
4032} 4032}
4033 4033
4034EOLIAN static void 4034EOLIAN static void
4035_elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv) 4035_elm_map_evas_object_smart_smart_add(Eo *obj, Elm_Map_Data *priv)
4036{ 4036{
4037 Evas_Coord minw, minh; 4037 Evas_Coord minw, minh;
4038 Elm_Map_Pan_Data *pan_data; 4038 Elm_Map_Pan_Data *pan_data;
@@ -4141,7 +4141,7 @@ _elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
4141} 4141}
4142 4142
4143EOLIAN static void 4143EOLIAN static void
4144_elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd) 4144_elm_map_evas_object_smart_smart_del(Eo *obj, Elm_Map_Data *sd)
4145{ 4145{
4146 Elm_Map_Route *r; 4146 Elm_Map_Route *r;
4147 Elm_Map_Name *na; 4147 Elm_Map_Name *na;
@@ -4201,7 +4201,7 @@ _elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd)
4201} 4201}
4202 4202
4203EOLIAN static void 4203EOLIAN static void
4204_elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) 4204_elm_map_evas_object_smart_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
4205{ 4205{
4206 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 4206 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
4207 4207
@@ -4209,7 +4209,7 @@ _elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Co
4209} 4209}
4210 4210
4211EOLIAN static void 4211EOLIAN static void
4212_elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h) 4212_elm_map_evas_object_smart_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
4213{ 4213{
4214 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 4214 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
4215 4215
@@ -4217,7 +4217,7 @@ _elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_
4217} 4217}
4218 4218
4219EOLIAN static void 4219EOLIAN static void
4220_elm_map_evas_object_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member) 4220_elm_map_evas_object_smart_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
4221{ 4221{
4222 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 4222 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
4223 4223
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,
626 implements { 626 implements {
627 class.constructor; 627 class.constructor;
628 Eo.Base.constructor; 628 Eo.Base.constructor;
629 Evas.Object.Smart.move; 629 Evas.Object.Smart.smart_move;
630 Evas.Object.Smart.add; 630 Evas.Object.Smart.smart_add;
631 Evas.Object.Smart.del; 631 Evas.Object.Smart.smart_del;
632 Evas.Object.Smart.member_add; 632 Evas.Object.Smart.smart_member_add;
633 Evas.Object.Smart.resize; 633 Evas.Object.Smart.smart_resize;
634 Elm.Widget.theme_apply; 634 Elm.Widget.theme_apply;
635 Elm.Widget.on_focus; 635 Elm.Widget.on_focus;
636 Elm.Widget.event; 636 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)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.destructor; 8 Eo.Base.destructor;
9 Evas.Object.Smart.calculate; 9 Evas.Object.Smart.smart_calculate;
10 Evas.Object.Smart.move; 10 Evas.Object.Smart.smart_move;
11 Evas.Object.Smart.resize; 11 Evas.Object.Smart.smart_resize;
12 Elm.Pan.content_size.get; 12 Elm.Pan.content_size.get;
13 Elm.Pan.pos; 13 Elm.Pan.pos;
14 Elm.Pan.pos_min.get; 14 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)
156} 156}
157 157
158EOLIAN static void 158EOLIAN static void
159_elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y) 159_elm_mapbuf_evas_object_smart_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
160{ 160{
161 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 161 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
162 162
@@ -166,7 +166,7 @@ _elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, E
166} 166}
167 167
168EOLIAN static void 168EOLIAN static void
169_elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h) 169_elm_mapbuf_evas_object_smart_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
170{ 170{
171 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 171 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
172 172
@@ -176,7 +176,7 @@ _elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w,
176} 176}
177 177
178EOLIAN static void 178EOLIAN static void
179_elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) 179_elm_mapbuf_evas_object_smart_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
180{ 180{
181 evas_obj_smart_show(eo_super(obj, MY_CLASS)); 181 evas_obj_smart_show(eo_super(obj, MY_CLASS));
182 182
@@ -185,7 +185,7 @@ _elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
185} 185}
186 186
187EOLIAN static void 187EOLIAN static void
188_elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd) 188_elm_mapbuf_evas_object_smart_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
189{ 189{
190 evas_obj_smart_hide(eo_super(obj, MY_CLASS)); 190 evas_obj_smart_hide(eo_super(obj, MY_CLASS));
191 191
@@ -264,7 +264,7 @@ _elm_mapbuf_efl_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd)
264} 264}
265 265
266EOLIAN static void 266EOLIAN static void
267_elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) 267_elm_mapbuf_evas_object_smart_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
268{ 268{
269 ELM_SAFE_FREE(priv->idler, ecore_idler_del); 269 ELM_SAFE_FREE(priv->idler, ecore_idler_del);
270 ELM_SAFE_FREE(priv->map, evas_map_free); 270 ELM_SAFE_FREE(priv->map, evas_map_free);
@@ -273,7 +273,7 @@ _elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
273} 273}
274 274
275EOLIAN static void 275EOLIAN static void
276_elm_mapbuf_evas_object_smart_add(Eo *obj, Elm_Mapbuf_Data *priv) 276_elm_mapbuf_evas_object_smart_smart_add(Eo *obj, Elm_Mapbuf_Data *priv)
277{ 277{
278 Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 278 Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj));
279 int i; 279 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)
129 implements { 129 implements {
130 class.constructor; 130 class.constructor;
131 Eo.Base.constructor; 131 Eo.Base.constructor;
132 Evas.Object.Smart.hide; 132 Evas.Object.Smart.smart_hide;
133 Evas.Object.Smart.show; 133 Evas.Object.Smart.smart_show;
134 Evas.Object.Smart.move; 134 Evas.Object.Smart.smart_move;
135 Evas.Object.Smart.add; 135 Evas.Object.Smart.smart_add;
136 Evas.Object.Smart.del; 136 Evas.Object.Smart.smart_del;
137 Evas.Object.Smart.resize; 137 Evas.Object.Smart.smart_resize;
138 Elm.Widget.theme_apply; 138 Elm.Widget.theme_apply;
139 Elm.Widget.sub_object_del; 139 Elm.Widget.sub_object_del;
140 Efl.Container.content.get; 140 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)
556} 556}
557 557
558EOLIAN static void 558EOLIAN static void
559_elm_menu_evas_object_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) 559_elm_menu_evas_object_smart_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
560{ 560{
561 evas_object_show(sd->hv); 561 evas_object_show(sd->hv);
562} 562}
@@ -672,7 +672,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
672} 672}
673 673
674EOLIAN static void 674EOLIAN static void
675_elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv) 675_elm_menu_evas_object_smart_smart_add(Eo *obj, Elm_Menu_Data *priv)
676{ 676{
677 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 677 evas_obj_smart_add(eo_super(obj, MY_CLASS));
678 elm_widget_sub_object_parent_add(obj); 678 elm_widget_sub_object_parent_add(obj);
@@ -701,7 +701,7 @@ _elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv)
701} 701}
702 702
703EOLIAN static void 703EOLIAN static void
704_elm_menu_evas_object_smart_del(Eo *obj, Elm_Menu_Data *sd) 704_elm_menu_evas_object_smart_smart_del(Eo *obj, Elm_Menu_Data *sd)
705{ 705{
706 Elm_Object_Item *eo_item; 706 Elm_Object_Item *eo_item;
707 707
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)
72 class.constructor; 72 class.constructor;
73 Eo.Base.constructor; 73 Eo.Base.constructor;
74 Eo.Base.destructor; 74 Eo.Base.destructor;
75 Evas.Object.Smart.show; 75 Evas.Object.Smart.smart_show;
76 Evas.Object.Smart.add; 76 Evas.Object.Smart.smart_add;
77 Evas.Object.Smart.del; 77 Evas.Object.Smart.smart_del;
78 Elm.Widget.widget_parent; 78 Elm.Widget.widget_parent;
79 Elm.Widget.theme_apply; 79 Elm.Widget.theme_apply;
80 Elm.Widget.translate; 80 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)
176 implements { 176 implements {
177 class.constructor; 177 class.constructor;
178 Eo.Base.constructor; 178 Eo.Base.constructor;
179 Evas.Object.Smart.add; 179 Evas.Object.Smart.smart_add;
180 Evas.Object.Smart.del; 180 Evas.Object.Smart.smart_del;
181 Elm.Widget.theme_apply; 181 Elm.Widget.theme_apply;
182 Elm.Widget.focus_next_manager_is; 182 Elm.Widget.focus_next_manager_is;
183 Elm.Widget.focus_direction_manager_is; 183 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)
142 implements { 142 implements {
143 class.constructor; 143 class.constructor;
144 Eo.Base.constructor; 144 Eo.Base.constructor;
145 Evas.Object.Smart.del; 145 Evas.Object.Smart.smart_del;
146 Evas.Object.Smart.show; 146 Evas.Object.Smart.smart_show;
147 Evas.Object.Smart.add; 147 Evas.Object.Smart.smart_add;
148 Elm.Widget.focus_direction; 148 Elm.Widget.focus_direction;
149 Elm.Widget.focus_next_manager_is; 149 Elm.Widget.focus_next_manager_is;
150 Elm.Widget.focus_direction_manager_is; 150 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,
226} 226}
227 227
228EOLIAN static void 228EOLIAN static void
229_elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, Evas_Coord h) 229_elm_notify_evas_object_smart_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w, Evas_Coord h)
230{ 230{
231 Evas_Coord x, y; 231 Evas_Coord x, y;
232 232
@@ -240,7 +240,7 @@ _elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd, Evas_Coord w,
240} 240}
241 241
242EOLIAN static void 242EOLIAN static void
243_elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord x, Evas_Coord y) 243_elm_notify_evas_object_smart_smart_move(Eo *obj, Elm_Notify_Data *sd, Evas_Coord x, Evas_Coord y)
244{ 244{
245 Evas_Coord w, h; 245 Evas_Coord w, h;
246 246
@@ -282,7 +282,7 @@ _timer_init(Evas_Object *obj,
282} 282}
283 283
284EOLIAN static void 284EOLIAN static void
285_elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd) 285_elm_notify_evas_object_smart_smart_show(Eo *obj, Elm_Notify_Data *sd)
286{ 286{
287 sd->had_hidden = EINA_FALSE; 287 sd->had_hidden = EINA_FALSE;
288 sd->in_timeout = EINA_FALSE; 288 sd->in_timeout = EINA_FALSE;
@@ -295,7 +295,7 @@ _elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd)
295} 295}
296 296
297EOLIAN static void 297EOLIAN static void
298_elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data *sd) 298_elm_notify_evas_object_smart_smart_hide(Eo *obj, Elm_Notify_Data *sd)
299{ 299{
300 const char *hide_signal; 300 const char *hide_signal;
301 301
@@ -452,7 +452,7 @@ _hide_finished_cb(void *data,
452} 452}
453 453
454EOLIAN static void 454EOLIAN static void
455_elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv) 455_elm_notify_evas_object_smart_smart_add(Eo *obj, Elm_Notify_Data *priv)
456{ 456{
457 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 457 evas_obj_smart_add(eo_super(obj, MY_CLASS));
458 elm_widget_sub_object_parent_add(obj); 458 elm_widget_sub_object_parent_add(obj);
@@ -470,7 +470,7 @@ _elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv)
470} 470}
471 471
472EOLIAN static void 472EOLIAN static void
473_elm_notify_evas_object_smart_del(Eo *obj, Elm_Notify_Data *sd) 473_elm_notify_evas_object_smart_smart_del(Eo *obj, Elm_Notify_Data *sd)
474{ 474{
475 edje_object_signal_callback_del_full 475 edje_object_signal_callback_del_full
476 (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj); 476 (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)
79 implements { 79 implements {
80 class.constructor; 80 class.constructor;
81 Eo.Base.constructor; 81 Eo.Base.constructor;
82 Evas.Object.Smart.hide; 82 Evas.Object.Smart.smart_hide;
83 Evas.Object.Smart.show; 83 Evas.Object.Smart.smart_show;
84 Evas.Object.Smart.move; 84 Evas.Object.Smart.smart_move;
85 Evas.Object.Smart.add; 85 Evas.Object.Smart.smart_add;
86 Evas.Object.Smart.del; 86 Evas.Object.Smart.smart_del;
87 Evas.Object.Smart.resize; 87 Evas.Object.Smart.smart_resize;
88 Elm.Widget.focus_direction; 88 Elm.Widget.focus_direction;
89 Elm.Widget.widget_parent; 89 Elm.Widget.widget_parent;
90 Elm.Widget.theme_apply; 90 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)
53 implements { 53 implements {
54 Eo.Base.constructor; 54 Eo.Base.constructor;
55 class.constructor; 55 class.constructor;
56 Evas.Object.Smart.hide; 56 Evas.Object.Smart.smart_hide;
57 Evas.Object.Smart.show; 57 Evas.Object.Smart.smart_show;
58 Evas.Object.Smart.move; 58 Evas.Object.Smart.smart_move;
59 Evas.Object.Smart.add; 59 Evas.Object.Smart.smart_add;
60 Evas.Object.Smart.del; 60 Evas.Object.Smart.smart_del;
61 Evas.Object.Smart.resize; 61 Evas.Object.Smart.smart_resize;
62 } 62 }
63 events { 63 events {
64 changed; 64 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)
1001} 1001}
1002 1002
1003EOLIAN static void 1003EOLIAN static void
1004_elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv) 1004_elm_panel_evas_object_smart_smart_add(Eo *obj, Elm_Panel_Data *priv)
1005{ 1005{
1006 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1006 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1007 1007
@@ -1049,7 +1049,7 @@ _elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv)
1049} 1049}
1050 1050
1051EOLIAN static void 1051EOLIAN static void
1052_elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd) 1052_elm_panel_evas_object_smart_smart_del(Eo *obj, Elm_Panel_Data *sd)
1053{ 1053{
1054 Evas_Object *child; 1054 Evas_Object *child;
1055 Eina_List *l; 1055 Eina_List *l;
@@ -1076,7 +1076,7 @@ _elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd)
1076} 1076}
1077 1077
1078EOLIAN static void 1078EOLIAN static void
1079_elm_panel_evas_object_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y) 1079_elm_panel_evas_object_smart_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y)
1080{ 1080{
1081 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 1081 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
1082 1082
@@ -1101,7 +1101,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1101} 1101}
1102 1102
1103EOLIAN static void 1103EOLIAN static void
1104_elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h) 1104_elm_panel_evas_object_smart_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, Evas_Coord h)
1105{ 1105{
1106 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 1106 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
1107 1107
@@ -1131,7 +1131,7 @@ _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, E
1131} 1131}
1132 1132
1133EOLIAN static void 1133EOLIAN static void
1134_elm_panel_evas_object_smart_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member) 1134_elm_panel_evas_object_smart_smart_member_add(Eo *obj, Elm_Panel_Data *sd, Evas_Object *member)
1135{ 1135{
1136 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 1136 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member);
1137 1137
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,
68 implements { 68 implements {
69 class.constructor; 69 class.constructor;
70 Eo.Base.constructor; 70 Eo.Base.constructor;
71 Evas.Object.Smart.add; 71 Evas.Object.Smart.smart_add;
72 Evas.Object.Smart.member_add; 72 Evas.Object.Smart.smart_member_add;
73 Evas.Object.Smart.del; 73 Evas.Object.Smart.smart_del;
74 Evas.Object.Smart.resize; 74 Evas.Object.Smart.smart_resize;
75 Evas.Object.Smart.move; 75 Evas.Object.Smart.smart_move;
76 Elm.Widget.theme_apply; 76 Elm.Widget.theme_apply;
77 Elm.Widget.focus_next_manager_is; 77 Elm.Widget.focus_next_manager_is;
78 Elm.Widget.focus_next; 78 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,
262} 262}
263 263
264EOLIAN static void 264EOLIAN static void
265_elm_panes_evas_object_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) 265_elm_panes_evas_object_smart_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
266{ 266{
267 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 267 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
268 ELM_PANES_DATA_GET(obj, sd); 268 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,
117 implements { 117 implements {
118 class.constructor; 118 class.constructor;
119 Eo.Base.constructor; 119 Eo.Base.constructor;
120 Evas.Object.Smart.add; 120 Evas.Object.Smart.smart_add;
121 Elm.Widget.focus_next_manager_is; 121 Elm.Widget.focus_next_manager_is;
122 Elm.Widget.focus_next; 122 Elm.Widget.focus_next;
123 Elm.Widget.theme_apply; 123 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)
243} 243}
244 244
245EOLIAN static void 245EOLIAN static void
246_elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv) 246_elm_photo_evas_object_smart_smart_add(Eo *obj, Elm_Photo_Data *priv)
247{ 247{
248 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 248 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
249 249
@@ -287,7 +287,7 @@ _elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv)
287} 287}
288 288
289EOLIAN static void 289EOLIAN static void
290_elm_photo_evas_object_smart_del(Eo *obj, Elm_Photo_Data *sd) 290_elm_photo_evas_object_smart_smart_del(Eo *obj, Elm_Photo_Data *sd)
291{ 291{
292 ecore_timer_del(sd->long_press_timer); 292 ecore_timer_del(sd->long_press_timer);
293 293
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)
6 class.constructor; 6 class.constructor;
7 Eo.Base.constructor; 7 Eo.Base.constructor;
8 Efl.File.file.set; 8 Efl.File.file.set;
9 Evas.Object.Smart.add; 9 Evas.Object.Smart.smart_add;
10 Evas.Object.Smart.del; 10 Evas.Object.Smart.smart_del;
11 Elm.Widget.theme_apply; 11 Elm.Widget.theme_apply;
12 } 12 }
13 13
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)
145} 145}
146 146
147EOLIAN static void 147EOLIAN static void
148_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) 148_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)
149{ 149{
150 ecore_job_del(psd->wsd->calc_job); 150 ecore_job_del(psd->wsd->calc_job);
151 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); 151 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
152} 152}
153 153
154EOLIAN static void 154EOLIAN static void
155_elm_photocam_pan_evas_object_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 155_elm_photocam_pan_evas_object_smart_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
156{ 156{
157 Evas_Coord ow, oh; 157 Evas_Coord ow, oh;
158 158
@@ -345,7 +345,7 @@ _grid_place(Evas_Object *obj,
345} 345}
346 346
347EOLIAN static void 347EOLIAN static void
348_elm_photocam_pan_evas_object_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd) 348_elm_photocam_pan_evas_object_smart_smart_calculate(Eo *obj, Elm_Photocam_Pan_Data *psd)
349{ 349{
350 Elm_Phocam_Grid *g; 350 Elm_Phocam_Grid *g;
351 Eina_List *l; 351 Eina_List *l;
@@ -1376,7 +1376,7 @@ _elm_photocam_image_orient_get(Eo *obj EINA_UNUSED, Elm_Photocam_Data *sd)
1376} 1376}
1377 1377
1378EOLIAN static void 1378EOLIAN static void
1379_elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv) 1379_elm_photocam_evas_object_smart_smart_add(Eo *obj, Elm_Photocam_Data *priv)
1380{ 1380{
1381 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; 1381 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
1382 Elm_Photocam_Pan_Data *pan_data; 1382 Elm_Photocam_Pan_Data *pan_data;
@@ -1452,7 +1452,7 @@ _elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv)
1452} 1452}
1453 1453
1454EOLIAN static void 1454EOLIAN static void
1455_elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd) 1455_elm_photocam_evas_object_smart_smart_del(Eo *obj, Elm_Photocam_Data *sd)
1456{ 1456{
1457 Elm_Phocam_Grid *g; 1457 Elm_Phocam_Grid *g;
1458 1458
@@ -1477,7 +1477,7 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
1477} 1477}
1478 1478
1479EOLIAN static void 1479EOLIAN static void
1480_elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y) 1480_elm_photocam_evas_object_smart_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord x, Evas_Coord y)
1481{ 1481{
1482 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y); 1482 evas_obj_smart_move(eo_super(obj, MY_CLASS), x, y);
1483 1483
@@ -1485,7 +1485,7 @@ _elm_photocam_evas_object_smart_move(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord
1485} 1485}
1486 1486
1487EOLIAN static void 1487EOLIAN static void
1488_elm_photocam_evas_object_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h) 1488_elm_photocam_evas_object_smart_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coord w, Evas_Coord h)
1489{ 1489{
1490 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h); 1490 evas_obj_smart_resize(eo_super(obj, MY_CLASS), w, h);
1491 1491
@@ -1493,7 +1493,7 @@ _elm_photocam_evas_object_smart_resize(Eo *obj, Elm_Photocam_Data *sd, Evas_Coor
1493} 1493}
1494 1494
1495EOLIAN static void 1495EOLIAN static void
1496_elm_photocam_evas_object_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member) 1496_elm_photocam_evas_object_smart_smart_member_add(Eo *obj, Elm_Photocam_Data *sd, Evas_Object *member)
1497{ 1497{
1498 1498
1499 evas_obj_smart_member_add(eo_super(obj, MY_CLASS), member); 1499 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,
189 implements { 189 implements {
190 class.constructor; 190 class.constructor;
191 Eo.Base.constructor; 191 Eo.Base.constructor;
192 Evas.Object.Smart.move; 192 Evas.Object.Smart.smart_move;
193 Evas.Object.Smart.add; 193 Evas.Object.Smart.smart_add;
194 Evas.Object.Smart.del; 194 Evas.Object.Smart.smart_del;
195 Evas.Object.Smart.member_add; 195 Evas.Object.Smart.smart_member_add;
196 Evas.Object.Smart.resize; 196 Evas.Object.Smart.smart_resize;
197 Elm.Widget.theme_apply; 197 Elm.Widget.theme_apply;
198 Elm.Widget.on_focus; 198 Elm.Widget.on_focus;
199 Elm.Widget.event; 199 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)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.destructor; 8 Eo.Base.destructor;
9 Evas.Object.Smart.calculate; 9 Evas.Object.Smart.smart_calculate;
10 Evas.Object.Smart.move; 10 Evas.Object.Smart.smart_move;
11 Evas.Object.Smart.resize; 11 Evas.Object.Smart.smart_resize;
12 Elm.Pan.content_size.get; 12 Elm.Pan.content_size.get;
13 Elm.Pan.pos; 13 Elm.Pan.pos;
14 Elm.Pan.pos_min.get; 14 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)
6 implements { 6 implements {
7 class.constructor; 7 class.constructor;
8 Eo.Base.constructor; 8 Eo.Base.constructor;
9 Evas.Object.Smart.add; 9 Evas.Object.Smart.smart_add;
10 Evas.Object.Smart.del; 10 Evas.Object.Smart.smart_del;
11 Elm.Widget.theme_apply; 11 Elm.Widget.theme_apply;
12 Elm.Widget.event; 12 Elm.Widget.event;
13 Elm.Layout.sizing_eval; 13 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,
107} 107}
108 108
109EOLIAN static void 109EOLIAN static void
110_elm_plug_evas_object_smart_add(Eo *obj, void *sd EINA_UNUSED) 110_elm_plug_evas_object_smart_smart_add(Eo *obj, void *sd EINA_UNUSED)
111{ 111{
112 Evas_Object *p_obj; 112 Evas_Object *p_obj;
113 Ecore_Evas *ee; 113 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)
32 implements { 32 implements {
33 class.constructor; 33 class.constructor;
34 Eo.Base.constructor; 34 Eo.Base.constructor;
35 Evas.Object.Smart.add; 35 Evas.Object.Smart.smart_add;
36 Elm.Widget.theme_apply; 36 Elm.Widget.theme_apply;
37 Elm.Widget.on_focus; 37 Elm.Widget.on_focus;
38 } 38 }
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)
167 implements { 167 implements {
168 class.constructor; 168 class.constructor;
169 Eo.Base.constructor; 169 Eo.Base.constructor;
170 Evas.Object.Smart.del; 170 Evas.Object.Smart.smart_del;
171 Evas.Object.Smart.add; 171 Evas.Object.Smart.smart_add;
172 Elm.Widget.focus_direction; 172 Elm.Widget.focus_direction;
173 Elm.Widget.focus_next_manager_is; 173 Elm.Widget.focus_next_manager_is;
174 Elm.Widget.theme_apply; 174 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 *,
46 Eina_Bool); 46 Eina_Bool);
47 47
48EOLIAN static void 48EOLIAN static void
49_elm_prefs_evas_object_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) 49_elm_prefs_evas_object_smart_smart_add(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
50{ 50{
51 evas_obj_smart_add(eo_super(obj, MY_CLASS)); 51 evas_obj_smart_add(eo_super(obj, MY_CLASS));
52 elm_widget_sub_object_parent_add(obj); 52 elm_widget_sub_object_parent_add(obj);
@@ -447,7 +447,7 @@ _elm_prefs_data_cbs_del(Eo *obj)
447} 447}
448 448
449EOLIAN static void 449EOLIAN static void
450_elm_prefs_evas_object_smart_del(Eo *obj, Elm_Prefs_Data *sd) 450_elm_prefs_evas_object_smart_smart_del(Eo *obj, Elm_Prefs_Data *sd)
451{ 451{
452 sd->delete_me = EINA_TRUE; 452 sd->delete_me = EINA_TRUE;
453 453
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)
216 Eo.Base.constructor; 216 Eo.Base.constructor;
217 Efl.File.file.set; 217 Efl.File.file.set;
218 Efl.File.file.get; 218 Efl.File.file.get;
219 Evas.Object.Smart.del; 219 Evas.Object.Smart.smart_del;