summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 13:26:15 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 14:35:19 +0900
commit7bf8da2baa243b972dd33d11ba873f6165e18fbf (patch)
tree91e8d9be8b6d16cd684178afbe081266fa1921fb /src
parent2f0b9edbb4b5e47d2d4a1380edc6ad1828134c41 (diff)
evas: Rename Evas.Object to Efl.Canvas.Object
One step closer to make the EO inheritance tree look like it's all Efl.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c8
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c72
-rw-r--r--src/lib/edje/Edje_Legacy.h2
-rw-r--r--src/lib/edje/edje_calc.c22
-rw-r--r--src/lib/edje/edje_callbacks.c6
-rw-r--r--src/lib/edje/edje_load.c6
-rw-r--r--src/lib/edje/edje_lua2.c16
-rw-r--r--src/lib/edje/edje_object.eo8
-rw-r--r--src/lib/edje/edje_private.h2
-rw-r--r--src/lib/edje/edje_smart.c8
-rw-r--r--src/lib/edje/edje_text.c16
-rw-r--r--src/lib/edje/edje_util.c4
-rw-r--r--src/lib/elementary/efl_ui_box.c2
-rw-r--r--src/lib/elementary/efl_ui_flip.c2
-rw-r--r--src/lib/elementary/efl_ui_grid.c2
-rw-r--r--src/lib/elementary/efl_ui_grid_static.c2
-rw-r--r--src/lib/elementary/efl_ui_image.c2
-rw-r--r--src/lib/elementary/efl_ui_nstate.c2
-rw-r--r--src/lib/elementary/efl_ui_text.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/elc_combobox.c2
-rw-r--r--src/lib/elementary/elc_ctxpopup.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c2
-rw-r--r--src/lib/elementary/elc_fileselector_button.c2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c2
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elc_player.c2
-rw-r--r--src/lib/elementary/elc_popup.c2
-rw-r--r--src/lib/elementary/elementary_config.h2
-rw-r--r--src/lib/elementary/elm_access.c2
-rw-r--r--src/lib/elementary/elm_actionslider.c2
-rw-r--r--src/lib/elementary/elm_app_server_view.eo2
-rw-r--r--src/lib/elementary/elm_bg.c2
-rw-r--r--src/lib/elementary/elm_box.c2
-rw-r--r--src/lib/elementary/elm_box.eo16
-rw-r--r--src/lib/elementary/elm_bubble.c2
-rw-r--r--src/lib/elementary/elm_button.c2
-rw-r--r--src/lib/elementary/elm_calendar.c2
-rw-r--r--src/lib/elementary/elm_check.c2
-rw-r--r--src/lib/elementary/elm_clock.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_conform.c2
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo6
-rw-r--r--src/lib/elementary/elm_datetime.c2
-rw-r--r--src/lib/elementary/elm_dayselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c2
-rw-r--r--src/lib/elementary/elm_frame.c2
-rw-r--r--src/lib/elementary/elm_gengrid.c2
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo2
-rw-r--r--src/lib/elementary/elm_genlist.c2
-rw-r--r--src/lib/elementary/elm_genlist_item.eo2
-rw-r--r--src/lib/elementary/elm_gesture_layer.c2
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo2
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_grid.c2
-rw-r--r--src/lib/elementary/elm_grid.eo6
-rw-r--r--src/lib/elementary/elm_hover.c2
-rw-r--r--src/lib/elementary/elm_hover.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_icon.c2
-rw-r--r--src/lib/elementary/elm_index.c2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_interface_scrollable.eo8
-rw-r--r--src/lib/elementary/elm_inwin.c2
-rw-r--r--src/lib/elementary/elm_label.c2
-rw-r--r--src/lib/elementary/elm_layout.c2
-rw-r--r--src/lib/elementary/elm_layout.eo2
-rw-r--r--src/lib/elementary/elm_list.c2
-rw-r--r--src/lib/elementary/elm_list.eo20
-rw-r--r--src/lib/elementary/elm_list_item.eo2
-rw-r--r--src/lib/elementary/elm_map.c2
-rw-r--r--src/lib/elementary/elm_map.eo4
-rw-r--r--src/lib/elementary/elm_mapbuf.c2
-rw-r--r--src/lib/elementary/elm_menu.c2
-rw-r--r--src/lib/elementary/elm_menu_item.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_naviframe.eo22
-rw-r--r--src/lib/elementary/elm_notify.c2
-rw-r--r--src/lib/elementary/elm_panel.c2
-rw-r--r--src/lib/elementary/elm_panes.c2
-rw-r--r--src/lib/elementary/elm_photo.c2
-rw-r--r--src/lib/elementary/elm_photocam.c2
-rw-r--r--src/lib/elementary/elm_photocam.eo2
-rw-r--r--src/lib/elementary/elm_plug.c2
-rw-r--r--src/lib/elementary/elm_plug.eo2
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_prefs.c2
-rw-r--r--src/lib/elementary/elm_prefs.eo6
-rw-r--r--src/lib/elementary/elm_progressbar.c2
-rw-r--r--src/lib/elementary/elm_radio.c2
-rw-r--r--src/lib/elementary/elm_radio.eo2
-rw-r--r--src/lib/elementary/elm_route.c2
-rw-r--r--src/lib/elementary/elm_scroller.c2
-rw-r--r--src/lib/elementary/elm_segment_control.c2
-rw-r--r--src/lib/elementary/elm_segment_control.eo6
-rw-r--r--src/lib/elementary/elm_segment_control_item.eo4
-rw-r--r--src/lib/elementary/elm_separator.c2
-rw-r--r--src/lib/elementary/elm_slider.c2
-rw-r--r--src/lib/elementary/elm_slideshow.c2
-rw-r--r--src/lib/elementary/elm_slideshow_item.eo2
-rw-r--r--src/lib/elementary/elm_spinner.c2
-rw-r--r--src/lib/elementary/elm_table.c2
-rw-r--r--src/lib/elementary/elm_table.eo10
-rw-r--r--src/lib/elementary/elm_thumb.c2
-rw-r--r--src/lib/elementary/elm_toolbar.c2
-rw-r--r--src/lib/elementary/elm_toolbar.eo2
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo8
-rw-r--r--src/lib/elementary/elm_video.c2
-rw-r--r--src/lib/elementary/elm_video.eo2
-rw-r--r--src/lib/elementary/elm_view_form.eo2
-rw-r--r--src/lib/elementary/elm_view_list.eo4
-rw-r--r--src/lib/elementary/elm_web.eo2
-rw-r--r--src/lib/elementary/elm_web2.c2
-rw-r--r--src/lib/elementary/elm_widget.c12
-rw-r--r--src/lib/elementary/elm_widget.eo64
-rw-r--r--src/lib/elementary/elm_widget_item.eo20
-rw-r--r--src/lib/elementary/elm_win_legacy.h2
-rw-r--r--src/lib/emotion/emotion_smart.c4
-rw-r--r--src/lib/ephysics/ephysics_body.cpp30
-rw-r--r--src/lib/evas/Evas_Common.h3
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Legacy.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c46
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo (renamed from src/lib/evas/canvas/evas_object.eo)13
-rw-r--r--src/lib/evas/canvas/efl_canvas_polygon.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.c26
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_rectangle.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene3d.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo10
-rw-r--r--src/lib/evas/canvas/efl_canvas_text_cursor.eo2
-rw-r--r--src/lib/evas/canvas/evas_box.eo44
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c46
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo20
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.eo2
-rw-r--r--src/lib/evas/canvas/evas_clip.c30
-rw-r--r--src/lib/evas/canvas/evas_events.c156
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c20
-rw-r--r--src/lib/evas/canvas/evas_focus.c4
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c2
-rw-r--r--src/lib/evas/canvas/evas_grid.eo14
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c40
-rw-r--r--src/lib/evas/canvas/evas_image_private.h2
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c8
-rw-r--r--src/lib/evas/canvas/evas_layer.c10
-rw-r--r--src/lib/evas/canvas/evas_line.eo2
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_map.c26
-rw-r--r--src/lib/evas/canvas/evas_name.c8
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c60
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c16
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c10
-rw-r--r--src/lib/evas/canvas/evas_object_line.c6
-rw-r--r--src/lib/evas/canvas/evas_object_main.c168
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c8
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c73
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c2
-rw-r--r--src/lib/evas/canvas/evas_object_table.c4
-rw-r--r--src/lib/evas/canvas/evas_object_text.c57
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c208
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c18
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c4
-rw-r--r--src/lib/evas/canvas/evas_render.c22
-rw-r--r--src/lib/evas/canvas/evas_stack.c16
-rw-r--r--src/lib/evas/canvas/evas_table.eo16
-rw-r--r--src/lib/evas/canvas/evas_text.eo10
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c2
-rw-r--r--src/lib/evas/filters/evas_filter.c4
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c4
-rw-r--r--src/lib/evas/include/evas_common_private.h4
-rw-r--r--src/lib/evas/include/evas_inline.x8
-rw-r--r--src/lib/evas/include/evas_private.h14
-rw-r--r--src/tests/edje/edje_test_edje.c12
-rw-r--r--src/tests/eolian/data/class_simple.eo2
-rw-r--r--src/tests/eolian/data/class_simple_ref.c16
-rw-r--r--src/tests/eolian/data/class_simple_ref_eo.h10
-rw-r--r--src/tests/eolian/eolian_parsing.c2
-rw-r--r--src/tests/evas/evas_test_mask.c2
198 files changed, 1004 insertions, 1002 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3630e4eaec..b740914c4a 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2,7 +2,7 @@
2### Library 2### Library
3 3
4evas_eolian_pub_files = \ 4evas_eolian_pub_files = \
5 lib/evas/canvas/evas_object.eo \ 5 lib/evas/canvas/efl_canvas_object.eo \
6 lib/evas/canvas/efl_canvas_polygon.eo \ 6 lib/evas/canvas/efl_canvas_polygon.eo \
7 lib/evas/canvas/efl_canvas_rectangle.eo \ 7 lib/evas/canvas/efl_canvas_rectangle.eo \
8 lib/evas/canvas/efl_canvas_text.eo \ 8 lib/evas/canvas/efl_canvas_text.eo \
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 6c9e6f69fe..a1ba77e9ac 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -126,15 +126,15 @@ _on_keydown(void *data EINA_UNUSED,
126 fprintf(stdout, "Toggling clipping "); 126 fprintf(stdout, "Toggling clipping ");
127 127
128 Evas_Object *clip = NULL; 128 Evas_Object *clip = NULL;
129 clip = evas_obj_clip_get(d.img); 129 clip = efl_canvas_object_clip_get(d.img);
130 if (clip == d.clipper) 130 if (clip == d.clipper)
131 { 131 {
132 evas_obj_clip_unset(d.img); 132 efl_canvas_object_clip_unset(d.img);
133 fprintf(stdout, "off\n"); 133 fprintf(stdout, "off\n");
134 } 134 }
135 else 135 else
136 { 136 {
137 evas_obj_clip_set(d.img, d.clipper); 137 efl_canvas_object_clip_set(d.img, d.clipper);
138 fprintf(stdout, "on\n"); 138 fprintf(stdout, "on\n");
139 } 139 }
140 return; 140 return;
@@ -239,7 +239,7 @@ main(void)
239 efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); 239 efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2);
240 efl_gfx_visible_set(d.clipper, EINA_TRUE); 240 efl_gfx_visible_set(d.clipper, EINA_TRUE);
241 241
242 evas_obj_clip_set(d.img, d.clipper); 242 efl_canvas_object_clip_set(d.img, d.clipper);
243 243
244 fprintf(stdout, "%s", commands); 244 fprintf(stdout, "%s", commands);
245 245
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 1657c3043f..018abdcb3c 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -59,7 +59,7 @@ _evas_object_associate_del(Evas_Object *obj)
59/* Interceptors Callbacks */ 59/* Interceptors Callbacks */
60 60
61static void 61static void
62_ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y) 62_ecore_evas_object_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
63{ 63{
64 Ecore_Evas *ee = data; 64 Ecore_Evas *ee = data;
65 // FIXME: account for frame 65 // FIXME: account for frame
@@ -68,33 +68,33 @@ _ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_
68} 68}
69 69
70static void 70static void
71_ecore_evas_obj_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED) 71_ecore_evas_object_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED)
72{ 72{
73 Ecore_Evas *ee = data; 73 Ecore_Evas *ee = data;
74 ecore_evas_raise(ee); 74 ecore_evas_raise(ee);
75} 75}
76 76
77static void 77static void
78_ecore_evas_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED) 78_ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
79{ 79{
80 Ecore_Evas *ee = data; 80 Ecore_Evas *ee = data;
81 ecore_evas_lower(ee); 81 ecore_evas_lower(ee);
82} 82}
83 83
84static void 84static void
85_ecore_evas_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) 85_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
86{ 86{
87 INF("TODO: %s", __FUNCTION__); 87 INF("TODO: %s", __FUNCTION__);
88} 88}
89 89
90static void 90static void
91_ecore_evas_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) 91_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
92{ 92{
93 INF("TODO: %s", __FUNCTION__); 93 INF("TODO: %s", __FUNCTION__);
94} 94}
95 95
96static void 96static void
97_ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l) 97_ecore_evas_object_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l)
98{ 98{
99 Ecore_Evas *ee = data; 99 Ecore_Evas *ee = data;
100 ecore_evas_layer_set(ee, l); 100 ecore_evas_layer_set(ee, l);
@@ -103,21 +103,21 @@ _ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, in
103/* Event Callbacks */ 103/* Event Callbacks */
104 104
105static void 105static void
106_ecore_evas_obj_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 106_ecore_evas_object_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
107{ 107{
108 Ecore_Evas *ee = data; 108 Ecore_Evas *ee = data;
109 ecore_evas_show(ee); 109 ecore_evas_show(ee);
110} 110}
111 111
112static void 112static void
113_ecore_evas_obj_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 113_ecore_evas_object_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
114{ 114{
115 Ecore_Evas *ee = data; 115 Ecore_Evas *ee = data;
116 ecore_evas_hide(ee); 116 ecore_evas_hide(ee);
117} 117}
118 118
119static void 119static void
120_ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 120_ecore_evas_object_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
121{ 121{
122 Ecore_Evas *ee = data; 122 Ecore_Evas *ee = data;
123 Evas_Coord ow, oh; 123 Evas_Coord ow, oh;
@@ -127,7 +127,7 @@ _ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *ob
127} 127}
128 128
129static void 129static void
130_ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 130_ecore_evas_object_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
131{ 131{
132 Ecore_Evas *ee = data; 132 Ecore_Evas *ee = data;
133 Evas_Coord w, h; 133 Evas_Coord w, h;
@@ -142,7 +142,7 @@ _ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Eva
142} 142}
143 143
144static void 144static void
145_ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 145_ecore_evas_object_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
146{ 146{
147 Ecore_Evas *ee = data; 147 Ecore_Evas *ee = data;
148 _ecore_evas_object_dissociate(ee, obj); 148 _ecore_evas_object_dissociate(ee, obj);
@@ -150,7 +150,7 @@ _ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
150} 150}
151 151
152static void 152static void
153_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 153_ecore_evas_object_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
154{ 154{
155 Ecore_Evas *ee = data; 155 Ecore_Evas *ee = data;
156 _ecore_evas_object_dissociate(ee, obj); 156 _ecore_evas_object_dissociate(ee, obj);
@@ -293,41 +293,41 @@ _ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object
293{ 293{
294 evas_object_event_callback_add 294 evas_object_event_callback_add
295 (obj, EVAS_CALLBACK_SHOW, 295 (obj, EVAS_CALLBACK_SHOW,
296 _ecore_evas_obj_callback_show, ee); 296 _ecore_evas_object_callback_show, ee);
297 evas_object_event_callback_add 297 evas_object_event_callback_add
298 (obj, EVAS_CALLBACK_HIDE, 298 (obj, EVAS_CALLBACK_HIDE,
299 _ecore_evas_obj_callback_hide, ee); 299 _ecore_evas_object_callback_hide, ee);
300 evas_object_event_callback_add 300 evas_object_event_callback_add
301 (obj, EVAS_CALLBACK_RESIZE, 301 (obj, EVAS_CALLBACK_RESIZE,
302 _ecore_evas_obj_callback_resize, ee); 302 _ecore_evas_object_callback_resize, ee);
303 evas_object_event_callback_add 303 evas_object_event_callback_add
304 (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 304 (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
305 _ecore_evas_obj_callback_changed_size_hints, ee); 305 _ecore_evas_object_callback_changed_size_hints, ee);
306 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL) 306 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
307 evas_object_event_callback_add 307 evas_object_event_callback_add
308 (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee); 308 (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee);
309 else 309 else
310 evas_object_event_callback_add 310 evas_object_event_callback_add
311 (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee); 311 (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee);
312 312
313 evas_object_intercept_move_callback_add 313 evas_object_intercept_move_callback_add
314 (obj, _ecore_evas_obj_intercept_move, ee); 314 (obj, _ecore_evas_object_intercept_move, ee);
315 315
316 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_STACK) 316 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_STACK)
317 { 317 {
318 evas_object_intercept_raise_callback_add 318 evas_object_intercept_raise_callback_add
319 (obj, _ecore_evas_obj_intercept_raise, ee); 319 (obj, _ecore_evas_object_intercept_raise, ee);
320 evas_object_intercept_lower_callback_add 320 evas_object_intercept_lower_callback_add
321 (obj, _ecore_evas_obj_intercept_lower, ee); 321 (obj, _ecore_evas_object_intercept_lower, ee);
322 evas_object_intercept_stack_above_callback_add 322 evas_object_intercept_stack_above_callback_add
323 (obj, _ecore_evas_obj_intercept_stack_above, ee); 323 (obj, _ecore_evas_object_intercept_stack_above, ee);
324 evas_object_intercept_stack_below_callback_add 324 evas_object_intercept_stack_below_callback_add
325 (obj, _ecore_evas_obj_intercept_stack_below, ee); 325 (obj, _ecore_evas_object_intercept_stack_below, ee);
326 } 326 }
327 327
328 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_LAYER) 328 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_LAYER)
329 evas_object_intercept_layer_set_callback_add 329 evas_object_intercept_layer_set_callback_add
330 (obj, _ecore_evas_obj_intercept_layer_set, ee); 330 (obj, _ecore_evas_object_intercept_layer_set, ee);
331 331
332 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL) 332 if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL)
333 { 333 {
@@ -346,35 +346,35 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
346{ 346{
347 evas_object_event_callback_del_full 347 evas_object_event_callback_del_full
348 (obj, EVAS_CALLBACK_SHOW, 348 (obj, EVAS_CALLBACK_SHOW,
349 _ecore_evas_obj_callback_show, ee); 349 _ecore_evas_object_callback_show, ee);
350 evas_object_event_callback_del_full 350 evas_object_event_callback_del_full
351 (obj, EVAS_CALLBACK_HIDE, 351 (obj, EVAS_CALLBACK_HIDE,
352 _ecore_evas_obj_callback_hide, ee); 352 _ecore_evas_object_callback_hide, ee);
353 evas_object_event_callback_del_full 353 evas_object_event_callback_del_full
354 (obj, EVAS_CALLBACK_RESIZE, 354 (obj, EVAS_CALLBACK_RESIZE,
355 _ecore_evas_obj_callback_resize, ee); 355 _ecore_evas_object_callback_resize, ee);
356 evas_object_event_callback_del_full 356 evas_object_event_callback_del_full
357 (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 357 (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
358 _ecore_evas_obj_callback_changed_size_hints, ee); 358 _ecore_evas_object_callback_changed_size_hints, ee);
359 evas_object_event_callback_del_full 359 evas_object_event_callback_del_full
360 (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee); 360 (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee);
361 evas_object_event_callback_del_full 361 evas_object_event_callback_del_full
362 (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee); 362 (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee);
363 363
364 evas_object_intercept_move_callback_del 364 evas_object_intercept_move_callback_del
365 (obj, _ecore_evas_obj_intercept_move); 365 (obj, _ecore_evas_object_intercept_move);
366 366
367 evas_object_intercept_raise_callback_del 367 evas_object_intercept_raise_callback_del
368 (obj, _ecore_evas_obj_intercept_raise); 368 (obj, _ecore_evas_object_intercept_raise);
369 evas_object_intercept_lower_callback_del 369 evas_object_intercept_lower_callback_del
370 (obj, _ecore_evas_obj_intercept_lower); 370 (obj, _ecore_evas_object_intercept_lower);
371 evas_object_intercept_stack_above_callback_del 371 evas_object_intercept_stack_above_callback_del
372 (obj, _ecore_evas_obj_intercept_stack_above); 372 (obj, _ecore_evas_object_intercept_stack_above);
373 evas_object_intercept_stack_below_callback_del 373 evas_object_intercept_stack_below_callback_del
374 (obj, _ecore_evas_obj_intercept_stack_below); 374 (obj, _ecore_evas_object_intercept_stack_below);
375 375
376 evas_object_intercept_layer_set_callback_del 376 evas_object_intercept_layer_set_callback_del
377 (obj, _ecore_evas_obj_intercept_layer_set); 377 (obj, _ecore_evas_object_intercept_layer_set);
378 378
379 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 379 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
380 { 380 {
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index 89393b3ab0..64ed2d6164 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -492,7 +492,7 @@ EAPI Eina_Bool edje_object_part_table_col_row_size_get(const Edje_Object *obj, c
492 * @param[in] col The column of the child to get 492 * @param[in] col The column of the child to get
493 * @param[in] row The row of the child to get 493 * @param[in] row The row of the child to get
494 * 494 *
495 * @return The child Evas.Object 495 * @return The child Efl.Canvas.Object
496 * 496 *
497 * @ingroup Edje_Object 497 * @ingroup Edje_Object
498 */ 498 */
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 436825512e..7c0e98a479 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1494,7 +1494,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
1494 double s = base_s; 1494 double s = base_s;
1495 1495
1496 if (ep->part->scale) base_s = TO_DOUBLE(sc); 1496 if (ep->part->scale) base_s = TO_DOUBLE(sc);
1497 evas_obj_scale_set(ep->object, base_s); 1497 efl_canvas_object_scale_set(ep->object, base_s);
1498 efl_canvas_text_size_native_get(ep->object, &tw, &th); 1498 efl_canvas_text_size_native_get(ep->object, &tw, &th);
1499 1499
1500 orig_s = base_s; 1500 orig_s = base_s;
@@ -1503,7 +1503,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
1503 { 1503 {
1504 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 1504 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
1505 orig_s * TO_INT(params->eval.w) / tw); 1505 orig_s * TO_INT(params->eval.w) / tw);
1506 evas_obj_scale_set(ep->object, orig_s); 1506 efl_canvas_object_scale_set(ep->object, orig_s);
1507 efl_canvas_text_size_native_get(ep->object, &tw, &th); 1507 efl_canvas_text_size_native_get(ep->object, &tw, &th);
1508 } 1508 }
1509 if (chosen_desc->text.fit_x) 1509 if (chosen_desc->text.fit_x)
@@ -1512,7 +1512,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
1512 { 1512 {
1513 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 1513 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
1514 orig_s * TO_INT(params->eval.w) / tw); 1514 orig_s * TO_INT(params->eval.w) / tw);
1515 evas_obj_scale_set(ep->object, s); 1515 efl_canvas_object_scale_set(ep->object, s);
1516 efl_canvas_text_size_native_get(ep->object, NULL, NULL); 1516 efl_canvas_text_size_native_get(ep->object, NULL, NULL);
1517 } 1517 }
1518 } 1518 }
@@ -1529,7 +1529,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
1529 s = tmp_s; 1529 s = tmp_s;
1530 } 1530 }
1531 1531
1532 evas_obj_scale_set(ep->object, s); 1532 efl_canvas_object_scale_set(ep->object, s);
1533 efl_canvas_text_size_native_get(ep->object, NULL, NULL); 1533 efl_canvas_text_size_native_get(ep->object, NULL, NULL);
1534 } 1534 }
1535 } 1535 }
@@ -1554,7 +1554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
1554 break; 1554 break;
1555 s = tmp_s; 1555 s = tmp_s;
1556 1556
1557 evas_obj_scale_set(ep->object, s); 1557 efl_canvas_object_scale_set(ep->object, s);
1558 efl_canvas_text_size_native_get(ep->object, &fw, &fh); 1558 efl_canvas_text_size_native_get(ep->object, &fw, &fh);
1559 i--; 1559 i--;
1560 } 1560 }
@@ -5015,8 +5015,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
5015 else map_obj = mo; 5015 else map_obj = mo;
5016 if (map_obj) 5016 if (map_obj)
5017 { 5017 {
5018 evas_obj_map_set(map_obj, map); 5018 efl_canvas_object_map_set(map_obj, map);
5019 evas_obj_map_enable_set(map_obj, EINA_TRUE); 5019 efl_canvas_object_map_enable_set(map_obj, EINA_TRUE);
5020 } 5020 }
5021 } 5021 }
5022 else 5022 else
@@ -5027,8 +5027,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
5027 { 5027 {
5028 if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */ 5028 if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */
5029 { 5029 {
5030 evas_obj_map_enable_set(ep->nested_smart, EINA_FALSE); 5030 efl_canvas_object_map_enable_set(ep->nested_smart, EINA_FALSE);
5031 evas_obj_map_set(ep->nested_smart, NULL); 5031 efl_canvas_object_map_set(ep->nested_smart, NULL);
5032 } 5032 }
5033 else 5033 else
5034 { 5034 {
@@ -5038,8 +5038,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
5038#endif 5038#endif
5039 if (mo) 5039 if (mo)
5040 { 5040 {
5041 evas_obj_map_enable_set(mo, 0); 5041 efl_canvas_object_map_enable_set(mo, 0);
5042 evas_obj_map_set(mo, NULL); 5042 efl_canvas_object_map_set(mo, NULL);
5043 } 5043 }
5044#ifdef HAVE_EPHYSICS 5044#ifdef HAVE_EPHYSICS
5045 } 5045 }
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 7afd37dc88..9d7515cbbf 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -430,7 +430,7 @@ _edje_pending_timer_cb(void *data)
430} 430}
431 431
432EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks, 432EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
433 { EVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb }, 433 { EFL_CANVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb },
434 { EFL_EVENT_POINTER_IN, _edje_mouse_in_signal_cb }, 434 { EFL_EVENT_POINTER_IN, _edje_mouse_in_signal_cb },
435 { EFL_EVENT_POINTER_OUT, _edje_mouse_out_signal_cb }, 435 { EFL_EVENT_POINTER_OUT, _edje_mouse_out_signal_cb },
436 { EFL_EVENT_POINTER_DOWN, _edje_mouse_down_signal_cb }, 436 { EFL_EVENT_POINTER_DOWN, _edje_mouse_down_signal_cb },
@@ -439,8 +439,8 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks,
439 { EFL_EVENT_POINTER_WHEEL, _edje_mouse_wheel_signal_cb }); 439 { EFL_EVENT_POINTER_WHEEL, _edje_mouse_wheel_signal_cb });
440 440
441EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks, 441EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks,
442 { EVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb }, 442 { EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb },
443 { EVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb }); 443 { EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb });
444 444
445void 445void
446_edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp) 446_edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 0c1605e226..95c507f7d4 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -892,7 +892,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
892 } 892 }
893 893
894 if (ep->no_render) 894 if (ep->no_render)
895 evas_obj_no_render_set(rp->object, 1); 895 efl_canvas_object_no_render_set(rp->object, 1);
896 896
897 if (st_nested && st_nested->nested_children_count) /* Add this to list of children */ 897 if (st_nested && st_nested->nested_children_count) /* Add this to list of children */
898 { 898 {
@@ -945,8 +945,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
945 evas_object_pass_events_set(rp->object, 1); 945 evas_object_pass_events_set(rp->object, 1);
946 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB); 946 evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
947 } 947 }
948 evas_obj_anti_alias_set(rp->object, ep->anti_alias); 948 efl_canvas_object_anti_alias_set(rp->object, ep->anti_alias);
949 evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside); 949 efl_canvas_object_precise_is_inside_set(rp->object, ep->precise_is_inside);
950 } 950 }
951 if (rp->part->clip_to_id < 0) 951 if (rp->part->clip_to_id < 0)
952 evas_object_clip_set(rp->object, ed->base->clipper); 952 evas_object_clip_set(rp->object, ed->base->clipper);
diff --git a/src/lib/edje/edje_lua2.c b/src/lib/edje/edje_lua2.c
index e64b989b56..1e824ecfd5 100644
--- a/src/lib/edje/edje_lua2.c
+++ b/src/lib/edje/edje_lua2.c
@@ -1516,7 +1516,7 @@ _elua_text_class(lua_State *L) // Stack usage [-(6|8), +(7|9), emv]
1516 1516
1517//------------- 1517//-------------
1518static void 1518static void
1519_elua_evas_obj_free(void *obj) 1519_elua_efl_canvas_object_free(void *obj)
1520{ 1520{
1521 Edje_Lua_Evas_Object *elo = obj; 1521 Edje_Lua_Evas_Object *elo = obj;
1522 1522
@@ -1559,7 +1559,7 @@ _elua_polish_evas_object(Edje *ed, Edje_Lua_Evas_Object *elo)
1559static int 1559static int
1560_elua_edje(lua_State *L) // Stack usage [-7, +8, em] 1560_elua_edje(lua_State *L) // Stack usage [-7, +8, em]
1561{ 1561{
1562 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_evas_obj_free) 1562 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_efl_canvas_object_free)
1563 // Stack usage [-7, +8, em] 1563 // Stack usage [-7, +8, em]
1564 elo->evas_obj = edje_object_add(evas_object_evas_get(ed->obj)); 1564 elo->evas_obj = edje_object_add(evas_object_evas_get(ed->obj));
1565 _edje_subobj_register(ed, elo->evas_obj); 1565 _edje_subobj_register(ed, elo->evas_obj);
@@ -1582,7 +1582,7 @@ _elua_edje(lua_State *L) // Stack usage [-7, +8, em]
1582static int 1582static int
1583_elua_image(lua_State *L) // Stack usage [-7, +8, em] 1583_elua_image(lua_State *L) // Stack usage [-7, +8, em]
1584{ 1584{
1585 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_evas_obj_free) 1585 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_efl_canvas_object_free)
1586 // Stack usage [-7, +8, em] 1586 // Stack usage [-7, +8, em]
1587 elo->evas_obj = evas_object_image_filled_add(evas_object_evas_get(ed->obj)); 1587 elo->evas_obj = evas_object_image_filled_add(evas_object_evas_get(ed->obj));
1588 _elua_polish_evas_object(ed, elo); 1588 _elua_polish_evas_object(ed, elo);
@@ -1604,7 +1604,7 @@ _elua_image(lua_State *L) // Stack usage [-7, +8, em]
1604static int 1604static int
1605_elua_line(lua_State *L) // Stack usage [-7, +8, em] 1605_elua_line(lua_State *L) // Stack usage [-7, +8, em]
1606{ 1606{
1607 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_evas_obj_free) 1607 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_efl_canvas_object_free)
1608 // Stack usage [-7, +8, em] 1608 // Stack usage [-7, +8, em]
1609 elo->evas_obj = evas_object_line_add(evas_object_evas_get(ed->obj)); 1609 elo->evas_obj = evas_object_line_add(evas_object_evas_get(ed->obj));
1610 _elua_polish_evas_object(ed, elo); 1610 _elua_polish_evas_object(ed, elo);
@@ -1656,7 +1656,7 @@ _elua_map(lua_State *L) // Stack usage [-7, +8, emv]
1656static int 1656static int
1657_elua_polygon(lua_State *L) // Stack usage [-7, +8, em] 1657_elua_polygon(lua_State *L) // Stack usage [-7, +8, em]
1658{ 1658{
1659 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_evas_obj_free) 1659 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_efl_canvas_object_free)
1660 // Stack usage [-7, +8, em] 1660 // Stack usage [-7, +8, em]
1661 elo->evas_obj = evas_object_polygon_add(evas_object_evas_get(ed->obj)); 1661 elo->evas_obj = evas_object_polygon_add(evas_object_evas_get(ed->obj));
1662 _elua_polish_evas_object(ed, elo); 1662 _elua_polish_evas_object(ed, elo);
@@ -1676,7 +1676,7 @@ _elua_polygon(lua_State *L) // Stack usage [-7, +8, em]
1676static int 1676static int
1677_elua_rect(lua_State *L) // Stack usage [-7, +8, em] 1677_elua_rect(lua_State *L) // Stack usage [-7, +8, em]
1678{ 1678{
1679 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_evas_obj_free) 1679 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_efl_canvas_object_free)
1680 // Stack usage [-7, +8, em] 1680 // Stack usage [-7, +8, em]
1681 elo->evas_obj = evas_object_rectangle_add(evas_object_evas_get(ed->obj)); 1681 elo->evas_obj = evas_object_rectangle_add(evas_object_evas_get(ed->obj));
1682 _elua_polish_evas_object(ed, elo); 1682 _elua_polish_evas_object(ed, elo);
@@ -1698,7 +1698,7 @@ _elua_rect(lua_State *L) // Stack usage [-7, +8, em]
1698static int 1698static int
1699_elua_text(lua_State *L) // Stack usage [-7, +8, em] 1699_elua_text(lua_State *L) // Stack usage [-7, +8, em]
1700{ 1700{
1701 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_evas_obj_free) 1701 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_efl_canvas_object_free)
1702 // Stack usage [-7, +8, em] 1702 // Stack usage [-7, +8, em]
1703 elo->evas_obj = evas_object_text_add(evas_object_evas_get(ed->obj)); 1703 elo->evas_obj = evas_object_text_add(evas_object_evas_get(ed->obj));
1704 _elua_polish_evas_object(ed, elo); 1704 _elua_polish_evas_object(ed, elo);
@@ -1708,7 +1708,7 @@ _elua_text(lua_State *L) // Stack usage [-7, +8, em]
1708/* XXX: disabled until there are enough textblock functions implemented to make it actually useful 1708/* XXX: disabled until there are enough textblock functions implemented to make it actually useful
1709 _elua_textblock(lua_State *L) // Stack usage [-7, +8, em] 1709 _elua_textblock(lua_State *L) // Stack usage [-7, +8, em]
1710 { 1710 {
1711 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_evas_obj_free) 1711 _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_efl_canvas_object_free)
1712 // Stack usage [-7, +8, em] 1712 // Stack usage [-7, +8, em]
1713 elo->evas_obj = evas_object_textblock_add(evas_object_evas_get(ed->obj)); 1713 elo->evas_obj = evas_object_textblock_add(evas_object_evas_get(ed->obj));
1714 _elua_polish_evas_object(ed, elo); 1714 _elua_polish_evas_object(ed, elo);
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index fb2c1f4b70..8da6cb2c3d 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -898,7 +898,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
898 Note: Almost all swallow rules apply: you should not move, resize, 898 Note: Almost all swallow rules apply: you should not move, resize,
899 hide, show, set the color or clipper of such part. It's a bit 899 hide, show, set the color or clipper of such part. It's a bit
900 more restrictive as one must never delete this object!]] 900 more restrictive as one must never delete this object!]]
901 return: Evas.Object; [[The externally created object, or $null if there is none or 901 return: Efl.Canvas.Object; [[The externally created object, or $null if there is none or
902 part is not an external.]] 902 part is not an external.]]
903 params { 903 params {
904 @in part: string; [[The part name]] 904 @in part: string; [[The part name]]
@@ -915,7 +915,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
915 content: string; [[A string identifying which content from the EXTERNAL to get]] 915 content: string; [[A string identifying which content from the EXTERNAL to get]]
916 } 916 }
917 values { 917 values {
918 v: Evas.Object; 918 v: Efl.Canvas.Object;
919 } 919 }
920 } 920 }
921 preload { 921 preload {
@@ -1113,7 +1113,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
1113 Note: If the type of Edje part is GROUP, SWALLOW or EXTERNAL, 1113 Note: If the type of Edje part is GROUP, SWALLOW or EXTERNAL,
1114 returned handle by this function will indicate nothing or transparent 1114 returned handle by this function will indicate nothing or transparent
1115 rectangle for events. Use $.part_swallow_get() in that case.]] 1115 rectangle for events. Use $.part_swallow_get() in that case.]]
1116 return: const(Evas.Object); [[A pointer to the Evas object implementing the given part, 1116 return: const(Efl.Canvas.Object); [[A pointer to the Evas object implementing the given part,
1117 or $null on failure (e.g. the given part doesn't exist)]] 1117 or $null on failure (e.g. the given part doesn't exist)]]
1118 params { 1118 params {
1119 @in part: string; [[The Edje part's name]] 1119 @in part: string; [[The Edje part's name]]
@@ -1999,7 +1999,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part)
1999 Eo.Base.constructor; 1999 Eo.Base.constructor;
2000 Eo.Base.destructor; 2000 Eo.Base.destructor;
2001 Eo.Base.dbg_info_get; 2001 Eo.Base.dbg_info_get;
2002 Evas.Object.paragraph_direction.set; 2002 Efl.Canvas.Object.paragraph_direction.set;
2003 Efl.Canvas.Group.group_hide; 2003 Efl.Canvas.Group.group_hide;
2004 Efl.Canvas.Group.group_show; 2004 Efl.Canvas.Group.group_show;
2005 Efl.Canvas.Group.group_move; 2005 Efl.Canvas.Group.group_move;
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 5b6898a9ff..e8e17e5fd0 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -39,7 +39,7 @@
39# include <Evil.h> 39# include <Evil.h>
40#endif 40#endif
41 41
42#define EVAS_OBJECT_PROTECTED 42#define EFL_CANVAS_OBJECT_PROTECTED
43 43
44#include <Eina.h> 44#include <Eina.h>
45#include <Eet.h> 45#include <Eet.h>
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 72b9dd078e..8e6c02da95 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -35,7 +35,7 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed)
35 ed->duration_scale = 1.0; 35 ed->duration_scale = 1.0;
36 36
37 obj = eo_constructor(eo_super(obj, MY_CLASS)); 37 obj = eo_constructor(eo_super(obj, MY_CLASS));
38 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 38 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
39 _edje_lib_ref(); 39 _edje_lib_ref();
40 40
41 parent = eo_parent_get(obj); 41 parent = eo_parent_get(obj);
@@ -343,7 +343,7 @@ _edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool h
343 Edje *edg; 343 Edje *edg;
344 344
345 efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide); 345 efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide);
346 if (evas_obj_no_render_get(obj) == hide) return; 346 if (efl_canvas_object_no_render_get(obj) == hide) return;
347 347
348 EINA_LIST_FOREACH(ed->groups, l, edg) 348 EINA_LIST_FOREACH(ed->groups, l, edg)
349 if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide); 349 if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide);
@@ -467,9 +467,9 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro
467} 467}
468 468
469EOLIAN static void 469EOLIAN static void
470_edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) 470_edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir)
471{ 471{
472 evas_obj_paragraph_direction_set(eo_super(obj, MY_CLASS), dir); 472 efl_canvas_object_paragraph_direction_set(eo_super(obj, MY_CLASS), dir);
473 473
474 /* Make it dirty to recalculate edje. 474 /* Make it dirty to recalculate edje.
475 It needs to move text objects according to new paragraph direction */ 475 It needs to move text objects according to new paragraph direction */
diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index a27842d0ef..46ebbde93e 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -331,7 +331,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
331 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 331 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
332 else efl_text_properties_font_source_set(ep->object, NULL); 332 else efl_text_properties_font_source_set(ep->object, NULL);
333 333
334 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 334 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
335 335
336 efl_text_properties_font_set(ep->object, font, size); 336 efl_text_properties_font_set(ep->object, font, size);
337 efl_text_set(ep->object, text); 337 efl_text_set(ep->object, text);
@@ -345,7 +345,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
345 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 345 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
346 else efl_text_properties_font_source_set(ep->object, NULL); 346 else efl_text_properties_font_source_set(ep->object, NULL);
347 347
348 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 348 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
349 349
350 efl_text_properties_font_set(ep->object, font, size); 350 efl_text_properties_font_set(ep->object, font, size);
351 351
@@ -367,7 +367,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
367 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 367 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
368 else efl_text_properties_font_source_set(ep->object, NULL); 368 else efl_text_properties_font_source_set(ep->object, NULL);
369 369
370 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 370 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
371 371
372 efl_text_properties_font_set(ep->object, font, size); 372 efl_text_properties_font_set(ep->object, font, size);
373 efl_text_set(ep->object, text); 373 efl_text_set(ep->object, text);
@@ -390,7 +390,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
390 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 390 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
391 else efl_text_properties_font_source_set(ep->object, NULL); 391 else efl_text_properties_font_source_set(ep->object, NULL);
392 392
393 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 393 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
394 efl_text_properties_font_set(ep->object, font, size); 394 efl_text_properties_font_set(ep->object, font, size);
395 395
396 part_get_geometry(ep, &tw, &th); 396 part_get_geometry(ep, &tw, &th);
@@ -402,7 +402,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
402 { 402 {
403 int current; 403 int current;
404 404
405 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 405 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
406 efl_text_properties_font_set(ep->object, font, 10); 406 efl_text_properties_font_set(ep->object, font, 10);
407 407
408 part_get_geometry(ep, &tw, &th); 408 part_get_geometry(ep, &tw, &th);
@@ -424,7 +424,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
424 { 424 {
425 current = (top + bottom) / 2; 425 current = (top + bottom) / 2;
426 426
427 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 427 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
428 efl_text_properties_font_set(ep->object, font, current); 428 efl_text_properties_font_set(ep->object, font, current);
429 429
430 part_get_geometry(ep, &tw, &th); 430 part_get_geometry(ep, &tw, &th);
@@ -440,7 +440,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
440 { 440 {
441 current++; 441 current++;
442 442
443 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 443 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
444 efl_text_properties_font_set(ep->object, font, current); 444 efl_text_properties_font_set(ep->object, font, current);
445 445
446 part_get_geometry(ep, &tw, &th); 446 part_get_geometry(ep, &tw, &th);
@@ -506,7 +506,7 @@ arrange_text:
506 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); 506 if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path);
507 else efl_text_properties_font_source_set(ep->object, NULL); 507 else efl_text_properties_font_source_set(ep->object, NULL);
508 508
509 if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); 509 if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc));
510 510
511 efl_text_properties_font_set(ep->object, font, size); 511 efl_text_properties_font_set(ep->object, font, size);
512 efl_text_set(ep->object, text); 512 efl_text_set(ep->object, text);
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 07ec9dc432..caae67b060 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -6532,8 +6532,8 @@ _edje_real_part_swallow(Edje *ed,
6532 else 6532 else
6533 evas_object_pass_events_set(obj_swallow, 1); 6533 evas_object_pass_events_set(obj_swallow, 1);
6534 _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp); 6534 _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp);
6535 evas_obj_anti_alias_set(obj_swallow, rp->part->anti_alias); 6535 efl_canvas_object_anti_alias_set(obj_swallow, rp->part->anti_alias);
6536 evas_obj_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside); 6536 efl_canvas_object_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside);
6537 6537
6538 ed->dirty = EINA_TRUE; 6538 ed->dirty = EINA_TRUE;
6539 ed->recalc_call = EINA_TRUE; 6539 ed->recalc_call = EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 6efefa294c..98b4daa6c3 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -254,7 +254,7 @@ _efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
254{ 254{
255 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); 255 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
256 obj = eo_constructor(eo_super(obj, MY_CLASS)); 256 obj = eo_constructor(eo_super(obj, MY_CLASS));
257 evas_obj_type_set(obj, MY_CLASS_NAME); 257 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
258 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 258 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
259 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 259 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
260 260
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index b5cc123e5c..1c11d3d9e0 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -1874,7 +1874,7 @@ _efl_ui_flip_eo_base_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
1874 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1874 obj = eo_constructor(eo_super(obj, MY_CLASS));
1875 sd->obj = obj; 1875 sd->obj = obj;
1876 1876
1877 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1877 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1878 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1878 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1879 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); 1879 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);
1880 1880
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 8f544c48a3..538c7fe4a9 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -292,7 +292,7 @@ EOLIAN static Eo *
292_efl_ui_grid_eo_base_constructor(Eo *obj, Efl_Ui_Grid_Data *pd) 292_efl_ui_grid_eo_base_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
293{ 293{
294 obj = eo_constructor(eo_super(obj, MY_CLASS)); 294 obj = eo_constructor(eo_super(obj, MY_CLASS));
295 evas_obj_type_set(obj, MY_CLASS_NAME); 295 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
296 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 296 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
297 297
298 pd->dir1 = EFL_ORIENT_RIGHT; 298 pd->dir1 = EFL_ORIENT_RIGHT;
diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c
index 08d29fc4fb..8069f01be3 100644
--- a/src/lib/elementary/efl_ui_grid_static.c
+++ b/src/lib/elementary/efl_ui_grid_static.c
@@ -9,7 +9,7 @@ _efl_ui_grid_static_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED)
9 Efl_Ui_Grid_Data *gd; 9 Efl_Ui_Grid_Data *gd;
10 10
11 obj = eo_constructor(eo_super(obj, MY_CLASS)); 11 obj = eo_constructor(eo_super(obj, MY_CLASS));
12 evas_obj_type_set(obj, MY_CLASS_NAME); 12 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
13 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 13 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
14 14
15 gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS); 15 gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS);
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index bfb39495ca..6578c20c7f 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -877,7 +877,7 @@ EOLIAN static Eo *
877_efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *pd) 877_efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
878{ 878{
879 obj = eo_constructor(eo_super(obj, MY_CLASS)); 879 obj = eo_constructor(eo_super(obj, MY_CLASS));
880 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 880 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
881 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 881 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
882 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 882 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
883 883
diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c
index ccdcc226a3..ccd60c6769 100644
--- a/src/lib/elementary/efl_ui_nstate.c
+++ b/src/lib/elementary/efl_ui_nstate.c
@@ -35,7 +35,7 @@ EOLIAN static Eo_Base *
35_efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) 35_efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED)
36{ 36{
37 obj = eo_constructor(eo_super(obj, MY_CLASS)); 37 obj = eo_constructor(eo_super(obj, MY_CLASS));
38 evas_obj_type_set(obj, MY_CLASS_NAME); 38 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
39 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 39 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
40 //TODO: Add ATSPI call here 40 //TODO: Add ATSPI call here
41 41
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 7473281a5c..617458a5b3 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4081,7 +4081,7 @@ EOLIAN static Eo *
4081_efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4081_efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4082{ 4082{
4083 obj = eo_constructor(eo_super(obj, MY_CLASS)); 4083 obj = eo_constructor(eo_super(obj, MY_CLASS));
4084 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 4084 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
4085 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 4085 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
4086 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 4086 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
4087 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); 4087 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index f5a0280d95..1a694bd836 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4279,7 +4279,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
4279 eo_parent_set(obj, ecore_evas_get(tmp_sd.ee)); 4279 eo_parent_set(obj, ecore_evas_get(tmp_sd.ee));
4280 4280
4281 eo_constructor(eo_super(obj, MY_CLASS)); 4281 eo_constructor(eo_super(obj, MY_CLASS));
4282 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 4282 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
4283 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 4283 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
4284 4284
4285 if (getenv("ELM_FIRST_FRAME")) 4285 if (getenv("ELM_FIRST_FRAME"))
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 946f7975cb..a2140edf7a 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -47,7 +47,7 @@ enum Efl.Ui.Win.Type
47 just like any other object would be, and do other things 47 just like any other object would be, and do other things
48 like applying \@ref Evas_Map effects to it. This is the only 48 like applying \@ref Evas_Map effects to it. This is the only
49 type of window that requires the parent parameter of 49 type of window that requires the parent parameter of
50 \@ref elm_win_add to be a valid @Evas.Object.]] 50 \@ref elm_win_add to be a valid @Efl.Canvas.Object.]]
51 socket_image, [[The window is rendered onto an image buffer and can be shown 51 socket_image, [[The window is rendered onto an image buffer and can be shown
52 other process's plug image object. No actual window is 52 other process's plug image object. No actual window is
53 created for this type, instead the window and all of its 53 created for this type, instead the window and all of its
@@ -401,7 +401,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
401 @endcode 401 @endcode
402 */ 402 */
403 values { 403 values {
404 icon: Evas.Object @nullable; [[The Evas image object to use for an icon.]] 404 icon: Efl.Canvas.Object @nullable; [[The Evas image object to use for an icon.]]
405 } 405 }
406 } 406 }
407 get { 407 get {
@@ -411,7 +411,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
411 the object to use for the window icon. 411 the object to use for the window icon.
412 ]] 412 ]]
413 values { 413 values {
414 icon: const(Evas.Object) @nullable; [[The Evas image object to use for an icon.]] 414 icon: const(Efl.Canvas.Object) @nullable; [[The Evas image object to use for an icon.]]
415 } 415 }
416 } 416 }
417 } 417 }
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index f9e3d76d7c..fb26c19dec 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -415,7 +415,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
415 415
416 sd->first_filter = EINA_TRUE; 416 sd->first_filter = EINA_TRUE;
417 417
418 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 418 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
419 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 419 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
420 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); 420 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
421 421
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index b7f2c6c18e..7d3a8b9f86 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1177,7 +1177,7 @@ EOLIAN static Eo *
1177_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED) 1177_elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED)
1178{ 1178{
1179 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1179 obj = eo_constructor(eo_super(obj, MY_CLASS));
1180 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1180 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1181 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1181 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1182 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); 1182 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
1183 1183
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 1944e9ac8a..68f5535713 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -2017,7 +2017,7 @@ _elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd)
2017{ 2017{
2018 obj = eo_constructor(eo_super(obj, MY_CLASS)); 2018 obj = eo_constructor(eo_super(obj, MY_CLASS));
2019 sd->obj = obj; 2019 sd->obj = obj;
2020 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 2020 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2021 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2021 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2022 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER); 2022 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER);
2023 2023
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index ff18f2d15b..abf4cb3d91 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -275,7 +275,7 @@ _elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Da
275 obj = eo_constructor(eo_super(obj, MY_CLASS)); 275 obj = eo_constructor(eo_super(obj, MY_CLASS));
276 sd->obj = obj; 276 sd->obj = obj;
277 277
278 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 278 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
279 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 279 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
280 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 280 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
281 281
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 970c5bcbe1..3d36e5ea20 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -389,7 +389,7 @@ EOLIAN static Eo *
389_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) 389_elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED)
390{ 390{
391 obj = eo_constructor(eo_super(obj, MY_CLASS)); 391 obj = eo_constructor(eo_super(obj, MY_CLASS));
392 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 392 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
393 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 393 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
394 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING); 394 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING);
395 395
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index fc3b4ba249..4b6df50265 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -615,7 +615,7 @@ EOLIAN static Eo *
615_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) 615_elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED)
616{ 616{
617 obj = eo_constructor(eo_super(obj, MY_CLASS)); 617 obj = eo_constructor(eo_super(obj, MY_CLASS));
618 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 618 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
619 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 619 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
620 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 620 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
621 621
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 5932ca2824..9fed32ab87 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -1702,7 +1702,7 @@ EOLIAN static Eo *
1702_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED) 1702_elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED)
1703{ 1703{
1704 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1704 obj = eo_constructor(eo_super(obj, MY_CLASS));
1705 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1705 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1706 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1706 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1707 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 1707 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
1708 1708
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 7f53e7dbb4..dc867a7767 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1593,7 +1593,7 @@ _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd)
1593{ 1593{
1594 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1594 obj = eo_constructor(eo_super(obj, MY_CLASS));
1595 sd->obj = obj; 1595 sd->obj = obj;
1596 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1596 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1597 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1597 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1598 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); 1598 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST);
1599 1599
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index a4e9551ee2..e901acafc7 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -680,7 +680,7 @@ EOLIAN static Eo *
680_elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) 680_elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
681{ 681{
682 obj = eo_constructor(eo_super(obj, MY_CLASS)); 682 obj = eo_constructor(eo_super(obj, MY_CLASS));
683 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 683 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
684 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 684 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
685 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 685 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
686 686
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 7e2861f777..f5dfb03f1c 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1614,7 +1614,7 @@ EOLIAN static Eo *
1614_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) 1614_elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
1615{ 1615{
1616 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1616 obj = eo_constructor(eo_super(obj, MY_CLASS));
1617 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1617 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1618 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1618 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1619 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); 1619 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
1620 1620
diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index 0e84d6ecda..b9d17497cf 100644
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -8,4 +8,4 @@
8 */ 8 */
9 9
10#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme" 10#define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
11#define EVAS_OBJECT_PROTECTED 11#define EFL_CANVAS_OBJECT_PROTECTED
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index a3ee86529d..dcae9481a3 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -1245,7 +1245,7 @@ EOLIAN static Eo *
1245_elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 1245_elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
1246{ 1246{
1247 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1247 obj = eo_constructor(eo_super(obj, MY_CLASS));
1248 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1248 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1249 1249
1250 return obj; 1250 return obj;
1251} 1251}
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 4301c5e417..face9848b4 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -540,7 +540,7 @@ EOLIAN static Eo *
540_elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED) 540_elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED)
541{ 541{
542 obj = eo_constructor(eo_super(obj, MY_CLASS)); 542 obj = eo_constructor(eo_super(obj, MY_CLASS));
543 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 543 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
544 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 544 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
545 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); 545 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
546 546
diff --git a/src/lib/elementary/elm_app_server_view.eo b/src/lib/elementary/elm_app_server_view.eo
index 52a1194fde..6aad03e108 100644
--- a/src/lib/elementary/elm_app_server_view.eo
+++ b/src/lib/elementary/elm_app_server_view.eo
@@ -44,7 +44,7 @@ class Elm.App.Server.View (Eo.Base)
44 set { 44 set {
45 } 45 }
46 values { 46 values {
47 win: Evas.Object; 47 win: Efl.Canvas.Object;
48 } 48 }
49 } 49 }
50 @property id { 50 @property id {
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index 5b8e684119..a019102f55 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -123,7 +123,7 @@ _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
123{ 123{
124 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED); 124 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED);
125 obj = eo_constructor(eo_super(obj, MY_CLASS)); 125 obj = eo_constructor(eo_super(obj, MY_CLASS));
126 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 126 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
127 127
128 return obj; 128 return obj;
129} 129}
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index cbba1960b9..c6e635cb78 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -438,7 +438,7 @@ _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
438{ 438{
439 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); 439 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
440 obj = eo_constructor(eo_super(obj, MY_CLASS)); 440 obj = eo_constructor(eo_super(obj, MY_CLASS));
441 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 441 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
442 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 442 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
443 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 443 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
444 444
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index c99ccade4e..96ad6051a5 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -139,7 +139,7 @@ class Elm.Box (Elm.Widget)
139 You must free this list with eina_list_free() once you are done with it. 139 You must free this list with eina_list_free() once you are done with it.
140 140
141 ]] 141 ]]
142 return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; 142 return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
143 } 143 }
144 } 144 }
145 pack_end { 145 pack_end {
@@ -160,7 +160,7 @@ class Elm.Box (Elm.Widget)
160 ]] 160 ]]
161 161
162 params { 162 params {
163 @in subobj: Evas.Object; [[The object to add to the box]] 163 @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
164 } 164 }
165 } 165 }
166 unpack_all { 166 unpack_all {
@@ -188,7 +188,7 @@ class Elm.Box (Elm.Widget)
188 ]] 188 ]]
189 189
190 params { 190 params {
191 @in subobj: Evas.Object; [[The object to unpack]] 191 @in subobj: Efl.Canvas.Object; [[The object to unpack]]
192 } 192 }
193 } 193 }
194 pack_after { 194 pack_after {
@@ -209,8 +209,8 @@ class Elm.Box (Elm.Widget)
209 ]] 209 ]]
210 210
211 params { 211 params {
212 @in subobj: Evas.Object; [[The object to add to the box]] 212 @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
213 @in after: Evas.Object; [[The object after which to add it]] 213 @in after: Efl.Canvas.Object; [[The object after which to add it]]
214 } 214 }
215 } 215 }
216 pack_start { 216 pack_start {
@@ -232,7 +232,7 @@ class Elm.Box (Elm.Widget)
232 ]] 232 ]]
233 233
234 params { 234 params {
235 @in subobj: Evas.Object; [[The object to add to the box]] 235 @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
236 } 236 }
237 } 237 }
238 recalculate { 238 recalculate {
@@ -265,8 +265,8 @@ class Elm.Box (Elm.Widget)
265 ]] 265 ]]
266 266
267 params { 267 params {
268 @in subobj: Evas.Object; [[The object to add to the box]] 268 @in subobj: Efl.Canvas.Object; [[The object to add to the box]]
269 @in before: Evas.Object; [[The object before which to add it]] 269 @in before: Efl.Canvas.Object; [[The object before which to add it]]
270 } 270 }
271 } 271 }
272 clear { 272 clear {
diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c
index 4c7a848a4a..e6177257d2 100644
--- a/src/lib/elementary/elm_bubble.c
+++ b/src/lib/elementary/elm_bubble.c
@@ -228,7 +228,7 @@ EOLIAN static Eo *
228_elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED) 228_elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED)
229{ 229{
230 obj = eo_constructor(eo_super(obj, MY_CLASS)); 230 obj = eo_constructor(eo_super(obj, MY_CLASS));
231 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 231 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
232 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 232 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
233 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 233 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
234 234
diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c
index 252956cb6c..fd6668068e 100644
--- a/src/lib/elementary/elm_button.c
+++ b/src/lib/elementary/elm_button.c
@@ -335,7 +335,7 @@ EOLIAN static Eo *
335_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) 335_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED)
336{ 336{
337 obj = eo_constructor(eo_super(obj, MY_CLASS)); 337 obj = eo_constructor(eo_super(obj, MY_CLASS));
338 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 338 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
339 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 339 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
340 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 340 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON);
341 341
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index 08096dc475..405165fd8f 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -1593,7 +1593,7 @@ _elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd)
1593 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1593 obj = eo_constructor(eo_super(obj, MY_CLASS));
1594 sd->obj = obj; 1594 sd->obj = obj;
1595 1595
1596 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1596 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1597 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1597 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1598 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR); 1598 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR);
1599 1599
diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c
index 21c0096352..9b10a3f99b 100644
--- a/src/lib/elementary/elm_check.c
+++ b/src/lib/elementary/elm_check.c
@@ -367,7 +367,7 @@ EOLIAN static Eo *
367_elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) 367_elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED)
368{ 368{
369 obj = eo_constructor(eo_super(obj, MY_CLASS)); 369 obj = eo_constructor(eo_super(obj, MY_CLASS));
370 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 370 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
371 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 371 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
372 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX); 372 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX);
373 373
diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c
index b9923085e4..23e2a04f75 100644
--- a/src/lib/elementary/elm_clock.c
+++ b/src/lib/elementary/elm_clock.c
@@ -798,7 +798,7 @@ EOLIAN static Eo *
798_elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED) 798_elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED)
799{ 799{
800 obj = eo_constructor(eo_super(obj, MY_CLASS)); 800 obj = eo_constructor(eo_super(obj, MY_CLASS));
801 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 801 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
802 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 802 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
803 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT); 803 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT);
804 804
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index abda3735e9..aab7340d0a 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -2216,7 +2216,7 @@ EOLIAN static Eo *
2216_elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED) 2216_elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED)
2217{ 2217{
2218 obj = eo_constructor(eo_super(obj, MY_CLASS)); 2218 obj = eo_constructor(eo_super(obj, MY_CLASS));
2219 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 2219 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2220 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2220 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2221 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER); 2221 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER);
2222 2222
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index c512aa5a13..4cc2a05380 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -995,7 +995,7 @@ EOLIAN static Eo *
995_elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd) 995_elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
996{ 996{
997 obj = eo_constructor(eo_super(obj, MY_CLASS)); 997 obj = eo_constructor(eo_super(obj, MY_CLASS));
998 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 998 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
999 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 999 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1000 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 1000 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
1001 1001
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 12d12e2132..e993ac0ed8 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -63,7 +63,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
63 ]] 63 ]]
64 } 64 }
65 values { 65 values {
66 parent: Evas.Object; [[The parent to use.]] 66 parent: Efl.Canvas.Object; [[The parent to use.]]
67 } 67 }
68 } 68 }
69 @property direction_priority { 69 @property direction_priority {
@@ -175,7 +175,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
175 175
176 params { 176 params {
177 @in label: string; [[The Label of the new item]] 177 @in label: string; [[The Label of the new item]]
178 @in icon: Evas.Object @optional; [[Icon to be set on new item]] 178 @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]]
179 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]] 179 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
180 @in data: const(void_ptr) @optional; [[Data passed to $func]] 180 @in data: const(void_ptr) @optional; [[Data passed to $func]]
181 } 181 }
@@ -194,7 +194,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati
194 194
195 params { 195 params {
196 @in label: string; [[The Label of the new item]] 196 @in label: string; [[The Label of the new item]]
197 @in icon: Evas.Object @optional; [[Icon to be set on new item]] 197 @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]]
198 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]] 198 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]]
199 @in data: const(void_ptr) @optional; [[Data passed to $func]] 199 @in data: const(void_ptr) @optional; [[Data passed to $func]]
200 } 200 }
diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c
index 907a052931..0698e1d517 100644
--- a/src/lib/elementary/elm_datetime.c
+++ b/src/lib/elementary/elm_datetime.c
@@ -892,7 +892,7 @@ EOLIAN static Eo *
892_elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED) 892_elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED)
893{ 893{
894 obj = eo_constructor(eo_super(obj, MY_CLASS)); 894 obj = eo_constructor(eo_super(obj, MY_CLASS));
895 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 895 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
896 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 896 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
897 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR); 897 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR);
898 898
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 0102a23c7c..48f84fef81 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -461,7 +461,7 @@ EOLIAN static Eo *
461_elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED) 461_elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED)
462{ 462{
463 obj = eo_constructor(eo_super(obj, MY_CLASS)); 463 obj = eo_constructor(eo_super(obj, MY_CLASS));
464 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 464 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
465 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 465 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
466 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); 466 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
467 467
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index 959e0188fc..36fbf59bc9 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -1463,7 +1463,7 @@ EOLIAN static Eo *
1463_elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED) 1463_elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED)
1464{ 1464{
1465 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1465 obj = eo_constructor(eo_super(obj, MY_CLASS));
1466 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1466 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1467 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1467 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1468 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); 1468 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
1469 1469
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index 274f52b4e5..92146a1961 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -179,7 +179,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
179 return: Elm.Widget.Item; 179 return: Elm.Widget.Item;
180 params { 180 params {
181 @in label: string; [[The label of the diskselector item.]] 181 @in label: string; [[The label of the diskselector item.]]
182 @in icon: Evas.Object @optional; [[The icon object to use at left side of the item. An 182 @in icon: Efl.Canvas.Object @optional; [[The icon object to use at left side of the item. An
183 icon can be any Evas object, but usually it is an icon created 183 icon can be any Evas object, but usually it is an icon created
184 with elm_icon_add(). ]] 184 with elm_icon_add(). ]]
185 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]] 185 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]]
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index c9100daa09..0c5e25c7b2 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3951,7 +3951,7 @@ EOLIAN static Eo *
3951_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 3951_elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
3952{ 3952{
3953 obj = eo_constructor(eo_super(obj, MY_CLASS)); 3953 obj = eo_constructor(eo_super(obj, MY_CLASS));
3954 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 3954 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
3955 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 3955 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3956 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 3956 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY);
3957 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); 3957 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 69b86adb59..8fdba32d90 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -381,7 +381,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
381 ]] 381 ]]
382 } 382 }
383 values { 383 values {
384 parent: Evas.Object @nullable; [[The object to use as parent for the hover.]] 384 parent: Efl.Canvas.Object @nullable; [[The object to use as parent for the hover.]]
385 } 385 }
386 } 386 }
387 @property prediction_allow { 387 @property prediction_allow {
@@ -574,7 +574,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
574 change the internal textblock object). This applies to all cursors 574 change the internal textblock object). This applies to all cursors
575 returned from textblock calls, and all the other derivative values. 575 returned from textblock calls, and all the other derivative values.
576 ]] 576 ]]
577 return: Evas.Object; 577 return: Efl.Canvas.Object;
578 } 578 }
579 } 579 }
580 @property cursor_geometry { 580 @property cursor_geometry {
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 0da66390bc..d4003c1474 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -670,7 +670,7 @@ _elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd)
670{ 670{
671 obj = eo_constructor(eo_super(obj, MY_CLASS)); 671 obj = eo_constructor(eo_super(obj, MY_CLASS));
672 sd->obj = obj; 672 sd->obj = obj;
673 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 673 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
674 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 674 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
675 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); 675 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
676 676
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c
index 4e5f02a038..b89d5a23fd 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/elm_frame.c
@@ -202,7 +202,7 @@ EOLIAN static Eo *
202_elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) 202_elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED)
203{ 203{
204 obj = eo_constructor(eo_super(obj, MY_CLASS)); 204 obj = eo_constructor(eo_super(obj, MY_CLASS));
205 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 205 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
206 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 206 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
207 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME); 207 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME);
208 208
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index edbb52a6df..4e509647cc 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -4357,7 +4357,7 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
4357 obj = eo_constructor(eo_super(obj, MY_CLASS)); 4357 obj = eo_constructor(eo_super(obj, MY_CLASS));
4358 sd->obj = obj; 4358 sd->obj = obj;
4359 4359
4360 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 4360 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
4361 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 4361 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
4362 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE); 4362 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE);
4363 4363
diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index 8ff492d6b1..ab4c99cd78 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -201,7 +201,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
201 floating "orphans" that can be re-used elsewhere if the user wants 201 floating "orphans" that can be re-used elsewhere if the user wants
202 to.]] 202 to.]]
203 params { 203 params {
204 @out l: own(list<own(Evas.Object)>); [[The contents list to return.]] 204 @out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]]
205 } 205 }
206 } 206 }
207 } 207 }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 18ec3d9ef9..ac67e68ed3 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -5708,7 +5708,7 @@ _elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd)
5708 obj = eo_constructor(eo_super(obj, MY_CLASS)); 5708 obj = eo_constructor(eo_super(obj, MY_CLASS));
5709 sd->obj = obj; 5709 sd->obj = obj;
5710 5710
5711 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 5711 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
5712 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 5712 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
5713 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); 5713 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
5714 5714
diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo
index 1decfa5aab..324ebd532d 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -326,7 +326,7 @@ class Elm.Genlist.Item(Elm.Widget.Item)
326 elsewhere if the user wants to. 326 elsewhere if the user wants to.
327 ]] 327 ]]
328 params { 328 params {
329 @out l: own(list<own(Evas.Object)>); [[The contents list to return.]] 329 @out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]]
330 } 330 }
331 } 331 }
332 update { 332 update {
diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c
index a0f9e30a42..5711a4b68c 100644
--- a/src/lib/elementary/elm_gesture_layer.c
+++ b/src/lib/elementary/elm_gesture_layer.c
@@ -3825,7 +3825,7 @@ EOLIAN static Eo *
3825_elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED) 3825_elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED)
3826{ 3826{
3827 obj = eo_constructor(eo_super(obj, MY_CLASS)); 3827 obj = eo_constructor(eo_super(obj, MY_CLASS));
3828 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 3828 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
3829 3829
3830 return obj; 3830 return obj;
3831} 3831}
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index 988e86b152..8d63081391 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -121,7 +121,7 @@ class Elm.Gesture_Layer (Elm.Widget)
121 ]] 121 ]]
122 return: bool; [[$true on success, $false otherwise.]] 122 return: bool; [[$true on success, $false otherwise.]]
123 params { 123 params {
124 @in target: Evas.Object; [[The object to attach.]] 124 @in target: Efl.Canvas.Object; [[The object to attach.]]
125 } 125 }
126 } 126 }
127 cb_del { 127 cb_del {
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index dfddc9df31..c376fa8d78 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -358,7 +358,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
358 ((version > 0) && (version <= 3)) ? version : EVAS_GL_GLES_2_X; 358 ((version > 0) && (version <= 3)) ? version : EVAS_GL_GLES_2_X;
359 _elm_glview_constructor(obj, sd); 359 _elm_glview_constructor(obj, sd);
360 360
361 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 361 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
362 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 362 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
363 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 363 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
364 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); 364 eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL);
diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c
index 349408a683..d68625b3a0 100644
--- a/src/lib/elementary/elm_grid.c
+++ b/src/lib/elementary/elm_grid.c
@@ -169,7 +169,7 @@ EOLIAN static Eo *
169_elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 169_elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
170{ 170{
171 obj = eo_constructor(eo_super(obj, MY_CLASS)); 171 obj = eo_constructor(eo_super(obj, MY_CLASS));
172 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 172 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
173 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 173 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
174 174
175 return obj; 175 return obj;
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index db3397cfe9..a0c1d628c1 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -25,7 +25,7 @@ class Elm.Grid (Elm.Widget)
25 It's possible to remove objects from the grid when walking this 25 It's possible to remove objects from the grid when walking this
26 list, but these removals won't be reflected on it. 26 list, but these removals won't be reflected on it.
27 ]] 27 ]]
28 return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; 28 return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
29 } 29 }
30 } 30 }
31 clear { 31 clear {
@@ -37,13 +37,13 @@ class Elm.Grid (Elm.Widget)
37 unpack { 37 unpack {
38 [[Unpack a child from a grid object]] 38 [[Unpack a child from a grid object]]
39 params { 39 params {
40 @in subobj: Evas.Object; [[The child to unpack]] 40 @in subobj: Efl.Canvas.Object; [[The child to unpack]]
41 } 41 }
42 } 42 }
43 pack { 43 pack {
44 [[Pack child at given position and size]] 44 [[Pack child at given position and size]]
45 params { 45 params {
46 @in subobj: Evas.Object; [[The child to pack.]] 46 @in subobj: Efl.Canvas.Object; [[The child to pack.]]
47 @in x: Evas.Coord; [[The virtual x coord at which to pack it.]] 47 @in x: Evas.Coord; [[The virtual x coord at which to pack it.]]
48 @in y: Evas.Coord; [[The virtual y coord at which to pack it.]] 48 @in y: Evas.Coord; [[The virtual y coord at which to pack it.]]
49 @in w: Evas.Coord; [[The virtual width at which to pack it.]] 49 @in w: Evas.Coord; [[The virtual width at which to pack it.]]
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index 2d554891cf..729cddff44 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -671,7 +671,7 @@ EOLIAN static Eo *
671_elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) 671_elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED)
672{ 672{
673 obj = eo_constructor(eo_super(obj, MY_CLASS)); 673 obj = eo_constructor(eo_super(obj, MY_CLASS));
674 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 674 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
675 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 675 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
676 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); 676 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU);
677 677
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 135c342c79..04dcfe6186 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -25,7 +25,7 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action
25 [[Get the target object for the hover.]] 25 [[Get the target object for the hover.]]
26 } 26 }
27 values { 27 values {
28 target: Evas.Object; [[The target object.]] 28 target: Efl.Canvas.Object; [[The target object.]]
29 } 29 }
30 } 30 }
31 best_content_location_get @const { 31 best_content_location_get @const {
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 9d4b2fceac..c11b44588a 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -30,7 +30,7 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
30 get { 30 get {
31 } 31 }
32 values { 32 values {
33 parent: Evas.Object @nullable; [[The parent to use]] 33 parent: Efl.Canvas.Object @nullable; [[The parent to use]]
34 } 34 }
35 } 35 }
36 @property expanded { 36 @property expanded {
diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c
index ff9d1d6e42..168e243ad0 100644
--- a/src/lib/elementary/elm_icon.c
+++ b/src/lib/elementary/elm_icon.c
@@ -617,7 +617,7 @@ _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd)
617 obj = eo_constructor(eo_super(obj, MY_CLASS)); 617 obj = eo_constructor(eo_super(obj, MY_CLASS));
618 sd->obj = obj; 618 sd->obj = obj;
619 619
620 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 620 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
621 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 621 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
622 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 622 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
623 623
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 5b2536d4b2..cfdd9b344d 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -1259,7 +1259,7 @@ EOLIAN static Eo *
1259_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED) 1259_elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
1260{ 1260{
1261 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1261 obj = eo_constructor(eo_super(obj, MY_CLASS));
1262 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1262 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1263 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1263 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1264 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR); 1264 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR);
1265 1265
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 5c1e166cce..32c2b3d97f 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -234,7 +234,7 @@ EOLIAN static Eo *
234_elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) 234_elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED)
235{ 235{
236 obj = eo_constructor(eo_super(obj, MY_PAN_CLASS)); 236 obj = eo_constructor(eo_super(obj, MY_PAN_CLASS));
237 evas_obj_type_set(obj, MY_PAN_CLASS_NAME_LEGACY); 237 efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY);
238 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 238 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
239 239
240 return obj; 240 return obj;
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index b9b3a85a3e..f1b74adf63 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -382,7 +382,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
382 set { 382 set {
383 } 383 }
384 values { 384 values {
385 pan: Evas.Object @nullable; 385 pan: Efl.Canvas.Object @nullable;
386 } 386 }
387 } 387 }
388 @property page_change_cb { 388 @property page_change_cb {
@@ -467,7 +467,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
467 set { 467 set {
468 } 468 }
469 values { 469 values {
470 content: Evas.Object @nullable; 470 content: Efl.Canvas.Object @nullable;
471 } 471 }
472 } 472 }
473 @property edge_left_cb { 473 @property edge_left_cb {
@@ -522,8 +522,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group)
522 set { 522 set {
523 } 523 }
524 values { 524 values {
525 edje_object: Evas.Object; 525 edje_object: Efl.Canvas.Object;
526 hit_rectangle: Evas.Object; 526 hit_rectangle: Efl.Canvas.Object;
527 } 527 }
528 } 528 }
529 @property last_page { 529 @property last_page {
diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c
index 38908d8b3a..28df916036 100644
--- a/src/lib/elementary/elm_inwin.c
+++ b/src/lib/elementary/elm_inwin.c
@@ -116,7 +116,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
116 } 116 }
117 117
118 obj = eo_constructor(eo_super(obj, MY_CLASS)); 118 obj = eo_constructor(eo_super(obj, MY_CLASS));
119 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 119 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
120 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); 120 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE);
121 121
122 return obj; 122 return obj;
diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c
index 12e5707c00..d95ce92020 100644
--- a/src/lib/elementary/elm_label.c
+++ b/src/lib/elementary/elm_label.c
@@ -414,7 +414,7 @@ EOLIAN static Eo *
414_elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) 414_elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED)
415{ 415{
416 obj = eo_constructor(eo_super(obj, MY_CLASS)); 416 obj = eo_constructor(eo_super(obj, MY_CLASS));
417 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 417 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
418 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 418 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
419 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL); 419 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL);
420 420
diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c
index 9d87908f72..4ffc97e1fd 100644
--- a/src/lib/elementary/elm_layout.c
+++ b/src/lib/elementary/elm_layout.c
@@ -1899,7 +1899,7 @@ _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd)
1899{ 1899{
1900 sd->obj = obj; 1900 sd->obj = obj;
1901 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1901 obj = eo_constructor(eo_super(obj, MY_CLASS));
1902 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1902 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1903 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1903 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1904 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 1904 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
1905 1905
diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo
index e7e52c4908..92b4fb9f8a 100644
--- a/src/lib/elementary/elm_layout.eo
+++ b/src/lib/elementary/elm_layout.eo
@@ -94,7 +94,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File)
94 hooking callbacks to signals, etc.) can be done with 94 hooking callbacks to signals, etc.) can be done with
95 proper elementary functions. 95 proper elementary functions.
96 ]] 96 ]]
97 return: Evas.Object; [[An Evas_Object with the edje layout 97 return: Efl.Canvas.Object; [[An Evas_Object with the edje layout
98 settings loaded \@ref elm_layout_file_set.]] 98 settings loaded \@ref elm_layout_file_set.]]
99 } 99 }
100 } 100 }
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 29ac55cea5..7c3a072095 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2553,7 +2553,7 @@ EOLIAN static Eo *
2553_elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED) 2553_elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
2554{ 2554{
2555 obj = eo_constructor(eo_super(obj, MY_CLASS)); 2555 obj = eo_constructor(eo_super(obj, MY_CLASS));
2556 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 2556 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2557 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2557 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2558 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); 2558 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
2559 2559
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 6b48304316..11de7b6c37 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -228,8 +228,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
228 params { 228 params {
229 @in before: Elm.Widget.Item; [[The list item to insert before.]] 229 @in before: Elm.Widget.Item; [[The list item to insert before.]]
230 @in label: string; [[The label of the list item.]] 230 @in label: string; [[The label of the list item.]]
231 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 231 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
232 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 232 @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
233 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 233 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
234 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] 234 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
235 } 235 }
@@ -275,8 +275,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
275 params { 275 params {
276 @in after: Elm.Widget.Item; [[The list item to insert after.]] 276 @in after: Elm.Widget.Item; [[The list item to insert after.]]
277 @in label: string; [[The label of the list item.]] 277 @in label: string; [[The label of the list item.]]
278 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 278 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
279 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 279 @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
280 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 280 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
281 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] 281 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
282 } 282 }
@@ -345,8 +345,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
345 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] 345 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
346 params { 346 params {
347 @in label: string; [[The label of the list item.]] 347 @in label: string; [[The label of the list item.]]
348 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 348 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
349 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 349 @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
350 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 350 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
351 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] 351 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
352 } 352 }
@@ -376,8 +376,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
376 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] 376 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
377 params { 377 params {
378 @in label: string; [[The label of the list item.]] 378 @in label: string; [[The label of the list item.]]
379 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 379 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
380 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 380 @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
381 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 381 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
382 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] 382 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
383 } 383 }
@@ -414,8 +414,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
414 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] 414 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
415 params { 415 params {
416 @in label: string; [[The label of the list item.]] 416 @in label: string; [[The label of the list item.]]
417 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 417 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
418 @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] 418 @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]]
419 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] 419 @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]]
420 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] 420 @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]]
421 @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list 421 @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list
diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo
index 939048bdab..755b7ec864 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/elm_list_item.eo
@@ -53,7 +53,7 @@ class Elm.List.Item(Elm.Widget.Item)
53 ]] 53 ]]
54 } 54 }
55 values { 55 values {
56 obj: Evas.Object; [[The base Edje object associated with the item.]] 56 obj: Efl.Canvas.Object; [[The base Edje object associated with the item.]]
57 } 57 }
58 } 58 }
59 @property prev { 59 @property prev {
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 3888d6c058..7466cc961a 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4236,7 +4236,7 @@ _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd)
4236 obj = eo_constructor(eo_super(obj, MY_CLASS)); 4236 obj = eo_constructor(eo_super(obj, MY_CLASS));
4237 sd->obj = obj; 4237 sd->obj = obj;
4238 4238
4239 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 4239 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
4240 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 4240 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
4241 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); 4241 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
4242 4242
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index a8b0b926b2..cc9311b1ff 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -348,7 +348,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
348 } 348 }
349 track_add { 349 track_add {
350 [[Add a track on the map.]] 350 [[Add a track on the map.]]
351 return: Evas.Object; [[The route object. This is an elm object of type Route.]] 351 return: Efl.Canvas.Object; [[The route object. This is an elm object of type Route.]]
352 params { 352 params {
353 @in emap: void_ptr; [[The emap route object.]] 353 @in emap: void_ptr; [[The emap route object.]]
354 } 354 }
@@ -547,7 +547,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable,
547 track_remove { 547 track_remove {
548 [[Remove a track from the map.]] 548 [[Remove a track from the map.]]
549 params { 549 params {
550 @in route: Evas.Object; [[The track to remove.]] 550 @in route: Efl.Canvas.Object; [[The track to remove.]]
551 } 551 }
552 } 552 }
553 overlay_route_add { 553 overlay_route_add {
diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c
index e98c3fef66..c6e1fa200f 100644
--- a/src/lib/elementary/elm_mapbuf.c
+++ b/src/lib/elementary/elm_mapbuf.c
@@ -316,7 +316,7 @@ EOLIAN static Eo *
316_elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) 316_elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED)
317{ 317{
318 obj = eo_constructor(eo_super(obj, MY_CLASS)); 318 obj = eo_constructor(eo_super(obj, MY_CLASS));
319 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 319 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
320 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); 320 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP);
321 321
322 return obj; 322 return obj;
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 358d1634db..04e33cc6a5 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -786,7 +786,7 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
786 Eo *parent = NULL; 786 Eo *parent = NULL;
787 787
788 obj = eo_constructor(eo_super(obj, MY_CLASS)); 788 obj = eo_constructor(eo_super(obj, MY_CLASS));
789 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 789 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
790 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 790 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
791 parent = eo_parent_get(obj); 791 parent = eo_parent_get(obj);
792 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU); 792 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU);
diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo
index d187779392..3aae16a355 100644
--- a/src/lib/elementary/elm_menu_item.eo
+++ b/src/lib/elementary/elm_menu_item.eo
@@ -69,7 +69,7 @@ class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection)
69 69
70 Warning: Don't manipulate this object! 70 Warning: Don't manipulate this object!
71 ]] 71 ]]
72 return: Evas.Object; [[The base Edje object containing the 72 return: Efl.Canvas.Object; [[The base Edje object containing the
73 swallowed content associated with the item.]] 73 swallowed content associated with the item.]]
74 } 74 }
75 } 75 }
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 5c7e5bf9f3..db17a9b144 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -71,7 +71,7 @@ class Elm.Multibuttonentry (Elm.Layout)
71 get { 71 get {
72 [[Get the entry of the multibuttonentry object]] 72 [[Get the entry of the multibuttonentry object]]
73 73
74 return: Evas.Object; [[The entry object, or NULL if none]] 74 return: Efl.Canvas.Object; [[The entry object, or NULL if none]]
75 } 75 }
76 } 76 }
77 @property selected_item { 77 @property selected_item {
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index 95c54c6e04..83c1f2d009 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -73,7 +73,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
73 is complete. 73 is complete.
74 ]] 74 ]]
75 75
76 return: Evas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]] 76 return: Efl.Canvas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]]
77 } 77 }
78 item_insert_before { 78 item_insert_before {
79 [[Insert a new item into the naviframe before item $before. 79 [[Insert a new item into the naviframe before item $before.
@@ -85,9 +85,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
85 params { 85 params {
86 @in before: Elm.Widget.Item; [[The naviframe item to insert before.]] 86 @in before: Elm.Widget.Item; [[The naviframe item to insert before.]]
87 @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]] 87 @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
88 @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] 88 @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
89 @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] 89 @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
90 @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] 90 @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
91 @in item_style: string @nullable; [[The current item style name. $NULL would be default.]] 91 @in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
92 } 92 }
93 } 93 }
@@ -106,9 +106,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
106 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] 106 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
107 params { 107 params {
108 @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]] 108 @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
109 @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] 109 @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
110 @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] 110 @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
111 @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] 111 @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
112 @in item_style: string @nullable; [[The current item style name. $NULL would be default.]] 112 @in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
113 } 113 }
114 } 114 }
@@ -116,7 +116,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
116 [[Simple version of item_promote.]] 116 [[Simple version of item_promote.]]
117 117
118 params { 118 params {
119 @in content: Evas.Object; 119 @in content: Efl.Canvas.Object;
120 } 120 }
121 } 121 }
122 item_insert_after { 122 item_insert_after {
@@ -132,9 +132,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
132 params { 132 params {
133 @in after: Elm.Widget.Item; [[The naviframe item to insert after.]] 133 @in after: Elm.Widget.Item; [[The naviframe item to insert after.]]
134 @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]] 134 @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]]
135 @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] 135 @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]]
136 @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] 136 @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]]
137 @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] 137 @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]]
138 @in item_style: string @nullable; [[The current item style name. $NULL would be default.]] 138 @in item_style: string @nullable; [[The current item style name. $NULL would be default.]]
139 } 139 }
140 } 140 }
diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c
index 810e71e52c..ed376194e8 100644
--- a/src/lib/elementary/elm_notify.c
+++ b/src/lib/elementary/elm_notify.c
@@ -494,7 +494,7 @@ EOLIAN static Eo *
494_elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED) 494_elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED)
495{ 495{
496 obj = eo_constructor(eo_super(obj, MY_CLASS)); 496 obj = eo_constructor(eo_super(obj, MY_CLASS));
497 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 497 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
498 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); 498 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION);
499 499
500 return obj; 500 return obj;
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 5a057e3e67..2e20914531 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1174,7 +1174,7 @@ EOLIAN static Eo *
1174_elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) 1174_elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED)
1175{ 1175{
1176 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1176 obj = eo_constructor(eo_super(obj, MY_CLASS));
1177 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1177 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1178 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1178 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1179 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); 1179 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL);
1180 1180
diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c
index f9c406d6f5..d8f7c4fdb7 100644
--- a/src/lib/elementary/elm_panes.c
+++ b/src/lib/elementary/elm_panes.c
@@ -331,7 +331,7 @@ EOLIAN static Eo *
331_elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) 331_elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED)
332{ 332{
333 obj = eo_constructor(eo_super(obj, MY_CLASS)); 333 obj = eo_constructor(eo_super(obj, MY_CLASS));
334 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 334 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
335 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 335 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
336 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE); 336 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE);
337 337
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 0436a3dc37..cd1c3118ac 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -304,7 +304,7 @@ EOLIAN static Eo *
304_elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED) 304_elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED)
305{ 305{
306 obj = eo_constructor(eo_super(obj, MY_CLASS)); 306 obj = eo_constructor(eo_super(obj, MY_CLASS));
307 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 307 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
308 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 308 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
309 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 309 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
310 310
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 139c5111ef..ca0f3864da 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -1511,7 +1511,7 @@ EOLIAN static Eo *
1511_elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED) 1511_elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED)
1512{ 1512{
1513 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1513 obj = eo_constructor(eo_super(obj, MY_CLASS));
1514 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1514 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1515 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1515 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1516 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 1516 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
1517 1517
diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo
index b456137f29..6d442c5abc 100644
--- a/src/lib/elementary/elm_photocam.eo
+++ b/src/lib/elementary/elm_photocam.eo
@@ -134,7 +134,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable,
134 modify it. It is for inspection only, and hooking callbacks 134 modify it. It is for inspection only, and hooking callbacks
135 to. Nothing else. It may be deleted at any time as well. 135 to. Nothing else. It may be deleted at any time as well.
136 ]] 136 ]]
137 return: Evas.Object; [[The internal image object handle or $null]] 137 return: Efl.Canvas.Object; [[The internal image object handle or $null]]
138 } 138 }
139 } 139 }
140 @property image_size { 140 @property image_size {
diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c
index 3dc73f7014..9654577b64 100644
--- a/src/lib/elementary/elm_plug.c
+++ b/src/lib/elementary/elm_plug.c
@@ -144,7 +144,7 @@ EOLIAN static Eo *
144_elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED) 144_elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED)
145{ 145{
146 obj = eo_constructor(eo_super(obj, MY_CLASS)); 146 obj = eo_constructor(eo_super(obj, MY_CLASS));
147 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 147 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
148 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 148 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
149 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 149 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
150 150
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index 9e3a60ff80..8f077da72f 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -16,7 +16,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable)
16 Note: Be careful to not manipulate it, as it is under control of 16 Note: Be careful to not manipulate it, as it is under control of
17 elementary. 17 elementary.
18 ]] 18 ]]
19 return: Evas.Object; [[The inlined image object or $null.]] 19 return: Efl.Canvas.Object; [[The inlined image object or $null.]]
20 } 20 }
21 } 21 }
22 connect { 22 connect {
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 9d4aa06d38..90745ca7b3 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -153,7 +153,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action)
153 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] 153 return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]]
154 params { 154 params {
155 @in label: string; [[The Label of the new item.]] 155 @in label: string; [[The Label of the new item.]]
156 @in icon: Evas.Object @optional; [[Icon to be set on new item.]] 156 @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item.]]
157 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]] 157 @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]]
158 @in data: const(void_ptr) @optional; [[Data passed to $func above.]] 158 @in data: const(void_ptr) @optional; [[Data passed to $func above.]]
159 } 159 }
diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c
index dfca0e11c9..120141feae 100644
--- a/src/lib/elementary/elm_prefs.c
+++ b/src/lib/elementary/elm_prefs.c
@@ -516,7 +516,7 @@ EOLIAN static Eo *
516_elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) 516_elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED)
517{ 517{
518 obj = eo_constructor(eo_super(obj, MY_CLASS)); 518 obj = eo_constructor(eo_super(obj, MY_CLASS));
519 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 519 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
520 evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks); 520 evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks);
521 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT); 521 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT);
522 522
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 16060fc095..b93070173e 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -119,7 +119,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
119 119
120 @since 1.8]] 120 @since 1.8]]
121 121
122 return: const(Evas.Object); [[A valid widget handle, on success, or $NULL, otherwise]] 122 return: const(Efl.Canvas.Object); [[A valid widget handle, on success, or $NULL, otherwise]]
123 params { 123 params {
124 @in name: string; [[The name of the item (as declared in the prefs collection) to get object from]] 124 @in name: string; [[The name of the item (as declared in the prefs collection) to get object from]]
125 } 125 }
@@ -151,7 +151,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
151 return: bool; [[$true, on success, $false otherwise]] 151 return: bool; [[$true, on success, $false otherwise]]
152 params { 152 params {
153 @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]] 153 @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]]
154 @in child: Evas.Object; [[The object to occupy the item]] 154 @in child: Efl.Canvas.Object; [[The object to occupy the item]]
155 } 155 }
156 } 156 }
157 item_editable_set { 157 item_editable_set {
@@ -182,7 +182,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
182 182
183 @since 1.8]] 183 @since 1.8]]
184 184
185 return: Evas.Object; [[The unswallowed object, or NULL on errors]] 185 return: Efl.Canvas.Object; [[The unswallowed object, or NULL on errors]]
186 params { 186 params {
187 @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]] 187 @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]]
188 } 188 }
diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c
index 3913d1337e..4c07e9dd24 100644
--- a/src/lib/elementary/elm_progressbar.c
+++ b/src/lib/elementary/elm_progressbar.c
@@ -359,7 +359,7 @@ EOLIAN static Eo *
359_elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED) 359_elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED)
360{ 360{
361 obj = eo_constructor(eo_super(obj, MY_CLASS)); 361 obj = eo_constructor(eo_super(obj, MY_CLASS));
362 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 362 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
363 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 363 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
364 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR); 364 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR);
365 365
diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c
index 28fbc8e4eb..5b1dd018aa 100644
--- a/src/lib/elementary/elm_radio.c
+++ b/src/lib/elementary/elm_radio.c
@@ -276,7 +276,7 @@ EOLIAN static Eo *
276_elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED) 276_elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED)
277{ 277{
278 obj = eo_constructor(eo_super(obj, MY_CLASS)); 278 obj = eo_constructor(eo_super(obj, MY_CLASS));
279 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 279 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
280 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 280 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
281 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON); 281 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON);
282 282
diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo
index 1be44f4093..043c36a763 100644
--- a/src/lib/elementary/elm_radio.eo
+++ b/src/lib/elementary/elm_radio.eo
@@ -57,7 +57,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action)
57 @property selected_object { 57 @property selected_object {
58 get { 58 get {
59 [[Get the selected radio object.]] 59 [[Get the selected radio object.]]
60 return: Evas.Object; [[The selected radio object]] 60 return: Efl.Canvas.Object; [[The selected radio object]]
61 } 61 }
62 } 62 }
63 group_add { 63 group_add {
diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c
index 4e78c00a5e..85a20731d5 100644
--- a/src/lib/elementary/elm_route.c
+++ b/src/lib/elementary/elm_route.c
@@ -186,7 +186,7 @@ EOLIAN static Eo *
186_elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) 186_elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
187{ 187{
188 obj = eo_constructor(eo_super(obj, MY_CLASS)); 188 obj = eo_constructor(eo_super(obj, MY_CLASS));
189 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 189 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
190 190
191 return obj; 191 return obj;
192} 192}
diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index 3f173ae340..7f03561a2e 100644
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -951,7 +951,7 @@ EOLIAN static Eo *
951_elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED) 951_elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
952{ 952{
953 obj = eo_constructor(eo_super(obj, MY_CLASS)); 953 obj = eo_constructor(eo_super(obj, MY_CLASS));
954 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 954 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
955 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 955 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
956 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE); 956 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE);
957 957
diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c
index 0b31ff4e7d..20c1f0f0c1 100644
--- a/src/lib/elementary/elm_segment_control.c
+++ b/src/lib/elementary/elm_segment_control.c
@@ -706,7 +706,7 @@ _elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd E
706{ 706{
707 obj = eo_constructor(eo_super(obj, MY_CLASS)); 707 obj = eo_constructor(eo_super(obj, MY_CLASS));
708 708
709 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 709 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
710 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 710 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
711 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); 711 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST);
712 712
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 55390f65ed..b0de254139 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -57,7 +57,7 @@ class Elm.Segment_Control (Elm.Layout)
57 57
58 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] 58 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
59 params { 59 params {
60 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 60 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
61 @in label: string @optional; [[The label of the item.]] 61 @in label: string @optional; [[The label of the item.]]
62 @in idx: int; [[Item position. Value should be between 0 and items count.]] 62 @in idx: int; [[Item position. Value should be between 0 and items count.]]
63 } 63 }
@@ -115,7 +115,7 @@ class Elm.Segment_Control (Elm.Layout)
115 115
116 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] 116 return: Elm.Widget.Item; [[The created item or $NULL upon failure.]]
117 params { 117 params {
118 @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] 118 @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]]
119 @in label: string @optional; [[The label of the item. Note that, NULL is different from empty string "".]] 119 @in label: string @optional; [[The label of the item. Note that, NULL is different from empty string "".]]
120 } 120 }
121 } 121 }
@@ -126,7 +126,7 @@ class Elm.Segment_Control (Elm.Layout)
126 it was created, with function elm_segment_control_item_add(), or later 126 it was created, with function elm_segment_control_item_add(), or later
127 with function elm_object_item_part_content_set(). If no icon 127 with function elm_object_item_part_content_set(). If no icon
128 was passed as argument, it will return $NULL.]] 128 was passed as argument, it will return $NULL.]]
129 return: Evas.Object; [[The left side icon associated to the item at $index.]] 129 return: Efl.Canvas.Object; [[The left side icon associated to the item at $index.]]
130 params { 130 params {
131 @in idx: int; [[The index of the segment item.]] 131 @in idx: int; [[The index of the segment item.]]
132 } 132 }
diff --git a/src/lib/elementary/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo
index 4caccc11d4..e8f175a1ac 100644
--- a/src/lib/elementary/elm_segment_control_item.eo
+++ b/src/lib/elementary/elm_segment_control_item.eo
@@ -15,8 +15,8 @@ class Elm.Segment_Control.Item(Elm.Widget.Item)
15 object_get @const { 15 object_get @const {
16 [[Get the real Evas(Edje) object created to implement the view of a given segment_control item. 16 [[Get the real Evas(Edje) object created to implement the view of a given segment_control item.
17 17
18 Base object is the @Evas.Object that represents that item.]] 18 Base object is the @Efl.Canvas.Object that represents that item.]]
19 return: Evas.Object; [[The base Edje object associated with $it]] 19 return: Efl.Canvas.Object; [[The base Edje object associated with $it]]
20 } 20 }
21 selected_set { 21 selected_set {
22 [[Set the selected state of an item. 22 [[Set the selected state of an item.
diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c
index a79f20ae14..e7b5e710d9 100644
--- a/src/lib/elementary/elm_separator.c
+++ b/src/lib/elementary/elm_separator.c
@@ -98,7 +98,7 @@ EOLIAN static Eo *
98_elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) 98_elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED)
99{ 99{
100 obj = eo_constructor(eo_super(obj, MY_CLASS)); 100 obj = eo_constructor(eo_super(obj, MY_CLASS));
101 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 101 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
102 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR); 102 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR);
103 103
104 return obj; 104 return obj;
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index b499e9f77a..cb61366a5d 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1286,7 +1286,7 @@ EOLIAN static Eo *
1286_elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) 1286_elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED)
1287{ 1287{
1288 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1288 obj = eo_constructor(eo_super(obj, MY_CLASS));
1289 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1289 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1290 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1290 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1291 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); 1291 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER);
1292 1292
diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c
index 729378525f..0efebad999 100644
--- a/src/lib/elementary/elm_slideshow.c
+++ b/src/lib/elementary/elm_slideshow.c
@@ -389,7 +389,7 @@ EOLIAN static Eo *
389_elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED) 389_elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED)
390{ 390{
391 obj = eo_constructor(eo_super(obj, MY_CLASS)); 391 obj = eo_constructor(eo_super(obj, MY_CLASS));
392 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 392 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
393 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 393 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
394 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); 394 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION);
395 395
diff --git a/src/lib/elementary/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo
index e03a9f2b33..7510a88cc2 100644
--- a/src/lib/elementary/elm_slideshow_item.eo
+++ b/src/lib/elementary/elm_slideshow_item.eo
@@ -25,7 +25,7 @@ class Elm.Slideshow.Item(Elm.Widget.Item)
25 lower level callbacks for events on that object. Do not delete 25 lower level callbacks for events on that object. Do not delete
26 this object under any circumstances.]] 26 this object under any circumstances.]]
27 27
28 return: Evas.Object; 28 return: Efl.Canvas.Object;
29 } 29 }
30 } 30 }
31 implements { 31 implements {
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index bb5c44990f..f7e306081f 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1451,7 +1451,7 @@ EOLIAN static Eo *
1451_elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) 1451_elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
1452{ 1452{
1453 obj = eo_constructor(eo_super(obj, MY_CLASS)); 1453 obj = eo_constructor(eo_super(obj, MY_CLASS));
1454 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 1454 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1455 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1455 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1456 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON); 1456 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON);
1457 1457
diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c
index 1e8cafe226..e5efebdc0e 100644
--- a/src/lib/elementary/elm_table.c
+++ b/src/lib/elementary/elm_table.c
@@ -222,7 +222,7 @@ EOLIAN static Eo *
222_elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) 222_elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
223{ 223{
224 obj = eo_constructor(eo_super(obj, MY_CLASS)); 224 obj = eo_constructor(eo_super(obj, MY_CLASS));
225 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 225 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
226 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 226 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER);
227 227
228 return obj; 228 return obj;
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index b2064d547d..9050ea2e35 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -51,7 +51,7 @@ class Elm.Table (Elm.Widget)
51 } 51 }
52 child_get @const { 52 child_get @const {
53 [[Get child object of table at given coordinates.]] 53 [[Get child object of table at given coordinates.]]
54 return: Evas.Object; [[Child of object if find if not return $null.]] 54 return: Efl.Canvas.Object; [[Child of object if find if not return $null.]]
55 params { 55 params {
56 @in col: int; [[Column number of child object.]] 56 @in col: int; [[Column number of child object.]]
57 @in row: int; [[Row number of child object.]] 57 @in row: int; [[Row number of child object.]]
@@ -68,7 +68,7 @@ class Elm.Table (Elm.Widget)
68 means only takes that 1 cell. 68 means only takes that 1 cell.
69 ]] 69 ]]
70 params { 70 params {
71 @in subobj: Evas.Object; [[The subobject to be modified in the table.]] 71 @in subobj: Efl.Canvas.Object; [[The subobject to be modified in the table.]]
72 @in column: int; [[Column number.]] 72 @in column: int; [[Column number.]]
73 @in row: int; [[Row number.]] 73 @in row: int; [[Row number.]]
74 @in colspan: int; 74 @in colspan: int;
@@ -79,7 +79,7 @@ class Elm.Table (Elm.Widget)
79 pack_get { 79 pack_get {
80 [[Get the packing location of an existing child of the table.]] 80 [[Get the packing location of an existing child of the table.]]
81 params { 81 params {
82 @in subobj: Evas.Object; [[The subobject to be modified in the table.]] 82 @in subobj: Efl.Canvas.Object; [[The subobject to be modified in the table.]]
83 @out column: int; [[Column number.]] 83 @out column: int; [[Column number.]]
84 @out row: int; [[Row number.]] 84 @out row: int; [[Row number.]]
85 @out colspan: int; 85 @out colspan: int;
@@ -90,7 +90,7 @@ class Elm.Table (Elm.Widget)
90 unpack { 90 unpack {
91 [[Remove child from table.]] 91 [[Remove child from table.]]
92 params { 92 params {
93 @in subobj: Evas.Object; [[The subobject.]] 93 @in subobj: Efl.Canvas.Object; [[The subobject.]]
94 } 94 }
95 } 95 }
96 pack { 96 pack {
@@ -108,7 +108,7 @@ class Elm.Table (Elm.Widget)
108 able to fit in 16bits will result in failure. 108 able to fit in 16bits will result in failure.
109 ]] 109 ]]
110 params { 110 params {
111 @in subobj: Evas.Object; [[The subobject to be added to the table.]] 111 @in subobj: Efl.Canvas.Object; [[The subobject to be added to the table.]]
112 @in column: int; [[Column number.]] 112 @in column: int; [[Column number.]]
113 @in row: int; [[Row number.]] 113 @in row: int; [[Row number.]]
114 @in colspan: int; 114 @in colspan: int;
diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c
index b9393977e8..c0a5767471 100644
--- a/src/lib/elementary/elm_thumb.c
+++ b/src/lib/elementary/elm_thumb.c
@@ -583,7 +583,7 @@ EOLIAN static Eo *
583_elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd) 583_elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd)
584{ 584{
585 obj = eo_constructor(eo_super(obj, MY_CLASS)); 585 obj = eo_constructor(eo_super(obj, MY_CLASS));
586 evas_obj_type_set(obj, "Elm_Thumb"); 586 efl_canvas_object_type_set(obj, "Elm_Thumb");
587 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 587 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
588 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 588 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE);
589 589
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 787ce908db..599f349e59 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -3094,7 +3094,7 @@ EOLIAN static Eo *
3094_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) 3094_elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED)
3095{ 3095{
3096 obj = eo_constructor(eo_super(obj, MY_CLASS)); 3096 obj = eo_constructor(eo_super(obj, MY_CLASS));
3097 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 3097 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
3098 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 3098 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3099 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR); 3099 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR);
3100 3100
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index f508135acc..f3f4282c90 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -136,7 +136,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
136 get { 136 get {
137 } 137 }
138 values { 138 values {
139 parent: Evas.Object; [[The parent of the menu objects.]] 139 parent: Efl.Canvas.Object; [[The parent of the menu objects.]]
140 } 140 }
141 } 141 }
142 @property standard_priority { 142 @property standard_priority {
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index 55746e6184..6f9f641a15 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -18,7 +18,7 @@ struct Elm.Toolbar.Item.State
18 ]] 18 ]]
19 label: string; 19 label: string;
20 icon_str: string; 20 icon_str: string;
21 icon: Evas.Object; 21 icon: Efl.Canvas.Object;
22 func: Evas_Smart_Cb ; 22 func: Evas_Smart_Cb ;
23 data: const(void_ptr); 23 data: const(void_ptr);
24} 24}
@@ -122,7 +122,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
122 ]] 122 ]]
123 } 123 }
124 values { 124 values {
125 obj: Evas.Object; [[The base Edje object associated with $it.]] 125 obj: Efl.Canvas.Object; [[The base Edje object associated with $it.]]
126 } 126 }
127 } 127 }
128 @property icon_object { 128 @property icon_object {
@@ -133,7 +133,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
133 ]] 133 ]]
134 } 134 }
135 values { 135 values {
136 obj: Evas.Object; [[The icon object.]] 136 obj: Efl.Canvas.Object; [[The icon object.]]
137 } 137 }
138 } 138 }
139 @property separator { 139 @property separator {
@@ -162,7 +162,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item)
162 ]] 162 ]]
163 } 163 }
164 values { 164 values {
165 menu: Evas.Object; [[Item's menu object or $null on failure.]] 165 menu: Efl.Canvas.Object; [[Item's menu object or $null on failure.]]
166 } 166 }
167 } 167 }
168 @property state { 168 @property state {
diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c
index 41ea4ce820..1ba65d7b6d 100644
--- a/src/lib/elementary/elm_video.c
+++ b/src/lib/elementary/elm_video.c
@@ -283,7 +283,7 @@ EOLIAN static Eo *
283_elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED) 283_elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED)
284{ 284{
285 obj = eo_constructor(eo_super(obj, MY_CLASS)); 285 obj = eo_constructor(eo_super(obj, MY_CLASS));
286 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 286 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
287 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 287 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
288 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 288 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION);
289 289
diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo
index cda43aef37..31f1f349b0 100644
--- a/src/lib/elementary/elm_video.eo
+++ b/src/lib/elementary/elm_video.eo
@@ -36,7 +36,7 @@ class Elm.Video (Elm.Layout, Efl.File,
36 @property emotion { 36 @property emotion {
37 get { 37 get {
38 [[Get the underlying Emotion object.]] 38 [[Get the underlying Emotion object.]]
39 return: Evas.Object; [[the underlying Emotion object.]] 39 return: Efl.Canvas.Object; [[the underlying Emotion object.]]
40 } 40 }
41 } 41 }
42 @property title { 42 @property title {
diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo
index 1c2bd19231..fee6e6a815 100644
--- a/src/lib/elementary/elm_view_form.eo
+++ b/src/lib/elementary/elm_view_form.eo
@@ -17,7 +17,7 @@ class Elm.View.Form (Eo.Base)
17 ]] 17 ]]
18 params { 18 params {
19 @in propname: string; [[Property name]] 19 @in propname: string; [[Property name]]
20 @in evas: Evas.Object; [[Evas widget]] 20 @in evas: Efl.Canvas.Object; [[Evas widget]]
21 } 21 }
22 } 22 }
23 } 23 }
diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo
index 29329128b6..3e0292ca97 100644
--- a/src/lib/elementary/elm_view_list.eo
+++ b/src/lib/elementary/elm_view_list.eo
@@ -9,7 +9,7 @@ class Elm.View.List (Eo.Base)
9 @since 1.11 9 @since 1.11
10 ]] 10 ]]
11 params { 11 params {
12 @in genlist: Evas.Object; [[Genlist object]] 12 @in genlist: Efl.Canvas.Object; [[Genlist object]]
13 @in item_type: Elm.Genlist.Item.Type; [[Item type]] 13 @in item_type: Elm.Genlist.Item.Type; [[Item type]]
14 @in item_style: string; [[The current item style name. $null would be default.]] 14 @in item_style: string; [[The current item style name. $null would be default.]]
15 } 15 }
@@ -20,7 +20,7 @@ class Elm.View.List (Eo.Base)
20 @since 1.11 20 @since 1.11
21 ]] 21 ]]
22 params { 22 params {
23 @out widget: Evas.Object; [[Returned widget]] 23 @out widget: Efl.Canvas.Object; [[Returned widget]]
24 } 24 }
25 } 25 }
26 property_connect { 26 property_connect {
diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo
index b0f01d4a10..685e6a4b80 100644
--- a/src/lib/elementary/elm_web.eo
+++ b/src/lib/elementary/elm_web.eo
@@ -307,7 +307,7 @@ class Elm.Web (Elm.Widget)
307 return the internal reference. Be careful using it as it may 307 return the internal reference. Be careful using it as it may
308 interfere with elm_web behavior. 308 interfere with elm_web behavior.
309 ]] 309 ]]
310 return: Evas.Object; [[The internal ewk_view object or $null 310 return: Efl.Canvas.Object; [[The internal ewk_view object or $null
311 if it does not exist. (Failure to 311 if it does not exist. (Failure to
312 create or Elementary compiled 312 create or Elementary compiled
313 without ewebkit)]] 313 without ewebkit)]]
diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c
index 008893aa98..f561fb562b 100644
--- a/src/lib/elementary/elm_web2.c
+++ b/src/lib/elementary/elm_web2.c
@@ -96,7 +96,7 @@ _elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd)
96{ 96{
97 obj = eo_constructor(eo_super(obj, MY_CLASS)); 97 obj = eo_constructor(eo_super(obj, MY_CLASS));
98 sd->obj = obj; 98 sd->obj = obj;
99 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 99 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
100 evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks); 100 evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks);
101 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER); 101 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER);
102 102
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 34e78feda2..8d1d8b28e8 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -105,10 +105,10 @@ static void
105_propagate_event(void *data, const Eo_Event *event); 105_propagate_event(void *data, const Eo_Event *event);
106 106
107EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, 107EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks,
108 { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }, 108 { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del },
109 { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide }); 109 { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide });
110EO_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks, 110EO_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks,
111 { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }); 111 { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del });
112EO_CALLBACKS_ARRAY_DEFINE(focus_callbacks, 112EO_CALLBACKS_ARRAY_DEFINE(focus_callbacks,
113 { EFL_EVENT_KEY_DOWN, _propagate_event }, 113 { EFL_EVENT_KEY_DOWN, _propagate_event },
114 { EFL_EVENT_KEY_UP, _propagate_event }, 114 { EFL_EVENT_KEY_UP, _propagate_event },
@@ -574,7 +574,7 @@ _elm_widget_efl_canvas_group_group_no_render_set(Eo *obj, Elm_Widget_Smart_Data
574 EINA_ITERATOR_FOREACH(it, o) 574 EINA_ITERATOR_FOREACH(it, o)
575 { 575 {
576 if (evas_object_data_get(o, "_elm_leaveme")) continue; 576 if (evas_object_data_get(o, "_elm_leaveme")) continue;
577 evas_obj_no_render_set(o, hide); 577 efl_canvas_object_no_render_set(o, hide);
578 } 578 }
579 eina_iterator_free(it); 579 eina_iterator_free(it);
580} 580}
@@ -626,7 +626,7 @@ _elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *_p
626 evas_object_color_get(obj, &r, &g, &b, &a); 626 evas_object_color_get(obj, &r, &g, &b, &a);
627 evas_object_color_set(child, r, g, b, a); 627 evas_object_color_set(child, r, g, b, a);
628 628
629 evas_obj_no_render_set(child, evas_obj_no_render_get(obj)); 629 efl_canvas_object_no_render_set(child, efl_canvas_object_no_render_get(obj));
630 evas_object_clip_set(child, evas_object_clip_get(obj)); 630 evas_object_clip_set(child, evas_object_clip_get(obj));
631 631
632 if (evas_object_visible_get(obj)) 632 if (evas_object_visible_get(obj))
@@ -4427,7 +4427,7 @@ EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks,
4427 { EFL_GFX_EVENT_MOVE, _track_obj_view_update }, 4427 { EFL_GFX_EVENT_MOVE, _track_obj_view_update },
4428 { EFL_GFX_EVENT_SHOW, _track_obj_view_update }, 4428 { EFL_GFX_EVENT_SHOW, _track_obj_view_update },
4429 { EFL_GFX_EVENT_HIDE, _track_obj_view_update }, 4429 { EFL_GFX_EVENT_HIDE, _track_obj_view_update },
4430 { EVAS_OBJECT_EVENT_DEL, _track_obj_view_del }); 4430 { EFL_CANVAS_OBJECT_EVENT_DEL, _track_obj_view_del });
4431 4431
4432static void 4432static void
4433_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) 4433_track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED)
@@ -5812,7 +5812,7 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED)
5812 5812
5813 sd->on_create = EINA_TRUE; 5813 sd->on_create = EINA_TRUE;
5814 obj = eo_constructor(eo_super(obj, MY_CLASS)); 5814 obj = eo_constructor(eo_super(obj, MY_CLASS));
5815 evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); 5815 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
5816 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 5816 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
5817 parent = eo_parent_get(obj); 5817 parent = eo_parent_get(obj);
5818 elm_obj_widget_parent_set(obj, parent); 5818 elm_obj_widget_parent_set(obj, parent);
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 274b0574cc..7d3da020b4 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -159,12 +159,12 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
159 the list of objects. The previous list will be deleted and this list 159 the list of objects. The previous list will be deleted and this list
160 will be managed by elementary. After it is set, don't modify it.]] 160 will be managed by elementary. After it is set, don't modify it.]]
161 values { 161 values {
162 objs: list<Evas.Object>; [[Chain of objects to pass focus]] 162 objs: list<Efl.Canvas.Object>; [[Chain of objects to pass focus]]
163 } 163 }
164 } 164 }
165 get { 165 get {
166 values { 166 values {
167 objs: const(list<Evas.Object>); [[Chain of objects]] 167 objs: const(list<Efl.Canvas.Object>); [[Chain of objects]]
168 } 168 }
169 } 169 }
170 } 170 }
@@ -209,7 +209,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
209 legacy: elm_widget_parent_get; /* Needed because we don't do duplication removal for legacy names. */ 209 legacy: elm_widget_parent_get; /* Needed because we don't do duplication removal for legacy names. */
210 } 210 }
211 values { 211 values {
212 parent: Evas.Object @nullable; 212 parent: Efl.Canvas.Object @nullable;
213 } 213 }
214 } 214 }
215 @property access_info { 215 @property access_info {
@@ -261,7 +261,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
261 return: bool; 261 return: bool;
262 } 262 }
263 values { 263 values {
264 edj: Evas.Object; 264 edj: Efl.Canvas.Object;
265 wname: string; 265 wname: string;
266 welement: string; 266 welement: string;
267 wstyle: string; 267 wstyle: string;
@@ -271,7 +271,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
271 set { 271 set {
272 } 272 }
273 values { 273 values {
274 sobj: Evas.Object @nullable; 274 sobj: Efl.Canvas.Object @nullable;
275 } 275 }
276 } 276 }
277 @property display_mode { 277 @property display_mode {
@@ -309,7 +309,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
309 set { 309 set {
310 } 310 }
311 values { 311 values {
312 sobj: Evas.Object @nullable; 312 sobj: Efl.Canvas.Object @nullable;
313 sub_obj: bool; 313 sub_obj: bool;
314 } 314 }
315 } 315 }
@@ -327,7 +327,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
327 [[Function to operate on a given widget's scrollabe children when necessary. 327 [[Function to operate on a given widget's scrollabe children when necessary.
328 328
329 Warning: free the returned list with eina_list_free().]] 329 Warning: free the returned list with eina_list_free().]]
330 return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; 330 return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
331 } 331 }
332 } 332 }
333 @property scroll_hold { 333 @property scroll_hold {
@@ -373,7 +373,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
373 } 373 }
374 @property top { 374 @property top {
375 get { 375 get {
376 return: Evas.Object; 376 return: Efl.Canvas.Object;
377 } 377 }
378 } 378 }
379 @property focus_order { 379 @property focus_order {
@@ -388,7 +388,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
388 } 388 }
389 @property can_focus_child_list { 389 @property can_focus_child_list {
390 get { 390 get {
391 return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; 391 return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused;
392 } 392 }
393 } 393 }
394 @property focused_item { 394 @property focused_item {
@@ -407,7 +407,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
407 } 407 }
408 @property parent_widget { 408 @property parent_widget {
409 get @virtual_pure { 409 get @virtual_pure {
410 return: Evas.Object; 410 return: Efl.Canvas.Object;
411 legacy: null; 411 legacy: null;
412 } 412 }
413 } 413 }
@@ -419,7 +419,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
419 @property focused_object { 419 @property focused_object {
420 [[Current focused object in object tree.]] 420 [[Current focused object in object tree.]]
421 get { 421 get {
422 return: Evas.Object; [[Current focused or $null, if there is no focused object.]] 422 return: Efl.Canvas.Object; [[Current focused or $null, if there is no focused object.]]
423 } 423 }
424 } 424 }
425 @property parent2 { 425 @property parent2 {
@@ -428,7 +428,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
428 get { 428 get {
429 } 429 }
430 values { 430 values {
431 parent: Evas.Object @nullable; 431 parent: Efl.Canvas.Object @nullable;
432 } 432 }
433 } 433 }
434 @property part_text { 434 @property part_text {
@@ -444,7 +444,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
444 } 444 }
445 } 445 }
446 newest_focus_order_get @const { 446 newest_focus_order_get @const {
447 return: Evas.Object; 447 return: Efl.Canvas.Object;
448 params { 448 params {
449 @out newest_focus_order: uint; 449 @out newest_focus_order: uint;
450 @in can_focus_only: bool; 450 @in can_focus_only: bool;
@@ -462,7 +462,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
462 462
463 @since 1.8]] 463 @since 1.8]]
464 params { 464 params {
465 @in next: Evas.Object @nullable; [[Focus next object]] 465 @in next: Efl.Canvas.Object @nullable; [[Focus next object]]
466 @in dir: Elm.Focus_Direction; [[Focus direction]] 466 @in dir: Elm.Focus_Direction; [[Focus direction]]
467 } 467 }
468 } 468 }
@@ -470,7 +470,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
470 [[Get the next object with specific focus direction. 470 [[Get the next object with specific focus direction.
471 471
472 @since 1.8]] 472 @since 1.8]]
473 return: Evas.Object; [[Focus next object]] 473 return: Efl.Canvas.Object; [[Focus next object]]
474 params { 474 params {
475 @in dir: Elm.Focus_Direction; [[Focus direction]] 475 @in dir: Elm.Focus_Direction; [[Focus direction]]
476 } 476 }
@@ -503,8 +503,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
503 503
504 Note: On focus cycle, only will be evaluated children of this container.]] 504 Note: On focus cycle, only will be evaluated children of this container.]]
505 params { 505 params {
506 @in child: Evas.Object; [[The child to be added in custom chain.]] 506 @in child: Efl.Canvas.Object; [[The child to be added in custom chain.]]
507 @in relative_child: Evas.Object @optional; [[The relative object to position the child.]] 507 @in relative_child: Efl.Canvas.Object @optional; [[The relative object to position the child.]]
508 } 508 }
509 } 509 }
510 part_text_translate { 510 part_text_translate {
@@ -535,7 +535,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
535 [['Virtual' function handling sub objects being added.]] 535 [['Virtual' function handling sub objects being added.]]
536 return: bool; 536 return: bool;
537 params { 537 params {
538 @in sobj: Evas.Object; 538 @in sobj: Efl.Canvas.Object;
539 } 539 }
540 } 540 }
541 focus_direction_manager_is { 541 focus_direction_manager_is {
@@ -546,7 +546,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
546 event { 546 event {
547 [['Virtual' function handling input events on the widget.]] 547 [['Virtual' function handling input events on the widget.]]
548 params { 548 params {
549 @in source: Evas.Object; 549 @in source: Efl.Canvas.Object;
550 @in type: Evas.Callback_Type; 550 @in type: Evas.Callback_Type;
551 @in event_info: void_ptr; 551 @in event_info: void_ptr;
552 } 552 }
@@ -604,9 +604,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
604 focus_direction @virtual_pure { 604 focus_direction @virtual_pure {
605 [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]] 605 [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]]
606 params { 606 params {
607 @in base: const(Evas.Object); 607 @in base: const(Efl.Canvas.Object);
608 @in degree: double; 608 @in degree: double;
609 @out direction: Evas.Object; 609 @out direction: Efl.Canvas.Object;
610 @out direction_item: Elm.Widget.Item; 610 @out direction_item: Elm.Widget.Item;
611 @out weight: double; 611 @out weight: double;
612 } 612 }
@@ -633,7 +633,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
633 return: bool; 633 return: bool;
634 } 634 }
635 name_find @const { 635 name_find @const {
636 return: Evas.Object; 636 return: Efl.Canvas.Object;
637 params { 637 params {
638 @in name: string; 638 @in name: string;
639 @in recurse: int; 639 @in recurse: int;
@@ -642,11 +642,11 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
642 focus_list_direction_get @const { 642 focus_list_direction_get @const {
643 return: bool; 643 return: bool;
644 params { 644 params {
645 @in base: const(Evas.Object); 645 @in base: const(Efl.Canvas.Object);
646 @in items: const(list<Eo.Base>); 646 @in items: const(list<Eo.Base>);
647 @in list_data_get: list_data_get_func_type; 647 @in list_data_get: list_data_get_func_type;
648 @in degree: double; 648 @in degree: double;
649 @out direction: Evas.Object; 649 @out direction: Efl.Canvas.Object;
650 @out direction_item: Elm.Widget.Item; 650 @out direction_item: Elm.Widget.Item;
651 @out weight: double; 651 @out weight: double;
652 } 652 }
@@ -687,7 +687,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
687 return: bool; 687 return: bool;
688 params { 688 params {
689 @in dir: Elm.Focus_Direction; 689 @in dir: Elm.Focus_Direction;
690 @out next: Evas.Object; 690 @out next: Efl.Canvas.Object;
691 @out next_item: Elm.Widget.Item; 691 @out next_item: Elm.Widget.Item;
692 } 692 }
693 } 693 }
@@ -729,7 +729,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
729 [['Virtual' function handling passing focus to sub-objects.]] 729 [['Virtual' function handling passing focus to sub-objects.]]
730 params { 730 params {
731 @in dir: Elm.Focus_Direction; 731 @in dir: Elm.Focus_Direction;
732 @out next: Evas.Object; 732 @out next: Efl.Canvas.Object;
733 @out next_item: Elm.Widget.Item; 733 @out next_item: Elm.Widget.Item;
734 } 734 }
735 return: bool; 735 return: bool;
@@ -740,7 +740,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
740 @in items: const(list<Eo.Base>); 740 @in items: const(list<Eo.Base>);
741 @in list_data_get: list_data_get_func_type; 741 @in list_data_get: list_data_get_func_type;
742 @in dir: Elm.Focus_Direction; 742 @in dir: Elm.Focus_Direction;
743 @out next: Evas.Object; 743 @out next: Efl.Canvas.Object;
744 @out next_item: Elm.Widget.Item; 744 @out next_item: Elm.Widget.Item;
745 } 745 }
746 } 746 }
@@ -754,9 +754,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
754 focus_direction_get @const { 754 focus_direction_get @const {
755 return: bool; 755 return: bool;
756 params { 756 params {
757 @in base: const(Evas.Object); 757 @in base: const(Efl.Canvas.Object);
758 @in degree: double; 758 @in degree: double;
759 @out direction: Evas.Object; 759 @out direction: Efl.Canvas.Object;
760 @out direction_item: Elm.Widget.Item; 760 @out direction_item: Elm.Widget.Item;
761 @out weight: double; 761 @out weight: double;
762 } 762 }
@@ -783,7 +783,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
783 [['Virtual' function handling sub objects being removed.]] 783 [['Virtual' function handling sub objects being removed.]]
784 return: bool; 784 return: bool;
785 params { 785 params {
786 @in sobj: Evas.Object; 786 @in sobj: Efl.Canvas.Object;
787 } 787 }
788 } 788 }
789 tooltip_add { 789 tooltip_add {
@@ -803,8 +803,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
803 803
804 Note: On focus cycle, only will be evaluated children of this container.]] 804 Note: On focus cycle, only will be evaluated children of this container.]]
805 params { 805 params {
806 @in child: Evas.Object; [[The child to be added in custom chain.]] 806 @in child: Efl.Canvas.Object; [[The child to be added in custom chain.]]
807 @in relative_child: Evas.Object @optional; [[The relative object to position the child.]] 807 @in relative_child: Efl.Canvas.Object @optional; [[The relative object to position the child.]]
808 } 808 }
809 } 809 }
810 @property focus_move_policy { 810 @property focus_move_policy {
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index ea87eef9fa..ba81cc96a4 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -108,7 +108,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
108 part: string @nullable; [[The content part name (NULL for the default content)]] 108 part: string @nullable; [[The content part name (NULL for the default content)]]
109 } 109 }
110 values { 110 values {
111 content: Evas.Object; [[The content of the object item]] 111 content: Efl.Canvas.Object; [[The content of the object item]]
112 } 112 }
113 } 113 }
114 @property part_text { 114 @property part_text {
@@ -189,14 +189,14 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
189 [[Get highlight order 189 [[Get highlight order
190 190
191 @since 1.8]] 191 @since 1.8]]
192 return: const(list<Evas.Object>); 192 return: const(list<Efl.Canvas.Object>);
193 } 193 }
194 access_order_set { 194 access_order_set {
195 [[Set highlight order 195 [[Set highlight order
196 196
197 @since 1.8]] 197 @since 1.8]]
198 params { 198 params {
199 @in objs: own(list<Evas.Object>); [[Order of objects to pass highlight]] 199 @in objs: own(list<Efl.Canvas.Object>); [[Order of objects to pass highlight]]
200 } 200 }
201 } 201 }
202 widget_get @const { 202 widget_get @const {
@@ -204,7 +204,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
204 204
205 Note: This returns the widget object itself that an item belongs to. 205 Note: This returns the widget object itself that an item belongs to.
206 Note: Every elm_object_item supports this API]] 206 Note: Every elm_object_item supports this API]]
207 return: Evas.Object; [[The widget object]] 207 return: Efl.Canvas.Object; [[The widget object]]
208 } 208 }
209 del { 209 del {
210 [[Delete the given item.]] 210 [[Delete the given item.]]
@@ -260,7 +260,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
260 params { 260 params {
261 part: string; [[The content part name to unset (NULL for the default content)]] 261 part: string; [[The content part name to unset (NULL for the default content)]]
262 } 262 }
263 return: Evas.Object; 263 return: Efl.Canvas.Object;
264 } 264 }
265 part_text_custom_update @protected { 265 part_text_custom_update @protected {
266 [[Update additional text part content]] 266 [[Update additional text part content]]
@@ -322,7 +322,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
322 [[Get an accessible object of the object item. 322 [[Get an accessible object of the object item.
323 323
324 @since 1.8]] 324 @since 1.8]]
325 return: Evas.Object; [[Accessible object of the object item or NULL for any error]] 325 return: Efl.Canvas.Object; [[Accessible object of the object item or NULL for any error]]
326 } 326 }
327 domain_translatable_part_text_set { 327 domain_translatable_part_text_set {
328 [[Set the text for an object item's part, marking it as translatable. 328 [[Set the text for an object item's part, marking it as translatable.
@@ -408,7 +408,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
408 See: @.track_get 408 See: @.track_get
409 409
410 @since 1.8]] 410 @since 1.8]]
411 return: Evas.Object; [[The track object]] 411 return: Efl.Canvas.Object; [[The track object]]
412 } 412 }
413 untrack { 413 untrack {
414 [[This retrieve the track object of the item. 414 [[This retrieve the track object of the item.
@@ -472,7 +472,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
472 [[Register object item as an accessible object. 472 [[Register object item as an accessible object.
473 473
474 @since 1.8]] 474 @since 1.8]]
475 return: Evas.Object; [[Accessible object of the object item or NULL for any error]] 475 return: Efl.Canvas.Object; [[Accessible object of the object item or NULL for any error]]
476 } 476 }
477 access_unregister { 477 access_unregister {
478 [[Unregister accessible object of the object item. 478 [[Unregister accessible object of the object item.
@@ -498,14 +498,14 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible,
498 params { 498 params {
499 dir: Elm.Focus_Direction; [[Focus direction]] 499 dir: Elm.Focus_Direction; [[Focus direction]]
500 } 500 }
501 return: Evas.Object; [[Focus next object]] 501 return: Efl.Canvas.Object; [[Focus next object]]
502 } 502 }
503 focus_next_object_set { 503 focus_next_object_set {
504 [[Set the next object with specific focus direction. 504 [[Set the next object with specific focus direction.
505 505
506 @since 1.16]] 506 @since 1.16]]
507 params { 507 params {
508 next: Evas.Object @nullable; [[Focus next object]] 508 next: Efl.Canvas.Object @nullable; [[Focus next object]]
509 dir: Elm.Focus_Direction; [[Focus direction]] 509 dir: Elm.Focus_Direction; [[Focus direction]]
510 } 510 }
511 } 511 }
diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index abbd9ffff4..c98e6674e1 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -400,7 +400,7 @@ EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj);
400EAPI Ecore_Win32_Window *elm_win_win32_window_get(const Evas_Object *obj); 400EAPI Ecore_Win32_Window *elm_win_win32_window_get(const Evas_Object *obj);
401 401
402/** 402/**
403 * @brief Get the Ecore_Cocoa_Window of an Evas.Object. 403 * @brief Get the Ecore_Cocoa_Window of an Efl.Canvas.Object.
404 * 404 *
405 * @return The Ecore_Cocoa_Window of @c obj. 405 * @return The Ecore_Cocoa_Window of @c obj.
406 * 406 *
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 1b3364ca07..b1ce922aa0 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -2,7 +2,7 @@
2# include "config.h" 2# include "config.h"
3#endif 3#endif
4 4
5#define EVAS_OBJECT_PROTECTED 5#define EFL_CANVAS_OBJECT_PROTECTED
6 6
7#include <Evas.h> 7#include <Evas.h>
8#include <Ecore.h> 8#include <Ecore.h>
@@ -246,7 +246,7 @@ EOLIAN static Eo *
246_emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED) 246_emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
247{ 247{
248 obj = eo_constructor(eo_super(obj, MY_CLASS)); 248 obj = eo_constructor(eo_super(obj, MY_CLASS));
249 evas_obj_type_set(obj, E_OBJ_NAME); 249 efl_canvas_object_type_set(obj, E_OBJ_NAME);
250 250
251 return obj; 251 return obj;
252} 252}
diff --git a/src/lib/ephysics/ephysics_body.cpp b/src/lib/ephysics/ephysics_body.cpp
index c2120265c0..98da084ae3 100644
--- a/src/lib/ephysics/ephysics_body.cpp
+++ b/src/lib/ephysics/ephysics_body.cpp
@@ -890,7 +890,7 @@ err_body:
890} 890}
891 891
892static void 892static void
893_ephysics_body_evas_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 893_ephysics_body_efl_canvas_object_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
894{ 894{
895 EPhysics_Body *body = (EPhysics_Body *) data; 895 EPhysics_Body *body = (EPhysics_Body *) data;
896 896
@@ -1214,7 +1214,7 @@ _ephysics_body_move(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord
1214} 1214}
1215 1215
1216static void 1216static void
1217_ephysics_body_evas_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 1217_ephysics_body_efl_canvas_object_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
1218{ 1218{
1219 EPhysics_Body *body = (EPhysics_Body *) data; 1219 EPhysics_Body *body = (EPhysics_Body *) data;
1220 int w, h; 1220 int w, h;
@@ -1329,9 +1329,9 @@ _ephysics_body_del(EPhysics_Body *body)
1329 if (body->evas_obj) 1329 if (body->evas_obj)
1330 { 1330 {
1331 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL, 1331 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL,
1332 _ephysics_body_evas_obj_del_cb); 1332 _ephysics_body_efl_canvas_object_del_cb);
1333 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE, 1333 evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE,
1334