summaryrefslogtreecommitdiff
path: root/src/lib/ector
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/lib/ector
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/lib/ector')
-rw-r--r--src/lib/ector/cairo/ector_cairo_software_surface.c12
-rw-r--r--src/lib/ector/cairo/ector_cairo_surface.c12
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.c16
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c38
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c38
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c32
-rw-r--r--src/lib/ector/ector_main.c6
-rw-r--r--src/lib/ector/ector_private.h12
-rw-r--r--src/lib/ector/ector_renderer.c10
-rw-r--r--src/lib/ector/ector_renderer_buffer.c2
-rw-r--r--src/lib/ector/ector_renderer_shape.c6
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c12
-rw-r--r--src/lib/ector/gl/ector_renderer_gl.c6
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c20
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c20
-rw-r--r--src/lib/ector/software/ector_renderer_software_buffer.c14
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_linear.c24
-rw-r--r--src/lib/ector/software/ector_renderer_software_gradient_radial.c24
-rw-r--r--src/lib/ector/software/ector_renderer_software_shape.c22
-rw-r--r--src/lib/ector/software/ector_software_buffer.c12
-rw-r--r--src/lib/ector/software/ector_software_rasterizer.c2
-rw-r--r--src/lib/ector/software/ector_software_surface.c18
23 files changed, 189 insertions, 189 deletions
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c
index 81c14d1e81..d96fdd517e 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.c
@@ -73,7 +73,7 @@ _ector_cairo_software_surface_ector_buffer_pixels_set(Eo *obj, Ector_Cairo_Softw
73 cairo_surface_destroy(pd->surface); 73 cairo_surface_destroy(pd->surface);
74 pd->surface = NULL; 74 pd->surface = NULL;
75 75
76 ok = ector_buffer_pixels_set(eo_super(obj, MY_CLASS), pixels, width, height, stride, cspace, writable, l, r, t, b); 76 ok = ector_buffer_pixels_set(efl_super(obj, MY_CLASS), pixels, width, height, stride, cspace, writable, l, r, t, b);
77 77
78 if (ok && pixels) 78 if (ok && pixels)
79 { 79 {
@@ -102,11 +102,11 @@ _ector_cairo_software_surface_surface_get(Eo *obj EINA_UNUSED, Ector_Cairo_Softw
102static Efl_Object * 102static Efl_Object *
103_ector_cairo_software_surface_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 105 obj = efl_constructor(efl_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 = efl_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
109 pd->base->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN); 109 pd->base->generic = efl_data_ref(obj, ECTOR_BUFFER_MIXIN);
110 pd->base->generic->eo = obj; 110 pd->base->generic->eo = obj;
111 return obj; 111 return obj;
112} 112}
@@ -114,8 +114,8 @@ _ector_cairo_software_surface_efl_object_constructor(Eo *obj, Ector_Cairo_Softwa
114EOLIAN static void 114EOLIAN static void
115_ector_cairo_software_surface_efl_object_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 efl_data_unref(obj, pd->base);
118 efl_destructor(eo_super(obj, MY_CLASS)); 118 efl_destructor(efl_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_surface.c b/src/lib/ector/cairo/ector_cairo_surface.c
index a06706a90f..64bc1c570e 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -63,13 +63,13 @@ _ector_cairo_surface_ector_surface_renderer_factory_new(Eo *obj,
63 const Efl_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 efl_add(ECTOR_RENDERER_CAIRO_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
67 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 67 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
68 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 68 return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
69 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 69 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
70 return eo_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 70 return efl_add(ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
71 71
72 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 72 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
73 return NULL; 73 return NULL;
74} 74}
75 75
@@ -122,7 +122,7 @@ _ector_cairo_surface_efl_object_constructor(Eo *obj,
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 = efl_constructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); 125 obj = efl_constructor(efl_super(obj, ECTOR_CAIRO_SURFACE_CLASS));
126 if (!obj) return NULL; 126 if (!obj) return NULL;
127 127
128 _cairo_count++; 128 _cairo_count++;
@@ -136,7 +136,7 @@ static void
136_ector_cairo_surface_efl_object_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 efl_destructor(eo_super(obj, ECTOR_CAIRO_SURFACE_CLASS)); 139 efl_destructor(efl_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_renderer_cairo.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index 4f97d28777..59ec00594c 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -99,7 +99,7 @@ _ector_renderer_cairo_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Data
99{ 99{
100 if (!pd->parent) 100 if (!pd->parent)
101 { 101 {
102 pd->parent = eo_data_xref(pd->generic->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 102 pd->parent = efl_data_xref(pd->generic->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
103 } 103 }
104 if (pd->generic->m) 104 if (pd->generic->m)
105 { 105 {
@@ -182,10 +182,10 @@ _ector_renderer_cairo_ector_renderer_draw(Eo *obj EINA_UNUSED,
182static Eo * 182static Eo *
183_ector_renderer_cairo_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 185 obj = efl_constructor(efl_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 = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
189 189
190 return obj; 190 return obj;
191} 191}
@@ -193,7 +193,7 @@ _ector_renderer_cairo_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo_Data
193static Efl_Object * 193static Efl_Object *
194_ector_renderer_cairo_efl_object_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 = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 196 obj = efl_finalize(efl_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);
@@ -217,13 +217,13 @@ _ector_renderer_cairo_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_Data *
217{ 217{
218 Ector_Renderer_Data *base; 218 Ector_Renderer_Data *base;
219 219
220 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 220 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
221 eo_data_xunref(base->surface, pd->parent, obj); 221 efl_data_xunref(base->surface, pd->parent, obj);
222 eo_data_xunref(obj, pd->generic, obj); 222 efl_data_xunref(obj, pd->generic, obj);
223 223
224 free(pd->m); 224 free(pd->m);
225 225
226 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS)); 226 efl_destructor(efl_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_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
index bf8a05d428..ceccc57d53 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -48,14 +48,14 @@ static Eina_Bool
48_ector_renderer_cairo_gradient_linear_ector_renderer_prepare(Eo *obj, 48_ector_renderer_cairo_gradient_linear_ector_renderer_prepare(Eo *obj,
49 Ector_Renderer_Cairo_Gradient_Linear_Data *pd) 49 Ector_Renderer_Cairo_Gradient_Linear_Data *pd)
50{ 50{
51 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 51 ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
52 52
53 if (!pd->parent) 53 if (!pd->parent)
54 { 54 {
55 Ector_Renderer_Data *base; 55 Ector_Renderer_Data *base;
56 56
57 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 57 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
58 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 58 pd->parent = efl_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
59 } 59 }
60 60
61 return EINA_FALSE; 61 return EINA_FALSE;
@@ -71,14 +71,14 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_draw(Eo *obj,
71 cairo_pattern_t *pat; 71 cairo_pattern_t *pat;
72 72
73 // FIXME: don't ignore clipping ! 73 // FIXME: don't ignore clipping !
74 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN); 74 gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
75 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN); 75 gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
76 if (!gd || !gld) return EINA_FALSE; 76 if (!gd || !gld) return EINA_FALSE;
77 77
78 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col); 78 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
79 if (!pat) return EINA_FALSE; 79 if (!pat) return EINA_FALSE;
80 80
81 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), op, clips, mul_col); 81 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
82 82
83 cairo_rectangle(pd->parent->cairo, gld->start.x, gld->start.y, 83 cairo_rectangle(pd->parent->cairo, gld->start.x, gld->start.y,
84 gld->end.x - gld->start.x, 84 gld->end.x - gld->start.x,
@@ -99,8 +99,8 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
99 Ector_Renderer_Gradient_Data *gd; 99 Ector_Renderer_Gradient_Data *gd;
100 cairo_pattern_t *pat; 100 cairo_pattern_t *pat;
101 101
102 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN); 102 gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
103 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN); 103 gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
104 if (!gd || !gld) return EINA_FALSE; 104 if (!gd || !gld) return EINA_FALSE;
105 105
106 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col); 106 pat = _ector_renderer_cairo_gradient_linear_prepare(obj, gld, gd, mul_col);
@@ -120,8 +120,8 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_bounds_get(Eo *obj,
120 Ector_Renderer_Gradient_Linear_Data *gld; 120 Ector_Renderer_Gradient_Linear_Data *gld;
121 Ector_Renderer_Cairo_Data *bd; 121 Ector_Renderer_Cairo_Data *bd;
122 122
123 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN); 123 gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
124 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); 124 bd = efl_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
125 EINA_RECTANGLE_SET(r, 125 EINA_RECTANGLE_SET(r,
126 bd->generic->origin.x + gld->start.x, 126 bd->generic->origin.x + gld->start.x,
127 bd->generic->origin.y + gld->start.y, 127 bd->generic->origin.y + gld->start.y,
@@ -134,10 +134,10 @@ _ector_renderer_cairo_gradient_linear_efl_object_finalize(Eo *obj, Ector_Rendere
134{ 134{
135 Ector_Renderer_Data *base; 135 Ector_Renderer_Data *base;
136 136
137 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 137 obj = efl_finalize(efl_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 = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
141 141
142 USE(base, cairo_set_source, NULL); 142 USE(base, cairo_set_source, NULL);
143 USE(base, cairo_pattern_destroy, NULL); 143 USE(base, cairo_pattern_destroy, NULL);
@@ -158,10 +158,10 @@ _ector_renderer_cairo_gradient_linear_efl_object_destructor(Eo *obj,
158{ 158{
159 Ector_Renderer_Data *base; 159 Ector_Renderer_Data *base;
160 160
161 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 161 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
162 eo_data_xunref(base->surface, pd->parent, obj); 162 efl_data_xunref(base->surface, pd->parent, obj);
163 163
164 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 164 efl_destructor(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
165} 165}
166 166
167static void 167static void
@@ -170,7 +170,7 @@ _ector_renderer_cairo_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj,
170 const Efl_Gfx_Gradient_Stop *colors, 170 const Efl_Gfx_Gradient_Stop *colors,
171 unsigned int length) 171 unsigned int length)
172{ 172{
173 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), colors, length); 173 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS), colors, length);
174} 174}
175 175
176static unsigned int 176static unsigned int
@@ -180,10 +180,10 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Rend
180 Ector_Renderer_Gradient_Data *gd; 180 Ector_Renderer_Gradient_Data *gd;
181 unsigned int crc; 181 unsigned int crc;
182 182
183 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS)); 183 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_LINEAR_CLASS));
184 184
185 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN); 185 gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN);
186 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN); 186 gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
187 if (!gd || !gld) return crc; 187 if (!gd || !gld) return crc;
188 188
189 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 189 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
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 7127dabfb5..94225b6590 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -34,14 +34,14 @@ struct _Ector_Renderer_Cairo_Gradient_Radial_Data
34static Eina_Bool 34static Eina_Bool
35_ector_renderer_cairo_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd) 35_ector_renderer_cairo_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo_Gradient_Radial_Data *pd)
36{ 36{
37 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 37 ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
38 38
39 if (!pd->parent) 39 if (!pd->parent)
40 { 40 {
41 Ector_Renderer_Data *base; 41 Ector_Renderer_Data *base;
42 42
43 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 43 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
44 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 44 pd->parent = efl_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
45 } 45 }
46 46
47 return EINA_FALSE; 47 return EINA_FALSE;
@@ -75,14 +75,14 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Rendere
75 cairo_pattern_t *pat; 75 cairo_pattern_t *pat;
76 76
77 // FIXME: Handle clipping and generally make it work :-) 77 // FIXME: Handle clipping and generally make it work :-)
78 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN); 78 grd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
79 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN); 79 gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
80 if (!grd || !gd) return EINA_FALSE; 80 if (!grd || !gd) return EINA_FALSE;
81 81
82 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col); 82 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
83 if (!pat) return EINA_FALSE; 83 if (!pat) return EINA_FALSE;
84 84
85 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), op, clips, mul_col); 85 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
86 86
87 cairo_arc(pd->parent->cairo, 87 cairo_arc(pd->parent->cairo,
88 grd->radial.x, grd->radial.y, 88 grd->radial.x, grd->radial.y,
@@ -105,8 +105,8 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
105 Ector_Renderer_Gradient_Data *gd; 105 Ector_Renderer_Gradient_Data *gd;
106 cairo_pattern_t *pat; 106 cairo_pattern_t *pat;
107 107
108 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN); 108 grd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
109 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN); 109 gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
110 if (!grd || !gd) return EINA_FALSE; 110 if (!grd || !gd) return EINA_FALSE;
111 111
112 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col); 112 pat = _ector_renderer_cairo_gradient_radial_prepare(obj, grd, gd, mul_col);
@@ -126,8 +126,8 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_bounds_get(Eo *obj EINA_UNU
126 Ector_Renderer_Gradient_Radial_Data *gld; 126 Ector_Renderer_Gradient_Radial_Data *gld;
127 Ector_Renderer_Cairo_Data *bd; 127 Ector_Renderer_Cairo_Data *bd;
128 128
129 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN); 129 gld = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
130 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); 130 bd = efl_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
131 EINA_RECTANGLE_SET(r, 131 EINA_RECTANGLE_SET(r,
132 bd->generic->origin.x + gld->radial.x - gld->radius, 132 bd->generic->origin.x + gld->radial.x - gld->radius,
133 bd->generic->origin.y + gld->radial.y - gld->radius, 133 bd->generic->origin.y + gld->radial.y - gld->radius,
@@ -139,10 +139,10 @@ _ector_renderer_cairo_gradient_radial_efl_object_finalize(Eo *obj, Ector_Rendere
139{ 139{
140 Ector_Renderer_Data *base; 140 Ector_Renderer_Data *base;
141 141
142 obj = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 142 obj = efl_finalize(efl_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 = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
146 146
147 USE(base, cairo_set_source, NULL); 147 USE(base, cairo_set_source, NULL);
148 USE(base, cairo_pattern_destroy, NULL); 148 USE(base, cairo_pattern_destroy, NULL);
@@ -162,10 +162,10 @@ _ector_renderer_cairo_gradient_radial_efl_object_destructor(Eo *obj,
162{ 162{
163 Ector_Renderer_Data *base; 163 Ector_Renderer_Data *base;
164 164
165 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 165 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
166 eo_data_xunref(base->surface, pd->parent, obj); 166 efl_data_xunref(base->surface, pd->parent, obj);
167 167
168 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 168 efl_destructor(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
169} 169}
170 170
171static void 171static void
@@ -174,7 +174,7 @@ _ector_renderer_cairo_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj,
174 const Efl_Gfx_Gradient_Stop *colors, 174 const Efl_Gfx_Gradient_Stop *colors,
175 unsigned int length) 175 unsigned int length)
176{ 176{
177 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), colors, length); 177 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS), colors, length);
178} 178}
179 179
180static unsigned int 180static unsigned int
@@ -184,10 +184,10 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rend
184 Ector_Renderer_Gradient_Data *gd; 184 Ector_Renderer_Gradient_Data *gd;
185 unsigned int crc; 185 unsigned int crc;
186 186
187 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS)); 187 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_CAIRO_GRADIENT_RADIAL_CLASS));
188 188
189 grd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN); 189 grd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN);
190 gd = eo_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN); 190 gd = efl_data_scope_get(obj, ECTOR_RENDERER_GRADIENT_MIXIN);
191 if (!grd || !gd) return crc; 191 if (!grd || !gd) return crc;
192 192
193 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 193 crc = eina_crc((void*) gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 9acc36ae25..de7376b76d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -90,7 +90,7 @@ _ector_renderer_cairo_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo
90 const Efl_Gfx_Path_Command *cmds = NULL; 90 const Efl_Gfx_Path_Command *cmds = NULL;
91 const double *pts = NULL; 91 const double *pts = NULL;
92 92
93 ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 93 ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
94 94
95 if (pd->shape->fill) 95 if (pd->shape->fill)
96 ector_renderer_prepare(pd->shape->fill); 96 ector_renderer_prepare(pd->shape->fill);
@@ -104,8 +104,8 @@ _ector_renderer_cairo_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_Cairo
104 { 104 {
105 Ector_Renderer_Data *base; 105 Ector_Renderer_Data *base;
106 106
107 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 107 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
108 pd->parent = eo_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj); 108 pd->parent = efl_data_xref(base->surface, ECTOR_CAIRO_SURFACE_CLASS, obj);
109 } 109 }
110 110
111 efl_gfx_shape_path_get(obj, &cmds, &pts); 111 efl_gfx_shape_path_get(obj, &cmds, &pts);
@@ -161,7 +161,7 @@ _ector_renderer_cairo_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_Cairo_Sh
161 161
162 cairo_save(pd->parent->cairo); 162 cairo_save(pd->parent->cairo);
163 163
164 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS), op, clips, mul_col); 164 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS), op, clips, mul_col);
165 165
166 cairo_new_path(pd->parent->cairo); 166 cairo_new_path(pd->parent->cairo);
167 cairo_append_path(pd->parent->cairo, pd->path); 167 cairo_append_path(pd->parent->cairo, pd->path);
@@ -240,7 +240,7 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
240 // FIXME: It should be possible to actually ask cairo about that 240 // FIXME: It should be possible to actually ask cairo about that
241 efl_gfx_shape_bounds_get(obj, r); 241 efl_gfx_shape_bounds_get(obj, r);
242 242
243 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS); 243 bd = efl_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
244 r->x += bd->generic->origin.x; 244 r->x += bd->generic->origin.x;
245 r->y += bd->generic->origin.y; 245 r->y += bd->generic->origin.y;
246} 246}
@@ -248,13 +248,13 @@ _ector_renderer_cairo_shape_ector_renderer_bounds_get(Eo *obj,
248Eo * 248Eo *
249_ector_renderer_cairo_shape_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 251 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
252 252
253 if (!obj) return NULL; 253 if (!obj) return NULL;
254 254
255 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 255 pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
256 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 256 pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
257 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 257 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
258 258
259 efl_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
@@ -264,7 +264,7 @@ _ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo
264static Efl_Object * 264static Efl_Object *
265_ector_renderer_cairo_shape_efl_object_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 = efl_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 267 obj = efl_finalize(efl_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);
@@ -299,13 +299,13 @@ _ector_renderer_cairo_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Cairo_
299 // call explicit API to free shape data. 299 // call explicit API to free shape data.
300 efl_gfx_shape_reset(obj); 300 efl_gfx_shape_reset(obj);
301 301
302 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 302 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
303 eo_data_xunref(base->surface, pd->parent, obj); 303 efl_data_xunref(base->surface, pd->parent, obj);
304 304
305 eo_data_xunref(obj, pd->shape, obj); 305 efl_data_xunref(obj, pd->shape, obj);
306 eo_data_xunref(obj, pd->base, obj); 306 efl_data_xunref(obj, pd->base, obj);
307 307
308 efl_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 308 efl_destructor(efl_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}
@@ -316,7 +316,7 @@ _ector_renderer_cairo_shape_ector_renderer_crc_get(Eo *obj,
316{ 316{
317 unsigned int crc; 317 unsigned int crc;
318 318
319 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS)); 319 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS));
320 320
321 crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE); 321 crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
322 crc = eina_crc((void*) &pd->public_shape->stroke.scale, sizeof (pd->public_shape->stroke.scale) * 3, crc, EINA_FALSE); // scale, width, centered 322 crc = eina_crc((void*) &pd->public_shape->stroke.scale, sizeof (pd->public_shape->stroke.scale) * 3, crc, EINA_FALSE); // scale, width, centered
diff --git a/src/lib/ector/ector_main.c b/src/lib/ector/ector_main.c
index c7954eda3c..db65c44ea4 100644
--- a/src/lib/ector/ector_main.c
+++ b/src/lib/ector/ector_main.c
@@ -34,7 +34,7 @@ ector_init(void)
34 return ++_ector_main_count; 34 return ++_ector_main_count;
35 35
36 eina_init(); 36 eina_init();
37 eo_init(); 37 efl_object_init();
38 38
39 _ector_log_dom_global = eina_log_domain_register("ector", ECTOR_DEFAULT_LOG_COLOR); 39 _ector_log_dom_global = eina_log_domain_register("ector", ECTOR_DEFAULT_LOG_COLOR);
40 if (_ector_log_dom_global < 0) 40 if (_ector_log_dom_global < 0)
@@ -51,7 +51,7 @@ ector_init(void)
51 return _ector_main_count; 51 return _ector_main_count;
52 52
53 on_error: 53 on_error:
54 eo_shutdown(); 54 efl_object_shutdown();
55 eina_shutdown(); 55 eina_shutdown();
56 56
57 return 0; 57 return 0;
@@ -239,7 +239,7 @@ ector_shutdown(void)
239 EINA_LOG_STATE_START, 239 EINA_LOG_STATE_START,
240 EINA_LOG_STATE_SHUTDOWN); 240 EINA_LOG_STATE_SHUTDOWN);
241 241
242 eo_shutdown(); 242 efl_object_shutdown();
243 243
244 eina_log_domain_unregister(_ector_log_dom_global); 244 eina_log_domain_unregister(_ector_log_dom_global);
245 245
diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h
index 6bda277326..03d656454d 100644
--- a/src/lib/ector/ector_private.h
+++ b/src/lib/ector/ector_private.h
@@ -43,20 +43,20 @@ extern int _ector_log_dom_global;
43/* The following macro are internal to Ector only at this stage */ 43/* The following macro are internal to Ector only at this stage */
44 44
45static inline Eo * 45static inline Eo *
46_eo_refplace(Eo **d, const Eo *s) 46_efl_refplace(Eo **d, const Eo *s)
47{ 47{
48 Eo *tmp = *d; 48 Eo *tmp = *d;
49 *d = eo_ref(s); 49 *d = efl_ref(s);
50 if (tmp) eo_unref(tmp); 50 if (tmp) efl_unref(tmp);
51 return *d; 51 return *d;
52} 52}
53 53
54static inline Eo * 54static inline Eo *
55_eo_xrefplace(Eo **d, Eo *s, const Eo *ref_obj) 55_efl_xrefplace(Eo **d, Eo *s, const Eo *ref_obj)
56{ 56{
57 Eo *tmp = *d; 57 Eo *tmp = *d;
58 *d = eo_xref(s, ref_obj); 58 *d = efl_xref(s, ref_obj);
59 if (tmp) eo_xunref(tmp, ref_obj); 59 if (tmp) efl_xunref(tmp, ref_obj);
60 return *d; 60 return *d;
61} 61}
62 62
diff --git a/src/lib/ector/ector_renderer.c b/src/lib/ector/ector_renderer.c
index cfe0f017c4..f3b6c9499b 100644
--- a/src/lib/ector/ector_renderer.c
+++ b/src/lib/ector/ector_renderer.c
@@ -13,9 +13,9 @@ static void
13_ector_renderer_efl_object_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 efl_unref(pd->surface);
17 17
18 efl_destructor(eo_super(obj, MY_CLASS)); 18 efl_destructor(efl_super(obj, MY_CLASS));
19} 19}
20 20
21static Efl_Object * 21static Efl_Object *
@@ -27,7 +27,7 @@ _ector_renderer_efl_object_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 efl_finalize(eo_super(obj, MY_CLASS)); 30 return efl_finalize(efl_super(obj, MY_CLASS));
31} 31}
32 32
33static Ector_Surface * 33static Ector_Surface *
@@ -44,7 +44,7 @@ _ector_renderer_surface_set(Eo *obj EINA_UNUSED, Ector_Renderer_Data *pd, Ector_
44 CRI("surface_set can be called during object creation only!"); 44 CRI("surface_set can be called during object creation only!");
45 return; 45 return;
46 } 46 }
47 pd->surface = eo_xref(s, obj); 47 pd->surface = efl_xref(s, obj);
48} 48}
49 49
50static void 50static void
@@ -133,7 +133,7 @@ _ector_renderer_mask_set(Eo *obj EINA_UNUSED,
133 Ector_Renderer_Data *pd, 133 Ector_Renderer_Data *pd,
134 Ector_Renderer *r) 134 Ector_Renderer *r)
135{ 135{
136 _eo_refplace(&pd->mask, r); 136 _efl_refplace(&pd->mask, r);
137} 137}
138 138
139static Ector_Renderer * 139static Ector_Renderer *
diff --git a/src/lib/ector/ector_renderer_buffer.c b/src/lib/ector/ector_renderer_buffer.c
index 4bb93a24c1..56bb6f13e1 100644
--- a/src/lib/ector/ector_renderer_buffer.c
+++ b/src/lib/ector/ector_renderer_buffer.c
@@ -33,7 +33,7 @@ _ector_renderer_buffer_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Ector_Renderer
33EOLIAN static void 33EOLIAN static void
34_ector_renderer_buffer_buffer_set(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd, Ector_Buffer *buf) 34_ector_renderer_buffer_buffer_set(Eo *obj EINA_UNUSED, Ector_Renderer_Buffer_Data *pd, Ector_Buffer *buf)
35{ 35{
36 _eo_xrefplace(&pd->eo_buffer, buf, obj); 36 _efl_xrefplace(&pd->eo_buffer, buf, obj);
37} 37}
38 38
39EOLIAN static Ector_Buffer * 39EOLIAN static Ector_Buffer *
diff --git a/src/lib/ector/ector_renderer_shape.c b/src/lib/ector/ector_renderer_shape.c
index ffdd0158a4..3af47297f6 100644
--- a/src/lib/ector/ector_renderer_shape.c
+++ b/src/lib/ector/ector_renderer_shape.c
@@ -12,7 +12,7 @@ _ector_renderer_shape_fill_set(Eo *obj EINA_UNUSED,
12 Ector_Renderer_Shape_Data *pd, 12 Ector_Renderer_Shape_Data *pd,
13 const Ector_Renderer *r) 13 const Ector_Renderer *r)
14{ 14{
15 _eo_refplace(&pd->fill, r); 15 _efl_refplace(&pd->fill, r);
16} 16}
17 17
18static const Ector_Renderer * 18static const Ector_Renderer *
@@ -27,7 +27,7 @@ _ector_renderer_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
27 Ector_Renderer_Shape_Data *pd, 27 Ector_Renderer_Shape_Data *pd,
28 const Ector_Renderer *r) 28 const Ector_Renderer *r)
29{ 29{
30 _eo_refplace(&pd->stroke.fill, r); 30 _efl_refplace(&pd->stroke.fill, r);
31} 31}
32 32
33static const Ector_Renderer * 33static const Ector_Renderer *
@@ -42,7 +42,7 @@ _ector_renderer_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
42 Ector_Renderer_Shape_Data *pd, 42 Ector_Renderer_Shape_Data *pd,
43 const Ector_Renderer *r) 43 const Ector_Renderer *r)
44{ 44{
45 _eo_refplace(&pd->stroke.marker, r); 45 _efl_refplace(&pd->stroke.marker, r);
46} 46}
47 47
48static const Ector_Renderer * 48static const Ector_Renderer *
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 7f49aec2e7..54bdb9f41c 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -45,13 +45,13 @@ _ector_gl_surface_ector_surface_renderer_factory_new(Eo *obj,
45 const Efl_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 efl_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
49 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 49 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
50 return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 50 return efl_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
51 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 51 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
52 return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 52 return efl_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
53 53
54 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 54 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
55 return NULL; 55 return NULL;
56} 56}
57 57
@@ -329,7 +329,7 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA
329static void 329static void
330_ector_gl_surface_efl_object_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 efl_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); 332 efl_destructor(efl_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;
@@ -342,7 +342,7 @@ _ector_gl_surface_efl_object_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA
342{ 342{
343 Eina_Strbuf *file_path = NULL; 343 Eina_Strbuf *file_path = NULL;
344 344
345 obj = efl_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS)); 345 obj = efl_constructor(efl_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_renderer_gl.c b/src/lib/ector/gl/ector_renderer_gl.c
index 655f94772b..b06792ac3e 100644
--- a/src/lib/ector/gl/ector_renderer_gl.c
+++ b/src/lib/ector/gl/ector_renderer_gl.c
@@ -39,17 +39,17 @@ _ector_renderer_gl_ector_renderer_draw(Eo *obj EINA_UNUSED,
39static Efl_Object * 39static Efl_Object *
40_ector_renderer_gl_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_CLASS)); 42 obj = efl_constructor(efl_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 = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
46 return obj; 46 return obj;
47} 47}
48 48
49static void 49static void
50_ector_renderer_gl_efl_object_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 efl_data_xunref(obj, pd->base, obj);
53} 53}
54 54
55#include "ector_renderer_gl.eo.c" 55#include "ector_renderer_gl.eo.c"
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 07a9490abb..69e1c6d378 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c
@@ -31,7 +31,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_prepare(Eo *obj,
31static Eina_Bool 31static Eina_Bool
32_ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 32_ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
33{ 33{
34 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col); 34 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), op, clips, mul_col);
35 35
36 // FIXME: draw something ! 36 // FIXME: draw something !
37 (void) pd; 37 (void) pd;
@@ -69,13 +69,13 @@ _ector_renderer_gl_gradient_linear_ector_renderer_gl_fill(Eo *obj, Ector_Rendere
69static Efl_Object * 69static Efl_Object *
70_ector_renderer_gl_gradient_linear_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); 72 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
73 73
74 if (!obj) return NULL; 74 if (!obj) return NULL;
75 75
76 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 76 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
77 pd->linear = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj); 77 pd->linear = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
78 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 78 pd->gradient = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
79 79
80 return obj; 80 return obj;
81} 81}
@@ -83,15 +83,15 @@ _ector_renderer_gl_gradient_linear_efl_object_constructor(Eo *obj, Ector_Rendere
83static void 83static void
84_ector_renderer_gl_gradient_linear_efl_object_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 efl_data_xunref(obj, pd->base, obj);
87 eo_data_xunref(obj, pd->linear, obj); 87 efl_data_xunref(obj, pd->linear, obj);
88 eo_data_xunref(obj, pd->gradient, obj); 88 efl_data_xunref(obj, pd->gradient, obj);
89} 89}
90 90
91static void 91static void
92_ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 92_ector_renderer_gl_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Linear_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
93{ 93{
94 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length); 94 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS), colors, length);
95} 95}
96 96
97static unsigned int 97static unsigned int
@@ -99,7 +99,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_Rendere
99{ 99{
100 unsigned int crc; 100 unsigned int crc;
101 101
102 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS)); 102 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS));
103 103
104 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 104 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
105 if (pd->gradient->colors_count) 105 if (pd->gradient->colors_count)
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 77514f0387..8760bad429 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c
@@ -30,7 +30,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_Rendere
30static Eina_Bool 30static Eina_Bool
31_ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col) 31_ector_renderer_gl_gradient_radial_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd, Efl_Gfx_Render_Op op, Eina_Array *clips, unsigned int mul_col)
32{ 32{
33 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col); 33 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), op, clips, mul_col);
34 34
35 // FIXME: draw something ! 35 // FIXME: draw something !
36 (void) pd; 36 (void) pd;
@@ -69,7 +69,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
69{ 69{
70 unsigned int crc; 70 unsigned int crc;
71 71
72 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); 72 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
73 73
74 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 74 crc = eina_crc((void*) pd->gradient->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
75 if (pd->gradient->colors_count) 75 if (pd->gradient->colors_count)
@@ -82,13 +82,13 @@ _ector_renderer_gl_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_Rendere
82static Efl_Object * 82static Efl_Object *
83_ector_renderer_gl_gradient_radial_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS)); 85 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS));
86 86
87 if (!obj) return NULL; 87 if (!obj) return NULL;
88 88
89 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 89 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
90 pd->radial = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj); 90 pd->radial = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
91 pd->gradient = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 91 pd->gradient = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
92 92
93 return obj; 93 return obj;
94} 94}
@@ -96,15 +96,15 @@ _ector_renderer_gl_gradient_radial_efl_object_constructor(Eo *obj, Ector_Rendere
96static void 96static void
97_ector_renderer_gl_gradient_radial_efl_object_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 efl_data_xunref(obj, pd->base, obj);
100 eo_data_xunref(obj, pd->radial, obj); 100 efl_data_xunref(obj, pd->radial, obj);
101 eo_data_xunref(obj, pd->gradient, obj); 101 efl_data_xunref(obj, pd->gradient, obj);
102} 102}
103 103
104static void 104static void
105_ector_renderer_gl_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 105_ector_renderer_gl_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_GL_Gradient_Radial_Data *pd EINA_UNUSED, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
106{ 106{
107 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length); 107 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS), colors, length);
108} 108}
109 109
110#include "ector_renderer_gl_gradient_radial.eo.c" 110#include "ector_renderer_gl_gradient_radial.eo.c"
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index 0615ed9bf6..1e9a7277ea 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -37,7 +37,7 @@ _ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape
37 37
38 if (pd->vertex) return EINA_TRUE; 38 if (pd->vertex) return EINA_TRUE;
39 39
40 r = ector_renderer_prepare(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 40 r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
41 41
42 ector_renderer_bounds_get(obj, &bounding_box); 42 ector_renderer_bounds_get(obj, &bounding_box);
43 43
@@ -72,7 +72,7 @@ _ector_renderer_gl_shape_ector_renderer_draw(Eo *obj, Ector_Renderer_GL_Shape_Da
72{ 72{
73 uint64_t flags = 0; 73 uint64_t flags = 0;
74 74
75 ector_renderer_draw(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col); 75 ector_renderer_draw(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS), op, clips, mul_col);
76 76
77 // FIXME: adjust flags content correctly 77 // FIXME: adjust flags content correctly
78 // FIXME: should not ignore clips (idea is that the geometry will be cliped here and the 78 // FIXME: should not ignore clips (idea is that the geometry will be cliped here and the
@@ -118,7 +118,7 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
118{ 118{
119 unsigned int crc; 119 unsigned int crc;
120 120
121 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 121 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
122 122
123 // This code should be shared with other implementation 123 // This code should be shared with other implementation
124 crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE); 124 crc = eina_crc((void*) &pd->shape->stroke.marker, sizeof (pd->shape->stroke.marker), crc, EINA_FALSE);
@@ -141,13 +141,13 @@ _ector_renderer_gl_shape_ector_renderer_crc_get(Eo *obj, Ector_Renderer_GL_Shape
141static Efl_Object * 141static Efl_Object *
142_ector_renderer_gl_shape_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); 144 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS));
145 145
146 if (!obj) return NULL; 146 if (!obj) return NULL;
147 147
148 pd->public_shape = eo_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj); 148 pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
149 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 149 pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
150 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 150 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
151 151
152 efl_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
@@ -157,9 +157,9 @@ _ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape
157static void 157static void
158_ector_renderer_gl_shape_efl_object_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 efl_data_xunref(obj, pd->shape, obj);
161 eo_data_xunref(obj, pd->base, obj); 161 efl_data_xunref(obj, pd->base, obj);
162 eo_data_xunref(obj, pd->public_shape, obj); 162 efl_data_xunref(obj, pd->public_shape, obj);
163} 163}
164 164
165#include "ector_renderer_gl_shape.eo.c" 165#include "ector_renderer_gl_shape.eo.c"
diff --git a/src/lib/ector/software/ector_renderer_software_buffer.c b/src/lib/ector/software/ector_renderer_software_buffer.c
index 2b21e2d89b..9d524af72e 100644
--- a/src/lib/ector/software/ector_renderer_software_buffer.c
+++ b/src/lib/ector/software/ector_renderer_software_buffer.c
@@ -22,7 +22,7 @@ typedef struct
22EOLIAN static void 22EOLIAN static void
23_ector_renderer_software_buffer_buffer_set(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd, Ector_Buffer *buf) 23_ector_renderer_software_buffer_buffer_set(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd, Ector_Buffer *buf)
24{ 24{
25 _eo_xrefplace(&pd->eo_buffer, buf, obj); 25 _efl_xrefplace(&pd->eo_buffer, buf, obj);
26} 26}
27 27
28EOLIAN static Ector_Buffer * 28EOLIAN static Ector_Buffer *
@@ -34,7 +34,7 @@ _ector_renderer_software_buffer_buffer_get(Eo *obj EINA_UNUSED, Ector_Renderer_S
34EOLIAN static Eina_Bool 34EOLIAN static Eina_Bool
35_ector_renderer_software_buffer_ector_renderer_software_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) 35_ector_renderer_software_buffer_ector_renderer_software_fill(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
36{ 36{
37 Ector_Software_Buffer *buffer = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 37 Ector_Software_Buffer *buffer = efl_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
38 ector_software_rasterizer_buffer_set(pd->surface, buffer); 38 ector_software_rasterizer_buffer_set(pd->surface, buffer);
39 return EINA_TRUE; 39 return EINA_TRUE;
40} 40}
@@ -43,7 +43,7 @@ EOLIAN static Eina_Bool
43_ector_renderer_software_buffer_ector_renderer_prepare(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) 43_ector_renderer_software_buffer_ector_renderer_prepare(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
44{ 44{
45 if (!pd->surface) 45 if (!pd->surface)
46 pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 46 pd->surface = efl_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
47 47
48 return EINA_TRUE; 48 return EINA_TRUE;
49} 49}
@@ -51,10 +51,10 @@ _ector_renderer_software_buffer_ector_renderer_prepare(Eo *obj, Ector_Renderer_S
51EOLIAN static unsigned int 51EOLIAN static unsigned int
52_ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd) 52_ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_Software_Buffer_Data *pd)
53{ 53{
54 Ector_Software_Buffer_Base_Data *buffer = eo_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 54 Ector_Software_Buffer_Base_Data *buffer = efl_data_scope_get(pd->eo_buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
55 unsigned int crc; 55 unsigned int crc;
56 56
57 crc = ector_renderer_crc_get(eo_super(obj, MY_CLASS)); 57 crc = ector_renderer_crc_get(efl_super(obj, MY_CLASS));
58 crc = eina_crc((const char *) buffer, sizeof(*buffer), crc, EINA_FALSE); 58 crc = eina_crc((const char *) buffer, sizeof(*buffer), crc, EINA_FALSE);
59 if (pd->surface) 59 if (pd->surface)
60 crc = eina_crc((const char *) pd->surface, sizeof(*pd->surface), crc, EINA_FALSE); 60 crc = eina_crc((const char *) pd->surface, sizeof(*pd->surface), crc, EINA_FALSE);
@@ -65,8 +65,8 @@ _ector_renderer_software_buffer_ector_renderer_crc_get(Eo *obj, Ector_Renderer_S
65EOLIAN static void 65EOLIAN static void
66_ector_renderer_software_buffer_efl_object_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 efl_data_xunref(pd->base->surface, pd->surface, obj);
69 efl_destructor(eo_super(obj, MY_CLASS)); 69 efl_destructor(efl_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_gradient_linear.c b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
index 8c922a1cec..69bf9e42d9 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.c
@@ -17,8 +17,8 @@ _ector_renderer_software_gradient_linear_ector_renderer_prepare(Eo *obj,
17 { 17 {
18 Ector_Renderer_Data *base; 18 Ector_Renderer_Data *base;
19 19
20 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 20 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
21 pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 21 pd->surface = efl_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
22 } 22 }
23 23
24 update_color_table(pd); 24 update_color_table(pd);
@@ -66,11 +66,11 @@ static Eo *
66_ector_renderer_software_gradient_linear_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); 69 obj = efl_constructor(efl_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 = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
73 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj); 73 pd->gld = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN, obj);
74 74
75 return obj; 75 return obj;
76} 76}
@@ -83,19 +83,19 @@ _ector_renderer_software_gradient_linear_efl_object_destructor(Eo *obj,
83 83
84 destroy_color_table(pd); 84 destroy_color_table(pd);
85 85
86 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 86 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
87 eo_data_xunref(base->surface, pd->surface, obj); 87 efl_data_xunref(base->surface, pd->surface, obj);
88 88
89 eo_data_xunref(obj, pd->gd, obj); 89 efl_data_xunref(obj, pd->gd, obj);
90 eo_data_xunref(obj, pd->gld, obj); 90 efl_data_xunref(obj, pd->gld, obj);
91 91
92 efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); 92 efl_destructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
93} 93}
94 94
95void 95void
96_ector_renderer_software_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 96_ector_renderer_software_gradient_linear_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
97{ 97{
98 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS), colors, length); 98 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS), colors, length);
99 99
100 destroy_color_table(pd); 100 destroy_color_table(pd);
101} 101}
@@ -105,7 +105,7 @@ _ector_renderer_software_gradient_linear_ector_renderer_crc_get(Eo *obj, Ector_R
105{ 105{
106 unsigned int crc; 106 unsigned int crc;
107 107
108 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS)); 108 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS));
109 109
110 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 110 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
111 if (pd->gd->colors_count) 111 if (pd->gd->colors_count)
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 031778077b..439f193c0b 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.c
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.c
@@ -16,8 +16,8 @@ _ector_renderer_software_gradient_radial_ector_renderer_prepare(Eo *obj, Ector_R
16 { 16 {
17 Ector_Renderer_Data *base; 17 Ector_Renderer_Data *base;
18 18
19 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 19 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
20 pd->surface = eo_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 20 pd->surface = efl_data_xref(base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
21 } 21 }
22 22
23 update_color_table(pd); 23 update_color_table(pd);
@@ -76,9 +76,9 @@ Eo *
76_ector_renderer_software_gradient_radial_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); 79 obj = efl_constructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
80 pd->gd = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj); 80 pd->gd = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_MIXIN, obj);
81 pd->gld = eo_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj); 81 pd->gld = efl_data_xref(obj, ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN, obj);
82 82
83 return obj; 83 return obj;
84} 84}
@@ -91,19 +91,19 @@ _ector_renderer_software_gradient_radial_efl_object_destructor(Eo *obj,
91 91
92 destroy_color_table(pd); 92 destroy_color_table(pd);
93 93
94 base = eo_data_scope_get(obj, ECTOR_RENDERER_CLASS); 94 base = efl_data_scope_get(obj, ECTOR_RENDERER_CLASS);
95 eo_data_xunref(base->surface, pd->surface, obj); 95 efl_data_xunref(base->surface, pd->surface, obj);
96 96
97 eo_data_xunref(obj, pd->gd, obj); 97 efl_data_xunref(obj, pd->gd, obj);
98 eo_data_xunref(obj, pd->gld, obj); 98 efl_data_xunref(obj, pd->gld, obj);
99 99
100 efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); 100 efl_destructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
101} 101}
102 102
103void 103void
104_ector_renderer_software_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length) 104_ector_renderer_software_gradient_radial_efl_gfx_gradient_stop_set(Eo *obj, Ector_Renderer_Software_Gradient_Data *pd, const Efl_Gfx_Gradient_Stop *colors, unsigned int length)
105{ 105{
106 efl_gfx_gradient_stop_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS), colors, length); 106 efl_gfx_gradient_stop_set(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS), colors, length);
107 107
108 destroy_color_table(pd); 108 destroy_color_table(pd);
109} 109}
@@ -113,7 +113,7 @@ _ector_renderer_software_gradient_radial_ector_renderer_crc_get(Eo *obj, Ector_R
113{ 113{
114 unsigned int crc; 114 unsigned int crc;
115 115
116 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS)); 116 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS));
117 117
118 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE); 118 crc = eina_crc((void*) pd->gd->s, sizeof (Efl_Gfx_Gradient_Spread), crc, EINA_FALSE);
119 if (pd->gd->colors_count) 119 if (pd->gd->colors_count)
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index e9a6e8f5c4..35aedf0980 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -584,7 +584,7 @@ _ector_renderer_software_shape_ector_renderer_prepare(Eo *obj,
584 584
585 // shouldn't that be moved to the software base object 585 // shouldn't that be moved to the software base object
586 if (!pd->surface) 586 if (!pd->surface)
587 pd->surface = eo_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj); 587 pd->surface = efl_data_xref(pd->base->surface, ECTOR_SOFTWARE_SURFACE_CLASS, obj);
588 588
589 return EINA_TRUE; 589 return EINA_TRUE;
590} 590}
@@ -675,7 +675,7 @@ _ector_renderer_software_shape_efl_gfx_shape_path_set(Eo *obj,
675 pd->shape_data = NULL; 675 pd->shape_data = NULL;
676 pd->outline_data = NULL; 676 pd->outline_data = NULL;
677 677
678 efl_gfx_shape_path_set(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS), op, points); 678 efl_gfx_shape_path_set(efl_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS), op, points);
679} 679}
680 680
681 681
@@ -694,12 +694,12 @@ _ector_renderer_software_shape_path_changed(void *data, const Eo_Event *event EI
694static Eo * 694static Eo *
695_ector_renderer_software_shape_efl_object_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 = efl_constructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); 697 obj = efl_constructor(efl_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 = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
701 pd->shape = eo_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj); 701 pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
702 pd->base = eo_data_xref(obj, ECTOR_RENDERER_CLASS, obj); 702 pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
703 efl_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;
@@ -715,10 +715,10 @@ _ector_renderer_software_shape_efl_object_destructor(Eo *obj, Ector_Renderer_Sof
715 if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data); 715 if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data);
716 if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data); 716 if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data);
717 717
718 eo_data_xunref(pd->base->surface, pd->surface, obj); 718 efl_data_xunref(pd->base->surface, pd->surface, obj);
719 eo_data_xunref(obj, pd->shape, obj); 719 efl_data_xunref(obj, pd->shape, obj);
720 eo_data_xunref(obj, pd->base, obj); 720 efl_data_xunref(obj, pd->base, obj);
721 efl_destructor(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); 721 efl_destructor(efl_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
722} 722}
723 723
724 724
@@ -728,7 +728,7 @@ _ector_renderer_software_shape_ector_renderer_crc_get(Eo *obj,
728{ 728{
729 unsigned int crc; 729 unsigned int crc;
730 730
731 crc = ector_renderer_crc_get(eo_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS)); 731 crc = ector_renderer_crc_get(efl_super(obj, ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS));
732 732
733 crc = eina_crc((void*) &pd->shape->stroke.marker, 733 crc = eina_crc((void*) &pd->shape->stroke.marker,
734 sizeof (pd->shape->stroke.marker), 734 sizeof (pd->shape->stroke.marker),
diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c
index baf8d62015..499206309d 100644
--- a/src/lib/ector/software/ector_software_buffer.c
+++ b/src/lib/ector/software/ector_software_buffer.c
@@ -336,9 +336,9 @@ EOLIAN static Efl_Object *
336_ector_software_buffer_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 339 obj = efl_constructor(efl_super(obj, MY_CLASS));
340 pd = eo_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 340 pd = efl_data_scope_get(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
341 pd->generic = eo_data_ref(obj, ECTOR_BUFFER_MIXIN); 341 pd->generic = efl_data_ref(obj, ECTOR_BUFFER_MIXIN);
342 pd->generic->eo = obj; 342 pd->generic->eo = obj;
343 return obj; 343 return obj;
344} 344}
@@ -346,10 +346,10 @@ _ector_software_buffer_efl_object_constructor(Eo *obj, void *data EINA_UNUSED)
346EOLIAN static void 346EOLIAN static void
347_ector_software_buffer_efl_object_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 = efl_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 efl_data_unref(obj, pd->generic);
352 efl_destructor(eo_super(obj, MY_CLASS)); 352 efl_destructor(efl_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_rasterizer.c b/src/lib/ector/software/ector_software_rasterizer.c
index f3b31f5c72..cd59eb8735 100644
--- a/src/lib/ector/software/ector_software_rasterizer.c
+++ b/src/lib/ector/software/ector_software_rasterizer.c
@@ -559,7 +559,7 @@ void ector_software_rasterizer_radial_gradient_set(Software_Rasterizer *rasteriz
559void ector_software_rasterizer_buffer_set(Software_Rasterizer *rasterizer, 559void ector_software_rasterizer_buffer_set(Software_Rasterizer *rasterizer,
560 Ector_Software_Buffer *buffer) 560 Ector_Software_Buffer *buffer)
561{ 561{
562 rasterizer->fill_data.buffer = eo_data_scope_get(buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN); 562 rasterizer->fill_data.buffer = efl_data_scope_get(buffer, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
563 rasterizer->fill_data.type = Image; 563 rasterizer->fill_data.type = Image;
564} 564}
565 565
diff --git a/src/lib/ector/software/ector_software_surface.c b/src/lib/ector/software/ector_software_surface.c
index 115170b865..ad504c4499 100644
--- a/src/lib/ector/software/ector_software_surface.c
+++ b/src/lib/ector/software/ector_software_surface.c
@@ -16,24 +16,24 @@ _ector_software_surface_ector_surface_renderer_factory_new(Eo *obj,
16 const Efl_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 efl_add(ECTOR_RENDERER_SOFTWARE_SHAPE_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
20 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN) 20 else if (type == ECTOR_RENDERER_GRADIENT_LINEAR_MIXIN)
21 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 21 return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
22 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN) 22 else if (type == ECTOR_RENDERER_GRADIENT_RADIAL_MIXIN)
23 return eo_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 23 return efl_add(ECTOR_RENDERER_SOFTWARE_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
24 else if (type == ECTOR_RENDERER_BUFFER_MIXIN) 24 else if (type == ECTOR_RENDERER_BUFFER_MIXIN)
25 return eo_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(eo_self, obj)); 25 return efl_add(ECTOR_RENDERER_SOFTWARE_BUFFER_CLASS, NULL, ector_renderer_surface_set(efl_self, obj));
26 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 26 ERR("Couldn't find class for type: %s\n", efl_class_name_get(type));
27 return NULL; 27 return NULL;
28} 28}
29 29
30static Eo * 30static Eo *
31_ector_software_surface_efl_object_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 = efl_constructor(eo_super(obj, MY_CLASS)); 33 obj = efl_constructor(efl_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 = efl_data_ref(obj, ECTOR_SOFTWARE_BUFFER_BASE_MIXIN);
37 return obj; 37 return obj;
38} 38}
39 39
@@ -41,10 +41,10 @@ static void
41_ector_software_surface_efl_object_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 efl_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 efl_destructor(eo_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS)); 47 efl_destructor(efl_super(obj, ECTOR_SOFTWARE_SURFACE_CLASS));
48} 48}
49 49
50static void 50static void