summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-06-03 11:35:28 +0100
committerTom Hacohen <tom@stosb.com>2014-06-03 11:54:44 +0100
commite03cb09b678eec288c5719c8f39d1c127cec9b4f (patch)
tree97373956fb4c6d1d08a56f18c615d55e40c29df6
parentd0258f5fd3c0ef9d27156ad5b39c17b777fa5edf (diff)
Elm: Update code to use the new class names generated by eolian.
-rw-r--r--src/bin/test_systray.c2
-rw-r--r--src/lib/elc_ctxpopup.c10
-rw-r--r--src/lib/elc_ctxpopup.eo4
-rw-r--r--src/lib/elc_fileselector.c6
-rw-r--r--src/lib/elc_fileselector.eo4
-rw-r--r--src/lib/elc_fileselector_button.c6
-rw-r--r--src/lib/elc_fileselector_button.eo4
-rw-r--r--src/lib/elc_fileselector_entry.c6
-rw-r--r--src/lib/elc_fileselector_entry.eo4
-rw-r--r--src/lib/elc_hoversel.c10
-rw-r--r--src/lib/elc_hoversel.eo8
-rw-r--r--src/lib/elc_multibuttonentry.c6
-rw-r--r--src/lib/elc_multibuttonentry.eo4
-rw-r--r--src/lib/elc_naviframe.c8
-rw-r--r--src/lib/elc_naviframe.eo6
-rw-r--r--src/lib/elc_player.c6
-rw-r--r--src/lib/elc_player.eo4
-rw-r--r--src/lib/elc_popup.c6
-rw-r--r--src/lib/elc_popup.eo4
-rw-r--r--src/lib/elm_access.c4
-rw-r--r--src/lib/elm_access.eo2
-rw-r--r--src/lib/elm_actionslider.c4
-rw-r--r--src/lib/elm_actionslider.eo2
-rw-r--r--src/lib/elm_bg.c4
-rw-r--r--src/lib/elm_bg.eo2
-rw-r--r--src/lib/elm_box.c6
-rw-r--r--src/lib/elm_box.eo4
-rw-r--r--src/lib/elm_bubble.c4
-rw-r--r--src/lib/elm_bubble.eo2
-rw-r--r--src/lib/elm_button.c4
-rw-r--r--src/lib/elm_button.eo2
-rw-r--r--src/lib/elm_calendar.c8
-rw-r--r--src/lib/elm_calendar.eo6
-rw-r--r--src/lib/elm_check.c4
-rw-r--r--src/lib/elm_check.eo2
-rw-r--r--src/lib/elm_clock.c6
-rw-r--r--src/lib/elm_clock.eo4
-rw-r--r--src/lib/elm_cnp.c6
-rw-r--r--src/lib/elm_colorselector.c8
-rw-r--r--src/lib/elm_colorselector.eo4
-rw-r--r--src/lib/elm_conform.c6
-rw-r--r--src/lib/elm_conformant.eo4
-rw-r--r--src/lib/elm_container.c2
-rw-r--r--src/lib/elm_datetime.c6
-rw-r--r--src/lib/elm_datetime.eo4
-rw-r--r--src/lib/elm_dayselector.c6
-rw-r--r--src/lib/elm_dayselector.eo4
-rw-r--r--src/lib/elm_diskselector.c12
-rw-r--r--src/lib/elm_diskselector.eo10
-rw-r--r--src/lib/elm_entry.c20
-rw-r--r--src/lib/elm_entry.eo14
-rw-r--r--src/lib/elm_flip.c6
-rw-r--r--src/lib/elm_flip.eo4
-rw-r--r--src/lib/elm_flipselector.c6
-rw-r--r--src/lib/elm_flipselector.eo4
-rw-r--r--src/lib/elm_frame.c6
-rw-r--r--src/lib/elm_frame.eo4
-rw-r--r--src/lib/elm_gengrid.c20
-rw-r--r--src/lib/elm_gengrid.eo10
-rw-r--r--src/lib/elm_gengrid_pan.eo6
-rw-r--r--src/lib/elm_genlist.c22
-rw-r--r--src/lib/elm_genlist.eo10
-rw-r--r--src/lib/elm_genlist_pan.eo8
-rw-r--r--src/lib/elm_gesture_layer.c6
-rw-r--r--src/lib/elm_gesture_layer.eo4
-rw-r--r--src/lib/elm_glview.c8
-rw-r--r--src/lib/elm_glview.eo6
-rw-r--r--src/lib/elm_grid.c6
-rw-r--r--src/lib/elm_grid.eo4
-rw-r--r--src/lib/elm_hover.c18
-rw-r--r--src/lib/elm_hover.eo12
-rw-r--r--src/lib/elm_icon.c16
-rw-r--r--src/lib/elm_icon.eo4
-rw-r--r--src/lib/elm_image.c22
-rw-r--r--src/lib/elm_image.eo20
-rw-r--r--src/lib/elm_index.c6
-rw-r--r--src/lib/elm_index.eo4
-rw-r--r--src/lib/elm_interface_atspi_widget.c4
-rw-r--r--src/lib/elm_interface_atspi_widget_action.c2
-rw-r--r--src/lib/elm_interface_scrollable.c18
-rw-r--r--src/lib/elm_interface_scrollable.eo6
-rw-r--r--src/lib/elm_inwin.c6
-rw-r--r--src/lib/elm_inwin.eo2
-rw-r--r--src/lib/elm_label.c4
-rw-r--r--src/lib/elm_label.eo2
-rw-r--r--src/lib/elm_layout.c10
-rw-r--r--src/lib/elm_layout.eo6
-rw-r--r--src/lib/elm_list.c12
-rw-r--r--src/lib/elm_list.eo10
-rw-r--r--src/lib/elm_map.c20
-rw-r--r--src/lib/elm_map.eo10
-rw-r--r--src/lib/elm_map_pan.eo6
-rw-r--r--src/lib/elm_mapbuf.c14
-rw-r--r--src/lib/elm_mapbuf.eo12
-rw-r--r--src/lib/elm_menu.c14
-rw-r--r--src/lib/elm_menu.eo6
-rw-r--r--src/lib/elm_notify.c16
-rw-r--r--src/lib/elm_notify.eo12
-rw-r--r--src/lib/elm_pan.eo12
-rw-r--r--src/lib/elm_panel.c8
-rw-r--r--src/lib/elm_panel.eo4
-rw-r--r--src/lib/elm_panes.c4
-rw-r--r--src/lib/elm_panes.eo2
-rw-r--r--src/lib/elm_photo.c6
-rw-r--r--src/lib/elm_photo.eo4
-rw-r--r--src/lib/elm_photocam.c20
-rw-r--r--src/lib/elm_photocam.eo10
-rw-r--r--src/lib/elm_photocam_pan.eo6
-rw-r--r--src/lib/elm_plug.c4
-rw-r--r--src/lib/elm_plug.eo2
-rw-r--r--src/lib/elm_prefs.c6
-rw-r--r--src/lib/elm_prefs.eo4
-rw-r--r--src/lib/elm_progressbar.c6
-rw-r--r--src/lib/elm_progressbar.eo4
-rw-r--r--src/lib/elm_radio.c6
-rw-r--r--src/lib/elm_radio.eo4
-rw-r--r--src/lib/elm_route.c6
-rw-r--r--src/lib/elm_route.eo4
-rw-r--r--src/lib/elm_scroller.c10
-rw-r--r--src/lib/elm_scroller.eo8
-rw-r--r--src/lib/elm_segment_control.c6
-rw-r--r--src/lib/elm_segment_control.eo4
-rw-r--r--src/lib/elm_separator.c4
-rw-r--r--src/lib/elm_separator.eo2
-rw-r--r--src/lib/elm_slider.c8
-rw-r--r--src/lib/elm_slider.eo6
-rw-r--r--src/lib/elm_slideshow.c6
-rw-r--r--src/lib/elm_slideshow.eo4
-rw-r--r--src/lib/elm_spinner.c6
-rw-r--r--src/lib/elm_spinner.eo4
-rw-r--r--src/lib/elm_table.c6
-rw-r--r--src/lib/elm_table.eo4
-rw-r--r--src/lib/elm_thumb.c12
-rw-r--r--src/lib/elm_thumb.eo8
-rw-r--r--src/lib/elm_toolbar.c12
-rw-r--r--src/lib/elm_toolbar.eo10
-rw-r--r--src/lib/elm_video.c6
-rw-r--r--src/lib/elm_video.eo4
-rw-r--r--src/lib/elm_video.h2
-rw-r--r--src/lib/elm_web.c6
-rw-r--r--src/lib/elm_web.eo4
-rw-r--r--src/lib/elm_web2.c6
-rw-r--r--src/lib/elm_widget.c40
-rw-r--r--src/lib/elm_widget.eo26
-rw-r--r--src/lib/elm_widget.h4
-rw-r--r--src/lib/elm_widget_actionslider.h4
-rw-r--r--src/lib/elm_widget_bg.h4
-rw-r--r--src/lib/elm_widget_box.h4
-rw-r--r--src/lib/elm_widget_bubble.h4
-rw-r--r--src/lib/elm_widget_button.h4
-rw-r--r--src/lib/elm_widget_calendar.h4
-rw-r--r--src/lib/elm_widget_check.h4
-rw-r--r--src/lib/elm_widget_clock.h4
-rw-r--r--src/lib/elm_widget_colorselector.h4
-rw-r--r--src/lib/elm_widget_conform.h4
-rw-r--r--src/lib/elm_widget_ctxpopup.h4
-rw-r--r--src/lib/elm_widget_datetime.h4
-rw-r--r--src/lib/elm_widget_dayselector.h4
-rw-r--r--src/lib/elm_widget_diskselector.h6
-rw-r--r--src/lib/elm_widget_entry.h4
-rw-r--r--src/lib/elm_widget_fileselector.h4
-rw-r--r--src/lib/elm_widget_fileselector_button.h4
-rw-r--r--src/lib/elm_widget_fileselector_entry.h4
-rw-r--r--src/lib/elm_widget_flip.h4
-rw-r--r--src/lib/elm_widget_flipselector.h4
-rw-r--r--src/lib/elm_widget_frame.h4
-rw-r--r--src/lib/elm_widget_gengrid.h8
-rw-r--r--src/lib/elm_widget_genlist.h8
-rw-r--r--src/lib/elm_widget_glview.h4
-rw-r--r--src/lib/elm_widget_grid.h2
-rw-r--r--src/lib/elm_widget_hover.h4
-rw-r--r--src/lib/elm_widget_hoversel.h4
-rw-r--r--src/lib/elm_widget_icon.h4
-rw-r--r--src/lib/elm_widget_image.h4
-rw-r--r--src/lib/elm_widget_index.h4
-rw-r--r--src/lib/elm_widget_inwin.h4
-rw-r--r--src/lib/elm_widget_label.h4
-rw-r--r--src/lib/elm_widget_layout.h4
-rw-r--r--src/lib/elm_widget_list.h4
-rw-r--r--src/lib/elm_widget_map.h6
-rw-r--r--src/lib/elm_widget_mapbuf.h4
-rw-r--r--src/lib/elm_widget_menu.h4
-rw-r--r--src/lib/elm_widget_multibuttonentry.h6
-rw-r--r--src/lib/elm_widget_naviframe.h4
-rw-r--r--src/lib/elm_widget_notify.h4
-rw-r--r--src/lib/elm_widget_panel.h4
-rw-r--r--src/lib/elm_widget_panes.h4
-rw-r--r--src/lib/elm_widget_photo.h4
-rw-r--r--src/lib/elm_widget_photocam.h6
-rw-r--r--src/lib/elm_widget_player.h4
-rw-r--r--src/lib/elm_widget_plug.h4
-rw-r--r--src/lib/elm_widget_popup.h4
-rw-r--r--src/lib/elm_widget_prefs.h4
-rw-r--r--src/lib/elm_widget_progressbar.h4
-rw-r--r--src/lib/elm_widget_radio.h4
-rw-r--r--src/lib/elm_widget_route.h4
-rw-r--r--src/lib/elm_widget_scroller.h4
-rw-r--r--src/lib/elm_widget_segment_control.h4
-rw-r--r--src/lib/elm_widget_separator.h4
-rw-r--r--src/lib/elm_widget_slider.h4
-rw-r--r--src/lib/elm_widget_slideshow.h4
-rw-r--r--src/lib/elm_widget_spinner.h4
-rw-r--r--src/lib/elm_widget_table.h2
-rw-r--r--src/lib/elm_widget_thumb.h4
-rw-r--r--src/lib/elm_widget_toolbar.h6
-rw-r--r--src/lib/elm_widget_video.h4
-rw-r--r--src/lib/elm_widget_web.h4
-rw-r--r--src/lib/elm_win.c14
-rw-r--r--src/lib/elm_win.eo12
-rw-r--r--src/lib/els_cursor.c2
210 files changed, 674 insertions, 674 deletions
diff --git a/src/bin/test_systray.c b/src/bin/test_systray.c
index ceb58cdea..4efe8d685 100644
--- a/src/bin/test_systray.c
+++ b/src/bin/test_systray.c
@@ -82,7 +82,7 @@ test_systray(void *data EINA_UNUSED,
82 elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2"); 82 elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2");
83 83
84 // Status Notifier Item Handler 84 // Status Notifier Item Handler
85 item = eo_add(ELM_OBJ_SYSTRAY_CLASS, win); 85 item = eo_add(ELM_SYSTRAY_CLASS, win);
86 eo_do(item, elm_obj_systray_icon_name_set("elementary")); 86 eo_do(item, elm_obj_systray_icon_name_set("elementary"));
87 eo_do(item, elm_obj_systray_att_icon_name_set("elementary")); 87 eo_do(item, elm_obj_systray_att_icon_name_set("elementary"));
88 eo_do(item, elm_obj_systray_menu_set(it)); 88 eo_do(item, elm_obj_systray_menu_set(it));
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 7bacbd758..aadfee7c6 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_ctxpopup.h" 8#include "elm_widget_ctxpopup.h"
9 9
10#define MY_CLASS ELM_OBJ_CTXPOPUP_CLASS 10#define MY_CLASS ELM_CTXPOPUP_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Ctxpopup" 12#define MY_CLASS_NAME "Elm_Ctxpopup"
13#define MY_CLASS_NAME_LEGACY "elm_ctxpopup" 13#define MY_CLASS_NAME_LEGACY "elm_ctxpopup"
@@ -216,7 +216,7 @@ _base_geometry_calc(Evas_Object *obj,
216 evas_object_geometry_get 216 evas_object_geometry_get
217 (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w, 217 (sd->parent, &hover_area.x, &hover_area.y, &hover_area.w,
218 &hover_area.h); 218 &hover_area.h);
219 if (sd->parent && eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) 219 if (sd->parent && eo_isa(sd->parent, ELM_WIN_CLASS))
220 hover_area.x = hover_area.y = 0; 220 hover_area.x = hover_area.y = 0;
221 221
222 evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL); 222 evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
@@ -1073,7 +1073,7 @@ _elm_ctxpopup_elm_widget_disable(Eo *obj, Elm_Ctxpopup_Data *sd)
1073} 1073}
1074 1074
1075EOLIAN static void 1075EOLIAN static void
1076_elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv) 1076_elm_ctxpopup_evas_object_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1077{ 1077{
1078 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1078 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1079 1079
@@ -1126,7 +1126,7 @@ _elm_ctxpopup_evas_smart_add(Eo *obj, Elm_Ctxpopup_Data *priv)
1126} 1126}
1127 1127
1128EOLIAN static void 1128EOLIAN static void
1129_elm_ctxpopup_evas_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd) 1129_elm_ctxpopup_evas_object_smart_del(Eo *obj, Elm_Ctxpopup_Data *sd)
1130{ 1130{
1131 Elm_Ctxpopup_Item *it; 1131 Elm_Ctxpopup_Item *it;
1132 1132
@@ -1195,7 +1195,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare
1195 1195
1196 //Update Background 1196 //Update Background
1197 evas_object_geometry_get(parent, &x, &y, &w, &h); 1197 evas_object_geometry_get(parent, &x, &y, &w, &h);
1198 if (parent && eo_isa(parent, ELM_OBJ_WIN_CLASS)) 1198 if (parent && eo_isa(parent, ELM_WIN_CLASS))
1199 x = y = 0; 1199 x = y = 0;
1200 evas_object_move(sd->bg, x, y); 1200 evas_object_move(sd->bg, x, y);
1201 evas_object_resize(sd->bg, w, h); 1201 evas_object_resize(sd->bg, w, h);
diff --git a/src/lib/elc_ctxpopup.eo b/src/lib/elc_ctxpopup.eo
index 29fdffcae..f1a8fd030 100644
--- a/src/lib/elc_ctxpopup.eo
+++ b/src/lib/elc_ctxpopup.eo
@@ -167,8 +167,8 @@ class Elm_Ctxpopup (Elm_Layout)
167 implements { 167 implements {
168 class::constructor; 168 class::constructor;
169 Eo_Base::constructor; 169 Eo_Base::constructor;
170 Evas_Smart::del; 170 Evas_Object_Smart::del;
171 Evas_Smart::add; 171 Evas_Object_Smart::add;
172 Elm_Widget::parent::set; 172 Elm_Widget::parent::set;
173 Elm_Widget::focus_direction; 173 Elm_Widget::focus_direction;
174 Elm_Widget::sub_object_add; 174 Elm_Widget::sub_object_add;
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 584e7b9ea..5a03505d4 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -14,7 +14,7 @@
14#include "elm_interface_fileselector.h" 14#include "elm_interface_fileselector.h"
15#include "elm_widget_fileselector.h" 15#include "elm_widget_fileselector.h"
16 16
17#define MY_CLASS ELM_OBJ_FILESELECTOR_CLASS 17#define MY_CLASS ELM_FILESELECTOR_CLASS
18 18
19#define MY_CLASS_NAME "Elm_Fileselector" 19#define MY_CLASS_NAME "Elm_Fileselector"
20#define MY_CLASS_NAME_LEGACY "elm_fileselector" 20#define MY_CLASS_NAME_LEGACY "elm_fileselector"
@@ -1336,7 +1336,7 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev)
1336} 1336}
1337 1337
1338EOLIAN static void 1338EOLIAN static void
1339_elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv) 1339_elm_fileselector_evas_object_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
1340{ 1340{
1341 Evas_Object *ic, *bt, *en, *pb; 1341 Evas_Object *ic, *bt, *en, *pb;
1342 1342
@@ -1445,7 +1445,7 @@ _elm_fileselector_evas_smart_add(Eo *obj, Elm_Fileselector_Data *priv)
1445} 1445}
1446 1446
1447EOLIAN static void 1447EOLIAN static void
1448_elm_fileselector_evas_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd) 1448_elm_fileselector_evas_object_smart_del(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *sd)
1449{ 1449{
1450 Elm_Fileselector_Filter *filter; 1450 Elm_Fileselector_Filter *filter;
1451 char *path; 1451 char *path;
diff --git a/src/lib/elc_fileselector.eo b/src/lib/elc_fileselector.eo
index 656089ea8..922ab5d80 100644
--- a/src/lib/elc_fileselector.eo
+++ b/src/lib/elc_fileselector.eo
@@ -37,8 +37,8 @@ class Elm_Fileselector (Elm_Layout, Elm_Interface_Fileselector)
37 class::constructor; 37 class::constructor;
38 class::destructor; 38 class::destructor;
39 Eo_Base::constructor; 39 Eo_Base::constructor;
40 Evas_Smart::add; 40 Evas_Object_Smart::add;
41 Evas_Smart::del; 41 Evas_Object_Smart::del;
42 Elm_Widget::focus_next; 42 Elm_Widget::focus_next;
43 Elm_Widget::focus_direction_manager_is; 43 Elm_Widget::focus_direction_manager_is;
44 Elm_Widget::focus_direction; 44 Elm_Widget::focus_direction;
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index 8d0d2f6c5..a8c999eee 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -7,7 +7,7 @@
7#include "elm_interface_fileselector.h" 7#include "elm_interface_fileselector.h"
8#include "elm_widget_fileselector_button.h" 8#include "elm_widget_fileselector_button.h"
9 9
10#define MY_CLASS ELM_OBJ_FILESELECTOR_BUTTON_CLASS 10#define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Fileselector_Button" 12#define MY_CLASS_NAME "Elm_Fileselector_Button"
13#define MY_CLASS_NAME_LEGACY "elm_fileselector_button" 13#define MY_CLASS_NAME_LEGACY "elm_fileselector_button"
@@ -164,7 +164,7 @@ _button_clicked(void *data,
164} 164}
165 165
166EOLIAN static void 166EOLIAN static void
167_elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv) 167_elm_fileselector_button_evas_object_smart_add(Eo *obj, Elm_Fileselector_Button_Data *priv)
168{ 168{
169 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 169 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
170 elm_widget_sub_object_parent_add(obj); 170 elm_widget_sub_object_parent_add(obj);
@@ -187,7 +187,7 @@ _elm_fileselector_button_evas_smart_add(Eo *obj, Elm_Fileselector_Button_Data *p
187} 187}
188 188
189EOLIAN static void 189EOLIAN static void
190_elm_fileselector_button_evas_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd) 190_elm_fileselector_button_evas_object_smart_del(Eo *obj, Elm_Fileselector_Button_Data *sd)
191{ 191{
192 eina_stringshare_del(sd->window_title); 192 eina_stringshare_del(sd->window_title);
193 eina_stringshare_del(sd->fsd.path); 193 eina_stringshare_del(sd->fsd.path);
diff --git a/src/lib/elc_fileselector_button.eo b/src/lib/elc_fileselector_button.eo
index f2945758e..5830bb0c8 100644
--- a/src/lib/elc_fileselector_button.eo
+++ b/src/lib/elc_fileselector_button.eo
@@ -98,8 +98,8 @@ class Elm_Fileselector_Button (Elm_Button, Elm_Interface_Fileselector)
98 } 98 }
99 implements { 99 implements {
100 Eo_Base::constructor; 100 Eo_Base::constructor;
101 Evas_Smart::add; 101 Evas_Object_Smart::add;
102 Evas_Smart::del; 102 Evas_Object_Smart::del;
103 Elm_Widget::theme_apply; 103 Elm_Widget::theme_apply;
104 Elm_Button::admits_autorepeat::get; 104 Elm_Button::admits_autorepeat::get;
105 Elm_Interface_Fileselector::selected_paths::get; 105 Elm_Interface_Fileselector::selected_paths::get;
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index 869bcd311..d084cd698 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -8,7 +8,7 @@
8#include "elm_interface_fileselector.h" 8#include "elm_interface_fileselector.h"
9#include "elm_widget_fileselector_entry.h" 9#include "elm_widget_fileselector_entry.h"
10 10
11#define MY_CLASS ELM_OBJ_FILESELECTOR_ENTRY_CLASS 11#define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Fileselector_Entry" 13#define MY_CLASS_NAME "Elm_Fileselector_Entry"
14#define MY_CLASS_NAME_LEGACY "elm_fileselector_entry" 14#define MY_CLASS_NAME_LEGACY "elm_fileselector_entry"
@@ -269,7 +269,7 @@ _elm_fileselector_entry_elm_container_content_unset(Eo *obj, Elm_Fileselector_En
269} 269}
270 270
271EOLIAN static void 271EOLIAN static void
272_elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv) 272_elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *priv)
273{ 273{
274 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 274 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
275 elm_widget_sub_object_parent_add(obj); 275 elm_widget_sub_object_parent_add(obj);
@@ -326,7 +326,7 @@ _elm_fileselector_entry_evas_smart_add(Eo *obj, Elm_Fileselector_Entry_Data *pri
326} 326}
327 327
328EOLIAN static void 328EOLIAN static void
329_elm_fileselector_entry_evas_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd) 329_elm_fileselector_entry_evas_object_smart_del(Eo *obj, Elm_Fileselector_Entry_Data *sd)
330{ 330{
331 free(sd->path); 331 free(sd->path);
332 332
diff --git a/src/lib/elc_fileselector_entry.eo b/src/lib/elc_fileselector_entry.eo
index 2297454c2..211d13ce4 100644
--- a/src/lib/elc_fileselector_entry.eo
+++ b/src/lib/elc_fileselector_entry.eo
@@ -99,8 +99,8 @@ class Elm_Fileselector_Entry (Elm_Layout, Elm_Interface_Fileselector)
99 implements { 99 implements {
100 class::constructor; 100 class::constructor;
101 Eo_Base::constructor; 101 Eo_Base::constructor;
102 Evas_Smart::del; 102 Evas_Object_Smart::del;
103 Evas_Smart::add; 103 Evas_Object_Smart::add;
104 Elm_Widget::theme_apply; 104 Elm_Widget::theme_apply;
105 Elm_Widget::focus_next_manager_is; 105 Elm_Widget::focus_next_manager_is;
106 Elm_Widget::focus_next; 106 Elm_Widget::focus_next;
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 7cb91f857..db73d3b4a 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_hoversel.h" 7#include "elm_widget_hoversel.h"
8 8
9#define MY_CLASS ELM_OBJ_HOVERSEL_CLASS 9#define MY_CLASS ELM_HOVERSEL_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Hoversel" 11#define MY_CLASS_NAME "Elm_Hoversel"
12#define MY_CLASS_NAME_LEGACY "elm_hoversel" 12#define MY_CLASS_NAME_LEGACY "elm_hoversel"
@@ -277,7 +277,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
277} 277}
278 278
279EOLIAN static void 279EOLIAN static void
280_elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) 280_elm_hoversel_evas_object_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
281{ 281{
282 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 282 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
283 elm_widget_sub_object_parent_add(obj); 283 elm_widget_sub_object_parent_add(obj);
@@ -291,7 +291,7 @@ _elm_hoversel_evas_smart_add(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
291} 291}
292 292
293EOLIAN static void 293EOLIAN static void
294_elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd) 294_elm_hoversel_evas_object_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
295{ 295{
296 Elm_Hoversel_Item *item; 296 Elm_Hoversel_Item *item;
297 297
@@ -308,14 +308,14 @@ _elm_hoversel_evas_smart_del(Eo *obj, Elm_Hoversel_Data *sd)
308} 308}
309 309
310EOLIAN static void 310EOLIAN static void
311_elm_hoversel_evas_smart_show(Eo *obj, Elm_Hoversel_Data *sd) 311_elm_hoversel_evas_object_smart_show(Eo *obj, Elm_Hoversel_Data *sd)
312{ 312{
313 eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); 313 eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
314 evas_object_show(sd->hover); 314 evas_object_show(sd->hover);
315} 315}
316 316
317EOLIAN static void 317EOLIAN static void
318_elm_hoversel_evas_smart_hide(Eo *obj, Elm_Hoversel_Data *sd) 318_elm_hoversel_evas_object_smart_hide(Eo *obj, Elm_Hoversel_Data *sd)
319{ 319{
320 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 320 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
321 evas_object_hide(sd->hover); 321 evas_object_hide(sd->hover);
diff --git a/src/lib/elc_hoversel.eo b/src/lib/elc_hoversel.eo
index 51b60bde9..1eef4aa63 100644
--- a/src/lib/elc_hoversel.eo
+++ b/src/lib/elc_hoversel.eo
@@ -140,10 +140,10 @@ class Elm_Hoversel (Elm_Button, Evas_Selectable_Interface)
140 implements { 140 implements {
141 class::constructor; 141 class::constructor;
142 Eo_Base::constructor; 142 Eo_Base::constructor;
143 Evas_Smart::hide; 143 Evas_Object_Smart::hide;
144 Evas_Smart::show; 144 Evas_Object_Smart::show;
145 Evas_Smart::add; 145 Evas_Object_Smart::add;
146 Evas_Smart::del; 146 Evas_Object_Smart::del;
147 Elm_Widget::parent::set; 147 Elm_Widget::parent::set;
148 Elm_Widget::theme_apply; 148 Elm_Widget::theme_apply;
149 Elm_Widget::translate; 149 Elm_Widget::translate;
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 15b08bf14..8a139e500 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_multibuttonentry.h" 7#include "elm_widget_multibuttonentry.h"
8 8
9#define MY_CLASS ELM_OBJ_MULTIBUTTONENTRY_CLASS 9#define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Multibuttonentry" 11#define MY_CLASS_NAME "Elm_Multibuttonentry"
12#define MY_CLASS_NAME_LEGACY "elm_multibuttonentry" 12#define MY_CLASS_NAME_LEGACY "elm_multibuttonentry"
@@ -1461,7 +1461,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
1461} 1461}
1462 1462
1463EOLIAN static void 1463EOLIAN static void
1464_elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv) 1464_elm_multibuttonentry_evas_object_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
1465{ 1465{
1466 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1466 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1467 1467
@@ -1491,7 +1491,7 @@ _elm_multibuttonentry_evas_smart_add(Eo *obj, Elm_Multibuttonentry_Data *priv)
1491} 1491}
1492 1492
1493EOLIAN static void 1493EOLIAN static void
1494_elm_multibuttonentry_evas_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd) 1494_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data *sd)
1495{ 1495{
1496 Elm_Multibuttonentry_Item *item; 1496 Elm_Multibuttonentry_Item *item;
1497 1497
diff --git a/src/lib/elc_multibuttonentry.eo b/src/lib/elc_multibuttonentry.eo
index ee0983175..fb7c02bdd 100644
--- a/src/lib/elc_multibuttonentry.eo
+++ b/src/lib/elc_multibuttonentry.eo
@@ -255,8 +255,8 @@ class Elm_Multibuttonentry (Elm_Layout)
255 implements { 255 implements {
256 class::constructor; 256 class::constructor;
257 Eo_Base::constructor; 257 Eo_Base::constructor;
258 Evas_Smart::add; 258 Evas_Object_Smart::add;
259 Evas_Smart::del; 259 Evas_Object_Smart::del;
260 Elm_Widget::theme_apply; 260 Elm_Widget::theme_apply;
261 Elm_Widget::focus_next_manager_is; 261 Elm_Widget::focus_next_manager_is;
262 Elm_Widget::focus_direction_manager_is; 262 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 93971450b..14d58a2b6 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -7,7 +7,7 @@
7#include "elm_widget_naviframe.h" 7#include "elm_widget_naviframe.h"
8#include "elm_widget_container.h" 8#include "elm_widget_container.h"
9 9
10#define MY_CLASS ELM_OBJ_NAVIFRAME_CLASS 10#define MY_CLASS ELM_NAVIFRAME_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Naviframe" 12#define MY_CLASS_NAME "Elm_Naviframe"
13#define MY_CLASS_NAME_LEGACY "elm_naviframe" 13#define MY_CLASS_NAME_LEGACY "elm_naviframe"
@@ -1304,7 +1304,7 @@ _elm_naviframe_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Naviframe_Dat
1304} 1304}
1305 1305
1306EOLIAN static void 1306EOLIAN static void
1307_elm_naviframe_evas_smart_add(Eo *obj, Elm_Naviframe_Data *priv) 1307_elm_naviframe_evas_object_smart_add(Eo *obj, Elm_Naviframe_Data *priv)
1308{ 1308{
1309 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1309 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1310 1310
@@ -1344,7 +1344,7 @@ _pop_transition_cb(void *data)
1344} 1344}
1345 1345
1346EOLIAN static void 1346EOLIAN static void
1347_elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd) 1347_elm_naviframe_evas_object_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
1348{ 1348{
1349 Elm_Naviframe_Item *it; 1349 Elm_Naviframe_Item *it;
1350 1350
@@ -1370,7 +1370,7 @@ _elm_naviframe_evas_smart_del(Eo *obj, Elm_Naviframe_Data *sd)
1370 1370
1371//Show only the top item view 1371//Show only the top item view
1372EOLIAN static void 1372EOLIAN static void
1373_elm_naviframe_evas_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED) 1373_elm_naviframe_evas_object_smart_show(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED)
1374{ 1374{
1375 Elm_Naviframe_Item *top; 1375 Elm_Naviframe_Item *top;
1376 1376
diff --git a/src/lib/elc_naviframe.eo b/src/lib/elc_naviframe.eo
index ce7f4084b..464251961 100644
--- a/src/lib/elc_naviframe.eo
+++ b/src/lib/elc_naviframe.eo
@@ -256,9 +256,9 @@ class Elm_Naviframe (Elm_Layout)
256 implements { 256 implements {
257 class::constructor; 257 class::constructor;
258 Eo_Base::constructor; 258 Eo_Base::constructor;
259 Evas_Smart::del; 259 Evas_Object_Smart::del;
260 Evas_Smart::show; 260 Evas_Object_Smart::show;
261 Evas_Smart::add; 261 Evas_Object_Smart::add;
262 Elm_Widget::focus_direction; 262 Elm_Widget::focus_direction;
263 Elm_Widget::focus_next_manager_is; 263 Elm_Widget::focus_next_manager_is;
264 Elm_Widget::focus_direction_manager_is; 264 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index cce459975..13d0c86bc 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -9,7 +9,7 @@
9#include "elm_widget_layout.h" 9#include "elm_widget_layout.h"
10#include "elm_widget_player.h" 10#include "elm_widget_player.h"
11 11
12#define MY_CLASS ELM_OBJ_PLAYER_CLASS 12#define MY_CLASS ELM_PLAYER_CLASS
13 13
14#define MY_CLASS_NAME "Elm_Player" 14#define MY_CLASS_NAME "Elm_Player"
15#define MY_CLASS_NAME_LEGACY "elm_player" 15#define MY_CLASS_NAME_LEGACY "elm_player"
@@ -620,7 +620,7 @@ end:
620} 620}
621 621
622EOLIAN static void 622EOLIAN static void
623_elm_player_evas_smart_add(Eo *obj, Elm_Player_Data *priv) 623_elm_player_evas_object_smart_add(Eo *obj, Elm_Player_Data *priv)
624{ 624{
625 char buf[256]; 625 char buf[256];
626 626
@@ -688,7 +688,7 @@ _elm_player_evas_smart_add(Eo *obj, Elm_Player_Data *priv)
688} 688}
689 689
690EOLIAN static void 690EOLIAN static void
691_elm_player_evas_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) 691_elm_player_evas_object_smart_del(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
692{ 692{
693 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 693 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
694} 694}
diff --git a/src/lib/elc_player.eo b/src/lib/elc_player.eo
index f8579360e..e1468f598 100644
--- a/src/lib/elc_player.eo
+++ b/src/lib/elc_player.eo
@@ -4,8 +4,8 @@ class Elm_Player (Elm_Layout)
4 implements { 4 implements {
5 class::constructor; 5 class::constructor;
6 Eo_Base::constructor; 6 Eo_Base::constructor;
7 Evas_Smart::add; 7 Evas_Object_Smart::add;
8 Evas_Smart::del; 8 Evas_Object_Smart::del;
9 Elm_Widget::theme_apply; 9 Elm_Widget::theme_apply;
10 Elm_Widget::event; 10 Elm_Widget::event;
11 Elm_Container::content_set; 11 Elm_Container::content_set;
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 1129e8a84..2012f50ee 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_popup.h" 7#include "elm_widget_popup.h"
8 8
9#define MY_CLASS ELM_OBJ_POPUP_CLASS 9#define MY_CLASS ELM_POPUP_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Popup" 11#define MY_CLASS_NAME "Elm_Popup"
12#define MY_CLASS_NAME_LEGACY "elm_popup" 12#define MY_CLASS_NAME_LEGACY "elm_popup"
@@ -215,7 +215,7 @@ _items_remove(Elm_Popup_Data *sd)
215} 215}
216 216
217EOLIAN static void 217EOLIAN static void
218_elm_popup_evas_smart_del(Eo *obj, Elm_Popup_Data *sd) 218_elm_popup_evas_object_smart_del(Eo *obj, Elm_Popup_Data *sd)
219{ 219{
220 unsigned int i; 220 unsigned int i;
221 221
@@ -1478,7 +1478,7 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec
1478} 1478}
1479 1479
1480EOLIAN static void 1480EOLIAN static void
1481_elm_popup_evas_smart_add(Eo *obj, Elm_Popup_Data *priv) 1481_elm_popup_evas_object_smart_add(Eo *obj, Elm_Popup_Data *priv)
1482{ 1482{
1483 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1483 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1484 char style[1024]; 1484 char style[1024];
diff --git a/src/lib/elc_popup.eo b/src/lib/elc_popup.eo
index 1c7f116bf..94c1397d8 100644
--- a/src/lib/elc_popup.eo
+++ b/src/lib/elc_popup.eo
@@ -159,8 +159,8 @@ class Elm_Popup (Elm_Layout)
159 implements { 159 implements {
160 class::constructor; 160 class::constructor;
161 Eo_Base::constructor; 161 Eo_Base::constructor;
162 Evas_Smart::del; 162 Evas_Object_Smart::del;
163 Evas_Smart::add; 163 Evas_Object_Smart::add;
164 Elm_Widget::focus_direction; 164 Elm_Widget::focus_direction;
165 Elm_Widget::focus_next_manager_is; 165 Elm_Widget::focus_next_manager_is;
166 Elm_Widget::theme_apply; 166 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index fdb748a67..f5875917e 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7 7
8#define MY_CLASS ELM_OBJ_ACCESS_CLASS 8#define MY_CLASS ELM_ACCESS_CLASS
9 9
10#define MY_CLASS_NAME "Elm_Access" 10#define MY_CLASS_NAME "Elm_Access"
11#define MY_CLASS_NAME_LEGACY "elm_access" 11#define MY_CLASS_NAME_LEGACY "elm_access"
@@ -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_smart_add(Eo *obj, void *_pd EINA_UNUSED) 38_elm_access_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
39{ 39{
40 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 40 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
41 elm_widget_sub_object_parent_add(obj); 41 elm_widget_sub_object_parent_add(obj);
diff --git a/src/lib/elm_access.eo b/src/lib/elm_access.eo
index 0a9ab8100..6bc29c5de 100644
--- a/src/lib/elm_access.eo
+++ b/src/lib/elm_access.eo
@@ -5,7 +5,7 @@ eo_prefix: elm_obj_access;
5 implements { 5 implements {
6 class::constructor; 6 class::constructor;
7 Eo_Base::constructor; 7 Eo_Base::constructor;
8 Evas_Smart::add; 8 Evas_Object_Smart::add;
9 Elm_Widget::activate; 9 Elm_Widget::activate;
10 Elm_Widget::on_focus; 10 Elm_Widget::on_focus;
11 } 11 }
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 30a353e6b..d922cf4a2 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -8,7 +8,7 @@
8#include "elm_widget_actionslider.h" 8#include "elm_widget_actionslider.h"
9#include "elm_widget_layout.h" 9#include "elm_widget_layout.h"
10 10
11#define MY_CLASS ELM_OBJ_ACTIONSLIDER_CLASS 11#define MY_CLASS ELM_ACTIONSLIDER_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Actionslider" 13#define MY_CLASS_NAME "Elm_Actionslider"
14#define MY_CLASS_NAME_LEGACY "elm_actionslider" 14#define MY_CLASS_NAME_LEGACY "elm_actionslider"
@@ -453,7 +453,7 @@ _elm_actionslider_elm_layout_text_get(Eo *obj, Elm_Actionslider_Data *_pd EINA_U
453} 453}
454 454
455EOLIAN static void 455EOLIAN static void
456_elm_actionslider_evas_smart_add(Eo *obj, Elm_Actionslider_Data *priv) 456_elm_actionslider_evas_object_smart_add(Eo *obj, Elm_Actionslider_Data *priv)
457{ 457{
458 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 458 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
459 459
diff --git a/src/lib/elm_actionslider.eo b/src/lib/elm_actionslider.eo
index 9c66a0dc9..74981b1e8 100644
--- a/src/lib/elm_actionslider.eo
+++ b/src/lib/elm_actionslider.eo
@@ -78,7 +78,7 @@ class Elm_Actionslider (Elm_Layout)
78 implements { 78 implements {
79 class::constructor; 79 class::constructor;
80 Eo_Base::constructor; 80 Eo_Base::constructor;
81 Evas_Smart::add; 81 Evas_Object_Smart::add;
82 Elm_Widget::focus_next_manager_is; 82 Elm_Widget::focus_next_manager_is;
83 Elm_Widget::focus_direction_manager_is; 83 Elm_Widget::focus_direction_manager_is;
84 Elm_Widget::theme_apply; 84 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index 3a24d9db2..cc184a77f 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -7,7 +7,7 @@
7#include "elm_widget_bg.h" 7#include "elm_widget_bg.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_BG_CLASS 10#define MY_CLASS ELM_BG_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Bg" 12#define MY_CLASS_NAME "Elm_Bg"
13#define MY_CLASS_NAME_LEGACY "elm_bg" 13#define MY_CLASS_NAME_LEGACY "elm_bg"
@@ -99,7 +99,7 @@ _on_resize(void *data,
99} 99}
100 100
101EOLIAN static void 101EOLIAN static void
102_elm_bg_evas_smart_add(Eo *obj, Elm_Bg_Data *priv) 102_elm_bg_evas_object_smart_add(Eo *obj, Elm_Bg_Data *priv)
103{ 103{
104 104
105 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 105 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
diff --git a/src/lib/elm_bg.eo b/src/lib/elm_bg.eo
index 67beaa5f4..0eaa9218c 100644
--- a/src/lib/elm_bg.eo
+++ b/src/lib/elm_bg.eo
@@ -141,7 +141,7 @@ class Elm_Bg (Elm_Layout)
141 implements { 141 implements {
142 class::constructor; 142 class::constructor;
143 Eo_Base::constructor; 143 Eo_Base::constructor;
144 Evas_Smart::add; 144 Evas_Object_Smart::add;
145 Elm_Layout::content_aliases::get; 145 Elm_Layout::content_aliases::get;
146 Elm_Layout::sizing_eval; 146 Elm_Layout::sizing_eval;
147 } 147 }
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index af614c3f0..1f29f161d 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -7,7 +7,7 @@
7#include "els_box.h" 7#include "els_box.h"
8#include "elm_widget_box.h" 8#include "elm_widget_box.h"
9 9
10#define MY_CLASS ELM_OBJ_BOX_CLASS 10#define MY_CLASS ELM_BOX_CLASS
11#define MY_CLASS_NAME "Elm_Box" 11#define MY_CLASS_NAME "Elm_Box"
12#define MY_CLASS_NAME_LEGACY "elm_box" 12#define MY_CLASS_NAME_LEGACY "elm_box"
13 13
@@ -368,7 +368,7 @@ _transition_layout_animation_exec(Evas_Object *obj,
368} 368}
369 369
370EOLIAN static void 370EOLIAN static void
371_elm_box_evas_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) 371_elm_box_evas_object_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
372{ 372{
373 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 373 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
374 elm_widget_resize_object_set(obj, 374 elm_widget_resize_object_set(obj,
@@ -395,7 +395,7 @@ _elm_box_evas_smart_add(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
395} 395}
396 396
397EOLIAN static void 397EOLIAN static void
398_elm_box_evas_smart_del(Eo *obj, Elm_Box_Data *sd) 398_elm_box_evas_object_smart_del(Eo *obj, Elm_Box_Data *sd)
399{ 399{
400 Eina_List *l; 400 Eina_List *l;
401 Evas_Object *child; 401 Evas_Object *child;
diff --git a/src/lib/elm_box.eo b/src/lib/elm_box.eo
index b56d76873..c8c7fcf82 100644
--- a/src/lib/elm_box.eo
+++ b/src/lib/elm_box.eo
@@ -308,8 +308,8 @@ class Elm_Box (Elm_Widget)
308 implements { 308 implements {
309 class::constructor; 309 class::constructor;
310 Eo_Base::constructor; 310 Eo_Base::constructor;
311 Evas_Smart::add; 311 Evas_Object_Smart::add;
312 Evas_Smart::del; 312 Evas_Object_Smart::del;
313 Elm_Widget::focus_direction; 313 Elm_Widget::focus_direction;
314 Elm_Widget::focus_next_manager_is; 314 Elm_Widget::focus_next_manager_is;
315 Elm_Widget::focus_direction_manager_is; 315 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 8b5808ea9..69b917c1a 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -7,7 +7,7 @@
7#include "elm_widget_bubble.h" 7#include "elm_widget_bubble.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_BUBBLE_CLASS 10#define MY_CLASS ELM_BUBBLE_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Bubble" 12#define MY_CLASS_NAME "Elm_Bubble"
13#define MY_CLASS_NAME_LEGACY "elm_bubble" 13#define MY_CLASS_NAME_LEGACY "elm_bubble"
@@ -171,7 +171,7 @@ _access_info_cb(void *data EINA_UNUSED, Evas_Object *obj)
171} 171}
172 172
173EOLIAN static void 173EOLIAN static void
174_elm_bubble_evas_smart_add(Eo *obj, Elm_Bubble_Data *priv) 174_elm_bubble_evas_object_smart_add(Eo *obj, Elm_Bubble_Data *priv)
175{ 175{
176 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 176 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
177 177
diff --git a/src/lib/elm_bubble.eo b/src/lib/elm_bubble.eo
index e0bedd965..494c385df 100644
--- a/src/lib/elm_bubble.eo
+++ b/src/lib/elm_bubble.eo
@@ -32,7 +32,7 @@ class Elm_Bubble (Elm_Layout)
32 implements { 32 implements {
33 class::constructor; 33 class::constructor;
34 Eo_Base::constructor; 34 Eo_Base::constructor;
35 Evas_Smart::add; 35 Evas_Object_Smart::add;
36 Elm_Widget::focus_direction; 36 Elm_Widget::focus_direction;
37 Elm_Widget::focus_next_manager_is; 37 Elm_Widget::focus_next_manager_is;
38 Elm_Widget::focus_next; 38 Elm_Widget::focus_next;
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 5bb8a87a6..34c0084fb 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -7,7 +7,7 @@
7#include "elm_widget_button.h" 7#include "elm_widget_button.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_BUTTON_CLASS 10#define MY_CLASS ELM_BUTTON_CLASS
11 11
12// ATSPI Accessibility 12// ATSPI Accessibility
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
@@ -275,7 +275,7 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
275} 275}
276 276
277EOLIAN static void 277EOLIAN static void
278_elm_button_evas_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 278_elm_button_evas_object_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
279{ 279{
280 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 280 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
281 281
diff --git a/src/lib/elm_button.eo b/src/lib/elm_button.eo
index 61106e827..2c76dbe6c 100644
--- a/src/lib/elm_button.eo
+++ b/src/lib/elm_button.eo
@@ -99,7 +99,7 @@ class Elm_Button (Elm_Layout, Evas_Clickable_Interface,
99 implements { 99 implements {
100 class::constructor; 100 class::constructor;
101 Eo_Base::constructor; 101 Eo_Base::constructor;
102 Evas_Smart::add; 102 Evas_Object_Smart::add;
103 Elm_Widget::activate; 103 Elm_Widget::activate;
104 Elm_Widget::focus_next_manager_is; 104 Elm_Widget::focus_next_manager_is;
105 Elm_Widget::focus_direction_manager_is; 105 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 50fade466..680c9e7df 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_calendar.h" 7#include "elm_widget_calendar.h"
8 8
9#define MY_CLASS ELM_OBJ_CALENDAR_CLASS 9#define MY_CLASS ELM_CALENDAR_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Calendar" 11#define MY_CLASS_NAME "Elm_Calendar"
12#define MY_CLASS_NAME_LEGACY "elm_calendar" 12#define MY_CLASS_NAME_LEGACY "elm_calendar"
@@ -924,7 +924,7 @@ _elm_calendar_elm_widget_event(Eo *obj, Elm_Calendar_Data *sd EINA_UNUSED, Evas_
924} 924}
925 925
926EOLIAN static void 926EOLIAN static void
927_elm_calendar_evas_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED) 927_elm_calendar_evas_object_smart_calculate(Eo *obj, Elm_Calendar_Data *_pd EINA_UNUSED)
928{ 928{
929 elm_layout_freeze(obj); 929 elm_layout_freeze(obj);
930 930
@@ -951,7 +951,7 @@ _style_changed(void *data,
951} 951}
952 952
953EOLIAN static void 953EOLIAN static void
954_elm_calendar_evas_smart_add(Eo *obj, Elm_Calendar_Data *priv) 954_elm_calendar_evas_object_smart_add(Eo *obj, Elm_Calendar_Data *priv)
955{ 955{
956 time_t weekday = 259200; /* Just the first sunday since epoch */ 956 time_t weekday = 259200; /* Just the first sunday since epoch */
957 time_t current_time; 957 time_t current_time;
@@ -1037,7 +1037,7 @@ _elm_calendar_evas_smart_add(Eo *obj, Elm_Calendar_Data *priv)
1037} 1037}
1038 1038
1039EOLIAN static void 1039EOLIAN static void
1040_elm_calendar_evas_smart_del(Eo *obj, Elm_Calendar_Data *sd) 1040_elm_calendar_evas_object_smart_del(Eo *obj, Elm_Calendar_Data *sd)
1041{ 1041{
1042 int i; 1042 int i;
1043 Elm_Calendar_Mark *mark; 1043 Elm_Calendar_Mark *mark;
diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo
index e8e56e632..98d5a3a3c 100644
--- a/src/lib/elm_calendar.eo
+++ b/src/lib/elm_calendar.eo
@@ -396,9 +396,9 @@ class Elm_Calendar (Elm_Layout)
396 implements { 396 implements {
397 class::constructor; 397 class::constructor;
398 Eo_Base::constructor; 398 Eo_Base::constructor;
399 Evas_Smart::calculate; 399 Evas_Object_Smart::calculate;
400 Evas_Smart::add; 400 Evas_Object_Smart::add;
401 Evas_Smart::del; 401 Evas_Object_Smart::del;
402 Elm_Widget::theme_apply; 402 Elm_Widget::theme_apply;
403 Elm_Widget::focus_next_manager_is; 403 Elm_Widget::focus_next_manager_is;
404 Elm_Widget::focus_direction_manager_is; 404 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index b79af428b..e6fe526ea 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -7,7 +7,7 @@
7#include "elm_widget_check.h" 7#include "elm_widget_check.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_CHECK_CLASS 10#define MY_CLASS ELM_CHECK_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Check" 12#define MY_CLASS_NAME "Elm_Check"
13#define MY_CLASS_NAME_LEGACY "elm_check" 13#define MY_CLASS_NAME_LEGACY "elm_check"
@@ -282,7 +282,7 @@ _on_check_toggle(void *data,
282} 282}
283 283
284EOLIAN static void 284EOLIAN static void
285_elm_check_evas_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) 285_elm_check_evas_object_smart_add(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
286{ 286{
287 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 287 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
288 288
diff --git a/src/lib/elm_check.eo b/src/lib/elm_check.eo
index 0105bf943..f066d0b13 100644
--- a/src/lib/elm_check.eo
+++ b/src/lib/elm_check.eo
@@ -47,7 +47,7 @@ class Elm_Check (Elm_Layout)
47 implements { 47 implements {
48 class::constructor; 48 class::constructor;
49 Eo_Base::constructor; 49 Eo_Base::constructor;
50 Evas_Smart::add; 50 Evas_Object_Smart::add;
51 Elm_Widget::activate; 51 Elm_Widget::activate;
52 Elm_Widget::focus_next_manager_is; 52 Elm_Widget::focus_next_manager_is;
53 Elm_Widget::focus_direction_manager_is; 53 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index ce100a21d..62f307317 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_clock.h" 7#include "elm_widget_clock.h"
8 8
9#define MY_CLASS ELM_OBJ_CLOCK_CLASS 9#define MY_CLASS ELM_CLOCK_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Clock" 11#define MY_CLASS_NAME "Elm_Clock"
12#define MY_CLASS_NAME_LEGACY "elm_clock" 12#define MY_CLASS_NAME_LEGACY "elm_clock"
@@ -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_smart_add(Eo *obj, Elm_Clock_Data *priv) 653_elm_clock_evas_object_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_smart_add(Eo *obj, Elm_Clock_Data *priv)
688} 688}
689 689
690EOLIAN static void 690EOLIAN static void
691_elm_clock_evas_smart_del(Eo *obj, Elm_Clock_Data *sd) 691_elm_clock_evas_object_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/elm_clock.eo b/src/lib/elm_clock.eo
index e6d033432..4e9348407 100644
--- a/src/lib/elm_clock.eo
+++ b/src/lib/elm_clock.eo
@@ -243,8 +243,8 @@ class Elm_Clock (Elm_Layout)
243 implements { 243 implements {
244 class::constructor; 244 class::constructor;
245 Eo_Base::constructor; 245 Eo_Base::constructor;
246 Evas_Smart::add; 246 Evas_Object_Smart::add;
247 Evas_Smart::del; 247 Evas_Object_Smart::del;
248 Elm_Widget::focus_next_manager_is; 248 Elm_Widget::focus_next_manager_is;
249 Elm_Widget::focus_direction_manager_is; 249 Elm_Widget::focus_direction_manager_is;
250 Elm_Widget::access; 250 Elm_Widget::access;
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 7c02611a6..c82cb1fd3 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -1837,7 +1837,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
1837 par = elm_widget_parent_widget_get(obj); 1837 par = elm_widget_parent_widget_get(obj);
1838 if (par) top = elm_widget_top_get(par); 1838 if (par) top = elm_widget_top_get(par);
1839 } 1839 }
1840 if (top && (eo_isa(top, ELM_OBJ_WIN_CLASS))) 1840 if (top && (eo_isa(top, ELM_WIN_CLASS)))
1841 xwin = elm_win_xwindow_get(top); 1841 xwin = elm_win_xwindow_get(top);
1842 } 1842 }
1843 if (!xwin) 1843 if (!xwin)
@@ -2245,7 +2245,7 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
2245 if (elm_widget_is(obj)) 2245 if (elm_widget_is(obj))
2246 { 2246 {
2247 Evas_Object *win = elm_widget_top_get(obj); 2247 Evas_Object *win = elm_widget_top_get(obj);
2248 if (win && eo_isa(win, ELM_OBJ_WIN_CLASS)) 2248 if (win && eo_isa(win, ELM_WIN_CLASS))
2249 elm_win_rotation_set(dragwin, elm_win_rotation_get(win)); 2249 elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
2250 } 2250 }
2251 2251
@@ -3460,7 +3460,7 @@ _wl_elm_widget_window_get(Evas_Object *obj)
3460 { 3460 {
3461 top = elm_widget_top_get(obj); 3461 top = elm_widget_top_get(obj);
3462 if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj)); 3462 if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
3463 if (top && (eo_isa(top, ELM_OBJ_WIN_CLASS))) 3463 if (top && (eo_isa(top, ELM_WIN_CLASS)))
3464 win = elm_win_wl_window_get(top); 3464 win = elm_win_wl_window_get(top);
3465 } 3465 }
3466 if (!win) 3466 if (!win)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index ed4e67520..8323d6fc8 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_colorselector.h" 7#include "elm_widget_colorselector.h"
8 8
9#define MY_CLASS ELM_OBJ_COLORSELECTOR_CLASS 9#define MY_CLASS ELM_COLORSELECTOR_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Colorselector" 11#define MY_CLASS_NAME "Elm_Colorselector"
12#define MY_CLASS_NAME_LEGACY "elm_colorselector" 12#define MY_CLASS_NAME_LEGACY "elm_colorselector"
@@ -1144,7 +1144,7 @@ _sub_obj_size_hints_set(Evas_Object *sobj,
1144 Evas_Coord minw = -1, minh = -1; 1144 Evas_Coord minw = -1, minh = -1;
1145 1145
1146 elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh); 1146 elm_coords_finger_size_adjust(timesw, &minw, timesh, &minh);
1147 if (sobj && eo_isa(sobj, EDJE_OBJ_CLASS)) 1147 if (sobj && eo_isa(sobj, EDJE_CLASS))
1148 edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh); 1148 edje_object_size_min_restricted_calc(sobj, &minw, &minh, minw, minh);
1149 evas_object_size_hint_min_set(sobj, minw, minh); 1149 evas_object_size_hint_min_set(sobj, minw, minh);
1150 evas_object_size_hint_max_set(sobj, -1, -1); 1150 evas_object_size_hint_max_set(sobj, -1, -1);
@@ -1488,7 +1488,7 @@ _palette_colors_load(Evas_Object *obj)
1488} 1488}
1489 1489
1490EOLIAN static void 1490EOLIAN static void
1491_elm_colorselector_evas_smart_add(Eo *obj, Elm_Colorselector_Data *priv) 1491_elm_colorselector_evas_object_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
1492{ 1492{
1493 const char *hpadstr, *vpadstr; 1493 const char *hpadstr, *vpadstr;
1494 unsigned int h_pad = DEFAULT_HOR_PAD; 1494 unsigned int h_pad = DEFAULT_HOR_PAD;
@@ -1579,7 +1579,7 @@ _elm_colorselector_evas_smart_add(Eo *obj, Elm_Colorselector_Data *priv)
1579} 1579}
1580 1580
1581EOLIAN static void 1581EOLIAN static void
1582_elm_colorselector_evas_smart_del(Eo *obj, Elm_Colorselector_Data *sd) 1582_elm_colorselector_evas_object_smart_del(Eo *obj, Elm_Colorselector_Data *sd)
1583{ 1583{
1584 int i = 0; 1584 int i = 0;
1585 void *tmp[4]; 1585 void *tmp[4];
diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo
index bbe97c500..d38138ab1 100644
--- a/src/lib/elm_colorselector.eo
+++ b/src/lib/elm_colorselector.eo
@@ -126,8 +126,8 @@ class Elm_Colorselector (Elm_Layout)
126 implements { 126 implements {
127 class::constructor; 127 class::constructor;
128 Eo_Base::constructor; 128 Eo_Base::constructor;
129 Evas_Smart::add; 129 Evas_Object_Smart::add;
130 Evas_Smart::del; 130 Evas_Object_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_next; 133 Elm_Widget::focus_next;
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index f207ba5f2..3f9725222 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -7,7 +7,7 @@
7#include "elm_widget_conform.h" 7#include "elm_widget_conform.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_CONFORMANT_CLASS 10#define MY_CLASS ELM_CONFORMANT_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Conformant" 12#define MY_CLASS_NAME "Elm_Conformant"
13#define MY_CLASS_NAME_LEGACY "elm_conformant" 13#define MY_CLASS_NAME_LEGACY "elm_conformant"
@@ -889,7 +889,7 @@ _on_prop_change(void *data,
889#endif 889#endif
890 890
891EOLIAN static void 891EOLIAN static void
892_elm_conformant_evas_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED) 892_elm_conformant_evas_object_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
893{ 893{
894 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 894 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
895 elm_widget_sub_object_parent_add(obj); 895 elm_widget_sub_object_parent_add(obj);
@@ -910,7 +910,7 @@ _elm_conformant_evas_smart_add(Eo *obj, Elm_Conformant_Data *_pd EINA_UNUSED)
910} 910}
911 911
912EOLIAN static void 912EOLIAN static void
913_elm_conformant_evas_smart_del(Eo *obj, Elm_Conformant_Data *sd) 913_elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
914{ 914{
915 Evas_Object *top; 915 Evas_Object *top;
916 916
diff --git a/src/lib/elm_conformant.eo b/src/lib/elm_conformant.eo
index e3a9e2b13..930cb03bc 100644
--- a/src/lib/elm_conformant.eo
+++ b/src/lib/elm_conformant.eo
@@ -4,8 +4,8 @@ class Elm_Conformant (Elm_Layout)
4 implements { 4 implements {
5 class::constructor; 5 class::constructor;
6 Eo_Base::constructor; 6 Eo_Base::constructor;
7 Evas_Smart::add; 7 Evas_Object_Smart::add;
8 Evas_Smart::del; 8 Evas_Object_Smart::del;
9 Elm_Widget::parent::set; 9 Elm_Widget::parent::set;
10 Elm_Widget::theme_apply; 10 Elm_Widget::theme_apply;
11 Elm_Layout::content_aliases::get; 11 Elm_Layout::content_aliases::get;
diff --git a/src/lib/elm_container.c b/src/lib/elm_container.c
index 04f3bbc9f..ef51efa29 100644
--- a/src/lib/elm_container.c
+++ b/src/lib/elm_container.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_container.h" 7#include "elm_widget_container.h"
8 8
9#define MY_CLASS ELM_OBJ_CONTAINER_CLASS 9#define MY_CLASS ELM_CONTAINER_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Container" 11#define MY_CLASS_NAME "Elm_Container"
12 12
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index dcaf60df3..7d7412143 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_datetime.h" 7#include "elm_widget_datetime.h"
8 8
9#define MY_CLASS ELM_OBJ_DATETIME_CLASS 9#define MY_CLASS ELM_DATETIME_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Datetime" 11#define MY_CLASS_NAME "Elm_Datetime"
12#define MY_CLASS_NAME_LEGACY "elm_datetime" 12#define MY_CLASS_NAME_LEGACY "elm_datetime"
@@ -774,7 +774,7 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
774} 774}
775 775
776EOLIAN static void 776EOLIAN static void
777_elm_datetime_evas_smart_add(Eo *obj, Elm_Datetime_Data *priv) 777_elm_datetime_evas_object_smart_add(Eo *obj, Elm_Datetime_Data *priv)
778{ 778{
779 Datetime_Field *field; 779 Datetime_Field *field;
780 int idx; 780 int idx;
@@ -840,7 +840,7 @@ _elm_datetime_evas_smart_add(Eo *obj, Elm_Datetime_Data *priv)
840} 840}
841 841
842EOLIAN static void 842EOLIAN static void
843_elm_datetime_evas_smart_del(Eo *obj, Elm_Datetime_Data *sd) 843_elm_datetime_evas_object_smart_del(Eo *obj, Elm_Datetime_Data *sd)
844{ 844{
845 Datetime_Field *tmp; 845 Datetime_Field *tmp;
846 unsigned int idx; 846 unsigned int idx;
diff --git a/src/lib/elm_datetime.eo b/src/lib/elm_datetime.eo
index 8edb4e417..393111e20 100644
--- a/src/lib/elm_datetime.eo
+++ b/src/lib/elm_datetime.eo
@@ -321,8 +321,8 @@ class Elm_Datetime (Elm_Layout)
321 implements { 321 implements {
322 class::constructor; 322 class::constructor;
323 Eo_Base::constructor; 323 Eo_Base::constructor;
324 Evas_Smart::add; 324 Evas_Object_Smart::add;
325 Evas_Smart::del; 325 Evas_Object_Smart::del;
326 Elm_Widget::theme_apply; 326 Elm_Widget::theme_apply;
327 Elm_Widget::focus_next_manager_is; 327 Elm_Widget::focus_next_manager_is;
328 Elm_Widget::focus_next; 328 Elm_Widget::focus_next;
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 9c9192b8c..7698a6478 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -7,7 +7,7 @@
7#include "elm_widget_dayselector.h" 7#include "elm_widget_dayselector.h"
8#include "elm_widget_container.h" 8#include "elm_widget_container.h"
9 9
10#define MY_CLASS ELM_OBJ_DAYSELECTOR_CLASS 10#define MY_CLASS ELM_DAYSELECTOR_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Dayselector" 12#define MY_CLASS_NAME "Elm_Dayselector"
13#define MY_CLASS_NAME_LEGACY "elm_dayselector" 13#define MY_CLASS_NAME_LEGACY "elm_dayselector"
@@ -399,7 +399,7 @@ _items_create(Evas_Object *obj)
399} 399}
400 400
401EOLIAN static void 401EOLIAN static void
402_elm_dayselector_evas_smart_add(Eo *obj, Elm_Dayselector_Data *priv) 402_elm_dayselector_evas_object_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
403{ 403{
404 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 404 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
405 elm_widget_sub_object_parent_add(obj); 405 elm_widget_sub_object_parent_add(obj);
@@ -420,7 +420,7 @@ _elm_dayselector_evas_smart_add(Eo *obj, Elm_Dayselector_Data *priv)
420} 420}
421 421
422EOLIAN static void 422EOLIAN static void
423_elm_dayselector_evas_smart_del(Eo *obj, Elm_Dayselector_Data *sd) 423_elm_dayselector_evas_object_smart_del(Eo *obj, Elm_Dayselector_Data *sd)
424{ 424{
425 Elm_Dayselector_Item *it; 425 Elm_Dayselector_Item *it;
426 426
diff --git a/src/lib/elm_dayselector.eo b/src/lib/elm_dayselector.eo
index 2400c3b3c..2c0376403 100644
--- a/src/lib/elm_dayselector.eo
+++ b/src/lib/elm_dayselector.eo
@@ -164,8 +164,8 @@ class Elm_Dayselector (Elm_Layout)
164 implements { 164 implements {
165 class::constructor; 165 class::constructor;
166 Eo_Base::constructor; 166 Eo_Base::constructor;
167 Evas_Smart::add; 167 Evas_Object_Smart::add;
168 Evas_Smart::del; 168 Evas_Object_Smart::del;
169 Elm_Widget::theme_apply; 169 Elm_Widget::theme_apply;
170 Elm_Widget::focus_direction_manager_is; 170 Elm_Widget::focus_direction_manager_is;
171 Elm_Widget::translate; 171 Elm_Widget::translate;
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index b91fa8264..cd26ac435 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -9,7 +9,7 @@
9 9
10#define DISPLAY_ITEM_NUM_MIN 3 10#define DISPLAY_ITEM_NUM_MIN 3
11 11
12#define MY_CLASS ELM_OBJ_DISKSELECTOR_CLASS 12#define MY_CLASS ELM_DISKSELECTOR_CLASS
13 13
14#define MY_CLASS_NAME "Elm_Diskselector" 14#define MY_CLASS_NAME "Elm_Diskselector"
15#define MY_CLASS_NAME_LEGACY "elm_diskselector" 15#define MY_CLASS_NAME_LEGACY "elm_diskselector"
@@ -1238,7 +1238,7 @@ _round_items_add(Elm_Diskselector_Data *sd)
1238} 1238}
1239 1239
1240EOLIAN static void 1240EOLIAN static void
1241_elm_diskselector_evas_smart_add(Eo *obj, Elm_Diskselector_Data *priv) 1241_elm_diskselector_evas_object_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
1242{ 1242{
1243 Evas *evas; 1243 Evas *evas;
1244 Evas_Object *blank, *edje; 1244 Evas_Object *blank, *edje;
@@ -1315,7 +1315,7 @@ _elm_diskselector_evas_smart_add(Eo *obj, Elm_Diskselector_Data *priv)
1315} 1315}
1316 1316
1317EOLIAN static void 1317EOLIAN static void
1318_elm_diskselector_evas_smart_del(Eo *obj, Elm_Diskselector_Data *sd) 1318_elm_diskselector_evas_object_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1319{ 1319{
1320 Elm_Diskselector_Item *it; 1320 Elm_Diskselector_Item *it;
1321 Eina_List *l; 1321 Eina_List *l;
@@ -1391,7 +1391,7 @@ _elm_diskselector_evas_smart_del(Eo *obj, Elm_Diskselector_Data *sd)
1391} 1391}
1392 1392
1393EOLIAN static void 1393EOLIAN static void
1394_elm_diskselector_evas_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y) 1394_elm_diskselector_evas_object_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord x, Evas_Coord y)
1395{ 1395{
1396 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 1396 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
1397 1397
@@ -1399,7 +1399,7 @@ _elm_diskselector_evas_smart_move(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord
1399} 1399}
1400 1400
1401EOLIAN static void 1401EOLIAN static void
1402_elm_diskselector_evas_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h) 1402_elm_diskselector_evas_object_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coord w, Evas_Coord h)
1403{ 1403{
1404 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 1404 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
1405 1405
@@ -1407,7 +1407,7 @@ _elm_diskselector_evas_smart_resize(Eo *obj, Elm_Diskselector_Data *sd, Evas_Coo
1407} 1407}
1408 1408
1409EOLIAN static void 1409EOLIAN static void
1410_elm_diskselector_evas_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member) 1410_elm_diskselector_evas_object_smart_member_add(Eo *obj, Elm_Diskselector_Data *sd, Evas_Object *member)
1411{ 1411{
1412 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 1412 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
1413 1413
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 1706f24df..6a651394c 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -235,11 +235,11 @@ class Elm_Diskselector (Elm_Widget, Elm_Interface_Scrollable)
235 implements { 235 implements {
236 class::constructor; 236 class::constructor;
237 Eo_Base::constructor; 237 Eo_Base::constructor;
238 Evas_Smart::member_add; 238 Evas_Object_Smart::member_add;
239 Evas_Smart::move; 239 Evas_Object_Smart::move;
240 Evas_Smart::add; 240 Evas_Object_Smart::add;
241 Evas_Smart::del; 241 Evas_Object_Smart::del;
242 Evas_Smart::resize; 242 Evas_Object_Smart::resize;
243 Elm_Widget::focus_next_manager_is; 243 Elm_Widget::focus_next_manager_is;
244 Elm_Widget::access; 244 Elm_Widget::access;
245 Elm_Widget::focus_next; 245 Elm_Widget::focus_next;
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 67dfa0bfd..8390b3573 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_entry.h" 8#include "elm_widget_entry.h"
9 9
10#define MY_CLASS ELM_OBJ_ENTRY_CLASS 10#define MY_CLASS ELM_ENTRY_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Entry" 12#define MY_CLASS_NAME "Elm_Entry"
13#define MY_CLASS_NAME_LEGACY "elm_entry" 13#define MY_CLASS_NAME_LEGACY "elm_entry"
@@ -1052,7 +1052,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd)
1052 Eina_Bool top_is_win = EINA_FALSE; 1052 Eina_Bool top_is_win = EINA_FALSE;
1053 1053
1054 top = elm_widget_top_get(obj); 1054 top = elm_widget_top_get(obj);
1055 if (top && eo_isa(top, ELM_OBJ_WIN_CLASS)) 1055 if (top && eo_isa(top, ELM_WIN_CLASS))
1056 top_is_win = EINA_TRUE; 1056 top_is_win = EINA_TRUE;
1057 1057
1058 if (!sd->editable) return EINA_FALSE; 1058 if (!sd->editable) return EINA_FALSE;
@@ -1731,7 +1731,7 @@ _mouse_up_cb(void *data,
1731 top = elm_widget_top_get(data); 1731 top = elm_widget_top_get(data);
1732 if (top) 1732 if (top)
1733 { 1733 {
1734 if (eo_isa(top, ELM_OBJ_WIN_CLASS)) 1734 if (eo_isa(top, ELM_WIN_CLASS))
1735 top_is_win = EINA_TRUE; 1735 top_is_win = EINA_TRUE;
1736 1736
1737 if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand && 1737 if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&
@@ -3272,7 +3272,7 @@ _end_handler_mouse_move_cb(void *data,
3272} 3272}
3273 3273
3274EOLIAN static void 3274EOLIAN static void
3275_elm_entry_evas_smart_add(Eo *obj, Elm_Entry_Data *priv) 3275_elm_entry_evas_object_smart_add(Eo *obj, Elm_Entry_Data *priv)
3276{ 3276{
3277#ifdef HAVE_ELEMENTARY_X 3277#ifdef HAVE_ELEMENTARY_X
3278 Evas_Object *top; 3278 Evas_Object *top;
@@ -3473,7 +3473,7 @@ _create_selection_handlers(Evas_Object *obj, Elm_Entry_Data *sd)
3473} 3473}
3474 3474
3475EOLIAN static void 3475EOLIAN static void
3476_elm_entry_evas_smart_del(Eo *obj, Elm_Entry_Data *sd) 3476_elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd)
3477{ 3477{
3478 Elm_Entry_Context_Menu_Item *it; 3478 Elm_Entry_Context_Menu_Item *it;
3479 Elm_Entry_Item_Provider *ip; 3479 Elm_Entry_Item_Provider *ip;
@@ -3550,7 +3550,7 @@ _elm_entry_evas_smart_del(Eo *obj, Elm_Entry_Data *sd)
3550} 3550}
3551 3551
3552EOLIAN static void 3552EOLIAN static void
3553_elm_entry_evas_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y) 3553_elm_entry_evas_object_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord y)
3554{ 3554{
3555 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 3555 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
3556 3556
@@ -3563,7 +3563,7 @@ _elm_entry_evas_smart_move(Eo *obj, Elm_Entry_Data *sd, Evas_Coord x, Evas_Coord
3563} 3563}
3564 3564
3565EOLIAN static void 3565EOLIAN static void
3566_elm_entry_evas_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h) 3566_elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coord h)
3567{ 3567{
3568 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 3568 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
3569 3569
@@ -3572,7 +3572,7 @@ _elm_entry_evas_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, Evas_Coo
3572} 3572}
3573 3573
3574EOLIAN static void 3574EOLIAN static void
3575_elm_entry_evas_smart_show(Eo *obj, Elm_Entry_Data *sd) 3575_elm_entry_evas_object_smart_show(Eo *obj, Elm_Entry_Data *sd)
3576{ 3576{
3577 eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); 3577 eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
3578 3578
@@ -3581,7 +3581,7 @@ _elm_entry_evas_smart_show(Eo *obj, Elm_Entry_Data *sd)
3581} 3581}
3582 3582
3583EOLIAN static void 3583EOLIAN static void
3584_elm_entry_evas_smart_hide(Eo *obj, Elm_Entry_Data *sd) 3584_elm_entry_evas_object_smart_hide(Eo *obj, Elm_Entry_Data *sd)
3585{ 3585{
3586 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 3586 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
3587 3587
@@ -3590,7 +3590,7 @@ _elm_entry_evas_smart_hide(Eo *obj, Elm_Entry_Data *sd)
3590} 3590}
3591 3591
3592EOLIAN static void 3592EOLIAN static void
3593_elm_entry_evas_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member) 3593_elm_entry_evas_object_smart_member_add(Eo *obj, Elm_Entry_Data *sd, Evas_Object *member)
3594{ 3594{
3595 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 3595 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
3596 3596
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index d445022d0..c2f65a69b 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -1158,13 +1158,13 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interface)
1158 implements { 1158 implements {
1159 class::constructor; 1159 class::constructor;
1160 Eo_Base::constructor; 1160 Eo_Base::constructor;
1161 Evas_Smart::move; 1161 Evas_Object_Smart::move;
1162 Evas_Smart::member_add; 1162 Evas_Object_Smart::member_add;
1163 Evas_Smart::add; 1163 Evas_Object_Smart::add;
1164 Evas_Smart::resize; 1164 Evas_Object_Smart::resize;
1165 Evas_Smart::del; 1165 Evas_Object_Smart::del;
1166 Evas_Smart::show; 1166 Evas_Object_Smart::show;
1167 Evas_Smart::hide; 1167 Evas_Object_Smart::hide;
1168 Elm_Widget::activate; 1168 Elm_Widget::activate;
1169 Elm_Widget::focus_direction_manager_is; 1169 Elm_Widget::focus_direction_manager_is;
1170 Elm_Widget::theme_apply; 1170 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index d6443c534..019132cfa 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -7,7 +7,7 @@
7#include "elm_widget_flip.h" 7#include "elm_widget_flip.h"
8#include "elm_widget_container.h" 8#include "elm_widget_container.h"
9 9
10#define MY_CLASS ELM_OBJ_FLIP_CLASS 10#define MY_CLASS ELM_FLIP_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Flip" 12#define MY_CLASS_NAME "Elm_Flip"
13#define MY_CLASS_NAME_LEGACY "elm_flip" 13#define MY_CLASS_NAME_LEGACY "elm_flip"
@@ -1798,7 +1798,7 @@ _elm_flip_elm_container_content_unset(Eo *obj EINA_UNUSED, Elm_Flip_Data *_pd EI
1798} 1798}
1799 1799
1800EOLIAN static void 1800EOLIAN static void
1801_elm_flip_evas_smart_add(Eo *obj, Elm_Flip_Data *priv) 1801_elm_flip_evas_object_smart_add(Eo *obj, Elm_Flip_Data *priv)
1802{ 1802{
1803 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 1803 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
1804 elm_widget_sub_object_parent_add(obj); 1804 elm_widget_sub_object_parent_add(obj);
@@ -1841,7 +1841,7 @@ _elm_flip_evas_smart_add(Eo *obj, Elm_Flip_Data *priv)
1841} 1841}
1842 1842
1843EOLIAN static void 1843EOLIAN static void
1844_elm_flip_evas_smart_del(Eo *obj, Elm_Flip_Data *sd) 1844_elm_flip_evas_object_smart_del(Eo *obj, Elm_Flip_Data *sd)
1845{ 1845{
1846 ecore_animator_del(sd->animator); 1846 ecore_animator_del(sd->animator);
1847 _state_slices_clear(sd); 1847 _state_slices_clear(sd);
diff --git a/src/lib/elm_flip.eo b/src/lib/elm_flip.eo
index e53c084d6..7dd162769 100644
--- a/src/lib/elm_flip.eo
+++ b/src/lib/elm_flip.eo
@@ -243,8 +243,8 @@ class Elm_Flip (Elm_Container)
243 implements { 243 implements {
244 class::constructor; 244 class::constructor;
245 Eo_Base::constructor; 245 Eo_Base::constructor;
246 Evas_Smart::add; 246 Evas_Object_Smart::add;
247 Evas_Smart::del; 247 Evas_Object_Smart::del;
248 Elm_Widget::focus_direction; 248 Elm_Widget::focus_direction;
249 Elm_Widget::sub_object_add; 249 Elm_Widget::sub_object_add;
250 Elm_Widget::theme_apply; 250 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 9c5cd5d20..5427e5d8c 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -6,7 +6,7 @@
6#include "elm_priv.h" 6#include "elm_priv.h"
7#include "elm_widget_flipselector.h" 7#include "elm_widget_flipselector.h"
8 8
9#define MY_CLASS ELM_OBJ_FLIPSELECTOR_CLASS 9#define MY_CLASS ELM_FLIPSELECTOR_CLASS
10 10
11#define MY_CLASS_NAME "Elm_Flipselector" 11#define MY_CLASS_NAME "Elm_Flipselector"
12#define MY_CLASS_NAME_LEGACY "elm_flipselector" 12#define MY_CLASS_NAME_LEGACY "elm_flipselector"
@@ -549,7 +549,7 @@ _signal_val_change_stop(void *data,
549} 549}
550 550
551EOLIAN static void 551EOLIAN static void
552_elm_flipselector_evas_smart_add(Eo *obj, Elm_Flipselector_Data *priv) 552_elm_flipselector_evas_object_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
553{ 553{
554 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 554 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
555 elm_widget_sub_object_parent_add(obj); 555 elm_widget_sub_object_parent_add(obj);
@@ -575,7 +575,7 @@ _elm_flipselector_evas_smart_add(Eo *obj, Elm_Flipselector_Data *priv)
575} 575}
576 576
577EOLIAN static void 577EOLIAN static void
578_elm_flipselector_evas_smart_del(Eo *obj, Elm_Flipselector_Data *sd) 578_elm_flipselector_evas_object_smart_del(Eo *obj, Elm_Flipselector_Data *sd)
579{ 579{
580 sd->deleting = EINA_TRUE; 580 sd->deleting = EINA_TRUE;
581 581
diff --git a/src/lib/elm_flipselector.eo b/src/lib/elm_flipselector.eo
index f06e4f2f4..3983ebf7a 100644
--- a/src/lib/elm_flipselector.eo
+++ b/src/lib/elm_flipselector.eo
@@ -195,8 +195,8 @@ class Elm_Flipselector (Elm_Layout)
195 implements { 195 implements {
196 class::constructor; 196 class::constructor;
197 Eo_Base::constructor; 197 Eo_Base::constructor;
198 Evas_Smart::add; 198 Evas_Object_Smart::add;
199 Evas_Smart::del; 199 Evas_Object_Smart::del;
200 Elm_Widget::theme_apply; 200 Elm_Widget::theme_apply;
201 Elm_Widget::focus_next_manager_is; 201 Elm_Widget::focus_next_manager_is;
202 Elm_Widget::focus_direction_manager_is; 202 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 056d6b17d..01b4bd91e 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -7,7 +7,7 @@
7#include "elm_widget_frame.h" 7#include "elm_widget_frame.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_FRAME_CLASS 10#define MY_CLASS ELM_FRAME_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Frame" 12#define MY_CLASS_NAME "Elm_Frame"
13#define MY_CLASS_NAME_LEGACY "elm_frame" 13#define MY_CLASS_NAME_LEGACY "elm_frame"
@@ -142,7 +142,7 @@ _on_frame_clicked(void *data,
142 142
143/* using deferred sizing evaluation, just like the parent */ 143/* using deferred sizing evaluation, just like the parent */
144EOLIAN static void 144EOLIAN static void
145_elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd) 145_elm_frame_evas_object_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
146{ 146{
147 ELM_LAYOUT_DATA_GET(obj, ld); 147 ELM_LAYOUT_DATA_GET(obj, ld);
148 148
@@ -155,7 +155,7 @@ _elm_frame_evas_smart_calculate(Eo *obj, Elm_Frame_Data *sd)
155} 155}
156 156
157EOLIAN static void 157EOLIAN static void
158_elm_frame_evas_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) 158_elm_frame_evas_object_smart_add(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
159{ 159{
160 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 160 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
161 161
diff --git a/src/lib/elm_frame.eo b/src/lib/elm_frame.eo
index 444db1a78..259badbd0 100644
--- a/src/lib/elm_frame.eo
+++ b/src/lib/elm_frame.eo
@@ -65,8 +65,8 @@ class Elm_Frame (Elm_Layout, Evas_Clickable_Interface)
65 implements { 65 implements {
66 Eo_Base::constructor; 66 Eo_Base::constructor;
67 class::constructor; 67 class::constructor;
68 Evas_Smart::calculate; 68 Evas_Object_Smart::calculate;
69 Evas_Smart::add; 69 Evas_Object_Smart::add;
70 Elm_Widget::focus_direction; 70 Elm_Widget::focus_direction;
71 Elm_Widget::focus_next_manager_is; 71 Elm_Widget::focus_next_manager_is;
72 Elm_Widget::focus_next; 72 Elm_Widget::focus_next;
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 37f8cd212..73406ef34 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -8,12 +8,12 @@
8#include "elm_widget_gengrid.h" 8#include "elm_widget_gengrid.h"
9#include "elm_interface_scrollable.h" 9#include "elm_interface_scrollable.h"
10 10
11#define MY_PAN_CLASS ELM_OBJ_GENGRID_PAN_CLASS 11#define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS
12 12
13#define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan" 13#define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan"
14#define MY_PAN_CLASS_NAME_LEGACY "elm_gengrid_pan" 14#define MY_PAN_CLASS_NAME_LEGACY "elm_gengrid_pan"
15 15
16#define MY_CLASS ELM_OBJ_GENGRID_CLASS 16#define MY_CLASS ELM_GENGRID_CLASS
17 17
18#define MY_CLASS_NAME "Elm_Gengrid" 18#define MY_CLASS_NAME "Elm_Gengrid"
19#define MY_CLASS_NAME_LEGACY "elm_gengrid" 19#define MY_CLASS_NAME_LEGACY "elm_gengrid"
@@ -269,14 +269,14 @@ _elm_gengrid_pan_eo_base_destructor(Eo *obj, Elm_Gengrid_Pan_Data *psd)
269} 269}
270 270
271EOLIAN static void 271EOLIAN static void
272_elm_gengrid_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) 272_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)
273{ 273{
274 ecore_job_del(psd->wsd->calc_job); 274 ecore_job_del(psd->wsd->calc_job);
275 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj); 275 psd->wsd->calc_job = ecore_job_add(_calc_job, psd->wobj);
276} 276}
277 277
278EOLIAN static void 278EOLIAN static void
279_elm_gengrid_pan_evas_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 279_elm_gengrid_pan_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
280{ 280{
281 Evas_Coord ow, oh; 281 Evas_Coord ow, oh;
282 282
@@ -1346,7 +1346,7 @@ _group_item_place(Elm_Gengrid_Pan_Data *psd)
1346} 1346}
1347 1347
1348EOLIAN static void 1348EOLIAN static void
1349_elm_gengrid_pan_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd) 1349_elm_gengrid_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Gengrid_Pan_Data *psd)
1350{ 1350{
1351 Evas_Coord cx = 0, cy = 0; 1351 Evas_Coord cx = 0, cy = 0;
1352 Elm_Gen_Item *it; 1352 Elm_Gen_Item *it;
@@ -3119,7 +3119,7 @@ _elm_gengrid_elm_layout_sizing_eval(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *_pd E
3119} 3119}
3120 3120
3121EOLIAN static void 3121EOLIAN static void
3122_elm_gengrid_evas_smart_add(Eo *obj, Elm_Gengrid_Data *priv) 3122_elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
3123{ 3123{
3124 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable; 3124 Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
3125 Elm_Gengrid_Pan_Data *pan_data; 3125 Elm_Gengrid_Pan_Data *pan_data;
@@ -3185,7 +3185,7 @@ _elm_gengrid_evas_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
3185} 3185}
3186 3186
3187EOLIAN static void 3187EOLIAN static void
3188_elm_gengrid_evas_smart_del(Eo *obj, Elm_Gengrid_Data *sd) 3188_elm_gengrid_evas_object_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
3189{ 3189{
3190 elm_gengrid_clear(obj); 3190 elm_gengrid_clear(obj);
3191 eo_unref(sd->pan_obj); 3191 eo_unref(sd->pan_obj);
@@ -3198,7 +3198,7 @@ _elm_gengrid_evas_smart_del(Eo *obj, Elm_Gengrid_Data *sd)
3198} 3198}
3199 3199
3200EOLIAN static void 3200EOLIAN static void
3201_elm_gengrid_evas_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y) 3201_elm_gengrid_evas_object_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_Coord y)
3202{ 3202{
3203 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 3203 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
3204 3204
@@ -3206,7 +3206,7 @@ _elm_gengrid_evas_smart_move(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord x, Evas_C
3206} 3206}
3207 3207
3208EOLIAN static void 3208EOLIAN static void
3209_elm_gengrid_evas_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h) 3209_elm_gengrid_evas_object_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas_Coord h)
3210{ 3210{
3211 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 3211 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
3212 3212
@@ -3214,7 +3214,7 @@ _elm_gengrid_evas_smart_resize(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord w, Evas
3214} 3214}
3215 3215
3216EOLIAN static void 3216EOLIAN static void
3217_elm_gengrid_evas_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member) 3217_elm_gengrid_evas_object_smart_member_add(Eo *obj, Elm_Gengrid_Data *sd, Evas_Object *member)
3218{ 3218{
3219 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 3219 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
3220 3220
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index 65ceb6b22..0b7f95f5a 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -664,11 +664,11 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac
664 implements { 664 implements {
665 class::constructor; 665 class::constructor;
666 Eo_Base::constructor; 666 Eo_Base::constructor;
667 Evas_Smart::move; 667 Evas_Object_Smart::move;
668 Evas_Smart::add; 668 Evas_Object_Smart::add;
669 Evas_Smart::del; 669 Evas_Object_Smart::del;
670 Evas_Smart::member_add; 670 Evas_Object_Smart::member_add;
671 Evas_Smart::resize; 671 Evas_Object_Smart::resize;
672 Elm_Widget::theme_apply; 672 Elm_Widget::theme_apply;
673 Elm_Widget::focus_next_manager_is; 673 Elm_Widget::focus_next_manager_is;
674 Elm_Widget::focus_direction_manager_is; 674 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_gengrid_pan.eo b/src/lib/elm_gengrid_pan.eo
index 5fe6fccd3..e1c5e6713 100644
--- a/src/lib/elm_gengrid_pan.eo
+++ b/src/lib/elm_gengrid_pan.eo
@@ -4,9 +4,9 @@ class Elm_Gengrid_Pan (Elm_Pan)
4 implements { 4 implements {
5 class::constructor; 5 class::constructor;
6 Eo_Base::destructor; 6 Eo_Base::destructor;
7 Evas_Smart::calculate; 7 Evas_Object_Smart::calculate;
8 Evas_Smart::move; 8 Evas_Object_Smart::move;
9 Evas_Smart::resize; 9 Evas_Object_Smart::resize;
10 Elm_Pan::content_size::get; 10 Elm_Pan::content_size::get;
11 Elm_Pan::pos; 11 Elm_Pan::pos;
12 Elm_Pan::pos_min::get; 12 Elm_Pan::pos_min::get;
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 0e26793f8..406098a1b 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -11,12 +11,12 @@
11#include "elm_widget_genlist.h" 11#include "elm_widget_genlist.h"
12#include "elm_interface_scrollable.h" 12#include "elm_interface_scrollable.h"
13 13
14#define MY_PAN_CLASS ELM_OBJ_GENLIST_PAN_CLASS 14#define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS
15 15
16#define MY_PAN_CLASS_NAME "Elm_Genlist_Pan" 16#define MY_PAN_CLASS_NAME "Elm_Genlist_Pan"
17#define MY_PAN_CLASS_NAME_LEGACY "elm_genlist_pan" 17#define MY_PAN_CLASS_NAME_LEGACY "elm_genlist_pan"
18 18
19#define MY_CLASS ELM_OBJ_GENLIST_CLASS 19#define MY_CLASS ELM_GENLIST_CLASS
20 20
21#define MY_CLASS_NAME "Elm_Genlist" 21#define MY_CLASS_NAME "Elm_Genlist"
22#define MY_CLASS_NAME_LEGACY "elm_genlist" 22#define MY_CLASS_NAME_LEGACY "elm_genlist"
@@ -192,7 +192,7 @@ _elm_genlist_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_D
192} 192}
193 193
194EOLIAN static void 194EOLIAN static void
195_elm_genlist_pan_evas_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd) 195_elm_genlist_pan_evas_object_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
196{ 196{
197 ecore_job_del(psd->resize_job); 197 ecore_job_del(psd->resize_job);
198 198
@@ -200,7 +200,7 @@ _elm_genlist_pan_evas_smart_del(Eo *obj, Elm_Genlist_Pan_Data *psd)
200} 200}
201 201
202EOLIAN static void 202EOLIAN static void
203_elm_genlist_pan_evas_smart_move(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord _gen_param2 EINA_UNUSED, Evas_Coord _gen_param3 EINA_UNUSED) 203_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)
204{ 204{
205 psd->wsd->pan_changed = EINA_TRUE; 205 psd->wsd->pan_changed = EINA_TRUE;
206 evas_object_smart_changed(obj); 206 evas_object_smart_changed(obj);
@@ -217,7 +217,7 @@ _elm_genlist_pan_smart_resize_job(void *data)
217} 217}
218 218
219EOLIAN static void 219EOLIAN static void
220_elm_genlist_pan_evas_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 220_elm_genlist_pan_evas_object_smart_resize(Eo *obj, Elm_Genlist_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
221{ 221{
222 Evas_Coord ow, oh; 222 Evas_Coord ow, oh;
223 223
@@ -2176,7 +2176,7 @@ _item_block_realize(Item_Block *itb)
2176} 2176}
2177 2177
2178EOLIAN static void 2178EOLIAN static void
2179_elm_genlist_pan_evas_smart_calculate(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_Data *psd) 2179_elm_genlist_pan_evas_object_smart_calculate(Eo *obj EINA_UNUSED, Elm_Genlist_Pan_Data *psd)
2180{ 2180{
2181 Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh; 2181 Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
2182 Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0; 2182 Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0;
@@ -5211,7 +5211,7 @@ _elm_genlist_looping_down_cb(void *data,
5211 5211
5212 5212
5213EOLIAN static void 5213EOLIAN static void
5214_elm_genlist_evas_smart_add(Eo *obj, Elm_Genlist_Data *priv) 5214_elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
5215{ 5215{
5216 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 5216 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
5217 Elm_Genlist_Pan_Data *pan_data; 5217 Elm_Genlist_Pan_Data *pan_data;
@@ -5293,7 +5293,7 @@ _elm_genlist_evas_smart_add(Eo *obj, Elm_Genlist_Data *priv)
5293} 5293}
5294 5294
5295EOLIAN static void 5295EOLIAN static void
5296_elm_genlist_evas_smart_del(Eo *obj, Elm_Genlist_Data *sd) 5296_elm_genlist_evas_object_smart_del(Eo *obj, Elm_Genlist_Data *sd)
5297{ 5297{
5298 int i; 5298 int i;
5299 5299
@@ -5320,7 +5320,7 @@ _elm_genlist_evas_smart_del(Eo *obj, Elm_Genlist_Data *sd)
5320} 5320}
5321 5321
5322EOLIAN static void 5322EOLIAN static void
5323_elm_genlist_evas_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y) 5323_elm_genlist_evas_object_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_Coord y)
5324{ 5324{
5325 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 5325 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
5326 5326
@@ -5328,7 +5328,7 @@ _elm_genlist_evas_smart_move(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord x, Evas_C
5328} 5328}
5329 5329
5330EOLIAN static void 5330EOLIAN static void
5331_elm_genlist_evas_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h) 5331_elm_genlist_evas_object_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas_Coord h)
5332{ 5332{
5333 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 5333 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
5334 5334
@@ -5338,7 +5338,7 @@ _elm_genlist_evas_smart_resize(Eo *obj, Elm_Genlist_Data *sd, Evas_Coord w, Evas
5338} 5338}
5339 5339
5340EOLIAN static void 5340EOLIAN static void
5341_elm_genlist_evas_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member) 5341_elm_genlist_evas_object_smart_member_add(Eo *obj, Elm_Genlist_Data *sd, Evas_Object *member)
5342{ 5342{
5343 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 5343 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
5344 5344
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index 5f04a22f4..db380149f 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -730,11 +730,11 @@ class Elm_Genlist (Elm_Layout, Elm_Interface_Scrollable, Evas_Clickable_Interfac
730 implements { 730 implements {
731 class::constructor; 731 class::constructor;
732 Eo_Base::constructor; 732 Eo_Base::constructor;
733 Evas_Smart::member_add; 733 Evas_Object_Smart::member_add;
734 Evas_Smart::move; 734 Evas_Object_Smart::move;
735 Evas_Smart::add; 735 Evas_Object_Smart::add;
736 Evas_Smart::del; 736 Evas_Object_Smart::del;
737 Evas_Smart::resize; 737 Evas_Object_Smart::resize;
738 Elm_Widget::theme_apply; 738 Elm_Widget::theme_apply;
739 Elm_Widget::focus_next_manager_is; 739 Elm_Widget::focus_next_manager_is;
740 Elm_Widget::sub_object_add; 740 Elm_Widget::sub_object_add;
diff --git a/src/lib/elm_genlist_pan.eo b/src/lib/elm_genlist_pan.eo
index 8764ce324..e363cf47e 100644
--- a/src/lib/elm_genlist_pan.eo
+++ b/src/lib/elm_genlist_pan.eo
@@ -4,10 +4,10 @@ class Elm_Genlist_Pan (Elm_Pan)
4 implements { 4 implements {
5 class::constructor; 5 class::constructor;
6 Eo_Base::destructor; 6 Eo_Base::destructor;
7 Evas_Smart::calculate; 7 Evas_Object_Smart::calculate;
8 Evas_Smart::move; 8 Evas_Object_Smart::move;
9 Evas_Smart::del; 9 Evas_Object_Smart::del;
10 Evas_Smart::resize; 10 Evas_Object_Smart::resize;
11 Elm_Pan::content_size::get; 11 Elm_Pan::content_size::get;
12 Elm_Pan::pos; 12 Elm_Pan::pos;
13 Elm_Pan::pos_min::get; 13 Elm_Pan::pos_min::get;
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 67830d40e..6d901fa2e 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6#include "elm_priv.h" 6#include "elm_priv.h"
7 7
8#define MY_CLASS ELM_OBJ_GESTURE_LAYER_CLASS 8#define MY_CLASS ELM_GESTURE_LAYER_CLASS
9 9
10#define MY_CLASS_NAME "Elm_Gesture_Layer" 10#define MY_CLASS_NAME "Elm_Gesture_Layer"
11#define MY_CLASS_NAME_LEGACY "elm_gesture_layer" 11#define MY_CLASS_NAME_LEGACY "elm_gesture_layer"
@@ -3729,7 +3729,7 @@ _elm_gesture_layer_elm_widget_disable(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_
3729} 3729}
3730 3730
3731EOLIAN static void 3731EOLIAN static void
3732_elm_gesture_layer_evas_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv) 3732_elm_gesture_layer_evas_object_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
3733{ 3733{
3734 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 3734 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
3735 elm_widget_sub_object_parent_add(obj); 3735 elm_widget_sub_object_parent_add(obj);
@@ -3762,7 +3762,7 @@ _elm_gesture_layer_evas_smart_add(Eo *obj, Elm_Gesture_Layer_Data *priv)
3762static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type); 3762static void _cbs_clean(Elm_Gesture_Layer_Data *sd, Elm_Gesture_Type idx, Elm_Gesture_State cb_type);
3763 3763
3764EOLIAN static void 3764EOLIAN static void
3765_elm_gesture_layer_evas_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd) 3765_elm_gesture_layer_evas_object_smart_del(Eo *obj, Elm_Gesture_Layer_Data *sd)
3766{ 3766{
3767 Pointer_Event *data; 3767 Pointer_Event *data;
3768 int i; 3768 int i;
diff --git a/src/lib/elm_gesture_layer.eo b/src/lib/elm_gesture_layer.eo
index d61724ccb..deaab1c24 100644
--- a/src/lib/elm_gesture_layer.eo
+++ b/src/lib/elm_gesture_layer.eo
@@ -154,8 +154,8 @@ class Elm_Gesture_Layer (Elm_Widget)
154 implements { 154 implements {
155 class::constructor; 155 class::constructor;
156 Eo_Base::constructor; 156 Eo_Base::constructor;
157 Evas_Smart::add; 157 Evas_Object_Smart::add;
158 Evas_Smart::del; 158 Evas_Object_Smart::del;
159 Elm_Widget::disable; 159 Elm_Widget::disable;
160 } 160 }
161 161
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 26d6f8433..9f58fc493 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_glview.h" 8#include "elm_widget_glview.h"
9 9
10#define MY_CLASS ELM_OBJ_GLVIEW_CLASS 10#define MY_CLASS ELM_GLVIEW_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Glview" 12#define MY_CLASS_NAME "Elm_Glview"
13#define MY_CLASS_NAME_LEGACY "elm_glview" 13#define MY_CLASS_NAME_LEGACY "elm_glview"
@@ -73,7 +73,7 @@ _glview_update_surface(Evas_Object *obj)
73} 73}
74 74
75EOLIAN static void 75EOLIAN static void
76_elm_glview_evas_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h) 76_elm_glview_evas_object_smart_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coord w, Evas_Coord h)
77{ 77{
78 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 78 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
79 79
@@ -179,7 +179,7 @@ _set_render_policy_callback(Evas_Object *obj)
179} 179}
180 180
181EOLIAN static void 181EOLIAN static void
182_elm_glview_evas_smart_add(Eo *obj, Elm_Glview_Data *priv) 182_elm_glview_evas_object_smart_add(Eo *obj, Elm_Glview_Data *priv)
183{ 183{
184 Evas_Object *img; 184 Evas_Object *img;
185 185
@@ -235,7 +235,7 @@ _elm_glview_evas_smart_add(Eo *obj, Elm_Glview_Data *priv)
235} 235}
236 236
237EOLIAN static void 237EOLIAN static void
238_elm_glview_evas_smart_del(Eo *obj, Elm_Glview_Data *sd) 238_elm_glview_evas_object_smart_del(Eo *obj, Elm_Glview_Data *sd)
239{ 239{
240 // Call delete func if it's registered 240 // Call delete func if it's registered
241 if (sd->del_func) 241 if (sd->del_func)
diff --git a/src/lib/elm_glview.eo b/src/lib/elm_glview.eo
index 9b3c6de4c..bf25f7040 100644
--- a/src/lib/elm_glview.eo
+++ b/src/lib/elm_glview.eo
@@ -166,9 +166,9 @@ class Elm_Glview (Elm_Widget)
166 implements { 166 implements {
167 class::constructor; 167 class::constructor;
168 Eo_Base::constructor; 168 Eo_Base::constructor;
169 Evas_Smart::add; 169 Evas_Object_Smart::add;
170 Evas_Smart::del; 170 Evas_Object_Smart::del;
171 Evas_Smart::resize; 171 Evas_Object_Smart::resize;
172 Elm_Widget::on_focus; 172 Elm_Widget::on_focus;
173 } 173 }
174 events { 174 events {
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index b462f94bb..fa771b622 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_grid.h" 8#include "elm_widget_grid.h"
9 9
10#define MY_CLASS ELM_OBJ_GRID_CLASS 10#define MY_CLASS ELM_GRID_CLASS
11#define MY_CLASS_NAME "Elm_Grid" 11#define MY_CLASS_NAME "Elm_Grid"
12#define MY_CLASS_NAME_LEGACY "elm_grid" 12#define MY_CLASS_NAME_LEGACY "elm_grid"
13 13
@@ -114,7 +114,7 @@ _elm_grid_elm_widget_theme_apply(Eo *obj, void *sd EINA_UNUSED)
114} 114}
115 115
116EOLIAN static void 116EOLIAN static void
117_elm_grid_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) 117_elm_grid_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
118{ 118{
119 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 119 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
120 Evas_Object *grid; 120 Evas_Object *grid;
@@ -133,7 +133,7 @@ _elm_grid_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED)
133} 133}
134 134
135EOLIAN static void 135EOLIAN static void
136_elm_grid_evas_smart_del(Eo *obj, void *_pd EINA_UNUSED) 136_elm_grid_evas_object_smart_del(Eo *obj, void *_pd EINA_UNUSED)
137{ 137{
138 Eina_List *l; 138 Eina_List *l;
139 Evas_Object *child; 139 Evas_Object *child;
diff --git a/src/lib/elm_grid.eo b/src/lib/elm_grid.eo
index 07e879f9f..f618c7ad2 100644
--- a/src/lib/elm_grid.eo
+++ b/src/lib/elm_grid.eo
@@ -75,8 +75,8 @@ class Elm_Grid (Elm_Widget)
75 implements { 75 implements {
76 class::constructor; 76 class::constructor;
77 Eo_Base::constructor; 77 Eo_Base::constructor;
78 Evas_Smart::add; 78 Evas_Object_Smart::add;
79 Evas_Smart::del; 79 Evas_Object_Smart::del;
80 Elm_Widget::focus_direction; 80 Elm_Widget::focus_direction;
81 Elm_Widget::focus_next_manager_is; 81 Elm_Widget::focus_next_manager_is;
82 Elm_Widget::focus_next; 82 Elm_Widget::focus_next;
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 29b4d78df..6fb4c2019 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_hover.h" 8#include "elm_widget_hover.h"
9 9
10#define MY_CLASS ELM_OBJ_HOVER_CLASS 10#define MY_CLASS ELM_HOVER_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Hover" 12#define MY_CLASS_NAME "Elm_Hover"
13#define MY_CLASS_NAME_LEGACY "elm_hover" 13#define MY_CLASS_NAME_LEGACY "elm_hover"
@@ -131,7 +131,7 @@ _elm_hover_left_space_calc(Elm_Hover_Data *sd,
131 if (sd->parent) 131 if (sd->parent)
132 { 132 {
133 evas_object_geometry_get(sd->parent, &x, &y, &w, &h); 133 evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
134 if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) 134 if (eo_isa(sd->parent, ELM_WIN_CLASS))
135 { 135 {
136 x = 0; 136 x = 0;
137 y = 0; 137 y = 0;
@@ -313,7 +313,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd)
313 if (sd->parent) 313 if (sd->parent)
314 { 314 {
315 evas_object_geometry_get(sd->parent, &x, &y, &w, &h); 315 evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
316 if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) 316 if (eo_isa(sd->parent, ELM_WIN_CLASS))
317 { 317 {
318 x = 0; 318 x = 0;
319 y = 0; 319 y = 0;
@@ -520,7 +520,7 @@ _hov_dismiss_cb(void *data,
520} 520}
521 521
522EOLIAN static void 522EOLIAN static void
523_elm_hover_evas_smart_add(Eo *obj, Elm_Hover_Data *priv) 523_elm_hover_evas_object_smart_add(Eo *obj, Elm_Hover_Data *priv)
524{ 524{
525 unsigned int i; 525 unsigned int i;
526 526
@@ -551,7 +551,7 @@ _elm_hover_evas_smart_add(Eo *obj, Elm_Hover_Data *priv)
551} 551}
552 552
553EOLIAN static void 553EOLIAN static void
554_elm_hover_evas_smart_del(Eo *obj, Elm_Hover_Data *sd) 554_elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data *sd)
555{ 555{
556 556
557 sd->on_del = EINA_TRUE; 557 sd->on_del = EINA_TRUE;
@@ -571,7 +571,7 @@ _elm_hover_evas_smart_del(Eo *obj, Elm_Hover_Data *sd)
571} 571}
572 572
573EOLIAN static void 573EOLIAN static void
574_elm_hover_evas_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) 574_elm_hover_evas_object_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
575{ 575{
576 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 576 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
577 577
@@ -579,7 +579,7 @@ _elm_hover_evas_smart_move(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord
579} 579}
580 580
581EOLIAN static void 581EOLIAN static void
582_elm_hover_evas_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h) 582_elm_hover_evas_object_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
583{ 583{
584 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 584 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
585 585
@@ -587,7 +587,7 @@ _elm_hover_evas_smart_resize(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED, Evas_Coor
587} 587}
588 588
589EOLIAN static void 589EOLIAN static void
590_elm_hover_evas_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) 590_elm_hover_evas_object_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
591{ 591{
592 eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); 592 eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
593 593
@@ -595,7 +595,7 @@ _elm_hover_evas_smart_show(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
595} 595}
596 596
597EOLIAN static void 597EOLIAN static void
598_elm_hover_evas_smart_hide(Eo *obj, Elm_Hover_Data *sd) 598_elm_hover_evas_object_smart_hide(Eo *obj, Elm_Hover_Data *sd)
599{ 599{
600 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 600 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
601 601
diff --git a/src/lib/elm_hover.eo b/src/lib/elm_hover.eo
index 031ad5e6b..35514e90e 100644
--- a/src/lib/elm_hover.eo
+++ b/src/lib/elm_hover.eo
@@ -71,12 +71,12 @@ class Elm_Hover (Elm_Layout, Evas_Clickable_Interface)
71 implements { 71 implements {
72 class::constructor; 72 class::constructor;
73 Eo_Base::constructor; 73 Eo_Base::constructor;
74 Evas_Smart::del; 74 Evas_Object_Smart::del;
75 Evas_Smart::hide; 75 Evas_Object_Smart::hide;
76 Evas_Smart::show; 76 Evas_Object_Smart::show;
77 Evas_Smart::move; 77 Evas_Object_Smart::move;
78 Evas_Smart::add; 78 Evas_Object_Smart::add;
79 Evas_Smart::resize; 79 Evas_Object_Smart::resize;
80 Elm_Widget::theme_apply; 80 Elm_Widget::theme_apply;
81 Elm_Widget::sub_object_add; 81 Elm_Widget::sub_object_add;
82 Elm_Widget::parent; 82 Elm_Widget::parent;
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 792b97be7..31fc38cbd 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -11,7 +11,7 @@
11#define NON_EXISTING (void *)-1 11#define NON_EXISTING (void *)-1
12static const char *icon_theme = NULL; 12static const char *icon_theme = NULL;
13 13
14#define MY_CLASS ELM_OBJ_ICON_CLASS 14#define MY_CLASS ELM_ICON_CLASS
15#define MY_CLASS_NAME "Elm_Icon" 15#define MY_CLASS_NAME "Elm_Icon"
16#define MY_CLASS_NAME_LEGACY "elm_icon" 16#define MY_CLASS_NAME_LEGACY "elm_icon"
17 17
@@ -349,7 +349,7 @@ static void
349_edje_signals_free(Elm_Icon_Data *sd) 349_edje_signals_free(Elm_Icon_Data *sd)
350{ 350{
351 Edje_Signal_Data *esd; 351 Edje_Signal_Data *esd;
352 Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_OBJ_IMAGE_CLASS); 352 Elm_Image_Data *id = eo_data_scope_get(sd->obj, ELM_IMAGE_CLASS);
353 353
354 EINA_LIST_FREE(sd->edje_signals, esd) 354 EINA_LIST_FREE(sd->edje_signals, esd)
355 { 355 {
@@ -367,7 +367,7 @@ _elm_icon_elm_image_file_set(Eo *obj, Elm_Icon_Data *sd, const char *file, const
367{ 367{
368 Evas_Object *pclip; 368 Evas_Object *pclip;
369 369
370 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); 370 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
371 371
372 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); 372 EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE);
373 373
@@ -565,7 +565,7 @@ _elm_icon_thumb_resize_cb(void *data,
565} 565}
566 566
567EOLIAN static void 567EOLIAN static void
568_elm_icon_evas_smart_add(Eo *obj, Elm_Icon_Data *priv) 568_elm_icon_evas_object_smart_add(Eo *obj, Elm_Icon_Data *priv)
569{ 569{
570 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 570 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
571 elm_widget_sub_object_parent_add(obj); 571 elm_widget_sub_object_parent_add(obj);
@@ -576,7 +576,7 @@ _elm_icon_evas_smart_add(Eo *obj, Elm_Icon_Data *priv)
576} 576}
577 577
578EOLIAN static void 578EOLIAN static void
579_elm_icon_evas_smart_del(Eo *obj, Elm_Icon_Data *sd) 579_elm_icon_evas_object_smart_del(Eo *obj, Elm_Icon_Data *sd)
580{ 580{
581 eina_stringshare_del(sd->stdicon); 581 eina_stringshare_del(sd->stdicon);
582 582
@@ -604,7 +604,7 @@ _elm_icon_signal_emit(Evas_Object *obj,
604 const char *source) 604 const char *source)
605{ 605{
606 606
607 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); 607 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
608 608
609 if (!id->edje) return; 609 if (!id->edje) return;
610 610
@@ -622,7 +622,7 @@ _elm_icon_signal_callback_add(Evas_Object *obj,
622 Edje_Signal_Data *esd; 622 Edje_Signal_Data *esd;
623 623
624 ELM_ICON_DATA_GET(obj, sd); 624 ELM_ICON_DATA_GET(obj, sd);
625 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); 625 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
626 626
627 if (!id->edje) return; 627 if (!id->edje) return;
628 628
@@ -653,7 +653,7 @@ _elm_icon_signal_callback_del(Evas_Object *obj,
653 Eina_List *l; 653 Eina_List *l;
654 654
655 ELM_ICON_DATA_GET(obj, sd); 655 ELM_ICON_DATA_GET(obj, sd);
656 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_OBJ_IMAGE_CLASS); 656 Elm_Image_Data *id = eo_data_scope_get(obj, ELM_IMAGE_CLASS);
657 657
658 if (!id->edje) return NULL; 658 if (!id->edje) return NULL;
659 659
diff --git a/src/lib/elm_icon.eo b/src/lib/elm_icon.eo
index 04bd65b26..d40f426f0 100644
--- a/src/lib/elm_icon.eo
+++ b/src/lib/elm_icon.eo
@@ -97,8 +97,8 @@ class Elm_Icon (Elm_Image)
97 implements { 97 implements {
98 class::constructor; 98 class::constructor;
99 Eo_Base::constructor; 99 Eo_Base::constructor;
100 Evas_Smart::add; 100 Evas_Object_Smart::add;
101 Evas_Smart::del; 101 Evas_Object_Smart::del;
102 Elm_Widget::theme_apply; 102 Elm_Widget::theme_apply;
103 Elm_Image::memfile::set; 103 Elm_Image::memfile::set;
104 Elm_Image::sizing_eval; 104 Elm_Image::sizing_eval;
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 7125fe3df..3a075cf94 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -12,7 +12,7 @@
12 12
13#define FMT_SIZE_T "%zu" 13#define FMT_SIZE_T "%zu"
14 14
15#define MY_CLASS ELM_OBJ_IMAGE_CLASS 15#define MY_CLASS ELM_IMAGE_CLASS
16#define MY_CLASS_NAME "Elm_Image" 16#define MY_CLASS_NAME "Elm_Image"
17#define MY_CLASS_NAME_LEGACY "elm_image" 17#define MY_CLASS_NAME_LEGACY "elm_image"
18 18
@@ -418,7 +418,7 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
418} 418}
419 419
420EOLIAN static void 420EOLIAN static void
421_elm_image_evas_smart_add(Eo *obj, Elm_Image_Data *priv) 421_elm_image_evas_object_smart_add(Eo *obj, Elm_Image_Data *priv)
422{ 422{
423 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 423 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
424 elm_widget_sub_object_parent_add(obj); 424 elm_widget_sub_object_parent_add(obj);
@@ -452,7 +452,7 @@ _elm_image_evas_smart_add(Eo *obj, Elm_Image_Data *priv)
452} 452}
453 453
454EOLIAN static void 454EOLIAN static void
455_elm_image_evas_smart_del(Eo *obj, Elm_Image_Data *sd) 455_elm_image_evas_object_smart_del(Eo *obj, Elm_Image_Data *sd)
456{ 456{
457 ecore_timer_del(sd->anim_timer); 457 ecore_timer_del(sd->anim_timer);
458 evas_object_del(sd->img); 458 evas_object_del(sd->img);
@@ -465,7 +465,7 @@ _elm_image_evas_smart_del(Eo *obj, Elm_Image_Data *sd)
465} 465}
466 466
467EOLIAN static void 467EOLIAN static void
468_elm_image_evas_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y) 468_elm_image_evas_object_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord y)
469{ 469{
470 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 470 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
471 471
@@ -478,7 +478,7 @@ _elm_image_evas_smart_move(Eo *obj, Elm_Image_Data *sd, Evas_Coord x, Evas_Coord
478} 478}
479 479
480EOLIAN static void 480EOLIAN static void
481_elm_image_evas_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h) 481_elm_image_evas_object_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coord h)
482{ 482{
483 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 483 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
484 484
@@ -492,7 +492,7 @@ _elm_image_evas_smart_resize(Eo *obj, Elm_Image_Data *sd, Evas_Coord w, Evas_Coo
492} 492}
493 493
494EOLIAN static void 494EOLIAN static void
495_elm_image_evas_smart_show(Eo *obj, Elm_Image_Data *sd) 495_elm_image_evas_object_smart_show(Eo *obj, Elm_Image_Data *sd)
496{ 496{
497 sd->show = EINA_TRUE; 497 sd->show = EINA_TRUE;
498 if (sd->preloading) return; 498 if (sd->preloading) return;
@@ -505,7 +505,7 @@ _elm_image_evas_smart_show(Eo *obj, Elm_Image_Data *sd)
505} 505}
506 506
507EOLIAN static void 507EOLIAN static void
508_elm_image_evas_smart_hide(Eo *obj, Elm_Image_Data *sd) 508_elm_image_evas_object_smart_hide(Eo *obj, Elm_Image_Data *sd)
509{ 509{
510 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 510 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
511 511
@@ -516,7 +516,7 @@ _elm_image_evas_smart_hide(Eo *obj, Elm_Image_Data *sd)
516} 516}
517 517
518EOLIAN static void 518EOLIAN static void
519_elm_image_evas_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member) 519_elm_image_evas_object_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *member)
520{ 520{
521 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 521 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
522 522
@@ -525,7 +525,7 @@ _elm_image_evas_smart_member_add(Eo *obj, Elm_Image_Data *sd, Evas_Object *membe
525} 525}
526 526
527EOLIAN static void 527EOLIAN static void
528_elm_image_evas_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a) 528_elm_image_evas_object_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b, int a)
529{ 529{
530 eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a)); 530 eo_do_super(obj, MY_CLASS, evas_obj_smart_color_set(r, g, b, a));
531 531
@@ -535,7 +535,7 @@ _elm_image_evas_smart_color_set(Eo *obj, Elm_Image_Data *sd, int r, int g, int b
535} 535}
536 536
537EOLIAN static void 537EOLIAN static void
538_elm_image_evas_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip) 538_elm_image_evas_object_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip)
539{ 539{
540 eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip)); 540 eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_set(clip));
541 541
@@ -544,7 +544,7 @@ _elm_image_evas_smart_clip_set(Eo *obj, Elm_Image_Data *sd, Evas_Object *clip)
544} 544}
545 545
546EOLIAN static void 546EOLIAN static void
547_elm_image_evas_smart_clip_unset(Eo *obj, Elm_Image_Data *sd) 547_elm_image_evas_object_smart_clip_unset(Eo *obj, Elm_Image_Data *sd)
548{ 548{
549 eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset()); 549 eo_do_super(obj, MY_CLASS, evas_obj_smart_clip_unset());
550 550
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index 5e4a49820..d234d8ad0 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -535,16 +535,16 @@ class Elm_Image (Elm_Widget, Evas_Clickable_Interface, Elm_Interface_Atspi_Image
535 implements { 535 implements {
536 class::constructor; 536 class::constructor;
537 Eo_Base::constructor; 537 Eo_Base::constructor;
538 Evas_Smart::hide; 538 Evas_Object_Smart::hide;
539 Evas_Smart::clip::set; 539 Evas_Object_Smart::clip::set;
540 Evas_Smart::clip_unset; 540 Evas_Object_Smart::clip_unset;
541 Evas_Smart::show; 541 Evas_Object_Smart::show;
542 Evas_Smart::color::set; 542 Evas_Object_Smart::color::set;
543 Evas_Smart::move; 543 Evas_Object_Smart::move;
544 Evas_Smart::add; 544 Evas_Object_Smart::add;
545 Evas_Smart::del; 545 Evas_Object_Smart::del;
546 Evas_Smart::member_add; 546 Evas_Object_Smart::member_add;
547 Evas_Smart::resize; 547 Evas_Object_Smart::resize;
548 Elm_Widget::theme_apply; 548 Elm_Widget::theme_apply;
549 Elm_Widget::event; 549 Elm_Widget::event;
550 Elm_Interface_Atspi_Image::extents::get; 550 Elm_Interface_Atspi_Image::extents::get;
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index b6c39fa33..0f32959a0 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -9,7 +9,7 @@
9#include "elm_widget_layout.h" 9#include "elm_widget_layout.h"
10#include "elm_widget_index.h" 10#include "elm_widget_index.h"
11 11
12#define MY_CLASS ELM_OBJ_INDEX_CLASS 12#define MY_CLASS ELM_INDEX_CLASS
13 13
14#define MY_CLASS_NAME "Elm_Index" 14#define MY_CLASS_NAME "Elm_Index"
15#define MY_CLASS_NAME_LEGACY "elm_index" 15#define MY_CLASS_NAME_LEGACY "elm_index"
@@ -871,7 +871,7 @@ _index_resize_cb(void *data EINA_UNUSED,
871} 871}
872 872
873EOLIAN static void 873EOLIAN static void
874_elm_index_evas_smart_add(Eo *obj, Elm_Index_Data *priv) 874_elm_index_evas_object_smart_add(Eo *obj, Elm_Index_Data *priv)
875{ 875{
876 Evas_Object *o; 876 Evas_Object *o;
877 Evas_Coord minw = 0, minh = 0; 877 Evas_Coord minw = 0, minh = 0;
@@ -949,7 +949,7 @@ _elm_index_evas_smart_add(Eo *obj, Elm_Index_Data *priv)
949} 949}
950 950
951EOLIAN static void 951EOLIAN static void
952_elm_index_evas_smart_del(Eo *obj, Elm_Index_Data *sd) 952_elm_index_evas_object_smart_del(Eo *obj, Elm_Index_Data *sd)
953{ 953{
954 Elm_Index_Omit *o; 954 Elm_Index_Omit *o;
955 955
diff --git a/src/lib/elm_index.eo b/src/lib/elm_index.eo
index fa25c1bbb..34f71225d 100644
--- a/src/lib/elm_index.eo
+++ b/src/lib/elm_index.eo
@@ -349,8 +349,8 @@ class Elm_Index (Elm_Layout)
349 implements { 349 implements {
350 class::constructor; 350 class::constructor;
351 Eo_Base::constructor; 351 Eo_Base::constructor;
352 Evas_Smart::add; 352 Evas_Object_Smart::add;
353 Evas_Smart::del; 353 Evas_Object_Smart::del;
354 Elm_Widget::theme_apply; 354 Elm_Widget::theme_apply;
355 Elm_Widget::focus_next_manager_is; 355 Elm_Widget::focus_next_manager_is;
356 Elm_Widget::focus_direction_manager_is; 356 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_interface_atspi_widget.c b/src/lib/elm_interface_atspi_widget.c
index a8a814383..1679b26c3 100644
--- a/src/lib/elm_interface_atspi_widget.c
+++ b/src/lib/elm_interface_atspi_widget.c
@@ -38,7 +38,7 @@ _elm_interface_atspi_widget_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Interfa
38 pd->role = ELM_ATSPI_ROLE_UNKNOWN; 38 pd->role = ELM_ATSPI_ROLE_UNKNOWN;
39 39
40 // Elm_Widget_Access_Object can only be constructed on top of Elm_Widget 40 // Elm_Widget_Access_Object can only be constructed on top of Elm_Widget
41 assert(eo_isa(obj, ELM_OBJ_WIDGET_CLASS)); 41 assert(eo_isa(obj, ELM_WIDGET_CLASS));
42 42
43 evas_object_smart_callback_add(obj, "focused", _on_focus_change, (void*)1); 43 evas_object_smart_callback_add(obj, "focused", _on_focus_change, (void*)1);
44 evas_object_smart_callback_add(obj, "unfocused", _on_focus_change, NULL); 44 evas_object_smart_callback_add(obj, "unfocused", _on_focus_change, NULL);
@@ -109,7 +109,7 @@ _elm_interface_atspi_widget_elm_interface_atspi_accessible_children_get(Eo *obj
109 Elm_Widget_Smart_Data *wd; 109 Elm_Widget_Smart_Data *wd;
110 Evas_Object *widget; 110 Evas_Object *widget;
111 111
112 wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); 112 wd = eo_data_scope_get(obj, ELM_WIDGET_CLASS);
113 if (!wd) return NULL; 113 if (!wd) return NULL;
114 114
115 EINA_LIST_FOREACH(wd->subobjs, l, widget) 115 EINA_LIST_FOREACH(wd->subobjs, l, widget)
diff --git a/src/lib/elm_interface_atspi_widget_action.c b/src/lib/elm_interface_atspi_widget_action.c
index 15caf0252..af2a05274 100644
--- a/src/lib/elm_interface_atspi_widget_action.c
+++ b/src/lib/elm_interface_atspi_widget_action.c
@@ -49,7 +49,7 @@ _elm_interface_atspi_widget_action_elm_interface_atspi_action_keybinding_get(Eo
49 Elm_Config_Binding_Key *binding; 49 Elm_Config_Binding_Key *binding;
50 int tmp = 0; 50 int tmp = 0;
51 51
52 if (!eo_isa(obj, ELM_OBJ_WIDGET_CLASS)) 52 if (!eo_isa(obj, ELM_WIDGET_CLASS))
53 return NULL; 53 return NULL;
54 54
55 eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get()); 55 eo_do(obj, actions = elm_interface_atspi_widget_action_elm_actions_get());
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index d62002322..c080d6e00 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_interface_scrollable.h" 8#include "elm_interface_scrollable.h"
9 9
10#define MY_PAN_CLASS ELM_OBJ_PAN_CLASS 10#define MY_PAN_CLASS ELM_PAN_CLASS
11 11
12#define MY_PAN_CLASS_NAME "Elm_Pan" 12#define MY_PAN_CLASS_NAME "Elm_Pan"
13#define MY_PAN_CLASS_NAME_LEGACY "elm_pan" 13#define MY_PAN_CLASS_NAME_LEGACY "elm_pan"
@@ -86,7 +86,7 @@ _elm_pan_update(Elm_Pan_Smart_Data *psd)
86} 86}
87 87
88EOLIAN static void 88EOLIAN static void
89_elm_pan_evas_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv) 89_elm_pan_evas_object_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
90{ 90{
91 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_add()); 91 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_add());
92 92
@@ -94,7 +94,7 @@ _elm_pan_evas_smart_add(Eo *obj, Elm_Pan_Smart_Data *priv)
94} 94}
95 95
96EOLIAN static void 96EOLIAN static void
97_elm_pan_evas_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) 97_elm_pan_evas_object_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
98{ 98{
99 _elm_pan_content_set(obj, NULL); 99 _elm_pan_content_set(obj, NULL);
100 100
@@ -102,7 +102,7 @@ _elm_pan_evas_smart_del(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
102} 102}
103 103
104EOLIAN static void 104EOLIAN static void
105_elm_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y) 105_elm_pan_evas_object_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord x, Evas_Coord y)
106{ 106{
107 psd->x = x; 107 psd->x = x;
108 psd->y = y; 108 psd->y = y;
@@ -111,7 +111,7 @@ _elm_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coor
111} 111}
112 112
113EOLIAN static void 113EOLIAN static void
114_elm_pan_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h) 114_elm_pan_evas_object_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Coord w, Evas_Coord h)
115{ 115{
116 psd->w = w; 116 psd->w = w;
117 psd->h = h; 117 psd->h = h;
@@ -121,7 +121,7 @@ _elm_pan_evas_smart_resize(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, Evas_Co
121} 121}
122 122
123EOLIAN static void 123EOLIAN static void
124_elm_pan_evas_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd) 124_elm_pan_evas_object_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
125{ 125{
126 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_show()); 126 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_show());
127 127
@@ -130,7 +130,7 @@ _elm_pan_evas_smart_show(Eo *obj, Elm_Pan_Smart_Data *psd)
130} 130}
131 131
132EOLIAN static void 132EOLIAN static void
133_elm_pan_evas_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd) 133_elm_pan_evas_object_smart_hide(Eo *obj, Elm_Pan_Smart_Data *psd)
134{ 134{
135 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_hide()); 135 eo_do_super(obj, MY_PAN_CLASS, evas_obj_smart_hide());
136 136
@@ -4291,7 +4291,7 @@ _elm_interface_scrollable_movement_block_get(Eo *obj EINA_UNUSED, Elm_Scrollable
4291} 4291}
4292 4292
4293EOLIAN static void 4293EOLIAN static void
4294_elm_interface_scrollable_evas_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) 4294_elm_interface_scrollable_evas_object_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
4295{ 4295{
4296 memset(sid, 0, sizeof(*sid)); 4296 memset(sid, 0, sizeof(*sid));
4297 4297
@@ -4326,7 +4326,7 @@ _elm_interface_scrollable_evas_smart_add(Eo *obj, Elm_Scrollable_Smart_Interface
4326} 4326}
4327 4327
4328EOLIAN static void 4328EOLIAN static void
4329_elm_interface_scrollable_evas_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid) 4329_elm_interface_scrollable_evas_object_smart_del(Eo *obj, Elm_Scrollable_Smart_Interface_Data *sid)
4330{ 4330{
4331 4331
4332 eo_do_super(obj, MY_SCROLLABLE_INTERFACE, evas_obj_smart_del()); 4332 eo_do_super(obj, MY_SCROLLABLE_INTERFACE, evas_obj_smart_del());
diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo
index 15af4c3b3..7339d7337 100644
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -1,4 +1,4 @@
1mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Smart) 1mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Object_Smart)
2{ 2{
3 legacy_prefix: null; 3 legacy_prefix: null;
4 eo_prefix: elm_interface_scrollable; 4 eo_prefix: elm_interface_scrollable;
@@ -514,8 +514,8 @@ mixin Elm_Interface_Scrollable(Evas_Scrollable_Interface, Evas_Smart)
514 implements { 514 implements {
515 Eo_Base::constructor; 515 Eo_Base::constructor;
516 class::constructor; 516 class::constructor;
517 Evas_Smart::add; 517 Evas_Object_Smart::add;
518 Evas_Smart::del; 518 Evas_Object_Smart::del;
519 } 519 }
520 events { 520 events {
521 changed; 521 changed;
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index 422f926e7..2e6cecd0e 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -8,7 +8,7 @@
8#include "elm_widget_inwin.h" 8#include "elm_widget_inwin.h"
9#include "elm_widget_layout.h" 9#include "elm_widget_layout.h"
10 10
11#define MY_CLASS ELM_OBJ_WIN_INWIN_CLASS 11#define MY_CLASS ELM_INWIN_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Inwin" 13#define MY_CLASS_NAME "Elm_Inwin"
14#define MY_CLASS_NAME_LEGACY "elm_inwin" 14#define MY_CLASS_NAME_LEGACY "elm_inwin"
@@ -63,7 +63,7 @@ _elm_inwin_elm_widget_focus_next(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Elm
63} 63}
64 64
65EOLIAN static void 65EOLIAN static void
66_elm_inwin_evas_smart_add(Eo *obj, void *_pd EINA_UNUSED) 66_elm_inwin_evas_object_smart_add(Eo *obj, void *_pd EINA_UNUSED)
67{ 67{
68 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 68 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
69 elm_widget_sub_object_parent_add(obj); 69 elm_widget_sub_object_parent_add(obj);
@@ -107,7 +107,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
107 107
108 eo_do(obj, parent = eo_parent_get()); 108 eo_do(obj, parent = eo_parent_get());
109 109
110 if (parent && !eo_isa(parent, ELM_OBJ_WIN_CLASS)) 110 if (parent && !eo_isa(parent, ELM_WIN_CLASS))
111 { 111 {
112 eo_error_set(obj); /* *has* to have a parent window */ 112 eo_error_set(obj); /* *has* to have a parent window */
113 return; 113 return;
diff --git a/src/lib/elm_inwin.eo b/src/lib/elm_inwin.eo
index 276b2517a..82e78df1c 100644
--- a/src/lib/elm_inwin.eo
+++ b/src/lib/elm_inwin.eo
@@ -23,7 +23,7 @@ class Elm_Inwin (Elm_Layout)
23 implements { 23 implements {
24 class::constructor; 24 class::constructor;
25 Eo_Base::constructor; 25 Eo_Base::constructor;
26 Evas_Smart::add; 26 Evas_Object_Smart::add;
27 Elm_Widget::parent::set; 27 Elm_Widget::parent::set;
28 Elm_Widget::focus_next_manager_is; 28 Elm_Widget::focus_next_manager_is;
29 Elm_Widget::focus_next; 29 Elm_Widget::focus_next;
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 2dd7046f6..7f06430ee 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -8,7 +8,7 @@
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9#include "elm_widget_label.h" 9#include "elm_widget_label.h"
10 10
11#define MY_CLASS ELM_OBJ_LABEL_CLASS 11#define MY_CLASS ELM_LABEL_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Label" 13#define MY_CLASS_NAME "Elm_Label"
14#define MY_CLASS_NAME_LEGACY "elm_label" 14#define MY_CLASS_NAME_LEGACY "elm_label"
@@ -353,7 +353,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
353} 353}
354 354
355EOLIAN static void 355EOLIAN static void
356_elm_label_evas_smart_add(Eo *obj, Elm_Label_Data *priv) 356_elm_label_evas_object_smart_add(Eo *obj, Elm_Label_Data *priv)
357{ 357{
358 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 358 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
359 359
diff --git a/src/lib/elm_label.eo b/src/lib/elm_label.eo
index ee7de19f9..524bb3367 100644
--- a/src/lib/elm_label.eo
+++ b/src/lib/elm_label.eo
@@ -190,7 +190,7 @@ class Elm_Label (Elm_Layout)
190 implements { 190 implements {
191 class::constructor; 191 class::constructor;
192 Eo_Base::constructor; 192 Eo_Base::constructor;
193 Evas_Smart::add; 193 Evas_Object_Smart::add;
194 Elm_Widget::focus_next_manager_is; 194 Elm_Widget::focus_next_manager_is;
195 Elm_Widget::focus_direction_manager_is; 195 Elm_Widget::focus_direction_manager_is;
196 Elm_Widget::theme_apply; 196 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index d6fa3fc65..9f439338e 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9 9
10#define MY_CLASS ELM_OBJ_LAYOUT_CLASS 10#define MY_CLASS ELM_LAYOUT_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Layout" 12#define MY_CLASS_NAME "Elm_Layout"
13#define MY_CLASS_NAME_LEGACY "elm_layout" 13#define MY_CLASS_NAME_LEGACY "elm_layout"
@@ -729,7 +729,7 @@ _on_size_evaluate_signal(void *data,
729} 729}
730 730
731EOLIAN static void 731EOLIAN static void
732_elm_layout_evas_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED) 732_elm_layout_evas_object_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
733{ 733{
734 Evas_Object *edje; 734 Evas_Object *edje;
735 735
@@ -750,7 +750,7 @@ _elm_layout_evas_smart_add(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
750} 750}
751 751
752EOLIAN static void 752EOLIAN static void
753_elm_layout_evas_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd) 753_elm_layout_evas_object_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
754{ 754{
755 Elm_Layout_Sub_Object_Data *sub_d; 755 Elm_Layout_Sub_Object_Data *sub_d;
756 Elm_Layout_Sub_Object_Cursor *pc; 756 Elm_Layout_Sub_Object_Cursor *pc;
@@ -808,7 +808,7 @@ _elm_layout_evas_smart_del(Eo *obj, Elm_Layout_Smart_Data *sd)
808/* rewrite or extend this one on your derived class as to suit your 808/* rewrite or extend this one on your derived class as to suit your
809 * needs */ 809 * needs */
810EOLIAN static void 810EOLIAN static void
811_elm_layout_evas_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd) 811_elm_layout_evas_object_smart_calculate(Eo *obj, Elm_Layout_Smart_Data *sd)
812{ 812{
813 if (sd->needs_size_calc) 813 if (sd->needs_size_calc)
814 { 814 {
@@ -1672,7 +1672,7 @@ _elm_layout_eo_base_dbg_info_get(Eo *eo_obj, Elm_Layout_Smart_Data *_pd EINA_UNU
1672 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); 1672 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
1673 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd); 1673 ELM_WIDGET_DATA_GET_OR_RETURN(eo_obj, wd);
1674 1674
1675 if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_OBJ_CLASS)) 1675 if (wd->resize_obj && eo_isa(wd->resize_obj, EDJE_CLASS))
1676 { 1676 {
1677 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 1677 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
1678 const char *file, *edje_group; 1678 const char *file, *edje_group;
diff --git a/src/lib/elm_layout.eo b/src/lib/elm_layout.eo
index 0cb8d878e..54ff1acce 100644
--- a/src/lib/elm_layout.eo
+++ b/src/lib/elm_layout.eo
@@ -652,9 +652,9 @@ class Elm_Layout (Elm_Container)
652 class::constructor; 652 class::constructor;
653 Eo_Base::constructor; 653 Eo_Base::constructor;
654 Eo_Base::dbg_info_get; 654 Eo_Base::dbg_info_get;
655 Evas_Smart::del; 655 Evas_Object_Smart::del;
656 Evas_Smart::add; 656 Evas_Object_Smart::add;
657 Evas_Smart::calculate; 657 Evas_Object_Smart::calculate;
658 Elm_Widget::focus_direction; 658 Elm_Widget::focus_direction;
659 Elm_Widget::sub_object_add; 659 Elm_Widget::sub_object_add;
660 Elm_Widget::theme_apply; 660 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4eaa8e16e..eb48c4da8 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -8,7 +8,7 @@
8#include "elm_widget_list.h" 8#include "elm_widget_list.h"
9#include "elm_interface_scrollable.h" 9#include "elm_interface_scrollable.h"
10 10
11#define MY_CLASS ELM_OBJ_LIST_CLASS 11#define MY_CLASS ELM_LIST_CLASS
12 12
13#define MY_CLASS_NAME "Elm_List" 13#define MY_CLASS_NAME "Elm_List"
14#define MY_CLASS_NAME_LEGACY "elm_list" 14#define MY_CLASS_NAME_LEGACY "elm_list"
@@ -2202,7 +2202,7 @@ _elm_list_elm_widget_focus_next(Eo *obj, Elm_List_Data *sd, Elm_Focus_Direction
2202} 2202}
2203 2203
2204EOLIAN static void 2204EOLIAN static void
2205_elm_list_evas_smart_add(Eo *obj, Elm_List_Data *priv) 2205_elm_list_evas_object_smart_add(Eo *obj, Elm_List_Data *priv)
2206{ 2206{
2207 Evas_Coord minw, minh; 2207 Evas_Coord minw, minh;
2208 2208
@@ -2268,7 +2268,7 @@ _elm_list_evas_smart_add(Eo *obj, Elm_List_Data *priv)
2268} 2268}
2269 2269
2270EOLIAN static void 2270EOLIAN static void
2271_elm_list_evas_smart_del(Eo *obj, Elm_List_Data *sd) 2271_elm_list_evas_object_smart_del(Eo *obj, Elm_List_Data *sd)
2272{ 2272{
2273 const Eina_List *l; 2273 const Eina_List *l;
2274 Elm_List_Item *it; 2274 Elm_List_Item *it;
@@ -2315,7 +2315,7 @@ _elm_list_evas_smart_del(Eo *obj, Elm_List_Data *sd)
2315} 2315}
2316 2316
2317EOLIAN static void 2317EOLIAN static void
2318_elm_list_evas_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y) 2318_elm_list_evas_object_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y)
2319{ 2319{
2320 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 2320 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
2321 2321
@@ -2323,7 +2323,7 @@ _elm_list_evas_smart_move(Eo *obj, Elm_List_Data *sd, Evas_Coord x, Evas_Coord y
2323} 2323}
2324 2324
2325EOLIAN static void 2325EOLIAN static void
2326_elm_list_evas_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h) 2326_elm_list_evas_object_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord h)
2327{ 2327{
2328 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 2328 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
2329 2329
@@ -2331,7 +2331,7 @@ _elm_list_evas_smart_resize(Eo *obj, Elm_List_Data *sd, Evas_Coord w, Evas_Coord
2331} 2331}
2332 2332
2333EOLIAN static void 2333EOLIAN static void
2334_elm_list_evas_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member) 2334_elm_list_evas_object_smart_member_add(Eo *obj, Elm_List_Data *sd, Evas_Object *member)
2335{ 2335{
2336 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 2336 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
2337 2337
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 1cef44557..95650032f 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -588,11 +588,11 @@ class Elm_List (Elm_Layout, Elm_Interface_Scrollable)
588 implements { 588 implements {
589 class::constructor; 589 class::constructor;
590 Eo_Base::constructor; 590 Eo_Base::constructor;
591 Evas_Smart::member_add; 591 Evas_Object_Smart::member_add;
592 Evas_Smart::move; 592 Evas_Object_Smart::move;
593 Evas_Smart::add; 593 Evas_Object_Smart::add;
594 Evas_Smart::del; 594 Evas_Object_Smart::del;
595 Evas_Smart::resize; 595 Evas_Object_Smart::resize;
596 Elm_Widget::theme_apply; 596 Elm_Widget::theme_apply;
597 Elm_Widget::focus_next_manager_is; 597 Elm_Widget::focus_next_manager_is;
598 Elm_Widget::focus_direction_manager_is; 598 Elm_Widget::focus_direction_manager_is;
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index d66087409..69c5cae11 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -8,12 +8,12 @@
8#include "elm_widget_map.h" 8#include "elm_widget_map.h"
9#include "elm_interface_scrollable.h" 9#include "elm_interface_scrollable.h"
10 10
11#define MY_PAN_CLASS ELM_OBJ_MAP_PAN_CLASS 11#define MY_PAN_CLASS ELM_MAP_PAN_CLASS
12 12
13#define MY_PAN_CLASS_NAME "Elm_Map_Pan" 13#define MY_PAN_CLASS_NAME "Elm_Map_Pan"
14#define MY_PAN_CLASS_NAME_LEGACY "elm_map_pan" 14#define MY_PAN_CLASS_NAME_LEGACY "elm_map_pan"
15 15
16#define MY_CLASS ELM_OBJ_MAP_CLASS 16#define MY_CLASS ELM_MAP_CLASS
17 17
18#define MY_CLASS_NAME "Elm_Map" 18#define MY_CLASS_NAME "Elm_Map"
19#define MY_CLASS_NAME_LEGACY "elm_map" 19#define MY_CLASS_NAME_LEGACY "elm_map"
@@ -3814,7 +3814,7 @@ _elm_map_pan_elm_pan_content_size_get(Eo *obj EINA_UNUSED, Elm_Map_Pan_Data *psd
3814} 3814}
3815 3815
3816EOLIAN static void 3816EOLIAN static void
3817_elm_map_pan_evas_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED) 3817_elm_map_pan_evas_object_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA_UNUSED, Evas_Coord h EINA_UNUSED)
3818{ 3818{
3819 _sizing_eval(psd->wsd->obj); 3819 _sizing_eval(psd->wsd->obj);
3820 elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode); 3820 elm_map_zoom_mode_set(psd->wobj, psd->wsd->mode);
@@ -3822,7 +3822,7 @@ _elm_map_pan_evas_smart_resize(Eo *obj, Elm_Map_Pan_Data *psd, Evas_Coord w EINA
3822} 3822}
3823 3823
3824EOLIAN static void 3824EOLIAN static void
3825_elm_map_pan_evas_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd) 3825_elm_map_pan_evas_object_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
3826{ 3826{
3827 Evas_Coord w, h; 3827 Evas_Coord w, h;
3828 3828
@@ -3836,7 +3836,7 @@ _elm_map_pan_evas_smart_calculate(Eo *obj, Elm_Map_Pan_Data *psd)
3836} 3836}
3837 3837
3838EOLIAN static void 3838EOLIAN static void
3839_elm_map_pan_evas_smart_move(Eo *obj, Elm_Map_Pan_Data *_pd EINA_UNUSED, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) 3839_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)
3840{ 3840{
3841 evas_object_smart_changed(obj); 3841 evas_object_smart_changed(obj);
3842} 3842}
@@ -3986,7 +3986,7 @@ _elm_map_elm_widget_event(Eo *obj, Elm_Map_Data *sd EINA_UNUSED, Evas_Object *sr
3986} 3986}
3987 3987
3988EOLIAN static void 3988EOLIAN static void
3989_elm_map_evas_smart_add(Eo *obj, Elm_Map_Data *priv) 3989_elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
3990{ 3990{
3991 Evas_Coord minw, minh; 3991 Evas_Coord minw, minh;
3992 Elm_Map_Pan_Data *pan_data; 3992 Elm_Map_Pan_Data *pan_data;
@@ -4095,7 +4095,7 @@ _elm_map_evas_smart_add(Eo *obj, Elm_Map_Data *priv)
4095} 4095}
4096 4096
4097EOLIAN static void 4097EOLIAN static void
4098_elm_map_evas_smart_del(Eo *obj, Elm_Map_Data *sd) 4098_elm_map_evas_object_smart_del(Eo *obj, Elm_Map_Data *sd)
4099{ 4099{
4100 Elm_Map_Route *r; 4100 Elm_Map_Route *r;
4101 Elm_Map_Name *na; 4101 Elm_Map_Name *na;
@@ -4156,7 +4156,7 @@ _elm_map_evas_smart_del(Eo *obj, Elm_Map_Data *sd)
4156} 4156}
4157 4157
4158EOLIAN static void 4158EOLIAN static void
4159_elm_map_evas_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y) 4159_elm_map_evas_object_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
4160{ 4160{
4161 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 4161 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
4162 4162
@@ -4164,7 +4164,7 @@ _elm_map_evas_smart_move(Eo *obj, Elm_Map_Data *sd, Evas_Coord x, Evas_Coord y)
4164} 4164}
4165 4165
4166EOLIAN static void 4166EOLIAN static void
4167_elm_map_evas_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h) 4167_elm_map_evas_object_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h)
4168{ 4168{
4169 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 4169 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
4170 4170
@@ -4172,7 +4172,7 @@ _elm_map_evas_smart_resize(Eo *obj, Elm_Map_Data *sd, Evas_Coord w, Evas_Coord h
4172} 4172}
4173 4173
4174EOLIAN static void 4174EOLIAN static void
4175_elm_map_evas_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member) 4175_elm_map_evas_object_smart_member_add(Eo *obj, Elm_Map_Data *sd, Evas_Object *member)
4176{ 4176{
4177 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member)); 4177 eo_do_super(obj, MY_CLASS, evas_obj_smart_member_add(member));
4178 4178
diff --git a/src/lib/elm_map.eo b/src/lib/elm_map.eo
index 847a2518c..f71e8c0aa 100644
--- a/src/lib/elm_map.eo
+++ b/src/lib/elm_map.eo
@@ -766,11 +766,11 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
766 implements { 766 implements {
767 class::constructor; 767 class::constructor;
768 Eo_Base::constructor; 768 Eo_Base::constructor;
769 Evas_Smart::move; 769 Evas_Object_Smart::move;
770 Evas_Smart::add; 770 Evas_Object_Smart::add;
771 Evas_Smart::del; 771 Evas_Object_Smart::del;
772 Evas_Smart::member_add; 772 Evas_Object_Smart::member_add;
773 Evas_Smart::resize; 773 Evas_Object_Smart::resize;
774 Elm_Widget::theme_apply; 774 Elm_Widget::theme_apply;
775 Elm_Widget::on_focus; 775 Elm_Widget::on_focus;
776 Elm_Widget::event; 776 Elm_Widget::event;
diff --git a/src/lib/elm_map_pan.eo b/src/lib/elm_map_pan.eo
index e24b884ce..316bb2919 100644
--- a/src/lib/elm_map_pan.eo
+++ b/src/lib/elm_map_pan.eo
@@ -4,9 +4,9 @@ class Elm_Map_Pan (Elm_Pan)
4 implements { 4 implements {
5 class::constructor; 5 class::constructor;
6 Eo_Base::destructor; 6 Eo_Base::destructor;
7 Evas_Smart::calculate; 7 Evas_Object_Smart::calculate;
8 Evas_Smart::move; 8 Evas_Object_Smart::move;
9 Evas_Smart::resize; 9 Evas_Object_Smart::resize;
10 Elm_Pan::content_size::get; 10 Elm_Pan::content_size::get;
11 Elm_Pan::pos; 11 Elm_Pan::pos;
12 Elm_Pan::pos_min::get; 12 Elm_Pan::pos_min::get;
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index a2324a861..c75b57192 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -8,7 +8,7 @@
8#include "elm_widget_mapbuf.h" 8#include "elm_widget_mapbuf.h"
9#include "elm_widget_container.h" 9#include "elm_widget_container.h"
10 10
11#define MY_CLASS ELM_OBJ_MAPBUF_CLASS 11#define MY_CLASS ELM_MAPBUF_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Mapbuf" 13#define MY_CLASS_NAME "Elm_Mapbuf"
14#define MY_CLASS_NAME_LEGACY "elm_mapbuf" 14#define MY_CLASS_NAME_LEGACY "elm_mapbuf"
@@ -150,7 +150,7 @@ _mapbuf_auto_smooth(Evas_Object *obj EINA_UNUSED, Elm_Mapbuf_Data *sd)
150} 150}
151 151
152EOLIAN static void 152EOLIAN static void
153_elm_mapbuf_evas_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y) 153_elm_mapbuf_evas_object_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coord y)
154{ 154{
155 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 155 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
156 156
@@ -160,7 +160,7 @@ _elm_mapbuf_evas_smart_move(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord x, Evas_Coo
160} 160}
161 161
162EOLIAN static void 162EOLIAN static void
163_elm_mapbuf_evas_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h) 163_elm_mapbuf_evas_object_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_Coord h)
164{ 164{
165 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 165 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
166 166
@@ -170,7 +170,7 @@ _elm_mapbuf_evas_smart_resize(Eo *obj, Elm_Mapbuf_Data *sd, Evas_Coord w, Evas_C
170} 170}
171 171
172EOLIAN static void 172EOLIAN static void
173_elm_mapbuf_evas_smart_show(Eo *obj, Elm_Mapbuf_Data *sd) 173_elm_mapbuf_evas_object_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
174{ 174{
175 eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); 175 eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
176 176
@@ -179,7 +179,7 @@ _elm_mapbuf_evas_smart_show(Eo *obj, Elm_Mapbuf_Data *sd)
179} 179}
180 180
181EOLIAN static void 181EOLIAN static void
182_elm_mapbuf_evas_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd) 182_elm_mapbuf_evas_object_smart_hide(Eo *obj, Elm_Mapbuf_Data *sd)
183{ 183{
184 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 184 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
185 185
@@ -240,7 +240,7 @@ _elm_mapbuf_elm_container_content_unset(Eo *obj, Elm_Mapbuf_Data *sd, const char
240} 240}
241 241
242EOLIAN static void 242EOLIAN static void
243_elm_mapbuf_evas_smart_del(Eo *obj, Elm_Mapbuf_Data *priv) 243_elm_mapbuf_evas_object_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
244{ 244{
245 ELM_SAFE_FREE(priv->idler, ecore_idler_del); 245 ELM_SAFE_FREE(priv->idler, ecore_idler_del);
246 ELM_SAFE_FREE(priv->map, evas_map_free); 246 ELM_SAFE_FREE(priv->map, evas_map_free);
@@ -249,7 +249,7 @@ _elm_mapbuf_evas_smart_del(Eo *obj, Elm_Mapbuf_Data *priv)
249} 249}
250 250
251EOLIAN static void 251EOLIAN static void
252_elm_mapbuf_evas_smart_add(Eo *obj, Elm_Mapbuf_Data *priv) 252_elm_mapbuf_evas_object_smart_add(Eo *obj, Elm_Mapbuf_Data *priv)
253{ 253{
254 Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 254 Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj));
255 int i; 255 int i;
diff --git a/src/lib/elm_mapbuf.eo b/src/lib/elm_mapbuf.eo
index 37ba8b1bf..920cd1d4f 100644
--- a/src/lib/elm_mapbuf.eo
+++ b/src/lib/elm_mapbuf.eo
@@ -178,12 +178,12 @@ class Elm_Mapbuf (Elm_Container)
178 implements { 178 implements {
179 class::constructor; 179 class::constructor;
180 Eo_Base::constructor; 180 Eo_Base::constructor;
181 Evas_Smart::hide; 181 Evas_Object_Smart::hide;
182 Evas_Smart::show; 182 Evas_Object_Smart::show;
183 Evas_Smart::move; 183 Evas_Object_Smart::move;
184 Evas_Smart::add; 184 Evas_Object_Smart::add;
185 Evas_Smart::del; 185 Evas_Object_Smart::del;
186 Evas_Smart::resize; 186 Evas_Object_Smart::resize;
187 Elm_Widget::theme_apply; 187 Elm_Widget::theme_apply;
188 Elm_Widget::sub_object_del; 188 Elm_Widget::sub_object_del;
189 Elm_Container::content_get; 189 Elm_Container::content_get;
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 8dff13018..aa4c02582 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_menu.h" 8#include "elm_widget_menu.h"
9 9
10#define MY_CLASS ELM_OBJ_MENU_CLASS 10#define MY_CLASS ELM_MENU_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Menu" 12#define MY_CLASS_NAME "Elm_Menu"
13#define MY_CLASS_NAME_LEGACY "elm_menu" 13#define MY_CLASS_NAME_LEGACY "elm_menu"
@@ -103,7 +103,7 @@ _submenu_sizing_eval(Elm_Menu_Item *parent_it)
103 evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2); 103 evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2);
104 evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh); 104 evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh);
105 evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph); 105 evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph);
106 if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) 106 if (eo_isa(sd->parent, ELM_WIN_CLASS))
107 { 107 {
108 px = 0; 108 px = 0;
109 py = 0; 109 py = 0;
@@ -165,7 +165,7 @@ _sizing_eval(Evas_Object *obj)
165 165
166 evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p); 166 evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
167 evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2); 167 evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
168 if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) 168 if (eo_isa(sd->parent, ELM_WIN_CLASS))
169 { 169 {
170 x2 = 0; 170 x2 = 0;
171 y2 = 0; 171 y2 = 0;
@@ -189,7 +189,7 @@ _sizing_eval(Evas_Object *obj)
189 evas_object_size_hint_max_set(sd->location, bw, h_p); 189 evas_object_size_hint_max_set(sd->location, bw, h_p);
190 elm_hover_target_set(sd->hv, sd->location); 190 elm_hover_target_set(sd->hv, sd->location);
191 191
192 hover = eo_data_scope_get(sd->hv, ELM_OBJ_WIDGET_CLASS); 192 hover = eo_data_scope_get(sd->hv, ELM_WIDGET_CLASS);
193 edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL, 193 edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL,
194 NULL, &bw, &bh); 194 NULL, &bw, &bh);
195 evas_object_size_hint_min_set(obj, bw, bh); 195 evas_object_size_hint_min_set(obj, bw, bh);
@@ -522,7 +522,7 @@ _unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNU
522} 522}
523 523
524EOLIAN static void 524EOLIAN static void
525_elm_menu_evas_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd) 525_elm_menu_evas_object_smart_show(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
526{ 526{
527 evas_object_show(sd->hv); 527 evas_object_show(sd->hv);
528} 528}
@@ -634,7 +634,7 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
634} 634}
635 635
636EOLIAN static void 636EOLIAN static void
637_elm_menu_evas_smart_add(Eo *obj, Elm_Menu_Data *priv) 637_elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data *priv)
638{ 638{
639 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 639 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
640 elm_widget_sub_object_parent_add(obj); 640 elm_widget_sub_object_parent_add(obj);
@@ -660,7 +660,7 @@ _elm_menu_evas_smart_add(Eo *obj, Elm_Menu_Data *priv)
660} 660}
661 661
662EOLIAN static void 662EOLIAN static void
663_elm_menu_evas_smart_del(Eo *obj, Elm_Menu_Data *sd) 663_elm_menu_evas_object_smart_del(Eo *obj, Elm_Menu_Data *sd)
664{ 664{
665 Elm_Menu_Item *item; 665 Elm_Menu_Item *item;
666 666
diff --git a/src/lib/elm_menu.eo b/src/lib/elm_menu.eo
index 4dba00703..a13bd077f 100644
--- a/src/lib/elm_menu.eo
+++ b/src/lib/elm_menu.eo
@@ -115,9 +115,9 @@ class Elm_Menu (Elm_Widget, Evas_Clickable_Interface)
115 implements { 115 implements {
116 class::constructor; 116 class::constructor;
117 Eo_Base::constructor; 117 Eo_Base::constructor;
118 Evas_Smart::show; 118 Evas_Object_Smart::show;
119 Evas_Smart::add; 119 Evas_Object_Smart::add;
120 Evas_Smart::del; 120 Evas_Object_Smart::del;
121 Elm_Widget::parent; 121 Elm_Widget::parent;
122 Elm_Widget::theme_apply; 122 Elm_Widget::theme_apply;
123 Elm_Widget::translate; 123 Elm_Widget::translate;
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 7eab484b2..0a78b0e4f 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -8,7 +8,7 @@
8#include "elm_widget_notify.h" 8#include "elm_widget_notify.h"
9#include "elm_widget_container.h" 9#include "elm_widget_container.h"
10 10
11#define MY_CLASS ELM_OBJ_NOTIFY_CLASS 11#define MY_CLASS ELM_NOTIFY_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Notify" 13#define MY_CLASS_NAME "Elm_Notify"
14#define MY_CLASS_NAME_LEGACY "elm_notify" 14#define MY_CLASS_NAME_LEGACY "elm_notify"
@@ -112,7 +112,7 @@ _sizing_eval(Evas_Object *obj)
112 112
113 if (!sd->parent) return; 113 if (!sd->parent) return;
114 evas_object_geometry_get(sd->parent, &x, &y, &w, &h); 114 evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
115 if (eo_isa(sd->parent, ELM_OBJ_WIN_CLASS)) 115 if (eo_isa(sd->parent, ELM_WIN_CLASS))
116 { 116 {
117 x = 0; 117 x = 0;
118 y = 0; 118 y = 0;
@@ -214,7 +214,7 @@ _restack_cb(void *data EINA_UNUSED,
214} 214}
215 215
216EOLIAN static void 216EOLIAN static void
217_elm_notify_evas_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h) 217_elm_notify_evas_object_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord w, Evas_Coord h)
218{ 218{
219 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); 219 eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h));
220 220
@@ -222,7 +222,7 @@ _elm_notify_evas_smart_resize(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coo
222} 222}
223 223
224EOLIAN static void 224EOLIAN static void
225_elm_notify_evas_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y) 225_elm_notify_evas_object_smart_move(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
226{ 226{
227 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y)); 227 eo_do_super(obj, MY_CLASS, evas_obj_smart_move(x, y));
228 228
@@ -268,7 +268,7 @@ _timer_init(Evas_Object *obj,
268} 268}
269 269
270EOLIAN static void 270EOLIAN static void
271_elm_notify_evas_smart_show(Eo *obj, Elm_Notify_Data *sd) 271_elm_notify_evas_object_smart_show(Eo *obj, Elm_Notify_Data *sd)
272{ 272{
273 sd->had_hidden = EINA_FALSE; 273 sd->had_hidden = EINA_FALSE;
274 sd->in_timeout = EINA_FALSE; 274 sd->in_timeout = EINA_FALSE;
@@ -281,7 +281,7 @@ _elm_notify_evas_smart_show(Eo *obj, Elm_Notify_Data *sd)
281} 281}
282 282
283EOLIAN static void 283EOLIAN static void
284_elm_notify_evas_smart_hide(Eo *obj, Elm_Notify_Data *sd) 284_elm_notify_evas_object_smart_hide(Eo *obj, Elm_Notify_Data *sd)
285{ 285{
286 const char *hide_signal; 286 const char *hide_signal;
287 287
@@ -419,7 +419,7 @@ _hide_finished_cb(void *data,
419} 419}
420 420
421EOLIAN static void 421EOLIAN static void
422_elm_notify_evas_smart_add(Eo *obj, Elm_Notify_Data *priv) 422_elm_notify_evas_object_smart_add(Eo *obj, Elm_Notify_Data *priv)
423{ 423{
424 eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); 424 eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
425 elm_widget_sub_object_parent_add(obj); 425 elm_widget_sub_object_parent_add(obj);
@@ -440,7 +440,7 @@ _elm_notify_evas_smart_add(Eo *obj, Elm_Notify_Data *priv)
440} 440}
441 441
442EOLIAN static void 442EOLIAN static void
443_elm_notify_evas_smart_del(Eo *obj, Elm_Notify_Data *sd) 443_elm_notify_evas_object_smart_del(Eo *obj, Elm_Notify_Data *sd)
444{ 444{
445 edje_object_signal_callback_del_full 445 edje_object_signal_callback_del_full
446 (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj); 446 (sd->notify, "elm,action,hide,finished", "elm", _hide_finished_cb, obj);
diff --git a/src/lib/elm_notify.eo b/src/lib/elm_notify.eo
index 20826802a..671e168de 100644
--- a/src/lib/elm_notify.eo
+++ b/src/lib/elm_notify.eo
@@ -86,12 +86,12 @@ class Elm_Notify (Elm_Container)
86 implements { 86 implements {
87 class::constructor; 87 class::constructor;
88 Eo_Base::constructor; 88 Eo_Base::constructor;
89 Evas_Smart::hide; 89 Evas_Object_Smart::hide;
90 Evas_Smart::show; 90 Evas_Object_Smart::show;
91 Evas_Smart::move; 91 Evas_Object_Smart::move;
92 Evas_Smart::add; 92 Evas_Object_Smart::add;
93 Evas_Smart::del; 93 Evas_Object_Smart::del;
94 Evas_Smart::resize; 94 Evas_Object_Smart::resize;
95 Elm_Widget::focus_direction; 95 Elm_Widget::focus_direction;
96 Elm_Widget::parent; 96 Elm_Widget::parent;
97 Elm_Widget::theme_apply; 97 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_pan.eo b/src/lib/elm_pan.eo
index f530d78e7..6194b2db7 100644
--- a/src/lib/elm_pan.eo
+++ b/src/lib/elm_pan.eo
@@ -58,12 +58,12 @@ class Elm_Pan (Evas_Smart_Clipped)
58 implements { 58 implements {
59 Eo_Base::constructor; 59 Eo_Base::constructor;
60 class::constructor; 60 class::constructor;
61 Evas_Smart::hide; 61 Evas_Object_Smart::hide;
62 Evas_Smart::show; 62 Evas_Object_Smart::show;
63 Evas_Smart::move; 63 Evas_Object_Smart::move;
64 Evas_Smart::add; 64 Evas_Object_Smart::add;
65 Evas_Smart::del; 65 Evas_Object_Smart::del;
66 Evas_Smart::resize; 66 Evas_Object_Smart::resize;
67 } 67 }
68 events { 68 events {
69 changed; 69 changed;
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index b0cc7d470..5b86ad7a0 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -9,7 +9,7 @@
9 9
10#include "els_box.h" 10#include "els_box.h"
11 11
12#define MY_CLASS ELM_OBJ_PANEL_CLASS 12#define MY_CLASS ELM_PANEL_CLASS
13 13
14#define MY_CLASS_NAME "Elm_Panel" 14#define MY_CLASS_NAME "Elm_Panel"
15#define MY_CLASS_NAME_LEGACY "elm_panel" 15#define MY_CLASS_NAME_LEGACY "elm_panel"
@@ -33,7 +33,7 @@ _mirrored_set(Evas_Object *obj,
33{ 33{
34 ELM_PANEL_DATA_GET(obj, sd); 34 ELM_PANEL_DATA_GET(obj, sd);
35 35
36 if ((sd->content) && (eo_isa(sd->content, ELM_OBJ_WIDGET_CLASS))) 36 if ((sd->content) && (eo_isa(sd->content, ELM_WIDGET_CLASS)))
37 elm_widget_mirrored_set(sd->content, rtl); 37 elm_widget_mirrored_set(sd->content, rtl);
38 elm_panel_orient_set(obj, elm_panel_orient_get(obj)); 38 elm_panel_orient_set(obj, elm_panel_orient_get(obj));
39} 39}
@@ -318,7 +318,7 @@ _elm_panel_elm_container_content_unset(Eo *obj, Elm_Panel_Data *sd, const char *
318} 318}
319 319
320EOLIAN static void 320EOLIAN static void
321_elm_panel_evas_smart_add(Eo *obj, Elm_Panel_Data *priv) 321_elm_panel_evas_object_smart_add(Eo *obj, Elm_Panel_Data *priv)
322{ 322{
323 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 323 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
324 324
@@ -365,7 +365,7 @@ _elm_panel_evas_smart_add(Eo *obj, Elm_Panel_Data *priv)
365} 365}
366 366
367EOLIAN static void 367EOLIAN static void
368_elm_panel_evas_smart_del(Eo *obj, Elm_Panel_Data *sd) 368_elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd)
369{ 369{
370 Evas_Object *child; 370 Evas_Object *child;
371 Eina_List *l; 371 Eina_List *l;
diff --git a/src/lib/elm_panel.eo b/src/lib/elm_panel.eo
index a58872685..3199c0eca 100644
--- a/src/lib/elm_panel.eo
+++ b/src/lib/elm_panel.eo
@@ -58,8 +58,8 @@ class Elm_Panel (Elm_Layout)
58 implements { 58 implements {
59 class::constructor; 59 class::constructor;
60 Eo_Base::constructor; 60 Eo_Base::constructor;
61 Evas_Smart::add; 61 Evas_Object_Smart::add;
62 Evas_Smart::del; 62 Evas_Object_Smart::del;
63 Elm_Widget::theme_apply; 63 Elm_Widget::theme_apply;
64 Elm_Widget::focus_next_manager_is; 64 Elm_Widget::focus_next_manager_is;
65 Elm_Widget::focus_next; 65 Elm_Widget::focus_next;
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 9c20e1cc0..d3658f246 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -8,7 +8,7 @@
8#include "elm_widget_layout.h" 8#include "elm_widget_layout.h"
9#include "elm_widget_panes.h" 9#include "elm_widget_panes.h"
10 10
11#define MY_CLASS ELM_OBJ_PANES_CLASS 11#define MY_CLASS ELM_PANES_CLASS
12 12
13#define MY_CLASS_NAME "Elm_Panes" 13#define MY_CLASS_NAME "Elm_Panes"
14#define MY_CLASS_NAME_LEGACY "elm_panes" 14#define MY_CLASS_NAME_LEGACY "elm_panes"
@@ -175,7 +175,7 @@ _on_unpressed(void *data,
175} 175}
176 176
177EOLIAN static void 177EOLIAN static void
178_elm_panes_evas_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) 178_elm_panes_evas_object_smart_add(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
179{ 179{
180 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 180 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
181 ELM_PANES_DATA_GET(obj, sd); 181 ELM_PANES_DATA_GET(obj, sd);
diff --git a/src/lib/elm_panes.eo b/src/lib/elm_panes.eo
index 3fdefd4bc..0bdbd084b 100644
--- a/src/lib/elm_panes.eo
+++ b/src/lib/elm_panes.eo
@@ -144,7 +144,7 @@ class Elm_Panes (Elm_Layout)
144 implements { 144 implements {
145 class::constructor; 145 class::constructor;
146 Eo_Base::constructor; 146 Eo_Base::constructor;
147 Evas_Smart::add; 147 Evas_Object_Smart::add;
148 Elm_Widget::focus_next_manager_is; 148 Elm_Widget::focus_next_manager_is;
149 Elm_Widget::focus_next; 149 Elm_Widget::focus_next;
150 Elm_Widget::theme_apply; 150 Elm_Widget::theme_apply;
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 2618da3fb..7aa012a72 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -7,7 +7,7 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_photo.h" 8#include "elm_widget_photo.h"
9 9
10#define MY_CLASS ELM_OBJ_PHOTO_CLASS 10#define MY_CLASS ELM_PHOTO_CLASS
11 11
12#define MY_CLASS_NAME "Elm_Photo" 12#define MY_CLASS_NAME "Elm_Photo"
13#define MY_CLASS_NAME_LEGACY "elm_photo" 13#define MY_CLASS_NAME_LEGACY "elm_photo"
@@ -249,7 +249,7 @@ _on_thumb_done(void *data,
249} 249}
250 250
251EOLIAN static void 251EOLIAN static void
252_elm_photo_evas_smart_add(Eo *obj, Elm_Photo_Data *priv) 252_elm_photo_evas_object_smart_add(Eo *obj, Elm_Photo_Data *priv)
253{ 253{
254 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 254 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
255 255
@@ -293,7 +293,7 @@ _elm_photo_evas_smart_add(Eo *obj, Elm_Photo_Data *priv)
293} 293}
294 294
295EOLIAN static void 295EOLIAN static void
296_elm_photo_evas_smart_del(Eo *obj, Elm_Photo_Data *sd) 296_elm_photo_evas_object_smart_del(Eo *obj, Elm_Photo_Data *sd)
297{ 297{
298 ecore_timer_del(sd->long_press_timer); 298 ecore_timer_del(sd->long_press_timer);
299 299
diff --git a/src/lib/elm_photo.eo b/src/lib/elm_photo.eo
index 54284480a..8cf130f0c 100644
--- a/src/lib/elm_photo.eo
+++ b/src/lib/elm_photo.eo
@@ -108,8 +108,8 @@ class Elm_Photo (Elm_Widget, Evas_Clickable_Interface, Evas_Draggable_Interface)
108 implements { 108 implements {
109 class::constructor; 109 class::constructor;
110 Eo_Base::constructor; 110 Eo_Base::constructor;
111 Evas_Smart::add; 111 Evas_Object_Smart::add;
112 Evas_Smart::del; 112 Evas_Object_Smart::del;
113 Elm_Widget::theme_apply; 113 Elm_Widget::theme_apply;
114 } 114 }
115 events { 115 events {
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index d98c38069..e71787d0b 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -8,12 +8,12 @@
8#include "elm_widget_photocam.h" 8#include "elm_widget_photocam.h"
9#include "elm_interface_scrollable.h" 9#include "elm_interface_scrollable.h"
10 10
11#define MY_PAN_CLASS ELM_OBJ_PHOTOCAM_PAN_CLASS 11#define MY_PAN_CLASS ELM_PHOTOCAM_PAN_CLASS
12 12
13#define MY_PAN_CLASS_NAME "Elm_Photocam_Pan" 13#define MY_PAN_CLASS_NAME "Elm_Photocam_Pan"
14#define MY_PAN_CLASS_NAME_LEGACY "elm_photocam_pan" 14#define MY_PAN_CLASS_NAME_LEGACY "elm_photocam_pan"
15 15
16#define MY_CLASS ELM_OBJ_PHOTOCAM_CLASS 16#define MY_CLASS ELM_PHOTOCAM_CLASS
17 17
18#define MY_CLASS_NAME "Elm_Photocam" 18#define MY_CLASS_NAME "Elm_Photocam"
19#define MY_CLASS_NAME_LEGACY "elm_photocam" 19#define MY_CLASS_NAME_LEGACY "elm_photocam"
@@ -135,14 +135,14 @@ _calc_job_cb(void *data)
135} 135}
136 136
137EOLIAN static void 137EOLIAN static void
138_elm_photocam_pan_evas_smart_move(Eo *obj EINA_UNUSED, Elm_Photocam_Pan_Data *psd, Evas_Coord x EINA_UNUSED, Evas_Coord y EINA_UNUSED) 138_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)
139{ 139{
140 ecore_job_del(psd->wsd->calc_job); 140 ecore_job_del(psd->wsd->calc_job);
141 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj); 141 psd->wsd->calc_job = ecore_job_add(_calc_job_cb, psd->wobj);
142} 142}
143 143
144EOLIAN static void 144EOLIAN static void
145_elm_photocam_pan_evas_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h) 145_elm_photocam_pan_evas_object_smart_resize(Eo *obj, Elm_Photocam_Pan_Data *psd, Evas_Coord w, Evas_Coord h)
146{ 146{
147 Evas_Coord ow, oh; 147 Evas_Coord ow, oh;
148 148
@@ -335,7 +335,7 @@ _grid_place(Evas_Object *obj,
335} 335}
336 336
337EOLIAN static void 337EOLIAN static void
338_elm_photoca