summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_vg_container.c
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/evas/canvas/evas_vg_container.c
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/evas/canvas/evas_vg_container.c')
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index dac9472..350a621 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -29,7 +29,7 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED,
29 { 29 {
30 if (flag & EFL_GFX_CHANGE_FLAG_MATRIX) 30 if (flag & EFL_GFX_CHANGE_FLAG_MATRIX)
31 { 31 {
32 child_nd = eo_data_scope_get(child, EFL_VG_CLASS); 32 child_nd = efl_data_scope_get(child, EFL_VG_CLASS);
33 child_nd->flags |= EFL_GFX_CHANGE_FLAG_MATRIX; 33 child_nd->flags |= EFL_GFX_CHANGE_FLAG_MATRIX;
34 } 34 }
35 _evas_vg_render_pre(child, s, current); 35 _evas_vg_render_pre(child, s, current);
@@ -44,9 +44,9 @@ _efl_vg_container_efl_object_constructor(Eo *obj,
44 44
45 pd->names = eina_hash_stringshared_new(NULL); 45 pd->names = eina_hash_stringshared_new(NULL);
46 46
47 obj = efl_constructor(eo_super(obj, MY_CLASS)); 47 obj = efl_constructor(efl_super(obj, MY_CLASS));
48 48
49 nd = eo_data_scope_get(obj, EFL_VG_CLASS); 49 nd = efl_data_scope_get(obj, EFL_VG_CLASS);
50 nd->render_pre = _efl_vg_container_render_pre; 50 nd->render_pre = _efl_vg_container_render_pre;
51 nd->data = pd; 51 nd->data = pd;
52 nd->flags = EFL_GFX_CHANGE_FLAG_ALL; 52 nd->flags = EFL_GFX_CHANGE_FLAG_ALL;
@@ -58,7 +58,7 @@ static void
58_efl_vg_container_efl_object_destructor(Eo *obj, 58_efl_vg_container_efl_object_destructor(Eo *obj,
59 Efl_VG_Container_Data *pd EINA_UNUSED) 59 Efl_VG_Container_Data *pd EINA_UNUSED)
60{ 60{
61 efl_destructor(eo_super(obj, MY_CLASS)); 61 efl_destructor(efl_super(obj, MY_CLASS));
62 62
63 eina_hash_free(pd->names); 63 eina_hash_free(pd->names);
64 pd->names = NULL; 64 pd->names = NULL;
@@ -121,11 +121,11 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
121 Eo *from_child, *to_child, *child; 121 Eo *from_child, *to_child, *child;
122 122
123 //1. check if both the object are containers 123 //1. check if both the object are containers
124 if (!(eo_isa(from, EFL_VG_CONTAINER_CLASS) && 124 if (!(efl_isa(from, EFL_VG_CONTAINER_CLASS) &&
125 eo_isa(to, EFL_VG_CONTAINER_CLASS))) 125 efl_isa(to, EFL_VG_CONTAINER_CLASS)))
126 return EINA_FALSE; 126 return EINA_FALSE;
127 127
128 r = efl_vg_interpolate(eo_super(obj, EFL_VG_CONTAINER_CLASS), from, to, pos_map); 128 r = efl_vg_interpolate(efl_super(obj, EFL_VG_CONTAINER_CLASS), from, to, pos_map);
129 129
130 if (!r) return EINA_FALSE; 130 if (!r) return EINA_FALSE;
131 131
@@ -135,8 +135,8 @@ _efl_vg_container_efl_vg_interpolate(Eo *obj,
135 { 135 {
136 res &= eina_iterator_next(from_it, (void **)&from_child); 136 res &= eina_iterator_next(from_it, (void **)&from_child);
137 res &= eina_iterator_next(to_it, (void **)&to_child); 137 res &= eina_iterator_next(to_it, (void **)&to_child);
138 if (!res && (eo_class_get(from_child) != eo_class_get(to_child) || 138 if (!res && (efl_class_get(from_child) != efl_class_get(to_child) ||
139 (eo_class_get(child) != eo_class_get(from_child)))) 139 (efl_class_get(child) != efl_class_get(from_child))))
140 { 140 {
141 r = EINA_FALSE; 141 r = EINA_FALSE;
142 break; 142 break;
@@ -160,25 +160,25 @@ _efl_vg_container_efl_vg_dup(Eo *obj,
160 Eina_List *l; 160 Eina_List *l;
161 Eo *child; 161 Eo *child;
162 162
163 efl_vg_dup(eo_super(obj, EFL_VG_CONTAINER_CLASS), from); 163 efl_vg_dup(efl_super(obj, EFL_VG_CONTAINER_CLASS), from);
164 164
165 fromd = eo_data_scope_get(from, EFL_VG_CONTAINER_CLASS); 165 fromd = efl_data_scope_get(from, EFL_VG_CONTAINER_CLASS);
166 166
167 EINA_LIST_FREE(pd->children, child) 167 EINA_LIST_FREE(pd->children, child)
168 eo_unref(child); 168 efl_unref(child);
169 169
170 EINA_LIST_FOREACH(fromd->children, l, child) 170 EINA_LIST_FOREACH(fromd->children, l, child)
171 { 171 {
172 // By setting parent, we automatically reference 172 // By setting parent, we automatically reference
173 // this new object as a child of obj. Magic at work ! 173 // this new object as a child of obj. Magic at work !
174 (void) eo_add(eo_class_get(child), obj, efl_vg_dup(eo_self, child)); 174 (void) efl_add(efl_class_get(child), obj, efl_vg_dup(efl_self, child));
175 } 175 }
176} 176}
177 177
178EAPI Efl_VG* 178EAPI Efl_VG*
179evas_vg_container_add(Efl_VG *parent) 179evas_vg_container_add(Efl_VG *parent)
180{ 180{
181 return eo_add(EFL_VG_CONTAINER_CLASS, parent); 181 return efl_add(EFL_VG_CONTAINER_CLASS, parent);
182} 182}
183 183
184#include "efl_vg_container.eo.c" 184#include "efl_vg_container.eo.c"