aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_map.c
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-05-02 14:17:19 +0900
commitb64a2994b3b277cbe7fce17d7ee275fd0d78c925 (patch)
tree3fd83519240da48e2355dfc6caa2415a2a77e282 /src/lib/evas/canvas/evas_map.c
parentEo: fix for unitialized value (diff)
downloadefl-b64a2994b3b277cbe7fce17d7ee275fd0d78c925.tar.gz
Revert "Efl: replace eo_data_get for objects data referencing."
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 d2b7e09277..e85e6cb9b9 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -6,7 +6,7 @@ static void
_evas_map_calc_geom_change(Evas_Object *eo_obj)
{
int is, was = 0;
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
if (!obj) return;
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
@@ -37,7 +37,7 @@ _evas_map_calc_map_geometry(Evas_Object *eo_obj)
const Evas_Map_Point *p, *p_end;
Eina_Bool ch = EINA_FALSE;
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
if (!obj) return;
if (!obj->map->cur.map) return;
// 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)
{
if (eo_obj)
{
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
if ((obj) && (obj->map->spans))
{
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)
const Evas_Object_Protected_Data *o;
if (!eo_parent) return EINA_FALSE;
- Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *parent = eo_data_get(eo_parent, EVAS_OBJ_CLASS);
if (!parent) return EINA_FALSE;
list = evas_object_smart_members_get_direct(parent->smart.parent);
EINA_INLIST_FOREACH(list, o)
@@ -495,7 +495,7 @@ _map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
Evas_Object_Protected_Data *parents = NULL;
for (eo_parents = obj->smart.parent; eo_parents; eo_parents = parents->smart.parent)
{
- parents = eo_data_scope_get(eo_parents, EVAS_OBJ_CLASS);
+ parents = eo_data_get(eo_parents, EVAS_OBJ_CLASS);
if (parents)
parents->child_has_map = EINA_TRUE;
}
@@ -844,7 +844,7 @@ evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *e
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
if (!obj) return;
if (m->count != 4)
@@ -866,7 +866,7 @@ evas_map_util_points_populate_from_object(Evas_Map *m, const Evas_Object *eo_obj
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
if (!obj) return;
if (m->count != 4)
@@ -1223,7 +1223,7 @@ evas_object_map_update(Evas_Object *eo_obj,
int imagew, int imageh,
int uvw, int uvh)
{
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
const Evas_Map_Point *p, *p_end;
RGBA_Map_Point *pts, *pt;