summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_vg_shape.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-05-11 13:13:27 +0100
committerTom Hacohen <tom@stosb.com>2016-05-11 13:13:27 +0100
commitd64f2fdd4373dfc477f4d69e6d2ef59ad333763b (patch)
tree99e7c6f486dd2c1273ad90787244d70ed47b5327 /src/lib/evas/canvas/evas_vg_shape.c
parent70b5f3875e54446e21dcef56e80fc7046a2dbdec (diff)
Efl vg: Remove the no longer needed .Base hack.
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_shape.c')
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 527006a..80e4e03 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -17,7 +17,7 @@ struct _Efl_VG_Shape_Data
17}; 17};
18 18
19static void 19static void
20_efl_vg_shape_efl_vg_base_bounds_get(Eo *obj, 20_efl_vg_shape_efl_vg_bounds_get(Eo *obj,
21 Efl_VG_Shape_Data *pd EINA_UNUSED, 21 Efl_VG_Shape_Data *pd EINA_UNUSED,
22 Eina_Rectangle *r) 22 Eina_Rectangle *r)
23{ 23{
@@ -35,7 +35,7 @@ _efl_vg_shape_fill_set(Eo *obj EINA_UNUSED,
35 pd->fill = eo_ref(f); 35 pd->fill = eo_ref(f);
36 eo_unref(tmp); 36 eo_unref(tmp);
37 37
38 _efl_vg_base_changed(obj); 38 _efl_vg_changed(obj);
39} 39}
40 40
41static Efl_VG * 41static Efl_VG *
@@ -90,7 +90,7 @@ _efl_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED,
90 pd->stroke.fill = eo_ref(f); 90 pd->stroke.fill = eo_ref(f);
91 eo_unref(tmp); 91 eo_unref(tmp);
92 92
93 _efl_vg_base_changed(obj); 93 _efl_vg_changed(obj);
94} 94}
95 95
96static Efl_VG * 96static Efl_VG *
@@ -110,7 +110,7 @@ _efl_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED,
110 pd->stroke.marker = eo_ref(m); 110 pd->stroke.marker = eo_ref(m);
111 eo_unref(tmp); 111 eo_unref(tmp);
112 112
113 _efl_vg_base_changed(obj); 113 _efl_vg_changed(obj);
114} 114}
115 115
116static Efl_VG_Shape * 116static Efl_VG_Shape *
@@ -125,10 +125,10 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
125 Eina_Matrix3 *parent, 125 Eina_Matrix3 *parent,
126 Ector_Surface *s, 126 Ector_Surface *s,
127 void *data, 127 void *data,
128 Efl_VG_Base_Data *nd) 128 Efl_VG_Data *nd)
129{ 129{
130 Efl_VG_Shape_Data *pd = data; 130 Efl_VG_Shape_Data *pd = data;
131 Efl_VG_Base_Data *fill, *stroke_fill, *stroke_marker, *mask; 131 Efl_VG_Data *fill, *stroke_fill, *stroke_marker, *mask;
132 double xn = nd->x, yn = nd->y ; 132 double xn = nd->x, yn = nd->y ;
133 133
134 if (!nd->changed) return ; 134 if (!nd->changed) return ;
@@ -163,7 +163,7 @@ _efl_vg_shape_render_pre(Eo *obj EINA_UNUSED,
163static Eo * 163static Eo *
164_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd) 164_efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
165{ 165{
166 Efl_VG_Base_Data *nd; 166 Efl_VG_Data *nd;
167 167
168 obj = eo_constructor(eo_super(obj, MY_CLASS)); 168 obj = eo_constructor(eo_super(obj, MY_CLASS));
169 169
@@ -172,7 +172,7 @@ _efl_vg_shape_eo_base_constructor(Eo *obj, Efl_VG_Shape_Data *pd)
172 efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT); 172 efl_gfx_shape_stroke_cap_set(obj, EFL_GFX_CAP_BUTT);
173 efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER); 173 efl_gfx_shape_stroke_join_set(obj, EFL_GFX_JOIN_MITER);
174 174
175 nd = eo_data_scope_get(obj, EFL_VG_BASE_CLASS); 175 nd = eo_data_scope_get(obj, EFL_VG_CLASS);
176 nd->render_pre = _efl_vg_shape_render_pre; 176 nd->render_pre = _efl_vg_shape_render_pre;
177 nd->data = pd; 177 nd->data = pd;
178 178
@@ -186,9 +186,9 @@ _efl_vg_shape_eo_base_destructor(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED)
186} 186}
187 187
188static Eina_Bool 188static Eina_Bool
189_efl_vg_shape_efl_vg_base_interpolate(Eo *obj, 189_efl_vg_shape_efl_vg_interpolate(Eo *obj,
190 Efl_VG_Shape_Data *pd, 190 Efl_VG_Shape_Data *pd,
191 const Efl_VG_Base *from, const Efl_VG_Base *to, 191 const Efl_VG *from, const Efl_VG *to,
192 double pos_map) 192 double pos_map)
193{ 193{
194 Efl_VG_Shape_Data *fromd, *tod; 194 Efl_VG_Shape_Data *fromd, *tod;
@@ -218,7 +218,7 @@ _efl_vg_shape_efl_vg_base_interpolate(Eo *obj,
218} 218}
219 219
220static void 220static void
221_efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Efl_VG_Base *from) 221_efl_vg_shape_efl_vg_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const Efl_VG *from)
222{ 222{
223 Efl_VG_Shape_Data *fromd; 223 Efl_VG_Shape_Data *fromd;
224 Eo *parent; 224 Eo *parent;