summaryrefslogtreecommitdiff
path: root/src/lib/ector
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/ector
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/lib/ector')
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.c10
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.eo4
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c10
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.eo6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.c14
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.eo6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo6
-rw-r--r--src/lib/ector/ector_renderer.c10
-rw-r--r--src/lib/ector/ector_renderer.eo6
-rw-r--r--src/lib/ector/ector_renderer_buffer.eo2
-rw-r--r--src/lib/ector/ector_surface.eo4
-rw-r--r--src/lib/ector/gl/ector_gl_buffer.eo2
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c12
-rw-r--r--src/lib/ector/gl/ector_gl_surface.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c8
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c10
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo4
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.c4
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.eo2
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.eo4
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c8
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.eo4
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c10
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.eo4
-rw-r--r--src/lib/ector/software/ector_software_buffer.c12
-rw-r--r--src/lib/ector/software/ector_software_buffer.eo6
-rw-r--r--src/lib/ector/software/ector_software_surface.c10
-rw-r--r--src/lib/ector/software/ector_software_surface.eo4
39 files changed, 133 insertions, 133 deletions
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c
index 25bf3f86e6..81c14d1e81 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.c
@@ -99,10 +99,10 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw
99 if (height) *height = pd->base->generic->h; 99 if (height) *height = pd->base->generic->h;
100} 100}
101 101
102static Eo_Base * 102static Efl_Object *
103_ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd) 103_ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
104{ 104{
105 obj = eo_constructor(eo_super(obj, MY_CLASS)); 105 obj = efl_constructor(eo_super(obj, MY_CLASS));
106 106
107 if (!obj) return NULL; 107 if (!obj) return NULL;
108 pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 108 pd->base = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@@ -112,10 +112,10 @@ _ector_cairo_software_surface_eo_base_constructor(Eo *obj, Ector_Cairo_Software_
112} 112}
113 113
114EOLIAN static void 114EOLIAN static void
115_ector_cairo_software_surface_eo_base_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd) 115_ector_cairo_software_surface_efl_object_destructor(Eo *obj, Ector_Cairo_Software_Surface_Data *pd)
116{ 116{
117 eo_data_unref(obj, pd->base); 117 eo_data_unref(obj, pd->base);
118 eo_destructor(eo_super(obj, MY_CLASS)); 118 efl_destructor(eo_super(obj, MY_CLASS));
119} 119}
120 120
121#include "ector_cairo_software_surface.eo.c" 121#include "ector_cairo_software_surface.eo.c"
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo
index 2aaf674ca2..f389a23bb4 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo
@@ -8,7 +8,7 @@ class Ector.Cairo.Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.B
8 methods {} 8 methods {}
9 implements { 9 implements {
10 Ector.Buffer.pixels_set; 10 Ector.Buffer.pixels_set;
11 Eo.Base.constructor; 11 Efl.Object.constructor;
12 Eo.Base.destructor; 12 Efl.Object.destructor;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index 540ce4e825..a06706a90f 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -60,7 +60,7 @@ _ector_cairo_surface_symbol_get(Eo *obj EINA_UNUSED,
60static Ector_Renderer * 60static Ector_Renderer *
61_ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj, 61_ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
62 Ector_Cairo_Surface_Data *pd EINA_UNUSED, 62 Ector_Cairo_Surface_Data *pd EINA_UNUSED,
63 const Eo_Class *type) 63 const Efl_Class *type)
64{ 64{
65 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 65 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 66 return eo_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -115,14 +115,14 @@ _ector_cairo_surface_ector_surface_reference_point_set(Eo *obj EINA_UNUSED,
115} 115}
116 116
117static Eo * 117static Eo *
118_ector_cairo_surface_eo_base_constructor(Eo *obj, 118_ector_cairo_surface_efl_object_constructor(Eo *obj,
119 Ector_Cairo_Surface_Data *pd) 119 Ector_Cairo_Surface_Data *pd)
120{ 120{
121 USE(obj, cairo_destroy, NULL); 121 USE(obj, cairo_destroy, NULL);
122 USE(obj, cairo_image_surface_create, NULL); 122 USE(obj, cairo_image_surface_create, NULL);
123 USE(obj, cairo_create, NULL); 123 USE(obj, cairo_create, NULL);
124 124
125 obj = eo_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); 125 obj = efl_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
126 if (!obj) return NULL; 126 if (!obj) return NULL;
127 127
128 _cairo_count++; 128 _cairo_count++;
@@ -133,10 +133,10 @@ _ector_cairo_surface_eo_base_constructor(Eo *obj,
133} 133}
134 134
135static void 135static void
136_ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED, 136_ector_cairo_surface_efl_object_destructor(Eo *obj EINA_UNUSED,
137 Ector_Cairo_Surface_Data *pd EINA_UNUSED) 137 Ector_Cairo_Surface_Data *pd EINA_UNUSED)
138{ 138{
139 eo_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); 139 efl_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
140 140
141 if (--_cairo_count) return ; 141 if (--_cairo_count) return ;
142 if (_cairo_so) eina_module_free(_cairo_so); 142 if (_cairo_so) eina_module_free(_cairo_so);
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 80b40ff578..4fce1f6a8d 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,6 +1,6 @@
1type @extern cairo_t: void_ptr; 1type @extern cairo_t: void_ptr;
2 2
3class Ector.Cairo.Surface (Eo.Base, Ector.Surface) 3class Ector.Cairo.Surface (Efl.Object, Ector.Surface)
4{ 4{
5 [[Ector surface on a cairo backend 5 [[Ector surface on a cairo backend
6 6
@@ -28,7 +28,7 @@ class Ector.Cairo.Surface (Eo.Base, Ector.Surface)
28 implements { 28 implements {
29 Ector.Surface.renderer_factory_new; 29 Ector.Surface.renderer_factory_new;
30 Ector.Surface.reference_point.set; 30 Ector.Surface.reference_point.set;
31 Eo.Base.destructor; 31 Efl.Object.destructor;
32 Eo.Base.constructor; 32 Efl.Object.constructor;
33 } 33 }
34} 34}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index eca5d0cc4b..4f97d28777 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -180,9 +180,9 @@ _ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
180} 180}
181 181
182static Eo * 182static Eo *
183_ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED) 183_ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
184{ 184{
185 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 185 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
186 if (!obj) return NULL; 186 if (!obj) return NULL;
187 187
188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
@@ -190,10 +190,10 @@ _ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd
190 return obj; 190 return obj;
191} 191}
192 192
193static Eo_Base * 193static Efl_Object *
194_ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd) 194_ector_renderer_cairo_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
195{ 195{
196 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 196 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
197 if (!obj) return NULL; 197 if (!obj) return NULL;
198 198
199 USE(pd->generic, cairo_matrix_init, NULL); 199 USE(pd->generic, cairo_matrix_init, NULL);
@@ -213,7 +213,7 @@ _ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
213} 213}
214 214
215static void 215static void
216_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd) 216_ector_renderer_cairo_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
217{ 217{
218 Ector_Renderer_Data *base; 218 Ector_Renderer_Data *base;
219 219
@@ -223,7 +223,7 @@ _ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
223 223
224 free(pd->m); 224 free(pd->m);
225 225
226 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 226 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
227} 227}
228 228
229#include "ector_renderer_cairo.eo.c" 229#include "ector_renderer_cairo.eo.c"
diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index f9e094fe9c..56a894dd66 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -13,8 +13,8 @@ abstract Ector.Renderer.Cairo (Ector.Renderer)
13 Ector.Renderer.draw; 13 Ector.Renderer.draw;
14 Ector.Renderer.color.set; 14 Ector.Renderer.color.set;
15 Ector.Renderer.color.get; 15 Ector.Renderer.color.get;
16 Eo.Base.constructor; 16 Efl.Object.constructor;
17 Eo.Base.finalize; 17 Efl.Object.finalize;
18 Eo.Base.destructor; 18 Efl.Object.destructor;
19 } 19 }
20} 20}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index 757d5c8af4..bf8a05d428 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -129,12 +129,12 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
129 gld->end.y - gld->start.y); 129 gld->end.y - gld->start.y);
130} 130}
131 131
132static Eo_Base * 132static Efl_Object *
133_ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED) 133_ector_renderer_cairo_gradient_linear_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED)
134{ 134{
135 Ector_Renderer_Data *base; 135 Ector_Renderer_Data *base;
136 136
137 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 137 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
138 if (!obj) return NULL; 138 if (!obj) return NULL;
139 139
140 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 140 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@@ -153,7 +153,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_finalize(Eo *obj, Ector_Renderer_C
153} 153}
154 154
155static void 155static void
156_ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj, 156_ector_renderer_cairo_gradient_linear_efl_object_destructor(Eo *obj,
157 Ector_Renderer_Cairo_Gradient_Linear_Data *pd) 157 Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
158{ 158{
159 Ector_Renderer_Data *base; 159 Ector_Renderer_Data *base;
@@ -161,7 +161,7 @@ _ector_renderer_cairo_gradient_linear_eo_base_destructor(Eo *obj,
161 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 161 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
162 eo_data_xunref(base->surface, pd->parent, obj); 162 eo_data_xunref(base->surface, pd->parent, obj);
163 163
164 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 164 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
165} 165}
166 166
167static void 167static void
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 0f3fc1d302..ebbf88f056 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.Cairo.fill; 9 Ector.Renderer.Cairo.fill;
10 Eo.Base.finalize; 10 Efl.Object.finalize;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
index 97d0417fbd..7127dabfb5 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -134,12 +134,12 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNU
134 gld->radius * 2, gld->radius * 2); 134 gld->radius * 2, gld->radius * 2);
135} 135}
136 136
137static Eo_Base * 137static Efl_Object *
138_ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED) 138_ector_renderer_cairo_gradient_radial_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED)
139{ 139{
140 Ector_Renderer_Data *base; 140 Ector_Renderer_Data *base;
141 141
142 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 142 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
143 if (!obj) return NULL; 143 if (!obj) return NULL;
144 144
145 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 145 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
@@ -157,7 +157,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_finalize(Eo *obj, Ector_Renderer_C
157} 157}
158 158
159static void 159static void
160_ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj, 160_ector_renderer_cairo_gradient_radial_efl_object_destructor(Eo *obj,
161 Ector_Renderer_Cairo_Gradient_Radial_Data *pd) 161 Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
162{ 162{
163 Ector_Renderer_Data *base; 163 Ector_Renderer_Data *base;
@@ -165,7 +165,7 @@ _ector_renderer_cairo_gradient_radial_eo_base_destructor(Eo *obj,
165 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 165 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS);
166 eo_data_xunref(base->surface, pd->parent, obj); 166 eo_data_xunref(base->surface, pd->parent, obj);
167 167
168 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 168 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
169} 169}
170 170
171static void 171static void
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
index 0df3bc1e81..9d17778bec 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.Cairo.fill; 9 Ector.Renderer.Cairo.fill;
10 Eo.Base.destructor; 10 Efl.Object.destructor;
11 Eo.Base.finalize; 11 Efl.Object.finalize;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 811dc5cac1..9acc36ae25 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -246,9 +246,9 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
246} 246}
247 247
248Eo * 248Eo *
249_ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) 249_ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
250{ 250{
251 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 251 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
252 252
253 if (!obj) return NULL; 253 if (!obj) return NULL;
254 254
@@ -256,15 +256,15 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh
256 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 256 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
257 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 257 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
258 258
259 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd); 259 efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
260 260
261 return obj; 261 return obj;
262} 262}
263 263
264static Eo_Base * 264static Efl_Object *
265_ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) 265_ector_renderer_cairo_shape_efl_object_finalize(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
266{ 266{
267 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 267 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
268 if (!obj) return NULL; 268 if (!obj) return NULL;
269 269
270 USE(pd->base, cairo_path_destroy, NULL); 270 USE(pd->base, cairo_path_destroy, NULL);
@@ -291,7 +291,7 @@ _ector_renderer_cairo_shape_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Shape
291} 291}
292 292
293void 293void
294_ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd) 294_ector_renderer_cairo_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Shape_Data *pd)
295{ 295{
296 Ector_Renderer_Data *base; 296 Ector_Renderer_Data *base;
297 297
@@ -305,7 +305,7 @@ _ector_renderer_cairo_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Sha
305 eo_data_xunref(obj, pd->shape, obj); 305 eo_data_xunref(obj, pd->shape, obj);
306 eo_data_xunref(obj, pd->base, obj); 306 eo_data_xunref(obj, pd->base, obj);
307 307
308 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 308 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
309 309
310 if (pd->path) cairo_path_destroy(pd->path); 310 if (pd->path) cairo_path_destroy(pd->path);
311} 311}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 4191ff0feb..917ae5d8e9 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape)
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.Cairo.fill; 9 Ector.Renderer.Cairo.fill;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.finalize; 11 Efl.Object.finalize;
12 Eo.Base.destructor; 12 Efl.Object.destructor;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/ector_renderer.c b/src/lib/ector/ector_renderer.c
index c3df0ff419..cfe0f017c4 100644
--- a/src/lib/ector/ector_renderer.c
+++ b/src/lib/ector/ector_renderer.c
@@ -10,16 +10,16 @@
10#define MY_CLASS ECTOR_RENDERER_CLASS 10#define MY_CLASS ECTOR_RENDERER_CLASS
11 11
12static void 12static void
13_ector_renderer_eo_base_destructor(Eo *obj, Ector_Renderer_Data *pd) 13_ector_renderer_efl_object_destructor(Eo *obj, Ector_Renderer_Data *pd)
14{ 14{
15 if (pd->m) free(pd->m); 15 if (pd->m) free(pd->m);
16 eo_unref(pd->surface); 16 eo_unref(pd->surface);
17 17
18 eo_destructor(eo_super(obj, MY_CLASS)); 18 efl_destructor(eo_super(obj, MY_CLASS));
19} 19}
20 20
21static Eo_Base * 21static Efl_Object *
22_ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd) 22_ector_renderer_efl_object_finalize(Eo *obj, Ector_Renderer_Data *pd)
23{ 23{
24 if (!pd->surface) 24 if (!pd->surface)
25 { 25 {
@@ -27,7 +27,7 @@ _ector_renderer_eo_base_finalize(Eo *obj, Ector_Renderer_Data *pd)
27 return NULL; 27 return NULL;
28 } 28 }
29 pd->finalized = EINA_TRUE; 29 pd->finalized = EINA_TRUE;
30 return eo_finalize(eo_super(obj, MY_CLASS)); 30 return efl_finalize(eo_super(obj, MY_CLASS));
31} 31}
32 32
33static Ector_Surface * 33static Ector_Surface *
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index c9432bb0fc..b2ac222e7e 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -9,7 +9,7 @@ enum Ector.Quality
9 last, [[Sentinel]] 9 last, [[Sentinel]]
10} 10}
11 11
12abstract Ector.Renderer (Eo.Base) 12abstract Ector.Renderer (Efl.Object)
13{ 13{
14 [[Ector renderer abstract interface]] 14 [[Ector renderer abstract interface]]
15 15
@@ -128,7 +128,7 @@ abstract Ector.Renderer (Eo.Base)
128 } 128 }
129 } 129 }
130 implements { 130 implements {
131 Eo.Base.destructor; 131 Efl.Object.destructor;
132 Eo.Base.finalize; 132 Efl.Object.finalize;
133 } 133 }
134} 134}
diff --git a/src/lib/ector/ector_renderer_buffer.eo b/src/lib/ector/ector_renderer_buffer.eo
index 477d5ee7cd..27e1eb5c5c 100644
--- a/src/lib/ector/ector_renderer_buffer.eo
+++ b/src/lib/ector/ector_renderer_buffer.eo
@@ -1,4 +1,4 @@
1mixin Ector.Renderer.Buffer (Eo.Interface, Ector.Renderer, Efl.Gfx.Fill) 1mixin Ector.Renderer.Buffer (Efl.Interface, Ector.Renderer, Efl.Gfx.Fill)
2{ 2{
3 [[Ector buffers have a default fill set to repeat]] 3 [[Ector buffers have a default fill set to repeat]]
4 eo_prefix: ector_renderer_buffer; 4 eo_prefix: ector_renderer_buffer;
diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo
index 8d5ba7b655..da4eea44bd 100644
--- a/src/lib/ector/ector_surface.eo
+++ b/src/lib/ector/ector_surface.eo
@@ -16,9 +16,9 @@ mixin Ector.Surface (Ector.Buffer)
16 } 16 }
17 renderer_factory_new @virtual_pure { 17 renderer_factory_new @virtual_pure {
18 [[Create a new renderer factory for the given type]] 18 [[Create a new renderer factory for the given type]]
19 return: Eo.Base; /* FIXME: Should be a more restricted type, only here for cyclic. */ 19 return: Efl.Object; /* FIXME: Should be a more restricted type, only here for cyclic. */
20 params { 20 params {
21 @in type: const(Eo.Class) @nonull; /* FIXME: Should probably be a more restricted type */ 21 @in type: const(Efl.Class) @nonull; /* FIXME: Should probably be a more restricted type */
22 } 22 }
23 } 23 }
24 } 24 }
diff --git a/src/lib/ector/gl/ector_gl_buffer.eo b/src/lib/ector/gl/ector_gl_buffer.eo
index 7e8c3c8e7b..ea1b327174 100644
--- a/src/lib/ector/gl/ector_gl_buffer.eo
+++ b/src/lib/ector/gl/ector_gl_buffer.eo
@@ -1,4 +1,4 @@
1class Ector.GL.Buffer (Eo.Base, Ector.GL.Buffer.Base) 1class Ector.GL.Buffer (Efl.Object, Ector.GL.Buffer.Base)
2{ 2{
3 data: null; 3 data: null;
4} 4}
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 0998ebde65..7f49aec2e7 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -42,7 +42,7 @@ _shader_free(void *s)
42static Ector_Renderer * 42static Ector_Renderer *
43_ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj, 43_ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj,
44 Ector_GL_Surface_Data *pd EINA_UNUSED, 44 Ector_GL_Surface_Data *pd EINA_UNUSED,
45 const Eo_Class *type) 45 const Efl_Class *type)
46{ 46{
47 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 47 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -327,9 +327,9 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA
327} 327}
328 328
329static void 329static void
330_ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED) 330_ector_gl_surface_efl_object_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
331{ 331{
332 eo_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); 332 efl_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
333 333
334 eina_hash_free(shader_cache); 334 eina_hash_free(shader_cache);
335 shader_cache = NULL; 335 shader_cache = NULL;
@@ -337,12 +337,12 @@ _ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNU
337 shader_file = NULL; 337 shader_file = NULL;
338} 338}
339 339
340static Eo_Base * 340static Efl_Object *
341_ector_gl_surface_eo_base_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED) 341_ector_gl_surface_efl_object_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
342{ 342{
343 Eina_Strbuf *file_path = NULL; 343 Eina_Strbuf *file_path = NULL;
344 344
345 obj = eo_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); 345 obj = efl_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
346 if (!obj) return NULL; 346 if (!obj) return NULL;
347 347
348 if (shader_cache) return obj; 348 if (shader_cache) return obj;
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo
index 24afe906da..8d31f24131 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -30,7 +30,7 @@ class Ector.GL.Surface (Ector.GL.Buffer, Ector.Surface)
30 implements { 30 implements {
31 Ector.Surface.renderer_factory_new; 31 Ector.Surface.renderer_factory_new;
32 Ector.Surface.reference_point.set; 32 Ector.Surface.reference_point.set;
33 Eo.Base.destructor; 33 Efl.Object.destructor;
34 Eo.Base.constructor; 34 Efl.Object.constructor;
35 } 35 }
36} 36}
diff --git a/src/lib/ector/gl/ector_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c
index b3b251ca7a..655f94772b 100644
--- a/src/lib/ector/gl/ector_renderer_gl.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -36,10 +36,10 @@ _ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED,
36 return r; 36 return r;
37} 37}
38 38
39static Eo_Base * 39static Efl_Object *
40_ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd) 40_ector_renderer_gl_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
41{ 41{
42 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); 42 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS));
43 if (!obj) return NULL; 43 if (!obj) return NULL;
44 44
45 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 45 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
@@ -47,7 +47,7 @@ _ector_renderer_gl_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Data *pd)
47} 47}
48 48
49static void 49static void
50_ector_renderer_gl_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Data *pd) 50_ector_renderer_gl_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Data *pd)
51{ 51{
52 eo_data_xunref(obj, pd->base, obj); 52 eo_data_xunref(obj, pd->base, obj);
53} 53}
diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo
index c6e0915d51..3a9dcd6671 100644
--- a/src/lib/ector/gl/ector_renderer_gl.eo
+++ b/src/lib/ector/gl/ector_renderer_gl.eo
@@ -16,7 +16,7 @@ abstract Ector.Renderer.GL (Ector.Renderer)
16 implements { 16 implements {
17 Ector.Renderer.prepare; 17 Ector.Renderer.prepare;
18 Ector.Renderer.draw; 18 Ector.Renderer.draw;
19 Eo.Base.constructor; 19 Efl.Object.constructor;
20 Eo.Base.destructor; 20 Efl.Object.destructor;
21 } 21 }
22} 22}
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
index 7aa2eeb90f..07a9490abb 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -66,10 +66,10 @@ _ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Rendere
66 return EINA_TRUE; 66 return EINA_TRUE;
67} 67}
68 68
69static Eo_Base * 69static Efl_Object *
70_ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) 70_ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
71{ 71{
72 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); 72 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
73 73
74 if (!obj) return NULL; 74 if (!obj) return NULL;
75 75
@@ -81,7 +81,7 @@ _ector_renderer_gl_gradient_linear_eo_base_constructor(Eo *obj, Ector_Renderer_G
81} 81}
82 82
83static void 83static void
84_ector_renderer_gl_gradient_linear_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd) 84_ector_renderer_gl_gradient_linear_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd)
85{ 85{
86 eo_data_xunref(obj, pd->base, obj); 86 eo_data_xunref(obj, pd->base, obj);
87 eo_data_xunref(obj, pd->linear, obj); 87 eo_data_xunref(obj, pd->linear, obj);
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
index 67c007849f..9ec8f1ffa7 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradi
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.GL.fill; 9 Ector.Renderer.GL.fill;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
index a16619c8a3..77514f0387 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -79,10 +79,10 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
79 return crc; 79 return crc;
80} 80}
81 81
82static Eo_Base * 82static Efl_Object *
83_ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) 83_ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
84{ 84{
85 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); 85 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
86 86
87 if (!obj) return NULL; 87 if (!obj) return NULL;
88 88
@@ -94,7 +94,7 @@ _ector_renderer_gl_gradient_radial_eo_base_constructor(Eo *obj, Ector_Renderer_G
94} 94}
95 95
96static void 96static void
97_ector_renderer_gl_gradient_radial_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd) 97_ector_renderer_gl_gradient_radial_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd)
98{ 98{
99 eo_data_xunref(obj, pd->base, obj); 99 eo_data_xunref(obj, pd->base, obj);
100 eo_data_xunref(obj, pd->radial, obj); 100 eo_data_xunref(obj, pd->radial, obj);
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
index b0446ce720..a03b7c6a51 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradi
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.GL.fill; 9 Ector.Renderer.GL.fill;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 7edc5e9e43..0615ed9bf6 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -138,10 +138,10 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
138 return crc; 138 return crc;
139} 139}
140 140
141static Eo_Base * 141static Efl_Object *
142_ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) 142_ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
143{ 143{
144 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 144 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
145 145
146 if (!obj) return NULL; 146 if (!obj) return NULL;
147 147
@@ -149,13 +149,13 @@ _ector_renderer_gl_shape_eo_base_constructor(Eo *obj, Ector_Renderer_GL_Shape_Da
149 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 149 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
150 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 150 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
151 151
152 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd); 152 efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
153 153
154 return obj; 154 return obj;
155} 155}
156 156
157static void 157static void
158_ector_renderer_gl_shape_eo_base_destructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd) 158_ector_renderer_gl_shape_efl_object_destructor(Eo *obj, Ector_Renderer_GL_Shape_Data *pd)
159{ 159{
160 eo_data_xunref(obj, pd->shape, obj); 160 eo_data_xunref(obj, pd->shape, obj);
161 eo_data_xunref(obj, pd->base, obj); 161 eo_data_xunref(obj, pd->base, obj);
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index 5282898d04..d4f1217bd5 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape)
7 Ector.Renderer.bounds_get; 7 Ector.Renderer.bounds_get;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.GL.fill; 9 Ector.Renderer.GL.fill;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 } 12 }
13} 13}
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.c b/src/lib/ector/software/ector_renderer_software_buffer.c
index e16ec6ee46..2b21e2d89b 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.c
+++ b/src/lib/ector/software/ector_renderer_software_buffer.c
@@ -63,10 +63,10 @@ _ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_S
63} 63}
64 64
65EOLIAN static void 65EOLIAN static void
66_ector_renderer_software_buffer_eo_base_destructor(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) 66_ector_renderer_software_buffer_efl_object_destructor(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
67{ 67{
68 eo_data_xunref(pd->base->surface, pd->surface, obj); 68 eo_data_xunref(pd->base->surface, pd->surface, obj);
69 eo_destructor(eo_super(obj, MY_CLASS)); 69 efl_destructor(eo_super(obj, MY_CLASS));
70} 70}
71 71
72#include "ector_renderer_software_buffer.eo.c" 72#include "ector_renderer_software_buffer.eo.c"
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.eo b/src/lib/ector/software/ector_renderer_software_buffer.eo
index 3d189b5a9b..ba7977bbb9 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.eo
+++ b/src/lib/ector/software/ector_renderer_software_buffer.eo
@@ -13,6 +13,6 @@ class Ector.Renderer.Software.Buffer (Ector.Renderer.Software, Ector.Renderer.Bu
13 Ector.Renderer.prepare; 13 Ector.Renderer.prepare;
14 Ector.Renderer.crc.get; 14 Ector.Renderer.crc.get;
15 Ector.Renderer.Software.fill; 15 Ector.Renderer.Software.fill;
16 Eo.Base.destructor; 16 Efl.Object.destructor;
17 } 17 }
18} 18}
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index d5d5effc5e..8c922a1cec 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -63,10 +63,10 @@ _ector_renderer_software_gradient_linear_ector_renderer_software_fill(Eo *obj EI
63} 63}
64 64
65static Eo * 65static Eo *
66_ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj, 66_ector_renderer_software_gradient_linear_efl_object_constructor(Eo *obj,
67 Ector_Renderer_Software_Gradient_Data *pd) 67 Ector_Renderer_Software_Gradient_Data *pd)
68{ 68{
69 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); 69 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
70 if (!obj) return NULL; 70 if (!obj) return NULL;
71 71
72 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 72 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
@@ -76,7 +76,7 @@ _ector_renderer_software_gradient_linear_eo_base_constructor(Eo *obj,
76} 76}
77 77
78static void 78static void
79_ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj, 79_ector_renderer_software_gradient_linear_efl_object_destructor(Eo *obj,
80 Ector_Renderer_Software_Gradient_Data *pd) 80 Ector_Renderer_Software_Gradient_Data *pd)
81{ 81{
82 Ector_Renderer_Data *base; 82 Ector_Renderer_Data *base;
@@ -89,7 +89,7 @@ _ector_renderer_software_gradient_linear_eo_base_destructor(Eo *obj,
89 eo_data_xunref(obj, pd->gd, obj); 89 eo_data_xunref(obj, pd->gd, obj);
90 eo_data_xunref(obj, pd->gld, obj); 90 eo_data_xunref(obj, pd->gld, obj);
91 91
92 eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); 92 efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
93} 93}
94 94
95void 95void
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 0d63b98b82..136724b40c 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Software.Gradient.Linear (Ector.Renderer.Software, Ector.Re
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.Software.fill; 9 Ector.Renderer.Software.fill;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.c b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
index 1154fea263..031778077b 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -73,10 +73,10 @@ _ector_renderer_software_gradient_radial_ector_renderer_software_fill(Eo *obj EI
73} 73}
74 74
75Eo * 75Eo *
76_ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj, 76_ector_renderer_software_gradient_radial_efl_object_constructor(Eo *obj,
77 Ector_Renderer_Software_Gradient_Data *pd) 77 Ector_Renderer_Software_Gradient_Data *pd)
78{ 78{
79 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); 79 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
80 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 80 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
81 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj); 81 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
82 82
@@ -84,7 +84,7 @@ _ector_renderer_software_gradient_radial_eo_base_constructor(Eo *obj,
84} 84}
85 85
86void 86void
87_ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj, 87_ector_renderer_software_gradient_radial_efl_object_destructor(Eo *obj,
88 Ector_Renderer_Software_Gradient_Data *pd) 88 Ector_Renderer_Software_Gradient_Data *pd)
89{ 89{
90 Ector_Renderer_Data *base; 90 Ector_Renderer_Data *base;
@@ -97,7 +97,7 @@ _ector_renderer_software_gradient_radial_eo_base_destructor(Eo *obj,
97 eo_data_xunref(obj, pd->gd, obj); 97 eo_data_xunref(obj, pd->gd, obj);
98 eo_data_xunref(obj, pd->gld, obj); 98 eo_data_xunref(obj, pd->gld, obj);
99 99
100 eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); 100 efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
101} 101}
102 102
103void 103void
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index c50b754109..bfe992eb08 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -7,8 +7,8 @@ class Ector.Renderer.Software.Gradient.Radial (Ector.Renderer.Software, Ector.Re
7 Ector.Renderer.draw; 7 Ector.Renderer.draw;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Ector.Renderer.Software.fill; 9 Ector.Renderer.Software.fill;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 Efl.Gfx.Gradient.stop.set; 12 Efl.Gfx.Gradient.stop.set;
13 } 13 }
14} 14}
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index 0a3f719498..e9a6e8f5c4 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -692,21 +692,21 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI
692} 692}
693 693
694static Eo * 694static Eo *
695_ector_renderer_software_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd) 695_ector_renderer_software_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
696{ 696{
697 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); 697 obj = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
698 if (!obj) return NULL; 698 if (!obj) return NULL;
699 699
700 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 700 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
701 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 701 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
702 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 702 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
703 eo_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd); 703 efl_event_callback_add(obj, EFL_GFX_PATH_CHANGED, _ector_renderer_software_shape_path_changed, pd);
704 704
705 return obj; 705 return obj;
706} 706}
707 707
708static void 708static void
709_ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd) 709_ector_renderer_software_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Software_Shape_Data *pd)
710{ 710{
711 //FIXME, As base class destructor can't call destructor of mixin class. 711 //FIXME, As base class destructor can't call destructor of mixin class.
712 // call explicit API to free shape data. 712 // call explicit API to free shape data.
@@ -718,7 +718,7 @@ _ector_renderer_software_shape_eo_base_destructor(Eo *obj, Ector_Renderer_Softwa
718 eo_data_xunref(pd->base->surface, pd->surface, obj); 718 eo_data_xunref(pd->base->surface, pd->surface, obj);
719 eo_data_xunref(obj, pd->shape, obj); 719 eo_data_xunref(obj, pd->shape, obj);
720 eo_data_xunref(obj, pd->base, obj); 720 eo_data_xunref(obj, pd->base, obj);
721 eo_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); 721 efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
722} 722}
723 723
724 724
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index b8d91fe610..2538f435bc 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -7,7 +7,7 @@ class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Sha
7 Ector.Renderer.Software.fill; 7 Ector.Renderer.Software.fill;
8 Ector.Renderer.crc.get; 8 Ector.Renderer.crc.get;
9 Efl.Gfx.Shape.path.set; 9 Efl.Gfx.Shape.path.set;
10 Eo.Base.constructor; 10 Efl.Object.constructor;
11 Eo.Base.destructor; 11 Efl.Object.destructor;
12 } 12 }
13} 13}
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index 65c21c993c..baf8d62015 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -69,7 +69,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj, Ector_Software_Buffer_Base_Dat
69 return; 69 return;
70 } 70 }
71 71
72 eo_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8); 72 efl_event_callback_call(obj, ECTOR_BUFFER_EVENT_DETACHED, pd->pixels.u8);
73 if (!pd->nofree) 73 if (!pd->nofree)
74 { 74 {
75 free(pd->pixels.u8); 75 free(pd->pixels.u8);
@@ -332,11 +332,11 @@ _ector_software_buffer_base_ector_buffer_flags_get(Eo *obj EINA_UNUSED, Ector_So
332 : 0); 332 : 0);
333} 333}
334 334
335EOLIAN static Eo_Base * 335EOLIAN static Efl_Object *
336_ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED) 336_ector_software_buffer_efl_object_constructor(Eo *obj, void *data EINA_UNUSED)
337{ 337{
338 Ector_Software_Buffer_Base_Data *pd; 338 Ector_Software_Buffer_Base_Data *pd;
339 obj = eo_constructor(eo_super(obj, MY_CLASS)); 339 obj = efl_constructor(eo_super(obj, MY_CLASS));
340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
341 pd->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN); 341 pd->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN);
342 pd->generic->eo = obj; 342 pd->generic->eo = obj;
@@ -344,12 +344,12 @@ _ector_software_buffer_eo_base_constructor(Eo *obj, void *data EINA_UNUSED)
344} 344}
345 345
346EOLIAN static void 346EOLIAN static void
347_ector_software_buffer_eo_base_destructor(Eo *obj, void *data EINA_UNUSED) 347_ector_software_buffer_efl_object_destructor(Eo *obj, void *data EINA_UNUSED)
348{ 348{
349 Ector_Software_Buffer_Base_Data *pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 349 Ector_Software_Buffer_Base_Data *pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
350 _ector_software_buffer_base_pixels_clear(obj, pd); 350 _ector_software_buffer_base_pixels_clear(obj, pd);
351 eo_data_unref(obj, pd->generic); 351 eo_data_unref(obj, pd->generic);
352 eo_destructor(eo_super(obj, MY_CLASS)); 352 efl_destructor(eo_super(obj, MY_CLASS));
353 if (pd->internal.maps) 353 if (pd->internal.maps)
354 { 354 {
355 ERR("Pixel data is still mapped during destroy! Check your code!"); 355 ERR("Pixel data is still mapped during destroy! Check your code!");
diff --git a/src/lib/ector/software/ector_software_buffer.eo b/src/lib/ector/software/ector_software_buffer.eo
index cfbe1f76d0..27ba690790 100644
--- a/src/lib/ector/software/ector_software_buffer.eo
+++ b/src/lib/ector/software/ector_software_buffer.eo
@@ -1,8 +1,8 @@
1class Ector.Software.Buffer (Eo.Base, Ector.Software.Buffer.Base) 1class Ector.Software.Buffer (Efl.Object, Ector.Software.Buffer.Base)
2{ 2{
3 data: null; 3 data: null;
4 implements { 4 implements {
5 Eo.Base.constructor; 5 Efl.Object.constructor;
6 Eo.Base.destructor; 6 Efl.Object.destructor;
7 } 7 }
8} 8}
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index ab5fe90b7a..115170b865 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -13,7 +13,7 @@
13static Ector_Renderer * 13static Ector_Renderer *
14_ector_software_surface_ector_surface_renderer_factory_new(Eo *obj, 14_ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
15 Ector_Software_Surface_Data *pd EINA_UNUSED, 15 Ector_Software_Surface_Data *pd EINA_UNUSED,
16 const Eo_Class *type) 16 const Efl_Class *type)
17{ 17{
18 if (type == ECTOR_RENDERER_SHAPE_MIXIN) 18 if (type == ECTOR_RENDERER_SHAPE_MIXIN)
19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 19 return eo_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(eo_self, obj));
@@ -28,9 +28,9 @@ _ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
28} 28}
29 29
30static Eo * 30static Eo *
31_ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data *pd) 31_ector_software_surface_efl_object_constructor(Eo *obj, Ector_Software_Surface_Data *pd)
32{ 32{
33 obj = eo_constructor(eo_super(obj, MY_CLASS)); 33 obj = efl_constructor(eo_super(obj, MY_CLASS));
34 pd->rasterizer = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer)); 34 pd->rasterizer = (Software_Rasterizer *) calloc(1, sizeof(Software_Rasterizer));
35 ector_software_rasterizer_init(pd->rasterizer); 35 ector_software_rasterizer_init(pd->rasterizer);
36 pd->rasterizer->fill_data.raster_buffer = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 36 pd->rasterizer->fill_data.raster_buffer = eo_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
@@ -38,13 +38,13 @@ _ector_software_surface_eo_base_constructor(Eo *obj, Ector_Software_Surface_Data
38} 38}
39 39
40static void 40static void
41_ector_software_surface_eo_base_destructor(Eo *obj, Ector_Software_Surface_Data *pd) 41_ector_software_surface_efl_object_destructor(Eo *obj, Ector_Software_Surface_Data *pd)
42{ 42{
43 ector_software_rasterizer_done(pd->rasterizer); 43 ector_software_rasterizer_done(pd->rasterizer);
44 eo_data_unref(obj, pd->rasterizer->fill_data.raster_buffer); 44 eo_data_unref(obj, pd->rasterizer->fill_data.raster_buffer);
45 free(pd->rasterizer); 45 free(pd->rasterizer);
46 pd->rasterizer = NULL; 46 pd->rasterizer = NULL;
47 eo_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS)); 47 efl_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
48} 48}
49 49
50static void 50static void
diff --git a/src/lib/ector/software/ector_software_surface.eo b/src/lib/ector/software/ector_software_surface.eo
index 3aa560d46e..fd0c174d37 100644
--- a/src/lib/ector/software/ector_software_surface.eo
+++ b/src/lib/ector/software/ector_software_surface.eo
@@ -5,7 +5,7 @@ class Ector.Software.Surface (Ector.Software.Buffer, Ector.Surface)
5 implements { 5 implements {
6 Ector.Surface.renderer_factory_new; 6 Ector.Surface.renderer_factory_new;
7 Ector.Surface.reference_point.set; 7 Ector.Surface.reference_point.set;
8 Eo.Base.destructor; 8 Efl.Object.destructor;
9 Eo.Base.constructor; 9 Efl.Object.constructor;
10 } 10 }
11} 11}