summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/lib/evas/canvas
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/efl_canvas_filter_internal.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_image.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_image_internal.eo8
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_polygon.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_rectangle.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_snapshot.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.c4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_tbm.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_wayland.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.c8
-rw-r--r--src/lib/evas/canvas/efl_canvas_surface_x11.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_text_cursor.eo6
-rw-r--r--src/lib/evas/canvas/efl_event_hold.c8
-rw-r--r--src/lib/evas/canvas/efl_event_hold.eo4
-rw-r--r--src/lib/evas/canvas/efl_event_key.c24
-rw-r--r--src/lib/evas/canvas/efl_event_key.eo4
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.c24
-rw-r--r--src/lib/evas/canvas/efl_event_pointer.eo6
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.eo2
-rw-r--r--src/lib/evas/canvas/efl_vg.eo8
-rw-r--r--src/lib/evas/canvas/efl_vg_container.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_linear.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_gradient_radial.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_root_node.eo4
-rw-r--r--src/lib/evas/canvas/efl_vg_shape.eo4
-rw-r--r--src/lib/evas/canvas/evas_box.eo2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c58
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo12
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_camera.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_light.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_material.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_mesh.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c30
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node_callback.h8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.c28
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_object.eo10
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_primitive.eo4
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c14
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.c8
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_texture.eo4
-rw-r--r--src/lib/evas/canvas/evas_clip.c8
-rw-r--r--src/lib/evas/canvas/evas_data.c8
-rw-r--r--src/lib/evas/canvas/evas_device.c2
-rw-r--r--src/lib/evas/canvas/evas_events.c42
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c16
-rw-r--r--src/lib/evas/canvas/evas_grid.eo2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c4
-rw-r--r--src/lib/evas/canvas/evas_line.eo2
-rw-r--r--src/lib/evas/canvas/evas_main.c16
-rw-r--r--src/lib/evas/canvas/evas_object_box.c28
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c4
-rw-r--r--src/lib/evas/canvas/evas_object_image.c24
-rw-r--r--src/lib/evas/canvas/evas_object_line.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c60
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c8
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c4
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c36
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c14
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c88
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c16
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c16
-rw-r--r--src/lib/evas/canvas/evas_out.c16
-rw-r--r--src/lib/evas/canvas/evas_out.eo6
-rw-r--r--src/lib/evas/canvas/evas_render.c8
-rw-r--r--src/lib/evas/canvas/evas_table.eo2
-rw-r--r--src/lib/evas/canvas/evas_text.eo6
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo6
-rw-r--r--src/lib/evas/canvas/evas_vg.eo8
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c8
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c8
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c8
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c36
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h2
-rw-r--r--src/lib/evas/canvas/evas_vg_root_node.c12
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c8
-rw-r--r--src/lib/evas/canvas/render2/evas_render2.c6
-rw-r--r--src/lib/evas/canvas/render2/evas_render2_old.c6
92 files changed, 501 insertions, 501 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
index 200973b..d9ef560 100644
--- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo
@@ -1,4 +1,4 @@
1mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base) 1mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object)
2{ 2{
3 [[Evas internal implementation of filters.]] 3 [[Evas internal implementation of filters.]]
4 4
@@ -60,8 +60,8 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base)
60 } 60 }
61 } 61 }
62 implements { 62 implements {
63 Eo.Base.constructor; 63 Efl.Object.constructor;
64 Eo.Base.destructor; 64 Efl.Object.destructor;
65 Efl.Gfx.Filter.filter_program.set; 65 Efl.Gfx.Filter.filter_program.set;
66 Efl.Gfx.Filter.filter_program.get; 66 Efl.Gfx.Filter.filter_program.get;
67 Efl.Gfx.Filter.filter_state.get; 67 Efl.Gfx.Filter.filter_state.get;
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 1dfcf59..da076a3 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -72,7 +72,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
72 canvas objects. 72 canvas objects.
73 73
74 This returns the list of "smart" children. This might be different 74 This returns the list of "smart" children. This might be different
75 from both the $Eo.Base children list as well as the $Efl.Container 75 from both the $Efl.Object children list as well as the $Efl.Container
76 content list. 76 content list.
77 ]] 77 ]]
78 return: free(own(iterator<Efl.Gfx>), eina_iterator_free); 78 return: free(own(iterator<Efl.Gfx>), eina_iterator_free);
@@ -183,7 +183,7 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
183 implements { 183 implements {
184 class.constructor; 184 class.constructor;
185 class.destructor; 185 class.destructor;
186 Eo.Base.constructor; 186 Efl.Object.constructor;
187 Efl.Canvas.Object.paragraph_direction.set; 187 Efl.Canvas.Object.paragraph_direction.set;
188 Efl.Canvas.Object.paragraph_direction.get; 188 Efl.Canvas.Object.paragraph_direction.get;
189 } 189 }
diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c
index d492cf1..adfbb99 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -623,7 +623,7 @@ _image_pixels_set(Evas_Object_Protected_Data *obj,
623 } 623 }
624 if (o->file_obj) 624 if (o->file_obj)
625 { 625 {
626 eo_del(o->file_obj); 626 efl_del(o->file_obj);
627 o->file_obj = NULL; 627 o->file_obj = NULL;
628 } 628 }
629 629
diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo
index 4d2676b..18ed92e 100644
--- a/src/lib/evas/canvas/efl_canvas_image_internal.eo
+++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo
@@ -6,10 +6,10 @@ abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Interna
6{ 6{
7 data: Evas_Image_Data; 7 data: Evas_Image_Data;
8 implements { 8 implements {
9 Eo.Base.constructor; 9 Efl.Object.constructor;
10 Eo.Base.destructor; 10 Efl.Object.destructor;
11 Eo.Base.dbg_info_get; 11 Efl.Object.dbg_info_get;
12 Eo.Base.finalize; 12 Efl.Object.finalize;
13 Efl.File.save; 13 Efl.File.save;
14 Efl.Orientation.orientation.get; 14 Efl.Orientation.orientation.get;
15 Efl.Orientation.orientation.set; 15 Efl.Orientation.orientation.set;
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 61a5ecd..61da55f 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,7 +1,7 @@
1import evas_types; 1import evas_types;
2import efl_text_types; 2import efl_text_types;
3 3
4abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, 4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
5 Efl.Input.Interface, Efl.Gfx.Size.Hint, 5 Efl.Input.Interface, Efl.Gfx.Size.Hint,
6 Efl.Gfx.Map) 6 Efl.Gfx.Map)
7{ 7{
@@ -391,7 +391,7 @@ abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
391 @property render_parent @protected { 391 @property render_parent @protected {
392 [[Gets the parent smart object of a given Evas object, if it has one. 392 [[Gets the parent smart object of a given Evas object, if it has one.
393 393
394 This can be different from @Eo.Base.parent because this one is 394 This can be different from @Efl.Object.parent because this one is
395 used internally for rendering and the normal parent is what the 395 used internally for rendering and the normal parent is what the
396 user expects to be the parent. 396 user expects to be the parent.
397 397
@@ -552,10 +552,10 @@ abstract Efl.Canvas.Object (Eo.Base, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
552 .type; 552 .type;
553 } 553 }
554 implements { 554 implements {
555 Eo.Base.constructor; 555 Efl.Object.constructor;
556 Eo.Base.destructor; 556 Efl.Object.destructor;
557 Eo.Base.dbg_info_get; 557 Efl.Object.dbg_info_get;
558 Eo.Base.provider_find; 558 Efl.Object.provider_find;
559 Efl.Gfx.visible.set; 559 Efl.Gfx.visible.set;
560 Efl.Gfx.visible.get; 560 Efl.Gfx.visible.get;
561 Efl.Gfx.color.set; 561 Efl.Gfx.color.set;
diff --git a/src/lib/evas/canvas/efl_canvas_polygon.eo b/src/lib/evas/canvas/efl_canvas_polygon.eo
index 41cb74e..41f5d87 100644
--- a/src/lib/evas/canvas/efl_canvas_polygon.eo
+++ b/src/lib/evas/canvas/efl_canvas_polygon.eo
@@ -15,8 +15,8 @@ class Efl.Canvas.Polygon (Efl.Canvas.Object)
15 } 15 }
16 } 16 }
17 implements { 17 implements {
18 Eo.Base.constructor; 18 Efl.Object.constructor;
19 Eo.Base.destructor; 19 Efl.Object.destructor;
20 } 20 }
21 21
22} 22}
diff --git a/src/lib/evas/canvas/efl_canvas_rectangle.eo b/src/lib/evas/canvas/efl_canvas_rectangle.eo
index 3e8e81a..a6899d8 100644
--- a/src/lib/evas/canvas/efl_canvas_rectangle.eo
+++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo
@@ -1,6 +1,6 @@
1class Efl.Canvas.Rectangle (Efl.Canvas.Object) 1class Efl.Canvas.Rectangle (Efl.Canvas.Object)
2{ 2{
3 implements { 3 implements {
4 Eo.Base.constructor; 4 Efl.Object.constructor;
5 } 5 }
6} 6}
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c
index aa877c3..9aae799 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.c
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.c
@@ -4,11 +4,11 @@
4#define MY_CLASS EFL_CANVAS_SNAPSHOT_CLASS 4#define MY_CLASS EFL_CANVAS_SNAPSHOT_CLASS
5 5
6EOLIAN static Eo * 6EOLIAN static Eo *
7_efl_canvas_snapshot_eo_base_constructor(Eo *eo_obj, void *pd EINA_UNUSED) 7_efl_canvas_snapshot_efl_object_constructor(Eo *eo_obj, void *pd EINA_UNUSED)
8{ 8{
9 Evas_Object_Protected_Data *obj; 9 Evas_Object_Protected_Data *obj;
10 10
11 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 11 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
12 if (!eo_obj) return NULL; 12 if (!eo_obj) return NULL;
13 13
14 efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE); 14 efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE);
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo
index b9f5c10..e370581 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.eo
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.eo
@@ -8,6 +8,6 @@ class Efl.Canvas.Snapshot (Efl.Canvas.Image.Internal)
8 ]] 8 ]]
9 data: null; 9 data: null;
10 implements { 10 implements {
11 Eo.Base.constructor; 11 Efl.Object.constructor;
12 } 12 }
13} 13}
diff --git a/src/lib/evas/canvas/efl_canvas_surface.c b/src/lib/evas/canvas/efl_canvas_surface.c
index 7f52945..13c86f0 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.c
+++ b/src/lib/evas/canvas/efl_canvas_surface.c
@@ -3,9 +3,9 @@
3#define MY_CLASS EFL_CANVAS_SURFACE_MIXIN 3#define MY_CLASS EFL_CANVAS_SURFACE_MIXIN
4 4
5EOLIAN static Eo * 5EOLIAN static Eo *
6_efl_canvas_surface_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd) 6_efl_canvas_surface_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Data *pd)
7{ 7{
8 eo = eo_constructor(eo_super(eo, MY_CLASS)); 8 eo = efl_constructor(eo_super(eo, MY_CLASS));
9 pd->surf.version = EVAS_NATIVE_SURFACE_VERSION; 9 pd->surf.version = EVAS_NATIVE_SURFACE_VERSION;
10 return eo; 10 return eo;
11} 11}
diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo
index b973c04..d05bd6b 100644
--- a/src/lib/evas/canvas/efl_canvas_surface.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface.eo
@@ -1,4 +1,4 @@
1mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal) 1mixin Efl.Canvas.Surface (Efl.Interface, Efl.Canvas.Image.Internal)
2{ 2{
3 [[Native surfaces usually bound to an externally-managed buffer. 3 [[Native surfaces usually bound to an externally-managed buffer.
4 4
@@ -27,6 +27,6 @@ mixin Efl.Canvas.Surface (Eo.Interface, Efl.Canvas.Image.Internal)
27 } 27 }
28 } 28 }
29 implements { 29 implements {
30 Eo.Base.constructor; 30 Efl.Object.constructor;
31 } 31 }
32} 32}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
index 9a9fd54..116aad0 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c
@@ -8,11 +8,11 @@ typedef struct _Efl_Canvas_Surface_Tbm_Data
8} Efl_Canvas_Surface_Tbm_Data; 8} Efl_Canvas_Surface_Tbm_Data;
9 9
10EOLIAN static Eo * 10EOLIAN static Eo *
11_efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd) 11_efl_canvas_surface_tbm_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd)
12{ 12{
13 Evas_Object_Protected_Data *obj; 13 Evas_Object_Protected_Data *obj;
14 14
15 eo = eo_constructor(eo_super(eo, MY_CLASS)); 15 eo = efl_constructor(eo_super(eo, MY_CLASS));
16 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 16 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
17 if (!obj) return NULL; 17 if (!obj) return NULL;
18 18
@@ -28,7 +28,7 @@ _efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data
28} 28}
29 29
30EOLIAN static void 30EOLIAN static void
31_efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd) 31_efl_canvas_surface_tbm_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *pd)
32{ 32{
33 Evas_Object_Protected_Data *obj; 33 Evas_Object_Protected_Data *obj;
34 34
@@ -36,7 +36,7 @@ _efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data *
36 36
37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM); 37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM);
38 eo_data_unref(eo, pd->base); 38 eo_data_unref(eo, pd->base);
39 eo_destructor(eo); 39 efl_destructor(eo);
40} 40}
41 41
42EOLIAN static Eina_Bool 42EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
index 0a9cd1d..7eb3d4d 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
@@ -1,10 +1,10 @@
1class Efl.Canvas.Surface.Tbm (Eo.Base, Efl.Canvas.Surface) 1class Efl.Canvas.Surface.Tbm (Efl.Object, Efl.Canvas.Surface)
2{ 2{
3 [[Native Tizen Buffer Manager surface for Efl canvas]] 3 [[Native Tizen Buffer Manager surface for Efl canvas]]
4 4
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Efl.Canvas.Surface.native_buffer.set; 8 Efl.Canvas.Surface.native_buffer.set;
9 } 9 }
10} 10}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
index d93f439..f15e969 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c
@@ -8,11 +8,11 @@ typedef struct _Efl_Canvas_Surface_Wayland_Data
8} Efl_Canvas_Surface_Wayland_Data; 8} Efl_Canvas_Surface_Wayland_Data;
9 9
10EOLIAN static Eo * 10EOLIAN static Eo *
11_efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd) 11_efl_canvas_surface_wayland_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd)
12{ 12{
13 Evas_Object_Protected_Data *obj; 13 Evas_Object_Protected_Data *obj;
14 14
15 eo = eo_constructor(eo_super(eo, MY_CLASS)); 15 eo = efl_constructor(eo_super(eo, MY_CLASS));
16 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 16 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
17 if (!obj) return NULL; 17 if (!obj) return NULL;
18 18
@@ -28,7 +28,7 @@ _efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayla
28} 28}
29 29
30EOLIAN static void 30EOLIAN static void
31_efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd) 31_efl_canvas_surface_wayland_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_Wayland_Data *pd)
32{ 32{
33 Evas_Object_Protected_Data *obj; 33 Evas_Object_Protected_Data *obj;
34 34
@@ -36,7 +36,7 @@ _efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Waylan
36 36
37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL); 37 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL);
38 eo_data_unref(eo, pd->base); 38 eo_data_unref(eo, pd->base);
39 eo_destructor(eo); 39 efl_destructor(eo);
40} 40}
41 41
42EOLIAN static Eina_Bool 42EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
index b689258..b3bf4f5 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
@@ -1,10 +1,10 @@
1class Efl.Canvas.Surface.Wayland (Eo.Base, Efl.Canvas.Surface) 1class Efl.Canvas.Surface.Wayland (Efl.Object, Efl.Canvas.Surface)
2{ 2{
3 [[Native Wayland surface for Efl canvas]] 3 [[Native Wayland surface for Efl canvas]]
4 4
5 implements { 5 implements {
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 Eo.Base.destructor; 7 Efl.Object.destructor;
8 Efl.Canvas.Surface.native_buffer.set; 8 Efl.Canvas.Surface.native_buffer.set;
9 } 9 }
10} 10}
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c
index 3c01a2d..c463a15 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.c
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c
@@ -9,11 +9,11 @@ typedef struct _Efl_Canvas_Surface_X11_Data
9} Efl_Canvas_Surface_X11_Data; 9} Efl_Canvas_Surface_X11_Data;
10 10
11EOLIAN static Eo * 11EOLIAN static Eo *
12_efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd) 12_efl_canvas_surface_x11_efl_object_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd)
13{ 13{
14 Evas_Object_Protected_Data *obj; 14 Evas_Object_Protected_Data *obj;
15 15
16 eo = eo_constructor(eo_super(eo, MY_CLASS)); 16 eo = efl_constructor(eo_super(eo, MY_CLASS));
17 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); 17 obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS);
18 if (!obj) return NULL; 18 if (!obj) return NULL;
19 19
@@ -30,7 +30,7 @@ _efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data
30} 30}
31 31
32EOLIAN static void 32EOLIAN static void
33_efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd) 33_efl_canvas_surface_x11_efl_object_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *pd)
34{ 34{
35 Evas_Object_Protected_Data *obj; 35 Evas_Object_Protected_Data *obj;
36 36
@@ -38,7 +38,7 @@ _efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data *
38 38
39 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11); 39 ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11);
40 eo_data_unref(eo, pd->base); 40 eo_data_unref(eo, pd->base);
41 eo_destructor(eo); 41 efl_destructor(eo);
42} 42}
43 43
44EOLIAN static Eina_Bool 44EOLIAN static Eina_Bool
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index c5ed11e..892a3c5 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -5,7 +5,7 @@ struct Efl.Canvas.Surface.X11_Pixmap
5 pixmap: ulong; [[X11 Pixmap ID.]] 5 pixmap: ulong; [[X11 Pixmap ID.]]
6} 6}
7 7
8class Efl.Canvas.Surface.X11 (Eo.Base, Efl.Canvas.Surface) 8class Efl.Canvas.Surface.X11 (Efl.Object, Efl.Canvas.Surface)
9{ 9{
10 [[Native X11 surface for Efl canvas]] 10 [[Native X11 surface for Efl canvas]]
11 11
@@ -21,8 +21,8 @@ class Efl.Canvas.Surface.X11 (Eo.Base, Efl.Canvas.Surface)
21 } 21 }
22 } 22 }
23 implements { 23 implements {
24 Eo.Base.constructor; 24 Efl.Object.constructor;
25 Eo.Base.destructor; 25 Efl.Object.destructor;
26 Efl.Canvas.Surface.native_buffer.set; 26 Efl.Canvas.Surface.native_buffer.set;
27 } 27 }
28} 28}
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index a3675e9..78dc931 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -295,9 +295,9 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text)
295 } 295 }
296 } 296 }
297 implements { 297 implements {
298 Eo.Base.constructor; 298 Efl.Object.constructor;
299 Eo.Base.destructor; 299 Efl.Object.destructor;
300 Eo.Base.dbg_info_get; 300 Efl.Object.dbg_info_get;
301 Efl.Canvas.Object.paragraph_direction.set; 301 Efl.Canvas.Object.paragraph_direction.set;
302 Efl.Canvas.Object.paragraph_direction.get; 302 Efl.Canvas.Object.paragraph_direction.get;
303 Efl.Text.text.set; 303 Efl.Text.text.set;
diff --git a/src/lib/evas/canvas/efl_canvas_text_cursor.eo b/src/lib/evas/canvas/efl_canvas_text_cursor.eo
index dcdb136..a130616 100644
--- a/src/lib/evas/canvas/efl_canvas_text_cursor.eo
+++ b/src/lib/evas/canvas/efl_canvas_text_cursor.eo
@@ -4,7 +4,7 @@ enum Efl.Canvas.Text.Cursor.Type
4 under 4 under
5} 5}
6 6
7class Efl.Canvas.Text.Cursor (Eo.Base) 7class Efl.Canvas.Text.Cursor (Efl.Object)
8{ 8{
9 legacy_prefix: evas_textblock_cursor; 9 legacy_prefix: evas_textblock_cursor;
10 methods { 10 methods {
@@ -200,8 +200,8 @@ class Efl.Canvas.Text.Cursor (Eo.Base)
200 } 200 }
201 } 201 }
202 implements { 202 implements {
203 Eo.Base.destructor; 203 Efl.Object.destructor;
204 Eo.Base.finalize; 204 Efl.Object.finalize;
205 } 205 }
206 events { 206 events {
207 changed; [[The cursor position has changed]] 207 changed; [[The cursor position has changed]]
diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c
index 700d486..95a4ae7 100644
--- a/src/lib/evas/canvas/efl_event_hold.c
+++ b/src/lib/evas/canvas/efl_event_hold.c
@@ -61,16 +61,16 @@ _efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_H
61} 61}
62 62
63EOLIAN static Eo * 63EOLIAN static Eo *
64_efl_event_hold_eo_base_constructor(Eo *obj, Efl_Event_Hold_Data *pd) 64_efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd)
65{ 65{
66 obj = eo_constructor(eo_super(obj, MY_CLASS)); 66 obj = efl_constructor(eo_super(obj, MY_CLASS));
67 pd->eo = obj; 67 pd->eo = obj;
68 return obj; 68 return obj;
69} 69}
70 70
71EOLIAN static Efl_Event * 71EOLIAN static Efl_Event *
72_efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED, 72_efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED,
73 Eo_Base *owner, void **priv) 73 Efl_Object *owner, void **priv)
74{ 74{
75 // TODO: Implement a cache. Depends only on how many hold events we trigger. 75 // TODO: Implement a cache. Depends only on how many hold events we trigger.
76 Efl_Event *evt = eo_add(MY_CLASS, owner); 76 Efl_Event *evt = eo_add(MY_CLASS, owner);
@@ -89,7 +89,7 @@ EOLIAN static Efl_Event *
89_efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd) 89_efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd)
90{ 90{
91 Efl_Event_Hold_Data *ev; 91 Efl_Event_Hold_Data *ev;
92 Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, eo_parent_get(obj)); 92 Efl_Event *evt = eo_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
93 ev = eo_data_scope_get(evt, MY_CLASS); 93 ev = eo_data_scope_get(evt, MY_CLASS);
94 if (ev) 94 if (ev)
95 { 95 {
diff --git a/src/lib/evas/canvas/efl_event_hold.eo b/src/lib/evas/canvas/efl_event_hold.eo
index 07e8fcf..ddc4c3c 100644
--- a/src/lib/evas/canvas/efl_event_hold.eo
+++ b/src/lib/evas/canvas/efl_event_hold.eo
@@ -1,4 +1,4 @@
1class Efl.Event.Hold (Eo.Base, Efl.Event.Input) 1class Efl.Event.Hold (Efl.Object, Efl.Event.Input)
2{ 2{
3 [[Event data sent when inputs are put on hold or resumed.]] 3 [[Event data sent when inputs are put on hold or resumed.]]
4 methods { 4 methods {
@@ -10,7 +10,7 @@ class Efl.Event.Hold (Eo.Base, Efl.Event.Input)
10 } 10 }
11 } 11 }
12 implements { 12 implements {
13 Eo.Base.constructor; 13 Efl.Object.constructor;
14 Efl.Event.instance_get; 14 Efl.Event.instance_get;
15 Efl.Event.reset; 15 Efl.Event.reset;
16 Efl.Event.dup; 16 Efl.Event.dup;
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_event_key.c
index bce7c7c..7729432 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_event_key.c
@@ -18,17 +18,17 @@ _del_hook(Eo *evt)
18{ 18{
19 if (!s_cached_event) 19 if (!s_cached_event)
20 { 20 {
21 if (eo_parent_get(evt)) 21 if (efl_parent_get(evt))
22 { 22 {
23 eo_ref(evt); 23 eo_ref(evt);
24 eo_parent_set(evt, NULL); 24 efl_parent_set(evt, NULL);
25 } 25 }
26 s_cached_event = evt; 26 s_cached_event = evt;
27 } 27 }
28 else 28 else
29 { 29 {
30 eo_del_intercept_set(evt, NULL); 30 efl_del_intercept_set(evt, NULL);
31 eo_del(evt); 31 efl_del(evt);
32 } 32 }
33} 33}
34 34
@@ -44,12 +44,12 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
44 evt = s_cached_event; 44 evt = s_cached_event;
45 s_cached_event = NULL; 45 s_cached_event = NULL;
46 efl_event_reset(evt); 46 efl_event_reset(evt);
47 eo_parent_set(evt, owner); 47 efl_parent_set(evt, owner);
48 } 48 }
49 else 49 else
50 { 50 {
51 evt = eo_add(EFL_EVENT_KEY_CLASS, owner); 51 evt = eo_add(EFL_EVENT_KEY_CLASS, owner);
52 eo_del_intercept_set(evt, _del_hook); 52 efl_del_intercept_set(evt, _del_hook);
53 } 53 }
54 54
55 ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 55 ev = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
@@ -60,18 +60,18 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
60} 60}
61 61
62EOLIAN static void 62EOLIAN static void
63_efl_event_key_class_destructor(Eo_Class *klass EINA_UNUSED) 63_efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED)
64{ 64{
65 // this is a strange situation... 65 // this is a strange situation...
66 eo_del_intercept_set(s_cached_event, NULL); 66 efl_del_intercept_set(s_cached_event, NULL);
67 eo_del(s_cached_event); 67 efl_del(s_cached_event);
68 s_cached_event = NULL; 68 s_cached_event = NULL;
69} 69}
70 70
71EOLIAN static Eo_Base * 71EOLIAN static Efl_Object *
72_efl_event_key_eo_base_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED) 72_efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED)
73{ 73{
74 obj = eo_constructor(eo_super(obj, MY_CLASS)); 74 obj = efl_constructor(eo_super(obj, MY_CLASS));
75 efl_event_reset(obj); 75 efl_event_reset(obj);
76 return obj; 76 return obj;
77} 77}
diff --git a/src/lib/evas/canvas/efl_event_key.eo b/src/lib/evas/canvas/efl_event_key.eo
index 897dd46..555aadb 100644
--- a/src/lib/evas/canvas/efl_event_key.eo
+++ b/src/lib/evas/canvas/efl_event_key.eo
@@ -1,4 +1,4 @@
1class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) 1class Efl.Event.Key (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input)
2{ 2{
3 [[Represents a single key event from a keyboard or similar device. 3 [[Represents a single key event from a keyboard or similar device.
4 4
@@ -53,7 +53,7 @@ class Efl.Event.Key (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
53 } 53 }
54 implements { 54 implements {
55 class.destructor; 55 class.destructor;
56 Eo.Base.constructor; 56 Efl.Object.constructor;
57 Efl.Event.instance_get; 57 Efl.Event.instance_get;
58 Efl.Event.reset; 58 Efl.Event.reset;
59 Efl.Event.dup; 59 Efl.Event.dup;
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_event_pointer.c
index 637f19f..8bd45c4 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_event_pointer.c
@@ -29,17 +29,17 @@ _del_hook(Eo *evt)
29{ 29{
30 if (!s_cached_event) 30 if (!s_cached_event)
31 { 31 {
32 if (eo_parent_get(evt)) 32 if (efl_parent_get(evt))
33 { 33 {
34 eo_ref(evt); 34 eo_ref(evt);
35 eo_parent_set(evt, NULL); 35 efl_parent_set(evt, NULL);
36 } 36 }
37 s_cached_event = evt; 37 s_cached_event = evt;
38 } 38 }
39 else 39 else
40 { 40 {
41 eo_del_intercept_set(evt, NULL); 41 efl_del_intercept_set(evt, NULL);
42 eo_del(evt); 42 efl_del(evt);
43 } 43 }
44} 44}
45 45
@@ -55,12 +55,12 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
55 evt = s_cached_event; 55 evt = s_cached_event;
56 s_cached_event = NULL; 56 s_cached_event = NULL;
57 efl_event_reset(evt); 57 efl_event_reset(evt);
58 eo_parent_set(evt, owner); 58 efl_parent_set(evt, owner);
59 } 59 }
60 else 60 else
61 { 61 {
62 evt = eo_add(EFL_EVENT_POINTER_CLASS, owner); 62 evt = eo_add(EFL_EVENT_POINTER_CLASS, owner);
63 eo_del_intercept_set(evt, _del_hook); 63 efl_del_intercept_set(evt, _del_hook);
64 } 64 }
65 65
66 ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 66 ev = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
@@ -71,18 +71,18 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
71} 71}
72 72
73EOLIAN static void 73EOLIAN static void
74_efl_event_pointer_class_destructor(Eo_Class *klass EINA_UNUSED) 74_efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
75{ 75{
76 // this is a strange situation... 76 // this is a strange situation...
77 eo_del_intercept_set(s_cached_event, NULL); 77 efl_del_intercept_set(s_cached_event, NULL);
78 eo_del(s_cached_event); 78 efl_del(s_cached_event);
79 s_cached_event = NULL; 79 s_cached_event = NULL;
80} 80}
81 81
82EOLIAN static Eo_Base * 82EOLIAN static Efl_Object *
83_efl_event_pointer_eo_base_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED) 83_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED)
84{ 84{
85 eo_constructor(eo_super(obj, MY_CLASS)); 85 efl_constructor(eo_super(obj, MY_CLASS));
86 efl_event_reset(obj); 86 efl_event_reset(obj);
87 return obj; 87 return obj;
88} 88}
diff --git a/src/lib/evas/canvas/efl_event_pointer.eo b/src/lib/evas/canvas/efl_event_pointer.eo
index 1fbac08..09fb1ba 100644
--- a/src/lib/evas/canvas/efl_event_pointer.eo
+++ b/src/lib/evas/canvas/efl_event_pointer.eo
@@ -1,7 +1,7 @@
1import efl_orientation; 1import efl_orientation;
2import efl_event_types; 2import efl_event_types;
3 3
4class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input) 4class Efl.Event.Pointer (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input)
5{ 5{
6 [[Event data carried over with any pointer event (mouse, touch, ...) 6 [[Event data carried over with any pointer event (mouse, touch, ...)
7 7
@@ -88,7 +88,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
88 propagation or repetition of the event. 88 propagation or repetition of the event.
89 ]] 89 ]]
90 values { 90 values {
91 src: Eo.Base; [[Source object: $Efl.Gfx]] 91 src: Efl.Object; [[Source object: $Efl.Gfx]]
92 } 92 }
93 } 93 }
94 @property button_flags { 94 @property button_flags {
@@ -127,7 +127,7 @@ class Efl.Event.Pointer (Eo.Base, Efl.Event, Efl.Input.State, Efl.Event.Input)
127 } 127 }
128 } 128 }
129 implements { 129 implements {
130 Eo.Base.constructor; 130 Efl.Object.constructor;
131 class.destructor; 131 class.destructor;
132 Efl.Event.instance_get; 132 Efl.Event.instance_get;
133 Efl.Event.reset; 133 Efl.Event.reset;
diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo
index 2270361..80d2d6f 100644
--- a/src/lib/evas/canvas/efl_gfx_map.eo
+++ b/src/lib/evas/canvas/efl_gfx_map.eo
@@ -1,4 +1,4 @@
1mixin Efl.Gfx.Map (Eo.Interface, Eo.Base) 1mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
2{ 2{
3 [[Texture UV mapping for all objects (rotation, perspective, 3d, ...). 3 [[Texture UV mapping for all objects (rotation, perspective, 3d, ...).
4 4
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index 647f86a..3a776e5 100644
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack) 3abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack)
4{ 4{
5 eo_prefix: efl_vg; 5 eo_prefix: efl_vg;
6 legacy_prefix: evas_vg_node; 6 legacy_prefix: evas_vg_node;
@@ -106,9 +106,9 @@ abstract Efl.VG (Eo.Base, Efl.Gfx, Efl.Gfx.Stack)
106 } 106 }
107 } 107 }
108 implements { 108 implements {
109 Eo.Base.parent.set; 109 Efl.Object.parent.set;
110 Eo.Base.constructor; 110 Efl.Object.constructor;
111 Eo.Base.destructor; 111 Efl.Object.destructor;
112 Efl.Gfx.visible.set; 112 Efl.Gfx.visible.set;
113 Efl.Gfx.visible.get; 113 Efl.Gfx.visible.get;
114 Efl.Gfx.color.set; 114 Efl.Gfx.color.set;
diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo
index 0b0541e..931367a 100644
--- a/src/lib/evas/canvas/efl_vg_container.eo
+++ b/src/lib/evas/canvas/efl_vg_container.eo
@@ -13,8 +13,8 @@ class Efl.VG.Container (Efl.VG)
13 } 13 }
14 } 14 }
15 implements { 15 implements {
16 Eo.Base.constructor; 16 Efl.Object.constructor;
17 Eo.Base.destructor; 17 Efl.Object.destructor;
18 Efl.VG.bounds_get; 18 Efl.VG.bounds_get;
19 Efl.VG.interpolate; 19 Efl.VG.interpolate;
20 Efl.VG.dup; 20 Efl.VG.dup;
diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
index a29ac26..89a7ac6 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo
@@ -9,7 +9,7 @@ class Efl.VG.Gradient.Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear)
9 Efl.VG.bounds_get; 9 Efl.VG.bounds_get;
10 Efl.VG.interpolate; 10 Efl.VG.interpolate;
11 Efl.VG.dup; 11 Efl.VG.dup;
12 Eo.Base.constructor; 12 Efl.Object.constructor;
13 Eo.Base.destructor; 13 Efl.Object.destructor;
14 } 14 }
15} 15}
diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
index 19ead03..88706d3 100644
--- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo
@@ -11,7 +11,7 @@ class Efl.VG.Gradient.Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial)
11 Efl.VG.bounds_get; 11 Efl.VG.bounds_get;
12 Efl.VG.interpolate; 12 Efl.VG.interpolate;
13 Efl.VG.dup; 13 Efl.VG.dup;
14 Eo.Base.constructor; 14 Efl.Object.constructor;
15 Eo.Base.destructor; 15 Efl.Object.destructor;
16 } 16 }
17} 17}
diff --git a/src/lib/evas/canvas/efl_vg_root_node.eo b/src/lib/evas/canvas/efl_vg_root_node.eo
index 685bf7e..3855571 100644
--- a/src/lib/evas/canvas/efl_vg_root_node.eo
+++ b/src/lib/evas/canvas/efl_vg_root_node.eo
@@ -2,7 +2,7 @@ class Efl.VG.Root_Node (Efl.VG.Container)
2{ 2{
3 legacy_prefix: evas_vg_root_node; 3 legacy_prefix: evas_vg_root_node;
4 implements { 4 implements {
5 Eo.Base.parent.set; 5 Efl.Object.parent.set;
6 Eo.Base.constructor; 6 Efl.Object.constructor;
7 } 7 }
8} 8}
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo
index b8894d3..7b74d36 100644
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -36,7 +36,7 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape)
36 Efl.VG.bounds_get; 36 Efl.VG.bounds_get;
37 Efl.VG.interpolate; 37 Efl.VG.interpolate;
38 Efl.VG.dup; 38 Efl.VG.dup;
39 Eo.Base.constructor; 39 Efl.Object.constructor;
40 Eo.Base.destructor; 40 Efl.Object.destructor;
41 } 41 }
42} 42}
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 7213736..26b04c3 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -656,7 +656,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped)
656 } 656 }
657 implements { 657 implements {
658 class.constructor; 658 class.constructor;
659 Eo.Base.constructor; 659 Efl.Object.constructor;
660 Efl.Canvas.Group.group_calculate; 660 Efl.Canvas.Group.group_calculate;
661 Efl.Canvas.Group.group_add; 661 Efl.Canvas.Group.group_add;
662 Efl.Canvas.Group.group_del; 662 Efl.Canvas.Group.group_del;
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 14e303f..82b8105 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -17,15 +17,15 @@ extern Eina_Hash* signals_hash_table;
17 * Evas events descriptions for Eo. 17 * Evas events descriptions for Eo.
18 */ 18 */
19#define DEFINE_EVAS_CALLBACKS(LAST, ...) \ 19#define DEFINE_EVAS_CALLBACKS(LAST, ...) \
20 static const Eo_Event_Description *_legacy_evas_callback_table(unsigned int index) \ 20 static const Efl_Event_Description *_legacy_evas_callback_table(unsigned int index) \
21 { \ 21 { \
22 static const Eo_Event_Description *internals[LAST] = { NULL }; \ 22 static const Efl_Event_Description *internals[LAST] = { NULL }; \
23 \ 23 \
24 if (internals[0] == NULL) \ 24 if (internals[0] == NULL) \
25 { \ 25 { \
26 memcpy(internals, \ 26 memcpy(internals, \
27 ((const Eo_Event_Description*[]) { __VA_ARGS__ }), \ 27 ((const Efl_Event_Description*[]) { __VA_ARGS__ }), \
28 sizeof ((const Eo_Event_Description *[]) { __VA_ARGS__ })); \ 28 sizeof ((const Efl_Event_Description *[]) { __VA_ARGS__ })); \
29 } \ 29 } \
30 return internals[index]; \ 30 return internals[index]; \
31 } 31 }
@@ -145,7 +145,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj)
145 if (!obj->callbacks) return; 145 if (!obj->callbacks) return;
146 EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info) 146 EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info)
147 { 147 {
148 eo_event_callback_del(eo_obj, _legacy_evas_callback_table(info->type), _eo_evas_object_cb, info); 148 efl_event_callback_del(eo_obj, _legacy_evas_callback_table(info->type), _eo_evas_object_cb, info);
149 149
150 obj->callbacks = 150 obj->callbacks =
151 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); 151 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -171,7 +171,7 @@ evas_event_callback_all_del(Evas *eo_e)
171 171
172 EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info) 172 EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info)
173 { 173 {
174 eo_event_callback_del(eo_e, _legacy_evas_callback_table(info->type), _eo_evas_cb, info); 174 efl_event_callback_del(eo_e, _legacy_evas_callback_table(info->type), _eo_evas_cb, info);
175 175
176 e->callbacks = 176 e->callbacks =
177 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); 177 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
@@ -188,13 +188,13 @@ evas_event_callback_cleanup(Evas *eo_e)
188void 188void
189evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info) 189evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
190{ 190{
191 eo_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info); 191 efl_event_callback_call(eo_e, _legacy_evas_callback_table(type), event_info);
192} 192}
193 193
194void 194void
195evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, 195evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
196 Evas_Callback_Type type, void *event_info, int event_id, 196 Evas_Callback_Type type, void *event_info, int event_id,
197 const Eo_Event_Description *eo_event_desc, Efl_Event *eo_event_info) 197 const Efl_Event_Description *efl_event_desc, Efl_Event *efl_event_info)
198{ 198{
199 /* MEM OK */ 199 /* MEM OK */
200 Evas_Button_Flags flags = EVAS_BUTTON_NONE; 200 Evas_Button_Flags flags = EVAS_BUTTON_NONE;
@@ -235,9 +235,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
235 ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK); 235 ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK);
236 } 236 }
237 obj->last_mouse_down_counter = e->last_mouse_down_counter; 237 obj->last_mouse_down_counter = e->last_mouse_down_counter;
238 if (eo_event_info) 238 if (efl_event_info)
239 { 239 {
240 efl_event_pointer_button_flags_set(eo_event_info, ev->flags); 240 efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
241 } 241 }
242 break; 242 break;
243 } 243 }
@@ -252,9 +252,9 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
252 ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK); 252 ev->flags &= ~(EVAS_BUTTON_DOUBLE_CLICK | EVAS_BUTTON_TRIPLE_CLICK);
253 } 253 }
254 obj->last_mouse_up_counter = e->last_mouse_up_counter; 254 obj->last_mouse_up_counter = e->last_mouse_up_counter;
255 if (eo_event_info) 255 if (efl_event_info)
256 { 256 {
257 efl_event_pointer_button_flags_set(eo_event_info, ev->flags); 257 efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
258 } 258 }
259 break; 259 break;
260 } 260 }
@@ -263,10 +263,10 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
263 } 263 }
264 264
265 /* legacy callbacks - relying on Efl.Canvas.Object events */ 265 /* legacy callbacks - relying on Efl.Canvas.Object events */
266 eo_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info); 266 efl_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info);
267 267
268 /* new input events */ 268 /* new input events */
269 if (eo_event_desc) 269 if (efl_event_desc)
270 { 270 {
271 Efl_Event_Flags *pevflags = NULL; 271 Efl_Event_Flags *pevflags = NULL;
272 272
@@ -291,23 +291,23 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
291 } 291 }
292#undef EV_CASE 292#undef EV_CASE
293 293
294 if (pevflags) efl_event_flags_set(eo_event_info, *pevflags); 294 if (pevflags) efl_event_flags_set(efl_event_info, *pevflags);
295 eo_event_callback_call(eo_obj, eo_event_desc, eo_event_info); 295 efl_event_callback_call(eo_obj, efl_event_desc, efl_event_info);
296 } 296 }
297 297
298 if (type == EVAS_CALLBACK_MOUSE_DOWN) 298 if (type == EVAS_CALLBACK_MOUSE_DOWN)
299 { 299 {
300 Evas_Event_Mouse_Down *ev = event_info; 300 Evas_Event_Mouse_Down *ev = event_info;
301 ev->flags = flags; 301 ev->flags = flags;
302 if (eo_event_info) 302 if (efl_event_info)
303 efl_event_pointer_button_flags_set(eo_event_info, ev->flags); 303 efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
304 } 304 }
305 else if (type == EVAS_CALLBACK_MOUSE_UP) 305 else if (type == EVAS_CALLBACK_MOUSE_UP)
306 { 306 {
307 Evas_Event_Mouse_Up *ev = event_info; 307 Evas_Event_Mouse_Up *ev = event_info;
308 ev->flags = flags; 308 ev->flags = flags;
309 if (eo_event_info) 309 if (efl_event_info)
310 efl_event_pointer_button_flags_set(eo_event_info, ev->flags); 310 efl_event_pointer_button_flags_set(efl_event_info, ev->flags);
311 } 311 }
312 312
313 nothing_here: 313 nothing_here:
@@ -317,7 +317,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
317 (type <= EVAS_CALLBACK_KEY_UP)) 317 (type <= EVAS_CALLBACK_KEY_UP))
318 { 318 {
319 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); 319 Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS);
320 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, eo_event_desc, eo_event_info); 320 evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, efl_event_desc, efl_event_info);
321 } 321 }
322 } 322 }
323 _evas_unwalk(e); 323 _evas_unwalk(e);
@@ -347,8 +347,8 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type
347 cb_info->data = (void *)data; 347 cb_info->data = (void *)data;
348 cb_info->type = type; 348 cb_info->type = type;
349 349
350 const Eo_Event_Description *desc = _legacy_evas_callback_table(type); 350 const Efl_Event_Description *desc = _legacy_evas_callback_table(type);
351 eo_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info); 351 efl_event_callback_priority_add(eo_obj, desc, priority, _eo_evas_object_cb, cb_info);
352 352
353 obj->callbacks = 353 obj->callbacks =
354 eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info)); 354 eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info));
@@ -374,7 +374,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva
374 if ((info->func == func) && (info->type == type)) 374 if ((info->func == func) && (info->type == type))
375 { 375 {
376 void *tmp = info->data; 376 void *tmp = info->data;
377 eo_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info); 377 efl_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info);
378 378
379 obj->callbacks = 379 obj->callbacks =
380 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); 380 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -405,7 +405,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type
405 if ((info->func == func) && (info->type == type) && info->data == data) 405 if ((info->func == func) && (info->type == type) && info->data == data)
406 { 406 {
407 void *tmp = info->data; 407 void *tmp = info->data;
408 eo_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info); 408 efl_event_callback_del(eo_obj, _legacy_evas_callback_table(type), _eo_evas_object_cb, info);
409 409
410 obj->callbacks = 410 obj->callbacks =
411 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info)); 411 eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
@@ -439,8 +439,8 @@ evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type, Evas_Callb
439 cb_info->data = (void *)data; 439 cb_info->data = (void *)data;
440 cb_info->type = type; 440 cb_info->type = type;
441 441
442 const Eo_Event_Description *desc = _legacy_evas_callback_table(type); 442 const Efl_Event_Description *desc = _legacy_evas_callback_table(type);
443 eo_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info); 443 efl_event_callback_priority_add(eo_e, desc, priority, _eo_evas_cb, cb_info);
444 444
445 e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info)); 445 e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info));
446} 446}
@@ -465,7 +465,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb func)
465 if ((info->func == func) && (info->type == type)) 465 if ((info->func == func) && (info->type == type))
466 { 466 {
467 void *tmp = info->data; 467 void *tmp = info->data;
468 eo_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info); 468 efl_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info);
469 469
470 e->callbacks = 470 e->callbacks =
471 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); 471 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
@@ -496,7 +496,7 @@ evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
496 if ((info->func == func) && (info->type == type) && (info->data == data)) 496 if ((info->func == func) && (info->type == type) && (info->data == data))
497 { 497 {
498 void *tmp = info->data; 498 void *tmp = info->data;
499 eo_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info); 499 efl_event_callback_del(eo_e, _legacy_evas_callback_table(type), _eo_evas_cb, info);
500 500
501 e->callbacks = 501 e->callbacks =
502 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info)); 502 eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 03a180b..ea75d1e 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
1import evas_types; 1import evas_types;
2import efl_event_types; 2import efl_event_types;
3 3
4class Evas.Canvas (Eo.Base, Efl.Canvas, Efl.Animator, Efl.Input.Interface) 4class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
5{ 5{
6 legacy_prefix: evas; 6 legacy_prefix: evas;
7 data: Evas_Public_Data; 7 data: Evas_Public_Data;
@@ -1190,11 +1190,11 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
1190 } 1190 }
1191 } 1191 }
1192 implements { 1192 implements {
1193 Eo.Base.constructor; 1193 Efl.Object.constructor;
1194 Eo.Base.destructor; 1194 Efl.Object.destructor;
1195 Eo.Base.event_thaw; 1195 Efl.Object.event_thaw;
1196 Eo.Base.event_freeze; 1196 Efl.Object.event_freeze;
1197 Eo.Base.provider_find; 1197 Efl.Object.provider_find;
1198 } 1198 }
1199 events { 1199 events {
1200 render,flush,pre @beta; 1200 render,flush,pre @beta;
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c
index d631df6..ab222e6 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.c
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.c
@@ -63,17 +63,17 @@ evas_canvas3d_camera_node_del(Evas_Canvas3D_Camera *camera, Evas_Canvas3D_Node *
63} 63}
64 64
65EOLIAN static Eo * 65EOLIAN static Eo *
66_evas_canvas3d_camera_eo_base_constructor(Eo *obj, 66_evas_canvas3d_camera_efl_object_constructor(Eo *obj,
67 Evas_Canvas3D_Camera_Data *pd EINA_UNUSED) 67 Evas_Canvas3D_Camera_Data *pd EINA_UNUSED)
68{ 68{
69 obj = eo_constructor(eo_super(obj, MY_CLASS)); 69 obj = efl_constructor(eo_super(obj, MY_CLASS));
70 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA); 70 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_CAMERA);
71 71
72 return obj; 72 return obj;
73} 73}
74 74
75EOLIAN static void 75EOLIAN static void
76_evas_canvas3d_camera_eo_base_destructor(Eo *obj, 76_evas_canvas3d_camera_efl_object_destructor(Eo *obj,
77 Evas_Canvas3D_Camera_Data *pd) 77 Evas_Canvas3D_Camera_Data *pd)
78{ 78{
79 Eina_Iterator *it = NULL; 79 Eina_Iterator *it = NULL;
@@ -92,7 +92,7 @@ _evas_canvas3d_camera_eo_base_destructor(Eo *obj,
92 eina_hash_free(pd->nodes); 92 eina_hash_free(pd->nodes);
93 } 93 }
94 94
95 eo_destructor(eo_super(obj, MY_CLASS)); 95 efl_destructor(eo_super(obj, MY_CLASS));
96} 96}
97 97
98EAPI Evas_Canvas3D_Camera * 98EAPI Evas_Canvas3D_Camera *
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index 4ac3b0d..18d22ae 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -77,8 +77,8 @@ class Evas.Canvas3D.Camera (Evas.Canvas3D.Object)
77 } 77 }
78 78
79 implements { 79 implements {
80 Eo.Base.constructor; 80 Efl.Object.constructor;
81 Eo.Base.destructor; 81 Efl.Object.destructor;
82 Evas.Canvas3D.Object.update_notify; 82 Evas.Canvas3D.Object.update_notify;
83 Evas.Canvas3D.Object.change_notify; 83 Evas.Canvas3D.Object.change_notify;
84 } 84 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.c b/src/lib/evas/canvas/evas_canvas3d_light.c
index 11e9c81..77a7d49 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.c
+++ b/src/lib/evas/canvas/evas_canvas3d_light.c
@@ -77,9 +77,9 @@ evas_canvas3d_light_add(Evas *e)
77} 77}
78 78
79EOLIAN static Eo * 79EOLIAN static Eo *
80_evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) 80_evas_canvas3d_light_efl_object_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
81{ 81{
82 obj = eo_constructor(eo_super(obj, MY_CLASS)); 82 obj = efl_constructor(eo_super(obj, MY_CLASS));
83 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT); 83 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_LIGHT);
84 evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0); 84 evas_color_set(&pd->ambient, 0.0, 0.0, 0.0, 1.0);
85 evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0); 85 evas_color_set(&pd->diffuse, 1.0, 1.0, 1.0, 1.0);
@@ -97,7 +97,7 @@ _evas_canvas3d_light_eo_base_constructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
97} 97}
98 98
99EOLIAN static void 99EOLIAN static void
100_evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd) 100_evas_canvas3d_light_efl_object_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
101{ 101{
102 Eina_Iterator *it = NULL; 102 Eina_Iterator *it = NULL;
103 void *data = NULL; 103 void *data = NULL;
@@ -115,7 +115,7 @@ _evas_canvas3d_light_eo_base_destructor(Eo *obj, Evas_Canvas3D_Light_Data *pd)
115 eina_hash_free(pd->nodes); 115 eina_hash_free(pd->nodes);
116 } 116 }
117 117
118 eo_destructor(eo_super(obj, MY_CLASS)); 118 efl_destructor(eo_super(obj, MY_CLASS));
119} 119}
120 120
121 121
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo
index 464ab8e..c5458d4 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -248,8 +248,8 @@ class Evas.Canvas3D.Light (Evas.Canvas3D.Object)
248 } 248 }
249 249
250 implements { 250 implements {
251 Eo.Base.constructor; 251 Efl.Object.constructor;
252 Eo.Base.destructor; 252 Efl.Object.destructor;
253 Evas.Canvas3D.Object.update_notify; 253 Evas.Canvas3D.Object.update_notify;
254 Evas.Canvas3D.Object.change_notify; 254 Evas.Canvas3D.Object.change_notify;
255 } 255 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.c b/src/lib/evas/canvas/evas_canvas3d_material.c
index 5070d44..150f5eb 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.c
+++ b/src/lib/evas/canvas/evas_canvas3d_material.c
@@ -89,9 +89,9 @@ evas_canvas3d_material_add(Evas *e)
89} 89}
90 90
91EOLIAN static Eo * 91EOLIAN static Eo *
92_evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd) 92_evas_canvas3d_material_efl_object_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_Material_Data *pd)
93{ 93{
94 obj = eo_constructor(eo_super(obj, MY_CLASS)); 94 obj = efl_constructor(eo_super(obj, MY_CLASS));
95 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL); 95 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MATERIAL);
96 96
97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0); 97 evas_color_set(&pd->attribs[EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT].color, 0.2, 0.2, 0.2, 1.0);
@@ -104,7 +104,7 @@ _evas_canvas3d_material_eo_base_constructor(Eo *obj EINA_UNUSED, Evas_Canvas3D_M
104} 104}
105 105
106EOLIAN static void 106EOLIAN static void
107_evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data *pd) 107_evas_canvas3d_material_efl_object_destructor(Eo *obj, Evas_Canvas3D_Material_Data *pd)
108{ 108{
109 int i = 0; 109 int i = 0;
110 Eina_Iterator *it = NULL; 110 Eina_Iterator *it = NULL;
@@ -136,7 +136,7 @@ _evas_canvas3d_material_eo_base_destructor(Eo *obj, Evas_Canvas3D_Material_Data
136 evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj); 136 evas_canvas3d_texture_material_del(pd->attribs[i].texture, obj);
137 } 137 }
138 } 138 }
139 eo_destructor(eo_super(obj, MY_CLASS)); 139 efl_destructor(eo_super(obj, MY_CLASS));
140} 140}
141 141
142EOLIAN static void 142EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo b/src/lib/evas/canvas/evas_canvas3d_material.eo
index 72871fc..68cd492 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -116,8 +116,8 @@ class Evas.Canvas3D.Material (Evas.Canvas3D.Object)
116 } 116 }
117 } 117 }
118 implements { 118 implements {
119 Eo.Base.constructor; 119 Efl.Object.constructor;
120 Eo.Base.destructor; 120 Efl.Object.destructor;
121 Evas.Canvas3D.Object.update_notify; 121 Evas.Canvas3D.Object.update_notify;
122 Evas.Canvas3D.Object.change_notify; 122 Evas.Canvas3D.Object.change_notify;
123 } 123 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c
index 9cfc637..e59497f 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.c
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c
@@ -261,9 +261,9 @@ evas_canvas3d_mesh_add(Evas *e)
261} 261}
262 262
263EOLIAN static Eo * 263EOLIAN static Eo *
264_evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 264_evas_canvas3d_mesh_efl_object_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
265{ 265{
266 obj = eo_constructor(eo_super(obj, MY_CLASS)); 266 obj = efl_constructor(eo_super(obj, MY_CLASS));
267 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH); 267 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_MESH);
268 _mesh_init(pd); 268 _mesh_init(pd);
269 269
@@ -271,10 +271,10 @@ _evas_canvas3d_mesh_eo_base_constructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
271} 271}
272 272
273EOLIAN static void 273EOLIAN static void
274_evas_canvas3d_mesh_eo_base_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd) 274_evas_canvas3d_mesh_efl_object_destructor(Eo *obj, Evas_Canvas3D_Mesh_Data *pd)
275{ 275{
276 _mesh_fini(pd); 276 _mesh_fini(pd);
277 eo_destructor(eo_super(obj, MY_CLASS)); 277 efl_destructor(eo_super(obj, MY_CLASS));
278} 278}
279 279
280EOLIAN static void 280EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index a15edf4..8fb7e53 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -420,8 +420,8 @@ class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File)
420 } 420 }
421 } 421 }
422 implements { 422 implements {
423 Eo.Base.constructor; 423 Efl.Object.constructor;
424 Eo.Base.destructor; 424 Efl.Object.destructor;
425 Evas.Canvas3D.Object.update_notify; 425 Evas.Canvas3D.Object.update_notify;
426 Evas.Canvas3D.Object.change_notify; 426 Evas.Canvas3D.Object.change_notify;
427 Efl.File.file.set; 427 Efl.File.file.set;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 31963a2..c4f6eee 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -56,13 +56,13 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
56 Eina_List *collision_list = NULL, *l = NULL; 56 Eina_List *collision_list = NULL, *l = NULL;
57 Evas_Canvas3D_Node *target_node = NULL, *n = NULL; 57 Evas_Canvas3D_Node *target_node = NULL, *n = NULL;
58 Evas_Canvas3D_Node_Data *pd_target = NULL, *pd = NULL; 58 Evas_Canvas3D_Node_Data *pd_target = NULL, *pd = NULL;
59 const Eo_Event_Description *eo_desc = NULL; 59 const Efl_Event_Description *eo_desc = NULL;
60 Eina_Bool ret = EINA_FALSE; 60 Eina_Bool ret = EINA_FALSE;
61 61
62 target_node = (Evas_Canvas3D_Node *)event->info; 62 target_node = (Evas_Canvas3D_Node *)event->info;
63 pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS); 63 pd_target = eo_data_scope_get(target_node, EVAS_CANVAS3D_NODE_CLASS);
64 collision_list = (Eina_List *)data; 64 collision_list = (Eina_List *)data;
65 eo_desc = eo_base_legacy_only_event_description_get("collision"); 65 eo_desc = efl_object_legacy_only_event_description_get("collision");
66 66
67 if (collision_list) 67 if (collision_list)
68 { 68 {
@@ -70,14 +70,14 @@ _evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event
70 { 70 {
71 pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS); 71 pd = eo_data_scope_get(n, EVAS_CANVAS3D_NODE_CLASS);
72 if (box_intersection_box(&pd_target->aabb, &pd->aabb)) 72 if (box_intersection_box(&pd_target->aabb, &pd->aabb))
73 ret = eo_event_callback_call(target_node, eo_desc, n); 73 ret = efl_event_callback_call(target_node, eo_desc, n);
74 } 74 }
75 if (!ret) 75 if (!ret)
76 { 76 {
77 /* XXX: Putting it like this because that's how the logic was, 77 /* XXX: Putting it like this because that's how the logic was,
78 * but it seems absolutely wrong that it only checks the last 78 * but it seems absolutely wrong that it only checks the last
79 * and decides based on that. */ 79 * and decides based on that. */
80 eo_event_callback_stop(event->object); 80 efl_event_callback_stop(event->object);
81 } 81 }
82 } 82 }
83} 83}
@@ -85,11 +85,11 @@ static void
85_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event) 85_evas_canvas3d_node_private_callback_clicked(void *data EINA_UNUSED, const Eo_Event *event)
86{ 86{
87 Eina_Bool ret = EINA_FALSE; 87 Eina_Bool ret = EINA_FALSE;
88 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get("clicked"); 88 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get("clicked");
89 ret = eo_event_callback_call((Eo *)event->info, eo_desc, event->info); 89 ret = efl_event_callback_call((Eo *)event->info, eo_desc, event->info);
90 90
91 if (!ret) 91 if (!ret)
92 eo_event_callback_stop(event->object); 92 efl_event_callback_stop(event->object);
93} 93}
94 94
95static inline Evas_Canvas3D_Node_Mesh * 95static inline Evas_Canvas3D_Node_Mesh *
@@ -205,7 +205,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_register(Eo *obj, Evas_Canvas3
205 GET_CALLBACK_TYPE(tcb, event) 205 GET_CALLBACK_TYPE(tcb, event)
206 206
207 if (tcb != PRIVATE_CALLBACK_NONE) 207 if (tcb != PRIVATE_CALLBACK_NONE)
208 eo_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data); 208 efl_event_callback_add(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], data);
209 209
210} 210}
211 211
@@ -218,7 +218,7 @@ _evas_canvas3d_node_evas_canvas3d_object_callback_unregister(Eo *obj, Evas_Canva
218 GET_CALLBACK_TYPE(tcb, event) 218 GET_CALLBACK_TYPE(tcb, event)
219 219
220 if (tcb != PRIVATE_CALLBACK_NONE) 220 if (tcb != PRIVATE_CALLBACK_NONE)
221 eo_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL); 221 efl_event_callback_del(obj, &evas_canvas3d_node_private_event_desc[tcb], evas_canvas3d_node_private_callback_functions[tcb], NULL);
222} 222}
223 223
224static Eina_Bool 224static Eina_Bool
@@ -500,7 +500,7 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
500 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); 500 Evas_Canvas3D_Node_Data *pd = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS);
501 Eina_List *current; 501 Eina_List *current;
502 Evas_Canvas3D_Node *datanode; 502 Evas_Canvas3D_Node *datanode;
503 const Eo_Event_Description *eo_desc = NULL; 503 const Efl_Event_Description *eo_desc = NULL;
504 if (pd->type != EVAS_CANVAS3D_NODE_TYPE_MESH && 504 if (pd->type != EVAS_CANVAS3D_NODE_TYPE_MESH &&
505 pd->type != EVAS_CANVAS3D_NODE_TYPE_NODE) 505 pd->type != EVAS_CANVAS3D_NODE_TYPE_NODE)
506 return EINA_TRUE; 506 return EINA_TRUE;
@@ -513,8 +513,8 @@ node_aabb_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED)
513 } 513 }
514 514
515 evas_build_sphere(&pd->aabb, &pd->bsphere); 515 evas_build_sphere(&pd->aabb, &pd->bsphere);
516 eo_desc = eo_base_legacy_only_event_description_get("collision,private"); 516 eo_desc = efl_object_legacy_only_event_description_get("collision,private");
517 eo_event_callback_call(node, eo_desc, (void *)node); 517 efl_event_callback_call(node, eo_desc, (void *)node);
518 518
519 return EINA_TRUE; 519 return EINA_TRUE;
520} 520}
@@ -538,7 +538,7 @@ _evas_canvas3d_node_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D_No
538 evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_ANY_ORDER, EINA_FALSE, 538 evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_ANY_ORDER, EINA_FALSE,
539 _node_billboard_update, NULL); 539 _node_billboard_update, NULL);
540 /* Update AABB. */ 540 /* Update AABB. */
541 if(eo_base_legacy_only_event_description_get("collision,private")) 541 if(efl_object_legacy_only_event_description_get("collision,private"))
542 { 542 {
543 evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE, 543 evas_canvas3d_node_tree_traverse(obj, EVAS_CANVAS3D_TREE_TRAVERSE_POST_ORDER, EINA_FALSE,
544 node_aabb_update, NULL); 544 node_aabb_update, NULL);
@@ -1065,11 +1065,11 @@ _evas_canvas3d_node_constructor(Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_Canva
1065} 1065}
1066 1066
1067EOLIAN static void 1067EOLIAN static void
1068_evas_canvas3d_node_eo_base_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA_UNUSED) 1068_evas_canvas3d_node_efl_object_destructor(Eo *obj, Evas_Canvas3D_Node_Data *pd EINA_UNUSED)
1069{ 1069{
1070 _node_free(obj); 1070 _node_free(obj);
1071 1071
1072 eo_destructor(eo_super(obj, MY_CLASS)); 1072 efl_destructor(eo_super(obj, MY_CLASS));
1073} 1073}
1074 1074
1075EOLIAN static Evas_Canvas3D_Node_Type 1075EOLIAN static Evas_Canvas3D_Node_Type
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo
index 2ffcbac..4ecb412 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -382,7 +382,7 @@ class Evas.Canvas3D.Node (Evas.Canvas3D.Object)
382 } 382 }
383 } 383 }
384 implements { 384 implements {
385 Eo.Base.destructor; 385 Efl.Object.destructor;
386 Evas.Canvas3D.Object.update_notify; 386 Evas.Canvas3D.Object.update_notify;
387 Evas.Canvas3D.Object.change_notify; 387 Evas.Canvas3D.Object.change_notify;
388 Evas.Canvas3D.Object.callback_register; 388 Evas.Canvas3D.Object.callback_register;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node_callback.h b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
index e868da5..7167217 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node_callback.h
+++ b/src/lib/evas/canvas/evas_canvas3d_node_callback.h
@@ -16,10 +16,10 @@ typedef enum _Evas_Canvas3D_Node_Private_Callback_Type
16 PRIVATE_CALLBACK_NONE 16 PRIVATE_CALLBACK_NONE
17} Evas_Canvas3D_Node_Private_Callback_Type; 17} Evas_Canvas3D_Node_Private_Callback_Type;
18 18
19const Eo_Event_Description evas_canvas3d_node_private_event_desc[] = 19const Efl_Event_Description evas_canvas3d_node_private_event_desc[] =
20{ 20{
21 EO_EVENT_DESCRIPTION("clicked,private"), 21 EFL_EVENT_DESCRIPTION("clicked,private"),
22 EO_EVENT_DESCRIPTION("collision,private") 22 EFL_EVENT_DESCRIPTION("collision,private")
23}; 23};
24 24
25/*Private callbacks */ 25/*Private callbacks */
@@ -28,7 +28,7 @@ _evas_canvas3d_node_private_callback_clicked(void *data, const Eo_Event *event);
28static void 28static void
29_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event); 29_evas_canvas3d_node_private_callback_collision(void *data, const Eo_Event *event);
30 30
31Eo_Event_Cb evas_canvas3d_node_private_callback_functions[] = 31Efl_Event_Cb evas_canvas3d_node_private_callback_functions[] =
32{ 32{
33 _evas_canvas3d_node_private_callback_clicked, 33 _evas_canvas3d_node_private_callback_clicked,
34 _evas_canvas3d_node_private_callback_collision, 34 _evas_canvas3d_node_private_callback_collision,
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.c b/src/lib/evas/canvas/evas_canvas3d_object.c
index b6b197d..8f99115 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.c
+++ b/src/lib/evas/canvas/evas_canvas3d_object.c
@@ -4,11 +4,11 @@
4#define MY_CLASS EVAS_CANVAS3D_OBJECT_CLASS 4#define MY_CLASS EVAS_CANVAS3D_OBJECT_CLASS
5 5
6EOLIAN static Eo * 6EOLIAN static Eo *
7_evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd) 7_evas_canvas3d_object_efl_object_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd)
8{ 8{
9 Eo *e = NULL; 9 Eo *e = NULL;
10 obj = eo_constructor(eo_super(obj, MY_CLASS)); 10 obj = efl_constructor(eo_super(obj, MY_CLASS));
11 e = eo_parent_get(obj); 11 e = efl_parent_get(obj);
12 pd->evas = e; 12 pd->evas = e;
13 pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID; 13 pd->type = EVAS_CANVAS3D_OBJECT_TYPE_INVALID;
14 memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX); 14 memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_CANVAS3D_STATE_MAX);
@@ -17,11 +17,11 @@ _evas_canvas3d_object_eo_base_constructor(Eo *obj, Evas_Canvas3D_Object_Data *pd
17} 17}
18 18
19EOLIAN static Evas * 19EOLIAN static Evas *
20 _evas_canvas3d_object_eo_base_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Eo_Class *klass) 20 _evas_canvas3d_object_efl_object_provider_find(Eo *obj, Evas_Canvas3D_Object_Data *pd, const Efl_Class *klass)
21{ 21{
22 if (klass == EVAS_CANVAS_CLASS) 22 if (klass == EVAS_CANVAS_CLASS)
23 return pd->evas; 23 return pd->evas;
24 return eo_provider_find(eo_super(obj, MY_CLASS), klass); 24 return efl_provider_find(eo_super(obj, MY_CLASS), klass);
25} 25}
26 26
27EOLIAN static void 27EOLIAN static void
@@ -67,29 +67,29 @@ _evas_canvas3d_object_update(Eo *obj, Evas_Canvas3D_Object_Data *pd)
67} 67}
68 68
69EOLIAN static Eina_Bool 69EOLIAN static Eina_Bool
70_evas_canvas3d_object_eo_base_event_callback_priority_add(Eo *obj, 70_evas_canvas3d_object_efl_object_event_callback_priority_add(Eo *obj,
71 Evas_Canvas3D_Object_Data *pd EINA_UNUSED, 71 Evas_Canvas3D_Object_Data *pd EINA_UNUSED,
72 const Eo_Event_Description *desc, 72 const Efl_Event_Description *desc,
73 Eo_Callback_Priority priority, 73 Efl_Callback_Priority priority,
74 Eo_Event_Cb func, 74 Efl_Event_Cb func,
75 const void *user_data) 75 const void *user_data)
76{ 76{
77 Eina_Bool r = EINA_FALSE; 77 Eina_Bool r = EINA_FALSE;
78 78
79 r = eo_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data); 79 r = efl_event_callback_priority_add(eo_super(obj, MY_CLASS), desc, priority, func, user_data);
80 evas_canvas3d_object_callback_register(obj, desc->name, user_data); 80 evas_canvas3d_object_callback_register(obj, desc->name, user_data);
81 81
82 return r; 82 return r;
83} 83}
84 84
85EOLIAN static Eina_Bool 85EOLIAN static Eina_Bool
86_evas_canvas3d_object_eo_base_event_callback_del(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED, 86_evas_canvas3d_object_efl_object_event_callback_del(Eo *obj, Evas_Canvas3D_Object_Data *pd EINA_UNUSED,
87 const Eo_Event_Description *desc, 87 const Efl_Event_Description *desc,
88 Eo_Event_Cb func, 88 Efl_Event_Cb func,
89 const void *user_data) 89 const void *user_data)
90{ 90{
91 Eina_Bool r = EINA_FALSE; 91 Eina_Bool r = EINA_FALSE;
92 r = eo_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data); 92 r = efl_event_callback_del(eo_super(obj, MY_CLASS), desc, func, user_data);
93 if (r) evas_canvas3d_object_callback_unregister(obj, desc->name); 93 if (r) evas_canvas3d_object_callback_unregister(obj, desc->name);
94 return r; 94 return r;
95} 95}
diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo
index e4db9c0..204c808 100644
--- a/src/lib/evas/canvas/evas_canvas3d_object.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_object.eo
@@ -1,6 +1,6 @@
1import evas_types; 1import evas_types;
2 2
3class Evas.Canvas3D.Object (Eo.Base) 3class Evas.Canvas3D.Object (Efl.Object)
4{ 4{
5 data: Evas_Canvas3D_Object_Data; 5 data: Evas_Canvas3D_Object_Data;
6 methods { 6 methods {
@@ -65,10 +65,10 @@ class Evas.Canvas3D.Object (Eo.Base)
65 } 65 }
66 66
67 implements { 67 implements {
68 Eo.Base.constructor; 68 Efl.Object.constructor;
69 Eo.Base.event_callback_priority_add; 69 Efl.Object.event_callback_priority_add;
70 Eo.Base.event_callback_del; 70 Efl.Object.event_callback_del;
71 Eo.Base.provider_find; 71 Efl.Object.provider_find;
72 } 72 }
73 events { 73 events {
74 clicked; [[Clicked Event.]] 74 clicked; [[Clicked Event.]]
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.c b/src/lib/evas/canvas/evas_canvas3d_primitive.c
index 76dcdd6..07e63a8 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.c
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.c
@@ -25,9 +25,9 @@ evas_canvas3d_primitive_add(Evas *e)
25} 25}
26 26
27EOLIAN static Eo * 27EOLIAN static Eo *
28_evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd) 28_evas_canvas3d_primitive_efl_object_constructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd)
29{ 29{
30 obj = eo_constructor(eo_super(obj, MY_CLASS)); 30 obj = efl_constructor(eo_super(obj, MY_CLASS));
31 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE); 31 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_PRIMITIVE);
32 _primitive_init(pd); 32 _primitive_init(pd);
33 33
@@ -35,9 +35,9 @@ _evas_canvas3d_primitive_eo_base_constructor(Eo *obj, Evas_Canvas3D_Primitive_Da
35} 35}
36 36
37EOLIAN static void 37EOLIAN static void
38_evas_canvas3d_primitive_eo_base_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED) 38_evas_canvas3d_primitive_efl_object_destructor(Eo *obj, Evas_Canvas3D_Primitive_Data *pd EINA_UNUSED)
39{ 39{
40 eo_destructor(eo_super(obj, MY_CLASS)); 40 efl_destructor(eo_super(obj, MY_CLASS));
41} 41}
42 42
43EOLIAN static void 43EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index 005ff55..18e43ff 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -134,7 +134,7 @@ class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object)
134 } 134 }
135 } 135 }
136 implements { 136 implements {
137 Eo.Base.constructor; 137 Efl.Object.constructor;
138 Eo.Base.destructor; 138 Efl.Object.destructor;
139 } 139 }
140} 140}
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index b67d451..4e5cc39 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -69,9 +69,9 @@ evas_canvas3d_scene_add(Evas *e)
69} 69}
70 70
71EOLIAN static Eo * 71EOLIAN static Eo *
72_evas_canvas3d_scene_eo_base_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd) 72_evas_canvas3d_scene_efl_object_constructor(Eo *obj, Evas_Canvas3D_Scene_Data *pd)
73{ 73{
74 obj = eo_constructor(eo_super(obj, MY_CLASS)); 74 obj = efl_constructor(eo_super(obj, MY_CLASS));
75 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE); 75 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_SCENE);
76 evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0); 76 evas_color_set(&pd->bg_color, 0.0, 0.0, 0.0, 0.0);
77 pd->shadows_enabled = EINA_FALSE; 77 pd->shadows_enabled = EINA_FALSE;
@@ -628,7 +628,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
628 Eina_Array *arr = NULL; 628 Eina_Array *arr = NULL;
629 Eina_Bool update_scene = EINA_FALSE; 629 Eina_Bool update_scene = EINA_FALSE;
630 Evas_Canvas3D_Node *picked_node = NULL; 630 Evas_Canvas3D_Node *picked_node = NULL;
631 const Eo_Event_Description *eo_desc = NULL; 631 const Efl_Event_Description *eo_desc = NULL;
632 632
633 pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS); 633 pd_parent = eo_data_scope_get(obj, EVAS_CANVAS3D_OBJECT_CLASS);
634 e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS); 634 e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS);
@@ -686,8 +686,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
686 eina_stringshare_del(tmp); 686 eina_stringshare_del(tmp);
687 687
688 /*Calling callback clicked*/ 688 /*Calling callback clicked*/
689 eo_desc = eo_base_legacy_only_event_description_get("clicked,private"); 689 eo_desc = efl_object_legacy_only_event_description_get("clicked,private");
690 eo_event_callback_call(picked_node, eo_desc, picked_node); 690 efl_event_callback_call(picked_node, eo_desc, picked_node);
691 691
692 return EINA_TRUE; 692 return EINA_TRUE;
693 } 693 }
@@ -725,8 +725,8 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
725 if (mesh) *mesh = data.mesh; 725 if (mesh) *mesh = data.mesh;
726 726
727 /*Calling callback clicked*/ 727 /*Calling callback clicked*/
728 eo_desc = eo_base_legacy_only_event_description_get("clicked,private"); 728 eo_desc = efl_object_legacy_only_event_description_get("clicked,private");
729 eo_event_callback_call(data.node, eo_desc, data.node); 729 efl_event_callback_call(data.node, eo_desc, data.node);
730 730
731 return EINA_TRUE; 731 return EINA_TRUE;
732} 732}
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 8076207..1bc01f2 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -161,7 +161,7 @@ class Evas.Canvas3D.Scene (Evas.Canvas3D.Object)
161 } 161 }
162} 162}
163 implements { 163 implements {
164 Eo.Base.constructor; 164 Efl.Object.constructor;
165 Evas.Canvas3D.Object.update_notify; 165 Evas.Canvas3D.Object.update_notify;
166 Evas.Canvas3D.Object.change_notify; 166 Evas.Canvas3D.Object.change_notify;
167 } 167 }
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c
index abfc79b..d27a803 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.c
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.c
@@ -319,9 +319,9 @@ evas_canvas3d_texture_add(Evas *e)
319 319
320 320
321EOLIAN static Eo * 321EOLIAN static Eo *
322_evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) 322_evas_canvas3d_texture_efl_object_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
323{ 323{
324 obj = eo_constructor(eo_super(obj, MY_CLASS)); 324 obj = efl_constructor(eo_super(obj, MY_CLASS));
325 pd->atlas_enable = EINA_TRUE; 325 pd->atlas_enable = EINA_TRUE;
326 326
327 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE); 327 evas_canvas3d_object_type_set(obj, EVAS_CANVAS3D_OBJECT_TYPE_TEXTURE);
@@ -330,10 +330,10 @@ _evas_canvas3d_texture_eo_base_constructor(Eo *obj, Evas_Canvas3D_Texture_Data *
330} 330}
331 331
332EOLIAN static void 332EOLIAN static void
333_evas_canvas3d_texture_eo_base_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED) 333_evas_canvas3d_texture_efl_object_destructor(Eo *obj, Evas_Canvas3D_Texture_Data *pd EINA_UNUSED)
334{ 334{
335 _texture_fini(obj); 335 _texture_fini(obj);
336 eo_destructor(eo_super(obj, MY_CLASS)); 336 efl_destructor(eo_super(obj, MY_CLASS));
337} 337}
338 338
339EOLIAN static void 339EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo b/src/lib/evas/canvas/evas_canvas3d_texture.eo
index af187ad..0ab00be 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo
@@ -159,8 +159,8 @@ class Evas.Canvas3D.Texture (Evas.Canvas3D.Object)
159 } 159 }
160 160
161 implements { 161 implements {
162 Eo.Base.constructor; 162 Efl.Object.constructor;
163 Eo.Base.destructor; 163 Efl.Object.destructor;
164 Evas.Canvas3D.Object.update_notify; 164 Evas.Canvas3D.Object.update_notify;
165 Evas.Canvas3D.Object.change_notify; 165 Evas.Canvas3D.Object.change_notify;
166 } 166 }
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 519ece2..dd26c28 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -327,7 +327,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
327 state_write->clipper = NULL; 327 state_write->clipper = NULL;
328 EINA_COW_STATE_WRITE_END(obj, state_write, cur); 328 EINA_COW_STATE_WRITE_END(obj, state_write, cur);
329 if (obj->prev->clipper != old_clip) 329 if (obj->prev->clipper != old_clip)
330 eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj); 330 efl_event_callback_del(old_clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj);
331 } 331 }
332 332
333 /* image object clipper */ 333 /* image object clipper */
@@ -359,7 +359,7 @@ _efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Ob
359 state_write->clipper = clip; 359 state_write->clipper = clip;
360 EINA_COW_STATE_WRITE_END(obj, state_write, cur); 360 EINA_COW_STATE_WRITE_END(obj, state_write, cur);
361 if (obj->prev->clipper != clip) 361 if (obj->prev->clipper != clip)
362 eo_event_callback_add(clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj); 362 efl_event_callback_add(clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj);
363 363
364 clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer); 364 clip->clip.cache_clipees_answer = eina_list_free(clip->clip.cache_clipees_answer);
365 clip->clip.clipees = eina_list_append(clip->clip.clipees, obj); 365 clip->clip.clipees = eina_list_append(clip->clip.clipees, obj);
@@ -457,7 +457,7 @@ _efl_canvas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
457 state_write->clipper = NULL; 457 state_write->clipper = NULL;
458 EINA_COW_STATE_WRITE_END(obj, state_write, cur); 458 EINA_COW_STATE_WRITE_END(obj, state_write, cur);
459 if (obj->prev->clipper != old_clip) 459 if (obj->prev->clipper != old_clip)
460 eo_event_callback_del(old_clip->object, EO_EVENT_DEL, _clipper_del_cb, eo_obj); 460 efl_event_callback_del(old_clip->object, EFL_EVENT_DEL, _clipper_del_cb, eo_obj);
461 } 461 }
462 462
463 evas_object_update_bounding_box(eo_obj, obj, NULL); 463 evas_object_update_bounding_box(eo_obj, obj, NULL);
@@ -510,7 +510,7 @@ _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cu
510 EINA_COW_STATE_WRITE_END(obj, state_write, prev); 510 EINA_COW_STATE_WRITE_END(obj, state_write, prev);
511 } 511 }
512 if (clip != obj->cur->clipper) 512 if (clip != obj->cur->clipper)
513 eo_event_callback_del(clip->object, EO_EVENT_DEL, _clipper_del_cb, obj->object); 513 efl_event_callback_del(clip->object, EFL_EVENT_DEL, _clipper_del_cb, obj->object);
514 } 514 }
515} 515}
516 516
diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index b332e16..f76fec5 100644
--- a/src/lib/evas/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
@@ -8,7 +8,7 @@ evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
8 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); 8 MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
9 return; 9 return;
10 MAGIC_CHECK_END(); 10 MAGIC_CHECK_END();
11 eo_key_data_set(obj, key, data); 11 efl_key_data_set(obj, key, data);
12} 12}
13 13
14EAPI void * 14EAPI void *
@@ -18,7 +18,7 @@ evas_object_data_get(const Evas_Object *obj, const char *key)
18 return NULL; 18 return NULL;
19 MAGIC_CHECK_END(); 19 MAGIC_CHECK_END();
20 void *data = NULL; 20 void *data = NULL;
21 data = eo_key_data_get((Evas_Object *)obj, key); 21 data = efl_key_data_get((Evas_Object *)obj, key);
22 return data; 22 return data;
23} 23}
24 24
@@ -29,7 +29,7 @@ evas_object_data_del(Evas_Object *obj, const char *key)
29 return NULL; 29 return NULL;
30 MAGIC_CHECK_END(); 30 MAGIC_CHECK_END();
31 void *data = NULL; 31 void *data = NULL;
32 data = eo_key_data_get(obj, key); 32 data = efl_key_data_get(obj, key);
33 eo_key_data_set(obj, key, NULL); 33 efl_key_data_set(obj, key, NULL);
34 return data; 34 return data;
35} 35}
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 0eb5511..a0eb26f 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -49,7 +49,7 @@ evas_device_add(Evas *eo_e)
49 49
50 e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 50 e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
51 e->devices = eina_list_append(e->devices, dev); 51 e->devices = eina_list_append(e->devices, dev);
52 eo_event_callback_add(dev, EO_EVENT_DEL, _del_cb, e); 52 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
53 53
54 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev); 54 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev);
55 55
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 0d3c356..67d4ed9 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -95,7 +95,7 @@ _efl_event_create(Efl_Event *evt, Evas_Callback_Type type, void *ev,
95 return evt; 95 return evt;
96} 96}
97 97
98static inline const Eo_Event_Description * 98static inline const Efl_Event_Description *
99_efl_event_desc_get(Evas_Callback_Type type) 99_efl_event_desc_get(Evas_Callback_Type type)
100{ 100{
101 switch (type) 101 switch (type)
@@ -1232,7 +1232,7 @@ evas_event_freeze(Evas *eo_e)
1232 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 1232 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
1233 return; 1233 return;
1234 MAGIC_CHECK_END(); 1234 MAGIC_CHECK_END();
1235 eo_event_freeze(eo_e); 1235 efl_event_freeze(eo_e);
1236} 1236}
1237 1237
1238EAPI void 1238EAPI void
@@ -1241,22 +1241,22 @@ evas_event_thaw(Evas *eo_e)
1241 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); 1241 MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
1242 return; 1242 return;
1243 MAGIC_CHECK_END(); 1243 MAGIC_CHECK_END();
1244 eo_event_thaw(eo_e); 1244 efl_event_thaw(eo_e);
1245} 1245}
1246 1246
1247EOLIAN void 1247EOLIAN void
1248_evas_canvas_eo_base_event_freeze(Eo *eo_e, Evas_Public_Data *e) 1248_evas_canvas_efl_object_event_freeze(Eo *eo_e, Evas_Public_Data *e)
1249{ 1249{
1250 eo_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS)); 1250 efl_event_freeze(eo_super(eo_e, EVAS_CANVAS_CLASS));
1251 e->is_frozen = EINA_TRUE; 1251 e->is_frozen = EINA_TRUE;
1252} 1252}
1253 1253
1254EOLIAN void 1254EOLIAN void
1255_evas_canvas_eo_base_event_thaw(Eo *eo_e, Evas_Public_Data *e) 1255_evas_canvas_efl_object_event_thaw(Eo *eo_e, Evas_Public_Data *e)
1256{ 1256{
1257 int fcount = -1; 1257 int fcount = -1;
1258 eo_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS)); 1258 efl_event_thaw(eo_super(eo_e, EVAS_CANVAS_CLASS));
1259 fcount = eo_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS)); 1259 fcount = efl_event_freeze_count_get(eo_super(eo_e, EVAS_CANVAS_CLASS));
1260 if (0 == fcount) 1260 if (0 == fcount)
1261 { 1261 {
1262 Evas_Layer *lay; 1262 Evas_Layer *lay;
@@ -1284,7 +1284,7 @@ evas_event_freeze_get(const Evas *eo_e)
1284 return 0; 1284 return 0;
1285 MAGIC_CHECK_END(); 1285 MAGIC_CHECK_END();
1286 int ret = 0; 1286 int ret = 0;
1287 ret = eo_event_freeze_count_get((Eo *)eo_e); 1287 ret = efl_event_freeze_count_get((Eo *)eo_e);
1288 return ret; 1288 return ret;
1289} 1289}
1290 1290
@@ -2794,7 +2794,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2794 unsigned int keycode, 2794 unsigned int keycode,
2795 Efl_Event_Key_Data *ke) 2795 Efl_Event_Key_Data *ke)
2796{ 2796{
2797 void *eo_event_info = NULL; 2797 void *efl_event_info = NULL;
2798 Evas_Public_Data *e = _pd; 2798 Evas_Public_Data *e = _pd;
2799 int event_id = 0; 2799 int event_id = 0;
2800 2800
@@ -2829,7 +2829,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2829 ke->event_flags = ev.event_flags; 2829 ke->event_flags = ev.event_flags;
2830 ke->modifiers = ev.modifiers; 2830 ke->modifiers = ev.modifiers;
2831 ke->locks = ev.locks; 2831 ke->locks = ev.locks;
2832 eo_event_info = ke->eo; 2832 efl_event_info = ke->eo;
2833 } 2833 }
2834 2834
2835 if (e->grabs) 2835 if (e->grabs)
@@ -2859,7 +2859,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2859 !evas_event_freezes_through(g->object, object_obj)) 2859 !evas_event_freezes_through(g->object, object_obj))
2860 { 2860 {
2861 EV_CALL(g->object, object_obj, EVAS_CALLBACK_KEY_DOWN, 2861 EV_CALL(g->object, object_obj, EVAS_CALLBACK_KEY_DOWN,
2862 &ev, event_id, eo_event_info, NULL); 2862 &ev, event_id, efl_event_info, NULL);
2863 } 2863 }
2864 if (g->exclusive) exclusive = EINA_TRUE; 2864 if (g->exclusive) exclusive = EINA_TRUE;
2865 } 2865 }
@@ -2886,14 +2886,14 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2886 } 2886 }
2887 } 2887 }
2888 } 2888 }
2889 if (!ke) EV_DEL(eo_event_info); 2889 if (!ke) EV_DEL(efl_event_info);
2890 if ((e->focused) && (!exclusive)) 2890 if ((e->focused) && (!exclusive))
2891 { 2891 {
2892 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS); 2892 Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS);
2893 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) 2893 if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj))
2894 { 2894 {
2895 EV_CALL(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN, 2895 EV_CALL(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN,
2896 &ev, event_id, eo_event_info, NULL); 2896 &ev, event_id, efl_event_info, NULL);
2897 } 2897 }
2898 } 2898 }
2899 _evas_post_event_callback_call(eo_e, e); 2899 _evas_post_event_callback_call(eo_e, e);
@@ -2908,7 +2908,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e,
2908 ke->locks = NULL; 2908 ke->locks = NULL;
2909 } 2909 }
2910 else 2910 else
2911 EV_DEL(eo_event_info); 2911 EV_DEL(efl_event_info);
2912} 2912}
2913 2913
2914static void 2914static void
@@ -2923,7 +2923,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2923 unsigned int keycode, 2923 unsigned int keycode,
2924 Efl_Event_Key_Data *ke) 2924 Efl_Event_Key_Data *ke)
2925{ 2925{
2926 void *eo_event_info = NULL; 2926 void *efl_event_info = NULL;
2927 Evas_Public_Data *e = _pd; 2927 Evas_Public_Data *e = _pd;
2928 int event_id = 0; 2928 int event_id = 0;
2929 if (!keyname) return; 2929 if (!keyname) return;
@@ -2957,7 +2957,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2957 ke->event_flags = ev.event_flags; 2957 ke->event_flags = ev.event_flags;
2958 ke->modifiers = ev.modifiers; 2958 ke->modifiers = ev.modifiers;
2959 ke->locks = ev.locks; 2959 ke->locks = ev.locks;
2960 eo_event_info = ke->eo; 2960 efl_event_info = ke->eo;
2961 } 2961 }
2962 2962
2963 if (e->grabs) 2963 if (e->grabs)
@@ -2987,7 +2987,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
2987 { 2987 {
2988 evas_object_event_callback_call 2988 evas_object_event_callback_call
2989 (g->object, object_obj, EVAS_CALLBACK_KEY_UP, 2989 (g->object, object_obj, EVAS_CALLBACK_KEY_UP,
2990 &ev, event_id, EFL_EVENT_KEY_UP, eo_event_info); 2990 &ev, event_id, EFL_EVENT_KEY_UP, efl_event_info);
2991 } 2991 }
2992 if (g->exclusive) exclusive = EINA_TRUE; 2992 if (g->exclusive) exclusive = EINA_TRUE;
2993 } 2993 }
@@ -3022,7 +3022,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e,
3022 { 3022 {
3023 evas_object_event_callback_call 3023 evas_object_event_callback_call
3024 (e->focused, focused_obj, EVAS_CALLBACK_KEY_UP, 3024 (e->focused, focused_obj, EVAS_CALLBACK_KEY_UP,
3025 &ev, event_id, EFL_EVENT_KEY_UP, eo_event_info); 3025 &ev, event_id, EFL_EVENT_KEY_UP, efl_event_info);
3026 } 3026 }
3027 } 3027 }
3028 _evas_post_event_callback_call(eo_e, e); 3028 _evas_post_event_callback_call(eo_e, e);
@@ -3539,11 +3539,11 @@ EO_CALLBACKS_ARRAY_DEFINE(_evas_canvas_event_pointer_callbacks,
3539void 3539void
3540_evas_canvas_event_init(Evas *eo_e, Evas_Public_Data *e) 3540_evas_canvas_event_init(Evas *eo_e, Evas_Public_Data *e)
3541{ 3541{
3542 eo_event_callback_array_add(eo_e, _evas_canvas_event_pointer_callbacks(), e); 3542 efl_event_callback_array_add(eo_e, _evas_canvas_event_pointer_callbacks(), e);
3543} 3543}
3544 3544
3545void 3545void
3546_evas_canvas_event_shutdown(Evas *eo_e, Evas_Public_Data *e) 3546_evas_canvas_event_shutdown(Evas *eo_e, Evas_Public_Data *e)
3547{ 3547{
3548 eo_event_callback_array_del(eo_e, _evas_canvas_event_pointer_callbacks(), e); 3548 efl_event_callback_array_del(eo_e, _evas_canvas_event_pointer_callbacks(), e);
3549} 3549}
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 46ab765..1796bc5 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -265,7 +265,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
265 { 265 {
266 // Post render callback is not required anymore 266 // Post render callback is not required anymore
267 Evas *e = obj->layer->evas->evas; 267 Evas *e = obj->layer->evas->evas;
268 eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); 268 efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
269 pd->has_cb = EINA_FALSE; 269 pd->has_cb = EINA_FALSE;
270 } 270 }
271 271
@@ -325,7 +325,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
325 if (do_async && !pd->has_cb) 325 if (do_async && !pd->has_cb)
326 { 326 {
327 Evas *e = obj->layer->evas->evas; 327 Evas *e = obj->layer->evas->evas;
328 eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); 328 efl_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
329 pd->has_cb = EINA_TRUE; 329 pd->has_cb = EINA_TRUE;
330 } 330 }
331 evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj); 331 evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj);
@@ -580,12 +580,12 @@ _efl_canvas_filter_internal_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filt
580 } 580 }
581} 581}
582 582
583EOLIAN static Eo_Base * 583EOLIAN static Efl_Object *
584_efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd) 584_efl_canvas_filter_internal_efl_object_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
585{ 585{
586 Eo *obj = NULL; 586 Eo *obj = NULL;
587 587
588 obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 588 obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
589 pd->data = eina_cow_alloc(evas_object_filter_cow); 589 pd->data = eina_cow_alloc(evas_object_filter_cow);
590 SLKI(pd->lck); 590 SLKI(pd->lck);
591 591
@@ -593,7 +593,7 @@ _efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd
593} 593}
594 594
595EOLIAN static void 595EOLIAN static void
596_efl_canvas_filter_internal_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd) 596_efl_canvas_filter_internal_efl_object_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
597{ 597{
598 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 598 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
599 Evas_Filter_Data_Binding *db; 599 Evas_Filter_Data_Binding *db;
@@ -626,11 +626,11 @@ finish:
626 if (pd->has_cb) 626 if (pd->has_cb)
627 { 627 {
628 Evas *e = obj->layer->evas->evas; 628 Evas *e = obj->layer->evas->evas;
629 eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); 629 efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
630 } 630 }
631 SLKD(pd->lck); 631 SLKD(pd->lck);
632 632
633 eo_destructor(eo_super(eo_obj, MY_CLASS)); 633 efl_destructor(eo_super(eo_obj, MY_CLASS));
634} 634}
635 635
636EOLIAN static void 636EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 7197915..f8c0f24 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -135,6 +135,6 @@ class Evas.Grid (Efl.Canvas.Group.Clipped)
135 } 135 }
136 } 136 }
137 implements { 137 implements {
138 Eo.Base.constructor; 138 Efl.Object.constructor;
139 } 139 }
140} 140}
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 9134a8f..8c3abf1 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -595,7 +595,7 @@ evas_object_image_data_set(Eo *eo_obj, void *data)
595 o->engine_data = NULL; 595 o->engine_data = NULL;
596 if (o->file_obj) 596 if (o->file_obj)
597 { 597 {
598 eo_del(o->file_obj); 598 efl_del(o->file_obj);
599 o->file_obj = NULL; 599 o->file_obj = NULL;
600 } 600 }
601 } 601 }
@@ -679,7 +679,7 @@ evas_object_image_data_copy_set(Eo *eo_obj, void *data)
679 ENFN->image_free(ENDT, o->engine_data); 679 ENFN->image_free(ENDT, o->engine_data);
680 if (o->file_obj) 680 if (o->file_obj)
681 { 681 {
682 eo_del(o->file_obj); 682 efl_del(o->file_obj);
683 o->file_obj = NULL; 683 o->file_obj = NULL;
684 } 684 }
685 o->engine_data = ENFN->image_new_from_copied_data(ENDT, 685 o->engine_data = ENFN->image_new_from_copied_data(ENDT,
diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo
index 3988b5a..90a4b3f 100644
--- a/src/lib/evas/canvas/evas_line.eo
+++ b/src/lib/evas/canvas/evas_line.eo
@@ -27,7 +27,7 @@ class Evas.Line (Efl.Canvas.Object)
27 } 27 }
28 } 28 }
29 implements { 29 implements {
30 Eo.Base.constructor; 30 Efl.Object.constructor;
31 } 31 }
32 32
33} 33}
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 44959b3..e0aa03a 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -169,9 +169,9 @@ evas_new(void)
169} 169}
170 170
171EOLIAN static Eo * 171EOLIAN static Eo *
172_evas_canvas_eo_base_constructor(Eo *eo_obj, Evas_Public_Data *e) 172_evas_canvas_efl_object_constructor(Eo *eo_obj, Evas_Public_Data *e)
173{ 173{
174 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 174 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
175 175
176 e->evas = eo_obj; 176 e->evas = eo_obj;
177 e->output.render_method = RENDER_METHOD_INVALID; 177 e->output.render_method = RENDER_METHOD_INVALID;
@@ -224,7 +224,7 @@ evas_free(Evas *eo_e)
224} 224}
225 225
226EOLIAN static void 226EOLIAN static void
227_evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e) 227_evas_canvas_efl_object_destructor(Eo *eo_e, Evas_Public_Data *e)
228{ 228{
229 Eina_Rectangle *r; 229 Eina_Rectangle *r;
230 Evas_Coord_Touch_Point *touch_point; 230 Evas_Coord_Touch_Point *touch_point;
@@ -279,7 +279,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
279 ___eo_ref2_reset(eo_obj); 279 ___eo_ref2_reset(eo_obj);
280 while (eo_ref_get(eo_obj) > 1) eo_unref(eo_obj); 280 while (eo_ref_get(eo_obj) > 1) eo_unref(eo_obj);
281 while (eo_ref_get(eo_obj) < 1) eo_ref(eo_obj); 281 while (eo_ref_get(eo_obj) < 1) eo_ref(eo_obj);
282 eo_del(eo_obj); 282 efl_del(eo_obj);
283 } 283 }
284 } 284 }
285 } 285 }
@@ -350,7 +350,7 @@ _evas_canvas_eo_base_destructor(Eo *eo_e, Evas_Public_Data *e)
350 eina_spinlock_free(&(e->render.lock)); 350 eina_spinlock_free(&(e->render.lock));
351 351
352 e->magic = 0; 352 e->magic = 0;
353 eo_destructor(eo_super(eo_e, MY_CLASS)); 353 efl_destructor(eo_super(eo_e, MY_CLASS));
354} 354}
355 355
356EOLIAN static Evas_Engine_Info* 356EOLIAN static Evas_Engine_Info*
@@ -608,12 +608,12 @@ evas_data_argb_unpremul(unsigned int *data, unsigned int len)
608} 608}
609 609
610EOLIAN static Eo * 610EOLIAN static Eo *
611_evas_canvas_eo_base_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, 611_evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED,
612 const Eo_Class *klass) 612 const Efl_Class *klass)
613{ 613{
614 if (klass == EVAS_CANVAS_CLASS) 614 if (klass == EVAS_CANVAS_CLASS)
615 return eo_e; 615 return eo_e;
616 return eo_provider_find(eo_super(eo_e, MY_CLASS), klass); 616 return efl_provider_find(eo_super(eo_e, MY_CLASS), klass);
617} 617}
618 618
619Ector_Surface * 619Ector_Surface *
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index f39471e..d6c8eb9 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -163,14 +163,14 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
163 163
164EO_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks, 164EO_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
165 { EFL_GFX_EVENT_RESIZE, _on_child_resize }, 165 { EFL_GFX_EVENT_RESIZE, _on_child_resize },
166 { EO_EVENT_DEL, _on_child_del }, 166 { EFL_EVENT_DEL, _on_child_del },
167 { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } 167 { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
168); 168);
169 169
170static void 170static void
171_evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent) 171_evas_object_box_child_callbacks_unregister(Evas_Object *obj, Evas_Object *parent)
172{ 172{
173 eo_event_callback_array_del(obj, evas_object_box_callbacks(), parent); 173 efl_event_callback_array_del(obj, evas_object_box_callbacks(), parent);
174} 174}
175 175
176static Evas_Object_Box_Option * 176static Evas_Object_Box_Option *
@@ -178,7 +178,7 @@ _evas_object_box_option_callbacks_register(Evas_Object *o, Evas_Object_Box_Data
178{ 178{
179 Evas_Object *obj = opt->obj; 179 Evas_Object *obj = opt->obj;
180 180
181 eo_event_callback_array_add(obj, evas_object_box_callbacks(), o); 181 efl_event_callback_array_add(obj, evas_object_box_callbacks(), o);
182 182
183 return opt; 183 return opt;
184} 184}
@@ -214,7 +214,7 @@ _evas_box_internal_append(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
214 214
215 priv->children = eina_list_append(priv->children, opt); 215 priv->children = eina_list_append(priv->children, opt);
216 priv->children_changed = EINA_TRUE; 216 priv->children_changed = EINA_TRUE;
217 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); 217 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
218 218
219 return opt; 219 return opt;
220} 220}
@@ -230,7 +230,7 @@ _evas_box_internal_prepend(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child
230 230
231 priv->children = eina_list_prepend(priv->children, opt); 231 priv->children = eina_list_prepend(priv->children, opt);
232 priv->children_changed = EINA_TRUE; 232 priv->children_changed = EINA_TRUE;
233 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt); 233 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, opt);
234 234
235 return opt; 235 return opt;
236} 236}
@@ -254,7 +254,7 @@ _evas_box_internal_insert_before(Eo *o, Evas_Object_Box_Data *priv, Evas_Object
254 priv->children = eina_list_prepend_relative 254 priv->children = eina_list_prepend_relative
255 (priv->children, new_opt, opt); 255 (priv->children, new_opt, opt);
256 priv->children_changed = EINA_TRUE; 256 priv->children_changed = EINA_TRUE;
257 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); 257 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
258 return new_opt; 258 return new_opt;
259 } 259 }
260 } 260 }
@@ -281,7 +281,7 @@ _evas_box_internal_insert_after(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *
281 priv->children = eina_list_append_relative 281 priv->children = eina_list_append_relative
282 (priv->children, new_opt, opt); 282 (priv->children, new_opt, opt);
283 priv->children_changed = EINA_TRUE; 283 priv->children_changed = EINA_TRUE;
284 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); 284 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
285 return new_opt; 285 return new_opt;
286 } 286 }
287 } 287 }
@@ -304,7 +304,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
304 304
305 priv->children = eina_list_prepend(priv->children, new_opt); 305 priv->children = eina_list_prepend(priv->children, new_opt);
306 priv->children_changed = EINA_TRUE; 306 priv->children_changed = EINA_TRUE;
307 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); 307 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
308 return new_opt; 308 return new_opt;
309 } 309 }
310 310
@@ -323,7 +323,7 @@ _evas_box_internal_insert_at(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *chi
323 priv->children = eina_list_prepend_relative 323 priv->children = eina_list_prepend_relative
324 (priv->children, new_opt, opt); 324 (priv->children, new_opt, opt);
325 priv->children_changed = EINA_TRUE; 325 priv->children_changed = EINA_TRUE;
326 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt); 326 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_ADDED, new_opt);
327 return new_opt; 327 return new_opt;
328 } 328 }
329 } 329 }
@@ -345,7 +345,7 @@ _evas_box_internal_remove(Eo *o, Evas_Object_Box_Data *priv, Evas_Object *child)
345 priv->children = eina_list_remove(priv->children, opt); 345 priv->children = eina_list_remove(priv->children, opt);
346 evas_obj_box_internal_option_free(o, opt); 346 evas_obj_box_internal_option_free(o, opt);
347 priv->children_changed = EINA_TRUE; 347 priv->children_changed = EINA_TRUE;
348 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); 348 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
349 349
350 return obj; 350 return obj;
351 } 351 }
@@ -373,7 +373,7 @@ _evas_box_internal_remove_at(Eo *o, Evas_Object_Box_Data *priv, unsigned int pos
373 priv->children = eina_list_remove_list(priv->children, node); 373 priv->children = eina_list_remove_list(priv->children, node);
374 evas_obj_box_internal_option_free(o, opt); 374 evas_obj_box_internal_option_free(o, opt);
375 priv->children_changed = EINA_TRUE; 375 priv->children_changed = EINA_TRUE;
376 eo_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj); 376 efl_event_callback_call(o, EVAS_BOX_EVENT_CHILD_REMOVED, obj);
377 return obj; 377 return obj;
378} 378}
379 379
@@ -464,9 +464,9 @@ evas_object_box_add(Evas *evas)
464} 464}
465 465
466EOLIAN static Eo * 466EOLIAN static Eo *
467_evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED) 467_evas_box_efl_object_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNUSED)
468{ 468{
469 obj = eo_constructor(eo_super(obj, MY_CLASS)); 469 obj = efl_constructor(eo_super(obj, MY_CLASS));
470 evas_object_smart_callbacks_descriptions_set(obj, _signals); 470 evas_object_smart_callbacks_descriptions_set(obj, _signals);
471 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 471 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
472 472
@@ -1972,7 +1972,7 @@ _evas_box_option_property_vget(const Eo *o EINA_UNUSED, Evas_Object_Box_Data *_p
1972} 1972}
1973 1973
1974EOLIAN static void 1974EOLIAN static void
1975_evas_box_class_constructor(Eo_Class *klass) 1975_evas_box_class_constructor(Efl_Class *klass)
1976{ 1976{
1977 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1977 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1978} 1978}
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index f656857..2077e21 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -270,9 +270,9 @@ evas_object_grid_add(Evas *evas)
270} 270}
271 271
272EOLIAN static Eo * 272EOLIAN static Eo *
273_evas_grid_eo_base_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED) 273_evas_grid_efl_object_constructor(Eo *obj, Evas_Grid_Data *class_data EINA_UNUSED)
274{ 274{
275 obj = eo_constructor(eo_super(obj, MY_CLASS)); 275 obj = efl_constructor(eo_super(obj, MY_CLASS));
276 evas_object_smart_attach(obj, _evas_object_grid_smart_class_new()); 276 evas_object_smart_attach(obj, _evas_object_grid_smart_class_new());
277 277
278 return obj; 278 return obj;
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 1eb8e9f..98989ee 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -169,12 +169,12 @@ _init_cow(void)
169} 169}
170 170
171EOLIAN static Eo * 171EOLIAN static Eo *
172_efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) 172_efl_canvas_image_internal_efl_object_constructor(Eo *eo_obj, Evas_Image_Data *o)
173{ 173{
174 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 174 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
175 Evas_Colorspace cspace; 175 Evas_Colorspace cspace;
176 176
177 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 177 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
178 178
179 evas_object_image_init(eo_obj); 179 evas_object_image_init(eo_obj);
180 180
@@ -199,11 +199,11 @@ _efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o)
199} 199}
200 200
201EOLIAN static Eo * 201EOLIAN static Eo *
202_efl_canvas_image_internal_eo_base_finalize(Eo *eo_obj, Evas_Image_Data *o) 202_efl_canvas_image_internal_efl_object_finalize(Eo *eo_obj, Evas_Image_Data *o)
203{ 203{
204 if (!o->filled_set) 204 if (!o->filled_set)
205 efl_gfx_fill_auto_set(eo_obj, EINA_TRUE); 205 efl_gfx_fill_auto_set(eo_obj, EINA_TRUE);
206 return eo_finalize(eo_super(eo_obj, MY_CLASS)); 206 return efl_finalize(eo_super(eo_obj, MY_CLASS));
207} 207}
208 208
209void 209void
@@ -262,7 +262,7 @@ _evas_image_init_set(const Eina_File *f, const char *file, const char *key,
262 } 262 }
263 if (o->file_obj) 263 if (o->file_obj)
264 { 264 {
265 eo_del(o->file_obj); 265 efl_del(o->file_obj);
266 o->file_obj = NULL; 266 o->file_obj = NULL;
267 } 267 }
268 o->load_error = EVAS_LOAD_ERROR_NONE; 268 o->load_error = EVAS_LOAD_ERROR_NONE;
@@ -463,10 +463,10 @@ _efl_canvas_image_internal_efl_flipable_flip_get(Eo *obj EINA_UNUSED, Evas_Image
463} 463}
464 464
465EOLIAN static void 465EOLIAN static void
466_efl_canvas_image_internal_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Eo_Dbg_Info *root) 466_efl_canvas_image_internal_efl_object_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, Efl_Dbg_Info *root)
467{ 467{
468 eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); 468 efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
469 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 469 Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
470 470
471 const char *file, *key; 471 const char *file, *key;
472 if (o->cur->mmaped_source) 472 if (o->cur->mmaped_source)
@@ -1371,14 +1371,14 @@ evas_object_image_init(Evas_Object *eo_obj)
1371} 1371}
1372 1372
1373EOLIAN static void 1373EOLIAN static void
1374_efl_canvas_image_internal_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED) 1374_efl_canvas_image_internal_efl_object_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED)
1375{ 1375{
1376 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1376 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1377 1377
1378 if (obj->legacy) 1378 if (obj->legacy)
1379 evas_object_image_video_surface_set(eo_obj, NULL); 1379 evas_object_image_video_surface_set(eo_obj, NULL);
1380 evas_object_image_free(eo_obj, obj); 1380 evas_object_image_free(eo_obj, obj);
1381 eo_destructor(eo_super(eo_obj, MY_CLASS)); 1381 efl_destructor(eo_super(eo_obj, MY_CLASS));
1382} 1382}
1383 1383
1384void 1384void
@@ -1435,7 +1435,7 @@ evas_object_image_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1435 o->engine_data = NULL; 1435 o->engine_data = NULL;
1436 if (o->file_obj) 1436 if (o->file_obj)
1437 { 1437 {
1438 eo_del(o->file_obj); 1438 efl_del(o->file_obj);
1439 o->file_obj = NULL; 1439 o->file_obj = NULL;
1440 } 1440 }
1441 if (o->pixels->pixel_updates) 1441 if (o->pixels->pixel_updates)
@@ -3336,7 +3336,7 @@ _evas_object_image_preloading_check(Evas_Object *eo_obj)
3336} 3336}
3337 3337
3338Evas_Object * 3338Evas_Object *
3339_evas_object_image_video_parent_get(Evas_Object *eo_obj) 3339_evas_object_image_videfl_parent_get(Evas_Object *eo_obj)
3340{ 3340{
3341 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 3341 Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
3342 return o->video_surface ? o->pixels->video.parent : NULL; 3342 return o->video_surface ? o->pixels->video.parent : NULL;
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index a528d08..3597bd3 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -216,11 +216,11 @@ evas_object_line_init(Evas_Object *eo_obj)
216} 216}
217 217
218EOLIAN static Eo * 218EOLIAN static Eo *
219_evas_line_eo_base_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED) 219_evas_line_efl_object_constructor(Eo *eo_obj, Evas_Line_Data *class_data EINA_UNUSED)
220{ 220{
221 Evas_Line_Data *o; 221 Evas_Line_Data *o;
222 222
223 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 223 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
224 224
225 evas_object_line_init(eo_obj); 225 evas_object_line_init(eo_obj);
226 226
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f1421fa..43d3fc9 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -91,14 +91,14 @@ _animator_repeater(void *data, const Eo_Event *event)
91{ 91{
92 Evas_Object_Protected_Data *obj = data; 92 Evas_Object_Protected_Data *obj = data;
93 93
94 eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info); 94 efl_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
95 DBG("Emitting animator tick on %p.", obj->object); 95 DBG("Emitting animator tick on %p.", obj->object);
96} 96}
97 97
98static void 98static void
99_check_event_catcher_add(void *data, const Eo_Event *event) 99_check_event_catcher_add(void *data, const Eo_Event *event)
100{ 100{
101 const Eo_Callback_Array_Item *array = event->info; 101 const Efl_Callback_Array_Item *array = event->info;
102 Evas_Object_Protected_Data *obj = data; 102 Evas_Object_Protected_Data *obj = data;
103 int i; 103 int i;
104 104
@@ -108,7 +108,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
108 { 108 {
109 if (obj->animator_ref++ > 0) break; 109 if (obj->animator_ref++ > 0) break;
110 110
111 eo_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); 111 efl_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
112 INF("Registering an animator tick on canvas %p for object %p.", 112 INF("Registering an animator tick on canvas %p for object %p.",
113 obj->layer->evas->evas, obj->object); 113 obj->layer->evas->evas, obj->object);
114 } 114 }
@@ -122,7 +122,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
122static void 122static void
123_check_event_catcher_del(void *data, const Eo_Event *event) 123_check_event_catcher_del(void *data, const Eo_Event *event)
124{ 124{
125 const Eo_Callback_Array_Item *array = event->info; 125 const Efl_Callback_Array_Item *array = event->info;
126 Evas_Object_Protected_Data *obj = data; 126 Evas_Object_Protected_Data *obj = data;
127 int i; 127 int i;
128 128
@@ -132,7 +132,7 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
132 { 132 {
133 if ((--obj->animator_ref) > 0) break; 133 if ((--obj->animator_ref) > 0) break;
134 134
135 eo_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); 135 efl_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
136 INF("Unregistering an animator tick on canvas %p for object %p.", 136 INF("Unregistering an animator tick on canvas %p for object %p.",
137 obj->layer->evas->evas, obj->object); 137 obj->layer->evas->evas, obj->object);
138 } 138 }
@@ -144,20 +144,20 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
144} 144}
145 145
146EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 146EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
147 { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add }, 147 { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
148 { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 148 { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
149 149
150EOLIAN static Eo * 150EOLIAN static Eo *
151_efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 151_efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
152{ 152{
153 Eo *parent = NULL; 153 Eo *parent = NULL;
154 Evas *evas; 154 Evas *evas;
155 155
156 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 156 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
157 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME); 157 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME);
158 eo_manual_free_set(eo_obj, EINA_TRUE); 158 eo_manual_free_set(eo_obj, EINA_TRUE);
159 159
160 parent = eo_parent_get(eo_obj); 160 parent = efl_parent_get(eo_obj);
161 evas = evas_object_evas_get(parent); 161 evas = evas_object_evas_get(parent);
162 162
163 if (!obj || !_init_cow() || !evas) 163 if (!obj || !_init_cow() || !evas)
@@ -177,7 +177,7 @@ _efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *o
177 177
178 evas_object_inject(eo_obj, obj, evas); 178 evas_object_inject(eo_obj, obj, evas);
179 179
180 eo_event_callback_array_add(eo_obj, event_catcher_watch(), obj); 180 efl_event_callback_array_add(eo_obj, event_catcher_watch(), obj);
181 181
182 return eo_obj; 182 return eo_obj;
183} 183}
@@ -727,20 +727,20 @@ evas_object_del(Evas_Object *eo_obj)
727 727
728 if (!obj) return; 728 if (!obj) return;
729 evas_object_async_block(obj); 729 evas_object_async_block(obj);
730 if (obj->delete_me || obj->eo_del_called) return; 730 if (obj->delete_me || obj->efl_del_called) return;
731 if (obj->ref > 0) 731 if (obj->ref > 0)
732 { 732 {
733 obj->del_ref = EINA_TRUE; 733 obj->del_ref = EINA_TRUE;
734 return; 734 return;
735 } 735 }
736 evas_object_hide(eo_obj); 736 evas_object_hide(eo_obj);
737 obj->eo_del_called = EINA_TRUE; 737 obj->efl_del_called = EINA_TRUE;
738 738
739 eo_del(eo_obj); 739 efl_del(eo_obj);
740} 740}
741 741
742EOLIAN static void 742EOLIAN static void
743_efl_canvas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 743_efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
744{ 744{
745 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 745 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
746 return; 746 return;
@@ -830,7 +830,7 @@ end:
830 evas_object_event_callback_all_del(eo_obj); 830 evas_object_event_callback_all_del(eo_obj);
831 evas_object_event_callback_cleanup(eo_obj); 831 evas_object_event_callback_cleanup(eo_obj);
832 832
833 eo_destructor(eo_super(eo_obj, MY_CLASS)); 833 efl_destructor(eo_super(eo_obj, MY_CLASS));
834} 834}
835 835
836EOLIAN static void 836EOLIAN static void
@@ -1771,11 +1771,11 @@ evas_object_render_op_get(const Evas_Object *eo_obj)
1771} 1771}
1772 1772
1773EOLIAN static void 1773EOLIAN static void
1774_efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root) 1774_efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Efl_Dbg_Info *root)
1775{ 1775{
1776 eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); 1776 efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
1777 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 1777 Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
1778 Eo_Dbg_Info *node; 1778 Efl_Dbg_Info *node;
1779 const char *name; 1779 const char *name;
1780 double dblw, dblh; 1780 double dblw, dblh;
1781 double dblx, dbly; 1781 double dblx, dbly;
@@ -1797,7 +1797,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1797 1797
1798 visible = efl_gfx_visible_get(eo_obj); 1798 visible = efl_gfx_visible_get(eo_obj);
1799 layer = efl_gfx_stack_layer_get(eo_obj); 1799 layer = efl_gfx_stack_layer_get(eo_obj);
1800 name = eo_name_get(eo_obj); // evas_object_name_get(eo_obj); 1800 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
1801 efl_gfx_position_get(eo_obj, &x, &y); 1801 efl_gfx_position_get(eo_obj, &x, &y);
1802 efl_gfx_size_get(eo_obj, &w, &h); 1802 efl_gfx_size_get(eo_obj, &w, &h);
1803 scale = efl_canvas_object_scale_get(eo_obj); 1803 scale = efl_canvas_object_scale_get(eo_obj);
@@ -1895,14 +1895,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1895 { /* Save map coords count info if object has map */ 1895 { /* Save map coords count info if object has map */
1896 node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map"); 1896 node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map");
1897 int points_count = evas_map_count_get(map); 1897 int points_count = evas_map_count_get(map);
1898 Eo_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points"); 1898 Efl_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points");
1899 Eo_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV"); 1899 Efl_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV");
1900 for (int i = 0 ; i < points_count; i++) 1900 for (int i = 0 ; i < points_count; i++)
1901 { 1901 {
1902 { 1902 {
1903 Evas_Coord px, py, pz; 1903 Evas_Coord px, py, pz;
1904 evas_map_point_coord_get(map, i, &px, &py, &pz); 1904 evas_map_point_coord_get(map, i, &px, &py, &pz);
1905 Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points"); 1905 Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points");
1906 EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px); 1906 EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px);
1907 EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py); 1907 EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py);
1908 EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz); 1908 EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz);
@@ -1911,7 +1911,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1911 { 1911 {
1912 double pu, pv; 1912 double pu, pv;
1913 evas_map_point_image_uv_get(map, i, &pu, &pv); 1913 evas_map_point_image_uv_get(map, i, &pu, &pv);
1914 Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV"); 1914 Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV");
1915 EO_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu); 1915 EO_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu);
1916 EO_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv); 1916 EO_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv);
1917 } 1917 }
@@ -1920,14 +1920,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1920} 1920}
1921 1921
1922EOLIAN static Eo * 1922EOLIAN static Eo *
1923_efl_canvas_object_eo_base_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Eo_Class *klass) 1923_efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass)
1924{ 1924{
1925 if (klass == EVAS_CANVAS_CLASS) 1925 if (klass == EVAS_CANVAS_CLASS)
1926 { 1926 {
1927 if ((obj->delete_me) || (!obj->layer)) return NULL; 1927 if ((obj->delete_me) || (!obj->layer)) return NULL;
1928 return obj->layer->evas->evas; 1928 return obj->layer->evas->evas;
1929 } 1929 }
1930 return eo_provider_find(eo_super(eo_obj, MY_CLASS), klass); 1930 return efl_provider_find(eo_super(eo_obj, MY_CLASS), klass);
1931} 1931}
1932 1932
1933EOLIAN Evas_Object* 1933EOLIAN Evas_Object*
@@ -2106,7 +2106,7 @@ _evas_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e,
2106EOLIAN static void 2106EOLIAN static void
2107_efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type) 2107_efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type)
2108{ 2108{
2109 if (eo_finalized_get(eo_obj)) 2109 if (efl_finalized_get(eo_obj))
2110 { 2110 {
2111 ERR("This function is only allowed during construction."); 2111 ERR("This function is only allowed during construction.");
2112 return; 2112 return;
@@ -2182,7 +2182,7 @@ _efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Object_P
2182EOLIAN static void 2182EOLIAN static void
2183_efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 2183_efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
2184{ 2184{
2185 EINA_SAFETY_ON_FALSE_RETURN(!eo_finalized_get(eo_obj)); 2185 EINA_SAFETY_ON_FALSE_RETURN(!efl_finalized_get(eo_obj));
2186 obj->legacy = EINA_TRUE; 2186 obj->legacy = EINA_TRUE;
2187} 2187}
2188 2188
@@ -2299,7 +2299,7 @@ evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y)
2299EAPI Evas * 2299EAPI Evas *
2300evas_object_evas_get(const Eo *eo_obj) 2300evas_object_evas_get(const Eo *eo_obj)
2301{ 2301{
2302 return eo_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS); 2302 return efl_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS);
2303} 2303}
2304 2304
2305EAPI void 2305EAPI void
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 03aa31f..2f9fbc4 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -88,9 +88,9 @@ evas_object_polygon_add(Evas *e)
88} 88}
89 89
90EOLIAN static Eo * 90EOLIAN static Eo *
91_efl_canvas_polygon_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED) 91_efl_canvas_polygon_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *class_data EINA_UNUSED)
92{ 92{
93 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 93 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
94 94
95 evas_object_polygon_init(eo_obj); 95 evas_object_polygon_init(eo_obj);
96 96
@@ -260,12 +260,12 @@ evas_object_polygon_init(Evas_Object *eo_obj)
260} 260}
261 261
262EOLIAN static void 262EOLIAN static void
263_efl_canvas_polygon_eo_base_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED) 263_efl_canvas_polygon_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED)
264{ 264{
265 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 265 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
266 266
267 evas_object_polygon_free(eo_obj, obj, obj->private_data); 267 evas_object_polygon_free(eo_obj, obj, obj->private_data);
268 eo_destructor(eo_super(eo_obj, MY_CLASS)); 268 efl_destructor(eo_super(eo_obj, MY_CLASS));
269} 269}
270 270
271static void 271static void
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index d38379e..956ced2 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -100,9 +100,9 @@ evas_object_rectangle_add(Evas *e)
100} 100}
101 101
102EOLIAN static Eo * 102EOLIAN static Eo *
103_efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED) 103_efl_canvas_rectangle_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED)
104{ 104{
105 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 105 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
106 106
107 evas_object_rectangle_init(eo_obj); 107 evas_object_rectangle_init(eo_obj);
108 108
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index a189101..2a77d9f 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -50,7 +50,7 @@ typedef struct
50 EINA_INLIST; 50 EINA_INLIST;
51 Evas_Smart_Cb func; 51 Evas_Smart_Cb func;
52 void *data; 52 void *data;
53 const Eo_Event_Description *event; 53 const Efl_Event_Description *event;
54} _eo_evas_smart_cb_info; 54} _eo_evas_smart_cb_info;
55 55
56 56
@@ -350,7 +350,7 @@ EAPI Eina_Bool
350evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type) 350evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
351{ 351{
352 const Evas_Smart_Class *sc; 352 const Evas_Smart_Class *sc;
353 Eo_Class *klass; 353 Efl_Class *klass;
354 Eina_Bool type_check = EINA_FALSE; 354 Eina_Bool type_check = EINA_FALSE;
355 355
356 Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE); 356 Evas_Object_Protected_Data *obj = EVAS_OBJ_GET_OR_RETURN(eo_obj, EINA_FALSE);
@@ -378,7 +378,7 @@ evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
378EAPI Eina_Bool 378EAPI Eina_Bool
379evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type) 379evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type)
380{ 380{
381 Eo_Class *klass; 381 Efl_Class *klass;
382 const Evas_Smart_Class *sc; 382 const Evas_Smart_Class *sc;
383 Eina_Bool type_check = EINA_FALSE; 383 Eina_Bool type_check = EINA_FALSE;
384 384
@@ -405,7 +405,7 @@ evas_object_smart_type_check_ptr(const Eo *eo_obj, const char* type)
405} 405}
406 406
407EAPI void 407EAPI void
408evas_smart_legacy_type_register(const char *type, const Eo_Class *klass) 408evas_smart_legacy_type_register(const char *type, const Efl_Class *klass)
409{ 409{
410 eina_hash_set(_evas_smart_class_names_hash_table, type, klass); 410 eina_hash_set(_evas_smart_class_names_hash_table, type, klass);
411} 411}
@@ -438,7 +438,7 @@ _efl_canvas_group_group_iterator_free(Evas_Object_Smart_Iterator *it)
438 free(it); 438 free(it);
439} 439}
440 440
441// Should we have an eo_children_iterator_new API and just inherit from it ? 441// Should we have an efl_children_iterator_new API and just inherit from it ?
442EOLIAN static Eina_Iterator* 442EOLIAN static Eina_Iterator*
443_efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv) 443_efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv)
444{ 444{
@@ -580,7 +580,7 @@ evas_object_smart_add(Evas *eo_e, Evas_Smart *s)
580} 580}
581 581
582EOLIAN static Eo * 582EOLIAN static Eo *
583_efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED) 583_efl_canvas_group_efl_object_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EINA_UNUSED)
584{ 584{
585 Evas_Smart_Data *smart; 585 Evas_Smart_Data *smart;
586 586
@@ -588,7 +588,7 @@ _efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EI
588 smart->object = eo_obj; 588 smart->object = eo_obj;
589 smart->inherit_paragraph_direction = EINA_TRUE; 589 smart->inherit_paragraph_direction = EINA_TRUE;
590 590
591 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 591 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
592 evas_object_smart_init(eo_obj); 592 evas_object_smart_init(eo_obj);
593 593
594 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY); 594 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY);
@@ -753,7 +753,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event,
753 if (!event) return; 753 if (!event) return;
754 if (!func) return; 754 if (!func) return;
755 755
756 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); 756 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
757 _eo_evas_smart_cb_info *cb_info = calloc(1, sizeof(*cb_info)); 757 _eo_evas_smart_cb_info *cb_info = calloc(1, sizeof(*cb_info));
758 cb_info->func = func; 758 cb_info->func = func;
759 cb_info->data = (void *)data; 759 cb_info->data = (void *)data;
@@ -762,7 +762,7 @@ evas_object_smart_callback_priority_add(Evas_Object *eo_obj, const char *event,
762 o->callbacks = eina_inlist_append(o->callbacks, 762 o->callbacks = eina_inlist_append(o->callbacks,
763 EINA_INLIST_GET(cb_info)); 763 EINA_INLIST_GET(cb_info));
764 764
765 eo_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info); 765 efl_event_callback_priority_add(eo_obj, eo_desc, priority, _eo_evas_smart_cb, cb_info);
766} 766}
767 767
768EAPI void * 768EAPI void *
@@ -778,14 +778,14 @@ evas_object_smart_callback_del(Evas_Object *eo_obj, const char *event, Evas_Smar
778 if (!o) return NULL; 778 if (!o) return NULL;
779 779
780 if (!event) return NULL; 780 if (!event) return NULL;
781 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); 781 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
782 782
783 EINA_INLIST_FOREACH(o->callbacks, info) 783 EINA_INLIST_FOREACH(o->callbacks, info)
784 { 784 {
785 if ((info->func == func) && (info->event == eo_desc)) 785 if ((info->func == func) && (info->event == eo_desc))
786 { 786 {
787 void *tmp = info->data; 787 void *tmp = info->data;
788 eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); 788 efl_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info);
789 789
790 o->callbacks = 790 o->callbacks =
791 eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); 791 eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
@@ -809,14 +809,14 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas
809 o = eo_data_scope_get(eo_obj, MY_CLASS); 809 o = eo_data_scope_get(eo_obj, MY_CLASS);
810 if (!o) return NULL; 810 if (!o) return NULL;
811 811
812 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); 812 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
813 813
814 EINA_INLIST_FOREACH(o->callbacks, info) 814 EINA_INLIST_FOREACH(o->callbacks, info)
815 { 815 {
816 if ((info->func == func) && (info->event == eo_desc) && (info->data == data)) 816 if ((info->func == func) && (info->event == eo_desc) && (info->data == data))
817 { 817 {
818 void *tmp = info->data; 818 void *tmp = info->data;
819 eo_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info); 819 efl_event_callback_del(eo_obj, eo_desc, _eo_evas_smart_cb, info);
820 820
821 o->callbacks = 821 o->callbacks =
822 eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); 822 eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
@@ -835,8 +835,8 @@ evas_object_smart_callback_call(Evas_Object *eo_obj, const char *event, void *ev
835 MAGIC_CHECK_END(); 835 MAGIC_CHECK_END();
836 836
837 if (!event) return; 837 if (!event) return;
838 const Eo_Event_Description *eo_desc = eo_base_legacy_only_event_description_get(event); 838 const Efl_Event_Description *eo_desc = efl_object_legacy_only_event_description_get(event);
839 eo_event_callback_call(eo_obj, eo_desc, event_info); 839 efl_event_callback_call(eo_obj, eo_desc, event_info);
840} 840}
841 841
842EAPI Eina_Bool 842EAPI Eina_Bool
@@ -1305,7 +1305,7 @@ evas_object_smart_cleanup(Evas_Object *eo_obj)
1305 while (o->callbacks) 1305 while (o->callbacks)
1306 { 1306 {
1307 _eo_evas_smart_cb_info *info = (_eo_evas_smart_cb_info *)o->callbacks; 1307 _eo_evas_smart_cb_info *info = (_eo_evas_smart_cb_info *)o->callbacks;
1308 eo_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info); 1308 efl_event_callback_del(eo_obj, info->event, _eo_evas_smart_cb, info);
1309 o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info)); 1309 o->callbacks = eina_inlist_remove(o->callbacks, EINA_INLIST_GET(info));
1310 free(info); 1310 free(info);
1311 } 1311 }
@@ -1550,14 +1550,14 @@ static void *evas_object_smart_engine_data_get(Evas_Object *eo_obj)
1550} 1550}
1551 1551
1552static void 1552static void
1553_efl_canvas_group_class_constructor(Eo_Class *klass EINA_UNUSED) 1553_efl_canvas_group_class_constructor(Efl_Class *klass EINA_UNUSED)
1554{ 1554{
1555 _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL); 1555 _evas_smart_class_names_hash_table = eina_hash_string_small_new(NULL);
1556 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1556 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1557} 1557}
1558 1558
1559static void 1559static void
1560_efl_canvas_group_class_destructor(Eo_Class *klass EINA_UNUSED) 1560_efl_canvas_group_class_destructor(Efl_Class *klass EINA_UNUSED)
1561{ 1561{
1562 eina_hash_free(_evas_smart_class_names_hash_table); 1562 eina_hash_free(_evas_smart_class_names_hash_table);
1563} 1563}
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 478685f..332a211 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -269,13 +269,13 @@ EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
269static void 269static void
270_evas_object_table_child_connect(Evas_Object *o, Evas_Object *child) 270_evas_object_table_child_connect(Evas_Object *o, Evas_Object *child)
271{ 271{
272 eo_event_callback_array_add(child, evas_object_table_callbacks(), o); 272 efl_event_callback_array_add(child, evas_object_table_callbacks(), o);
273} 273}
274 274
275static void 275static void
276_evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child) 276_evas_object_table_child_disconnect(Evas_Object *o, Evas_Object *child)
277{ 277{
278 eo_event_callback_array_del(child, evas_object_table_callbacks(), o); 278 efl_event_callback_array_del(child, evas_object_table_callbacks(), o);
279} 279}
280 280
281static void 281static void
@@ -966,9 +966,9 @@ evas_object_table_add(Evas *evas)
966} 966}
967 967
968EOLIAN static Eo * 968EOLIAN static Eo *
969_evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED) 969_evas_table_efl_object_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED)
970{ 970{
971 obj = eo_constructor(eo_super(obj, MY_CLASS)); 971 obj = efl_constructor(eo_super(obj, MY_CLASS));
972 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 972 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
973 973
974 return obj; 974 return obj;
@@ -1405,7 +1405,7 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored)
1405} 1405}
1406 1406
1407EOLIAN static void 1407EOLIAN static void
1408_evas_table_class_constructor(Eo_Class *klass) 1408_evas_table_class_constructor(Efl_Class *klass)
1409{ 1409{
1410 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); 1410 evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
1411} 1411}
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index c57544d..1bbbb62 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -377,9 +377,9 @@ evas_object_text_add(Evas *e)
377} 377}
378 378
379EOLIAN static Eo * 379EOLIAN static Eo *
380_evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) 380_evas_text_efl_object_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
381{ 381{
382 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 382 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
383 evas_object_text_init(eo_obj); 383 evas_object_text_init(eo_obj);
384 384
385 return eo_obj; 385 return eo_obj;
@@ -1031,10 +1031,10 @@ _evas_text_ellipsis_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o)
1031} 1031}
1032 1032
1033EOLIAN static void 1033EOLIAN static void
1034_evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Dbg_Info *root) 1034_evas_text_efl_object_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
1035{ 1035{
1036 eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); 1036 efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
1037 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 1037 Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
1038 1038
1039 const char *text; 1039 const char *text;
1040 int size; 1040 int size;
@@ -1625,11 +1625,11 @@ evas_object_text_init(Evas_Object *eo_obj)
1625} 1625}
1626 1626
1627EOLIAN static void 1627EOLIAN static void
1628_evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) 1628_evas_text_efl_object_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED)
1629{ 1629{
1630 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1630 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1631 evas_object_text_free(eo_obj, obj); 1631 evas_object_text_free(eo_obj, obj);
1632 eo_destructor(eo_super(eo_obj, MY_CLASS)); 1632 efl_destructor(eo_super(eo_obj, MY_CLASS));
1633} 1633}
1634 1634
1635static void 1635static void
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index a48cda4..fb003ca 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -6334,12 +6334,12 @@ evas_object_textblock_add(Evas *e)
6334} 6334}
6335 6335
6336EOLIAN static Eo * 6336EOLIAN static Eo *
6337_efl_canvas_text_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED) 6337_efl_canvas_text_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED)
6338{ 6338{
6339 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 6339 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
6340 Efl_Canvas_Text_Data *o; 6340 Efl_Canvas_Text_Data *o;
6341 6341
6342 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 6342 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
6343 6343
6344 /* set up methods (compulsory) */ 6344 /* set up methods (compulsory) */
6345 obj->func = &object_func; 6345 obj->func = &object_func;
@@ -7027,7 +7027,7 @@ _cursor_emit_if_changed(Efl_Canvas_Text_Cursor *cur_obj)
7027 if (cur->changed) 7027 if (cur->changed)
7028 { 7028 {
7029 cur->changed = EINA_FALSE; 7029 cur->changed = EINA_FALSE;
7030 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 7030 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
7031 } 7031 }
7032} 7032}
7033 7033
@@ -7081,7 +7081,7 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
7081 EINA_INLIST_GET(o->text_nodes), 7081 EINA_INLIST_GET(o->text_nodes),
7082 EINA_INLIST_GET(co->node))); 7082 EINA_INLIST_GET(co->node)));
7083 7083
7084 eo_event_freeze(o->cursor); 7084 efl_event_freeze(o->cursor);
7085 evas_textblock_cursor_paragraph_first(o->cursor); 7085 evas_textblock_cursor_paragraph_first(o->cursor);
7086 7086
7087 evas_object_textblock_text_markup_prepend(o->cursor, text); 7087 evas_object_textblock_text_markup_prepend(o->cursor, text);
@@ -7093,18 +7093,18 @@ evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
7093 evas_textblock_cursor_paragraph_first(o->cursor); 7093 evas_textblock_cursor_paragraph_first(o->cursor);
7094 EINA_LIST_FOREACH(o->cursors, l, data) 7094 EINA_LIST_FOREACH(o->cursors, l, data)
7095 { 7095 {
7096 eo_event_freeze(data); 7096 efl_event_freeze(data);
7097 evas_textblock_cursor_paragraph_first(data); 7097 evas_textblock_cursor_paragraph_first(data);
7098 } 7098 }
7099 7099
7100 EINA_LIST_FOREACH(o->cursors, l, data) 7100 EINA_LIST_FOREACH(o->cursors, l, data)
7101 { 7101 {
7102 eo_event_thaw(data); 7102 efl_event_thaw(data);
7103 eo_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 7103 efl_event_callback_call(data, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
7104 } 7104 }
7105 } 7105 }
7106 eo_event_thaw(o->cursor); 7106 efl_event_thaw(o->cursor);
7107 eo_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 7107 efl_event_callback_call(o->cursor, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
7108 7108
7109 o->markup_text = text; 7109 o->markup_text = text;
7110} 7110}
@@ -7633,7 +7633,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event)
7633static void 7633static void
7634_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs) 7634_obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
7635{ 7635{
7636 eo_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); 7636 efl_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
7637} 7637}
7638 7638
7639static void 7639static void
@@ -7669,7 +7669,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj,
7669 if (!obs) return EINA_FALSE; 7669 if (!obs) return EINA_FALSE;
7670 7670
7671 obs->eo_obs = eo_obs; 7671 obs->eo_obs = eo_obs;
7672 eo_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); 7672 efl_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj);
7673 7673
7674 obj->obstacles = eina_list_append(obj->obstacles, obs); 7674 obj->obstacles = eina_list_append(obj->obstacles, obs);
7675 _obstacle_update(obs, eo_obj); 7675 _obstacle_update(obs, eo_obj);
@@ -8051,8 +8051,8 @@ _efl_canvas_text_cursor_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o)
8051 return o->cursor; 8051 return o->cursor;
8052} 8052}
8053 8053
8054EOLIAN static Eo_Base * 8054EOLIAN static Efl_Object *
8055_efl_canvas_text_cursor_eo_base_finalize(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd) 8055_efl_canvas_text_cursor_efl_object_finalize(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd)
8056{ 8056{
8057 if (!pd->obj) 8057 if (!pd->obj)
8058 { 8058 {
@@ -8075,7 +8075,7 @@ _evas_textblock_cursor_init(Efl_Canvas_Text_Cursor_Data *cur, const Evas_Object
8075EOLIAN static void 8075EOLIAN static void
8076_efl_canvas_text_cursor_text_object_set(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd, const Evas_Object *tb) 8076_efl_canvas_text_cursor_text_object_set(Eo *obj, Efl_Canvas_Text_Cursor_Data *pd, const Evas_Object *tb)
8077{ 8077{
8078 if (eo_finalized_get(obj)) 8078 if (efl_finalized_get(obj))
8079 { 8079 {
8080 ERR("Can't change the cursor's textblock after creation."); 8080 ERR("Can't change the cursor's textblock after creation.");
8081 return; 8081 return;
@@ -8102,9 +8102,9 @@ evas_object_textblock_cursor_new(const Eo *eo_obj)
8102} 8102}
8103 8103
8104EOLIAN static void 8104EOLIAN static void
8105_efl_canvas_text_cursor_eo_base_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8105_efl_canvas_text_cursor_efl_object_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8106{ 8106{
8107 eo_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS)); 8107 efl_destructor(eo_super(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS));
8108 Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); 8108 Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS);
8109 if (cur_obj == o->cursor) return; 8109 if (cur_obj == o->cursor) return;
8110 o->cursors = eina_list_remove(o->cursors, cur_obj); 8110 o->cursors = eina_list_remove(o->cursors, cur_obj);
@@ -8113,7 +8113,7 @@ _efl_canvas_text_cursor_eo_base_destructor(Eo *cur_obj, Efl_Canvas_Text_Cursor_D
8113EAPI void 8113EAPI void
8114evas_textblock_cursor_free(Evas_Textblock_Cursor *cur) 8114evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
8115{ 8115{
8116 eo_del(cur); 8116 efl_del(cur);
8117} 8117}
8118 8118
8119EAPI Eina_Bool 8119EAPI Eina_Bool
@@ -8301,7 +8301,7 @@ EOLIAN static void
8301_efl_canvas_text_cursor_paragraph_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8301_efl_canvas_text_cursor_paragraph_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8302{ 8302{
8303 _canvas_text_cursor_paragraph_first(cur); 8303 _canvas_text_cursor_paragraph_first(cur);
8304 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8304 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8305} 8305}
8306 8306
8307 8307
@@ -8332,7 +8332,7 @@ EOLIAN static void
8332_efl_canvas_text_cursor_paragraph_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8332_efl_canvas_text_cursor_paragraph_last(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8333{ 8333{
8334 _canvas_text_cursor_paragraph_last(cur); 8334 _canvas_text_cursor_paragraph_last(cur);
8335 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8335 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8336} 8336}
8337 8337
8338static Eina_Bool 8338static Eina_Bool
@@ -8371,7 +8371,7 @@ EOLIAN static void
8371_efl_canvas_text_cursor_paragraph_next(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8371_efl_canvas_text_cursor_paragraph_next(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8372{ 8372{
8373 _evas_textblock_cursor_paragraph_next(cur); 8373 _evas_textblock_cursor_paragraph_next(cur);
8374 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8374 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8375} 8375}
8376 8376
8377static Eina_Bool 8377static Eina_Bool
@@ -8414,7 +8414,7 @@ EOLIAN static void
8414_efl_canvas_text_cursor_paragraph_prev(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8414_efl_canvas_text_cursor_paragraph_prev(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8415{ 8415{
8416 _evas_textblock_cursor_paragraph_prev(cur); 8416 _evas_textblock_cursor_paragraph_prev(cur);
8417 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8417 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8418} 8418}
8419 8419
8420EAPI void 8420EAPI void
@@ -8571,7 +8571,7 @@ EOLIAN static void
8571_efl_canvas_text_cursor_word_start(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED) 8571_efl_canvas_text_cursor_word_start(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED)
8572{ 8572{
8573 evas_textblock_cursor_word_start(cur_obj); 8573 evas_textblock_cursor_word_start(cur_obj);
8574 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8574 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8575} 8575}
8576 8576
8577EAPI Eina_Bool 8577EAPI Eina_Bool
@@ -8633,7 +8633,7 @@ EOLIAN static void
8633_efl_canvas_text_cursor_word_end(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED) 8633_efl_canvas_text_cursor_word_end(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur EINA_UNUSED)
8634{ 8634{
8635 evas_textblock_cursor_word_end(cur_obj); 8635 evas_textblock_cursor_word_end(cur_obj);
8636 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8636 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8637} 8637}
8638 8638
8639static Eina_Bool 8639static Eina_Bool
@@ -8688,7 +8688,7 @@ EOLIAN static void
8688_efl_canvas_text_cursor_char_next(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8688_efl_canvas_text_cursor_char_next(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8689{ 8689{
8690 _evas_textblock_cursor_char_next(cur); 8690 _evas_textblock_cursor_char_next(cur);
8691 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8691 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8692} 8692}
8693 8693
8694static Eina_Bool 8694static Eina_Bool
@@ -8718,7 +8718,7 @@ EOLIAN static void
8718_efl_canvas_text_cursor_char_prev(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8718_efl_canvas_text_cursor_char_prev(Eo *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8719{ 8719{
8720 _evas_textblock_cursor_char_prev(cur); 8720 _evas_textblock_cursor_char_prev(cur);
8721 eo_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL); 8721 efl_event_callback_call(cur_obj, EFL_CANVAS_TEXT_CURSOR_EVENT_CHANGED, NULL);
8722} 8722}
8723 8723
8724static void 8724static void
@@ -8734,7 +8734,7 @@ EOLIAN static void
8734_efl_canvas_text_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) 8734_efl_canvas_text_cursor_paragraph_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur)
8735