summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_map.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 16:47:16 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 16:47:16 +0900
commitf8c9a8d16708ac52195a8df70493a1fc91872348 (patch)
treec78586a9c486bf2468ac4645521ba24a79c3df09 /src/lib/evas/canvas/evas_map.c
parentb64a2994b3b277cbe7fce17d7ee275fd0d78c925 (diff)
revert the revert... damn you git!
Revert "Revert "Efl: replace eo_data_get for objects data referencing."" This reverts commit b64a2994b3b277cbe7fce17d7ee275fd0d78c925.
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 e85e6cb..d2b7e09 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_get(eo_obj, EVAS_OBJ_CLASS); 9 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_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_get(eo_obj, EVAS_OBJ_CLASS); 40 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_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_get(eo_obj, EVAS_OBJ_CLASS); 176 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_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_get(eo_parent, EVAS_OBJ_CLASS); 419 Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJ_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)
@@ -495,7 +495,7 @@ _map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
495 Evas_Object_Protected_Data *parents = NULL; 495 Evas_Object_Protected_Data *parents = NULL;
496 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent) 496 for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent)
497 { 497 {
498 parents = eo_data_get(eo_parents, EVAS_OBJ_CLASS); 498 parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS);
499 if (parents) 499 if (parents)
500 parents->child_has_map = EINA_TRUE; 500 parents->child_has_map = EINA_TRUE;
501 } 501 }
@@ -844,7 +844,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e
844 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 844 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
845 return; 845 return;
846 MAGIC_CHECK_END(); 846 MAGIC_CHECK_END();
847 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 847 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
848 848
849 if (!obj) return; 849 if (!obj) return;
850 if (m->count != 4) 850 if (m->count != 4)
@@ -866,7 +866,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj
866 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 866 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
867 return; 867 return;
868 MAGIC_CHECK_END(); 868 MAGIC_CHECK_END();
869 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 869 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
870 870
871 if (!obj) return; 871 if (!obj) return;
872 if (m->count != 4) 872 if (m->count != 4)
@@ -1223,7 +1223,7 @@ evas_object_map_update(Evas_Object *eo_obj,
1223 int imagew, int imageh, 1223 int imagew, int imageh,
1224 int uvw, int uvh) 1224 int uvw, int uvh)
1225{ 1225{
1226 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 1226 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
1227 const Evas_Map_Point *p, *p_end; 1227 const Evas_Map_Point *p, *p_end;
1228 RGBA_Map_Point *pts, *pt; 1228 RGBA_Map_Point *pts, *pt;
1229 1229