summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_map.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-06-02 14:47:59 +0100
committerTom Hacohen <tom@stosb.com>2014-06-03 11:28:01 +0100
commit0fc3279db966a5329b80c84794f9bff97e7a7ef0 (patch)
treea9a5e8a5c4d3291ceef4889955ed60b91432641f /src/lib/evas/canvas/evas_map.c
parent62a3522fcc4bbb6389d1c81b439cf9cc2f4a4e28 (diff)
Efl: Update code to use the new class names generated by eolian.
Diffstat (limited to 'src/lib/evas/canvas/evas_map.c')
-rw-r--r--src/lib/evas/canvas/evas_map.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 142f6f0..9d41cf3 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -6,7 +6,7 @@ static void
6_evas_map_calc_geom_change(Evas_Object *eo_obj) 6_evas_map_calc_geom_change(Evas_Object *eo_obj)
7{ 7{
8 int is, was = 0; 8 int is, was = 0;
9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
10 if (!obj) return; 10 if (!obj) return;
11 evas_object_change(eo_obj, obj); 11 evas_object_change(eo_obj, obj);
12 evas_object_clip_dirty(eo_obj, obj); 12 evas_object_clip_dirty(eo_obj, obj);
@@ -37,7 +37,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj)
37 const Evas_Map_Point *p, *p_end; 37 const Evas_Map_Point *p, *p_end;
38 Eina_Bool ch = EINA_FALSE; 38 Eina_Bool ch = EINA_FALSE;
39 39
40 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 40 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
41 if (!obj) return; 41 if (!obj) return;
42 if (!obj->map->cur.map) return; 42 if (!obj->map->cur.map) return;
43 // WARN: Do not merge below code to SLP until it is fixed. 43 // WARN: Do not merge below code to SLP until it is fixed.
@@ -173,7 +173,7 @@ _evas_map_free(Evas_Object *eo_obj, Evas_Map *m)
173{ 173{
174 if (eo_obj) 174 if (eo_obj)
175 { 175 {
176 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 176 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
177 if ((obj) && (obj->map->spans)) 177 if ((obj) && (obj->map->spans))
178 { 178 {
179 obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans); 179 obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans);
@@ -416,7 +416,7 @@ _evas_object_map_parent_check(Evas_Object *eo_parent)
416 const Evas_Object_Protected_Data *o; 416 const Evas_Object_Protected_Data *o;
417 417
418 if (!eo_parent) return EINA_FALSE; 418 if (!eo_parent) return EINA_FALSE;
419 Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJ_CLASS); 419 Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJECT_CLASS);
420 if (!parent) return EINA_FALSE; 420 if (!parent) return EINA_FALSE;
421 list = evas_object_smart_members_get_direct(parent->smart.parent); 421 list = evas_object_smart_members_get_direct(parent->smart.parent);
422 EINA_INLIST_FOREACH(list, o) 422 EINA_INLIST_FOREACH(list, o)
@@ -483,7 +483,7 @@ _evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo
483 Evas_Object_Protected_Data *parents = NULL; 483 Evas_Object_Protected_Data *parents = NULL;
484 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent) 484 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent)
485 { 485 {
486 parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS); 486 parents = eo_data_scope_get(eo_parents, EVAS_OBJECT_CLASS);
487 if (!parents) break; 487 if (!parents) break;
488 parents->child_has_map = EINA_TRUE; 488 parents->child_has_map = EINA_TRUE;
489 } 489 }
@@ -795,7 +795,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e
795 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 795 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
796 return; 796 return;
797 MAGIC_CHECK_END(); 797 MAGIC_CHECK_END();
798 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 798 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
799 799
800 if (!obj) return; 800 if (!obj) return;
801 if (m->count != 4) 801 if (m->count != 4)
@@ -817,7 +817,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj
817 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 817 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
818 return; 818 return;
819 MAGIC_CHECK_END(); 819 MAGIC_CHECK_END();
820 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 820 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
821 821
822 if (!obj) return; 822 if (!obj) return;
823 if (m->count != 4) 823 if (m->count != 4)
@@ -1178,7 +1178,7 @@ evas_object_map_update(Evas_Object *eo_obj,
1178 int imagew, int imageh, 1178 int imagew, int imageh,
1179 int uvw, int uvh) 1179 int uvw, int uvh)
1180{ 1180{
1181 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1181 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
1182 const Evas_Map_Point *p, *p_end; 1182 const Evas_Map_Point *p, *p_end;
1183 RGBA_Map_Point *pts, *pt; 1183 RGBA_Map_Point *pts, *pt;
1184 1184