aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_map.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 13:26:15 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 14:35:19 +0900
commit7bf8da2baa243b972dd33d11ba873f6165e18fbf (patch)
tree91e8d9be8b6d16cd684178afbe081266fa1921fb /src/lib/evas/canvas/evas_map.c
parentelm: Fix obvious warning (leak / typo) (diff)
downloadefl-7bf8da2baa243b972dd33d11ba873f6165e18fbf.tar.gz
evas: Rename Evas.Object to Efl.Canvas.Object
One step closer to make the EO inheritance tree look like it's all Efl.
Diffstat (limited to 'src/lib/evas/canvas/evas_map.c')
-rw-r--r--src/lib/evas/canvas/evas_map.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 84886441f6..4873733f80 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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if (!obj) return;
if (!obj->map->cur.map) return;
if (obj->map->prev.map)
@@ -117,7 +117,7 @@ evas_object_map_move_sync(Evas_Object *eo_obj)
Evas_Coord diff_x, diff_y;
int i, count;
- obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
+ obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if (!obj) return;
if ((!obj->map->cur.map->move_sync.enabled) ||
@@ -209,7 +209,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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if ((obj) && (obj->map->spans))
{
obj->layer->evas->engine.func->image_map_clean(obj->layer->evas->engine.data.output, obj->map->spans);
@@ -452,7 +452,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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *parent = eo_data_scope_get(eo_parent, EFL_CANVAS_OBJECT_CLASS);
if (!parent) return EINA_FALSE;
list = evas_object_smart_members_get_direct(parent->smart.parent);
EINA_INLIST_FOREACH(list, o)
@@ -464,7 +464,7 @@ _evas_object_map_parent_check(Evas_Object *eo_parent)
}
EOLIAN void
-_evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enabled)
+_efl_canvas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enabled)
{
Eina_Bool pchange = EINA_FALSE;
@@ -520,7 +520,7 @@ _evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo
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_OBJECT_CLASS);
+ parents = eo_data_scope_get(eo_parents, EFL_CANVAS_OBJECT_CLASS);
if (!parents) break;
parents->child_has_map = EINA_TRUE;
}
@@ -533,13 +533,13 @@ _evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo
}
EOLIAN Eina_Bool
-_evas_object_map_enable_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_map_enable_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
return obj->map->cur.usemap;
}
EOLIAN void
-_evas_object_map_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const Evas_Map *map)
+_efl_canvas_object_map_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const Evas_Map *map)
{
evas_object_async_block(obj);
if ((!map) || (map->count < 4))
@@ -631,7 +631,7 @@ _evas_object_map_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const Evas_Map
}
EOLIAN Evas_Map *
-_evas_object_map_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
+_efl_canvas_object_map_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
evas_object_async_block(obj);
return obj->map->cur.map;
@@ -863,7 +863,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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if (!obj) return;
if (m->count != 4)
@@ -885,7 +885,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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
if (!obj) return;
if (m->count != 4)
@@ -1244,7 +1244,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_OBJECT_CLASS);
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
const Evas_Map_Point *p, *p_end;
RGBA_Map_Point *pts, *pt;