diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-06-21 13:26:15 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-06-21 14:35:19 +0900 |
| commit | 7bf8da2baa243b972dd33d11ba873f6165e18fbf (patch) | |
| tree | 91e8d9be8b6d16cd684178afbe081266fa1921fb | |
| parent | 2f0b9edbb4b5e47d2d4a1380edc6ad1828134c41 (diff) | |
| download | efl-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.
198 files changed, 1004 insertions, 1002 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 3630e4eaec..b740914c4a 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2,7 +2,7 @@ ### Library evas_eolian_pub_files = \ - lib/evas/canvas/evas_object.eo \ + lib/evas/canvas/efl_canvas_object.eo \ lib/evas/canvas/efl_canvas_polygon.eo \ lib/evas/canvas/efl_canvas_rectangle.eo \ lib/evas/canvas/efl_canvas_text.eo \ diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c index 6c9e6f69fe..a1ba77e9ac 100644 --- a/src/examples/evas/evas-object-manipulation-eo.c +++ b/src/examples/evas/evas-object-manipulation-eo.c @@ -126,15 +126,15 @@ _on_keydown(void *data EINA_UNUSED, fprintf(stdout, "Toggling clipping "); Evas_Object *clip = NULL; - clip = evas_obj_clip_get(d.img); + clip = efl_canvas_object_clip_get(d.img); if (clip == d.clipper) { - evas_obj_clip_unset(d.img); + efl_canvas_object_clip_unset(d.img); fprintf(stdout, "off\n"); } else { - evas_obj_clip_set(d.img, d.clipper); + efl_canvas_object_clip_set(d.img, d.clipper); fprintf(stdout, "on\n"); } return; @@ -239,7 +239,7 @@ main(void) efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); efl_gfx_visible_set(d.clipper, EINA_TRUE); - evas_obj_clip_set(d.img, d.clipper); + efl_canvas_object_clip_set(d.img, d.clipper); fprintf(stdout, "%s", commands); diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c index 1657c3043f..018abdcb3c 100644 --- a/src/lib/ecore_evas/ecore_evas_util.c +++ b/src/lib/ecore_evas/ecore_evas_util.c @@ -59,7 +59,7 @@ _evas_object_associate_del(Evas_Object *obj) /* Interceptors Callbacks */ static void -_ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y) +_ecore_evas_object_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y) { Ecore_Evas *ee = data; // FIXME: account for frame @@ -68,33 +68,33 @@ _ecore_evas_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_ } static void -_ecore_evas_obj_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED) +_ecore_evas_object_intercept_raise(void *data, Evas_Object *obj EINA_UNUSED) { Ecore_Evas *ee = data; ecore_evas_raise(ee); } static void -_ecore_evas_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED) +_ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED) { Ecore_Evas *ee = data; ecore_evas_lower(ee); } static void -_ecore_evas_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) +_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) { INF("TODO: %s", __FUNCTION__); } static void -_ecore_evas_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) +_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) { INF("TODO: %s", __FUNCTION__); } static void -_ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l) +_ecore_evas_object_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l) { Ecore_Evas *ee = data; ecore_evas_layer_set(ee, l); @@ -103,21 +103,21 @@ _ecore_evas_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, in /* Event Callbacks */ static void -_ecore_evas_obj_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_ecore_evas_object_callback_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Ecore_Evas *ee = data; ecore_evas_show(ee); } static void -_ecore_evas_obj_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_ecore_evas_object_callback_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Ecore_Evas *ee = data; ecore_evas_hide(ee); } static void -_ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_ecore_evas_object_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Ecore_Evas *ee = data; Evas_Coord ow, oh; @@ -127,7 +127,7 @@ _ecore_evas_obj_callback_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *ob } static void -_ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_ecore_evas_object_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Ecore_Evas *ee = data; Evas_Coord w, h; @@ -142,7 +142,7 @@ _ecore_evas_obj_callback_changed_size_hints(void *data, Evas *e EINA_UNUSED, Eva } static void -_ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_ecore_evas_object_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Ecore_Evas *ee = data; _ecore_evas_object_dissociate(ee, obj); @@ -150,7 +150,7 @@ _ecore_evas_obj_callback_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, } static void -_ecore_evas_obj_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_ecore_evas_object_callback_del_dissociate(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Ecore_Evas *ee = data; _ecore_evas_object_dissociate(ee, obj); @@ -293,41 +293,41 @@ _ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object { evas_object_event_callback_add (obj, EVAS_CALLBACK_SHOW, - _ecore_evas_obj_callback_show, ee); + _ecore_evas_object_callback_show, ee); evas_object_event_callback_add (obj, EVAS_CALLBACK_HIDE, - _ecore_evas_obj_callback_hide, ee); + _ecore_evas_object_callback_hide, ee); evas_object_event_callback_add (obj, EVAS_CALLBACK_RESIZE, - _ecore_evas_obj_callback_resize, ee); + _ecore_evas_object_callback_resize, ee); evas_object_event_callback_add (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _ecore_evas_obj_callback_changed_size_hints, ee); + _ecore_evas_object_callback_changed_size_hints, ee); if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL) evas_object_event_callback_add - (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee); + (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee); else evas_object_event_callback_add - (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee); + (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee); evas_object_intercept_move_callback_add - (obj, _ecore_evas_obj_intercept_move, ee); + (obj, _ecore_evas_object_intercept_move, ee); if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_STACK) { evas_object_intercept_raise_callback_add - (obj, _ecore_evas_obj_intercept_raise, ee); + (obj, _ecore_evas_object_intercept_raise, ee); evas_object_intercept_lower_callback_add - (obj, _ecore_evas_obj_intercept_lower, ee); + (obj, _ecore_evas_object_intercept_lower, ee); evas_object_intercept_stack_above_callback_add - (obj, _ecore_evas_obj_intercept_stack_above, ee); + (obj, _ecore_evas_object_intercept_stack_above, ee); evas_object_intercept_stack_below_callback_add - (obj, _ecore_evas_obj_intercept_stack_below, ee); + (obj, _ecore_evas_object_intercept_stack_below, ee); } if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_LAYER) evas_object_intercept_layer_set_callback_add - (obj, _ecore_evas_obj_intercept_layer_set, ee); + (obj, _ecore_evas_object_intercept_layer_set, ee); if (flags & ECORE_EVAS_OBJECT_ASSOCIATE_DEL) { @@ -346,35 +346,35 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj) { evas_object_event_callback_del_full (obj, EVAS_CALLBACK_SHOW, - _ecore_evas_obj_callback_show, ee); + _ecore_evas_object_callback_show, ee); evas_object_event_callback_del_full (obj, EVAS_CALLBACK_HIDE, - _ecore_evas_obj_callback_hide, ee); + _ecore_evas_object_callback_hide, ee); evas_object_event_callback_del_full (obj, EVAS_CALLBACK_RESIZE, - _ecore_evas_obj_callback_resize, ee); + _ecore_evas_object_callback_resize, ee); evas_object_event_callback_del_full (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, - _ecore_evas_obj_callback_changed_size_hints, ee); + _ecore_evas_object_callback_changed_size_hints, ee); evas_object_event_callback_del_full - (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del, ee); + (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del, ee); evas_object_event_callback_del_full - (obj, EVAS_CALLBACK_DEL, _ecore_evas_obj_callback_del_dissociate, ee); + (obj, EVAS_CALLBACK_DEL, _ecore_evas_object_callback_del_dissociate, ee); evas_object_intercept_move_callback_del - (obj, _ecore_evas_obj_intercept_move); + (obj, _ecore_evas_object_intercept_move); evas_object_intercept_raise_callback_del - (obj, _ecore_evas_obj_intercept_raise); + (obj, _ecore_evas_object_intercept_raise); evas_object_intercept_lower_callback_del - (obj, _ecore_evas_obj_intercept_lower); + (obj, _ecore_evas_object_intercept_lower); evas_object_intercept_stack_above_callback_del - (obj, _ecore_evas_obj_intercept_stack_above); + (obj, _ecore_evas_object_intercept_stack_above); evas_object_intercept_stack_below_callback_del - (obj, _ecore_evas_obj_intercept_stack_below); + (obj, _ecore_evas_object_intercept_stack_below); evas_object_intercept_layer_set_callback_del - (obj, _ecore_evas_obj_intercept_layer_set); + (obj, _ecore_evas_object_intercept_layer_set); if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) { diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 89393b3ab0..64ed2d6164 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -492,7 +492,7 @@ EAPI Eina_Bool edje_object_part_table_col_row_size_get(const Edje_Object *obj, c * @param[in] col The column of the child to get * @param[in] row The row of the child to get * - * @return The child Evas.Object + * @return The child Efl.Canvas.Object * * @ingroup Edje_Object */ diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 436825512e..7c0e98a479 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -1494,7 +1494,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, double s = base_s; if (ep->part->scale) base_s = TO_DOUBLE(sc); - evas_obj_scale_set(ep->object, base_s); + efl_canvas_object_scale_set(ep->object, base_s); efl_canvas_text_size_native_get(ep->object, &tw, &th); orig_s = base_s; @@ -1503,7 +1503,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / tw); - evas_obj_scale_set(ep->object, orig_s); + efl_canvas_object_scale_set(ep->object, orig_s); efl_canvas_text_size_native_get(ep->object, &tw, &th); } if (chosen_desc->text.fit_x) @@ -1512,7 +1512,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / tw); - evas_obj_scale_set(ep->object, s); + efl_canvas_object_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, NULL, NULL); } } @@ -1529,7 +1529,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, s = tmp_s; } - evas_obj_scale_set(ep->object, s); + efl_canvas_object_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, NULL, NULL); } } @@ -1554,7 +1554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, break; s = tmp_s; - evas_obj_scale_set(ep->object, s); + efl_canvas_object_scale_set(ep->object, s); efl_canvas_text_size_native_get(ep->object, &fw, &fh); i--; } @@ -5015,8 +5015,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta else map_obj = mo; if (map_obj) { - evas_obj_map_set(map_obj, map); - evas_obj_map_enable_set(map_obj, EINA_TRUE); + efl_canvas_object_map_set(map_obj, map); + efl_canvas_object_map_enable_set(map_obj, EINA_TRUE); } } else @@ -5027,8 +5027,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta { if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */ { - evas_obj_map_enable_set(ep->nested_smart, EINA_FALSE); - evas_obj_map_set(ep->nested_smart, NULL); + efl_canvas_object_map_enable_set(ep->nested_smart, EINA_FALSE); + efl_canvas_object_map_set(ep->nested_smart, NULL); } else { @@ -5038,8 +5038,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta #endif if (mo) { - evas_obj_map_enable_set(mo, 0); - evas_obj_map_set(mo, NULL); + efl_canvas_object_map_enable_set(mo, 0); + efl_canvas_object_map_set(mo, NULL); } #ifdef HAVE_EPHYSICS } diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c index 7afd37dc88..9d7515cbbf 100644 --- a/src/lib/edje/edje_callbacks.c +++ b/src/lib/edje/edje_callbacks.c @@ -430,7 +430,7 @@ _edje_pending_timer_cb(void *data) } EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks, - { EVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb }, + { EFL_CANVAS_OBJECT_EVENT_HOLD, _edje_hold_signal_cb }, { EFL_EVENT_POINTER_IN, _edje_mouse_in_signal_cb }, { EFL_EVENT_POINTER_OUT, _edje_mouse_out_signal_cb }, { EFL_EVENT_POINTER_DOWN, _edje_mouse_down_signal_cb }, @@ -439,8 +439,8 @@ EO_CALLBACKS_ARRAY_DEFINE(edje_callbacks, { EFL_EVENT_POINTER_WHEEL, _edje_mouse_wheel_signal_cb }); EO_CALLBACKS_ARRAY_DEFINE(edje_focus_callbacks, - { EVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb }, - { EVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb }); + { EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, _edje_focus_in_signal_cb }, + { EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT, _edje_focus_out_signal_cb }); void _edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp) diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 0c1605e226..95c507f7d4 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -892,7 +892,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch } if (ep->no_render) - evas_obj_no_render_set(rp->object, 1); + efl_canvas_object_no_render_set(rp->object, 1); if (st_nested && st_nested->nested_children_count) /* Add this to list of children */ { @@ -945,8 +945,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch evas_object_pass_events_set(rp->object, 1); evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB); } - evas_obj_anti_alias_set(rp->object, ep->anti_alias); - evas_obj_precise_is_inside_set(rp->object, ep->precise_is_inside); + efl_canvas_object_anti_alias_set(rp->object, ep->anti_alias); + efl_canvas_object_precise_is_inside_set(rp->object, ep->precise_is_inside); } if (rp->part->clip_to_id < 0) evas_object_clip_set(rp->object, ed->base->clipper); diff --git a/src/lib/edje/edje_lua2.c b/src/lib/edje/edje_lua2.c index e64b989b56..1e824ecfd5 100644 --- a/src/lib/edje/edje_lua2.c +++ b/src/lib/edje/edje_lua2.c @@ -1516,7 +1516,7 @@ _elua_text_class(lua_State *L) // Stack usage [-(6|8), +(7|9), emv] //------------- static void -_elua_evas_obj_free(void *obj) +_elua_efl_canvas_object_free(void *obj) { Edje_Lua_Evas_Object *elo = obj; @@ -1559,7 +1559,7 @@ _elua_polish_evas_object(Edje *ed, Edje_Lua_Evas_Object *elo) static int _elua_edje(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_edje_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = edje_object_add(evas_object_evas_get(ed->obj)); _edje_subobj_register(ed, elo->evas_obj); @@ -1582,7 +1582,7 @@ _elua_edje(lua_State *L) // Stack usage [-7, +8, em] static int _elua_image(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_image_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = evas_object_image_filled_add(evas_object_evas_get(ed->obj)); _elua_polish_evas_object(ed, elo); @@ -1604,7 +1604,7 @@ _elua_image(lua_State *L) // Stack usage [-7, +8, em] static int _elua_line(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_line_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = evas_object_line_add(evas_object_evas_get(ed->obj)); _elua_polish_evas_object(ed, elo); @@ -1656,7 +1656,7 @@ _elua_map(lua_State *L) // Stack usage [-7, +8, emv] static int _elua_polygon(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_polygon_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = evas_object_polygon_add(evas_object_evas_get(ed->obj)); _elua_polish_evas_object(ed, elo); @@ -1676,7 +1676,7 @@ _elua_polygon(lua_State *L) // Stack usage [-7, +8, em] static int _elua_rect(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = evas_object_rectangle_add(evas_object_evas_get(ed->obj)); _elua_polish_evas_object(ed, elo); @@ -1698,7 +1698,7 @@ _elua_rect(lua_State *L) // Stack usage [-7, +8, em] static int _elua_text(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_text_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = evas_object_text_add(evas_object_evas_get(ed->obj)); _elua_polish_evas_object(ed, elo); @@ -1708,7 +1708,7 @@ _elua_text(lua_State *L) // Stack usage [-7, +8, em] /* XXX: disabled until there are enough textblock functions implemented to make it actually useful _elua_textblock(lua_State *L) // Stack usage [-7, +8, em] { - _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_evas_obj_free) + _ELUA_PLANT_EVAS_OBJECT(Edje_Lua_Evas_Object, _elua_evas_textblock_meta, _elua_efl_canvas_object_free) // Stack usage [-7, +8, em] elo->evas_obj = evas_object_textblock_add(evas_object_evas_get(ed->obj)); _elua_polish_evas_object(ed, elo); diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index fb2c1f4b70..8da6cb2c3d 100644 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/edje_object.eo @@ -898,7 +898,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part) Note: Almost all swallow rules apply: you should not move, resize, hide, show, set the color or clipper of such part. It's a bit more restrictive as one must never delete this object!]] - return: Evas.Object; [[The externally created object, or $null if there is none or + return: Efl.Canvas.Object; [[The externally created object, or $null if there is none or part is not an external.]] params { @in part: string; [[The part name]] @@ -915,7 +915,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part) content: string; [[A string identifying which content from the EXTERNAL to get]] } values { - v: Evas.Object; + v: Efl.Canvas.Object; } } preload { @@ -1113,7 +1113,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part) Note: If the type of Edje part is GROUP, SWALLOW or EXTERNAL, returned handle by this function will indicate nothing or transparent rectangle for events. Use $.part_swallow_get() in that case.]] - return: const(Evas.Object); [[A pointer to the Evas object implementing the given part, + return: const(Efl.Canvas.Object); [[A pointer to the Evas object implementing the given part, or $null on failure (e.g. the given part doesn't exist)]] params { @in part: string; [[The Edje part's name]] @@ -1999,7 +1999,7 @@ class Edje.Object (Efl.Canvas.Group.Clipped, Efl.File, Efl.Container, Efl.Part) Eo.Base.constructor; Eo.Base.destructor; Eo.Base.dbg_info_get; - Evas.Object.paragraph_direction.set; + Efl.Canvas.Object.paragraph_direction.set; Efl.Canvas.Group.group_hide; Efl.Canvas.Group.group_show; Efl.Canvas.Group.group_move; diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 5b6898a9ff..e8e17e5fd0 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h @@ -39,7 +39,7 @@ # include <Evil.h> #endif -#define EVAS_OBJECT_PROTECTED +#define EFL_CANVAS_OBJECT_PROTECTED #include <Eina.h> #include <Eet.h> diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index 72b9dd078e..8e6c02da95 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -35,7 +35,7 @@ _edje_object_eo_base_constructor(Eo *obj, Edje *ed) ed->duration_scale = 1.0; obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); _edje_lib_ref(); parent = eo_parent_get(obj); @@ -343,7 +343,7 @@ _edje_object_efl_canvas_group_group_no_render_set(Eo *obj, Edje *ed, Eina_Bool h Edje *edg; efl_canvas_group_no_render_set(eo_super(obj, MY_CLASS), hide); - if (evas_obj_no_render_get(obj) == hide) return; + if (efl_canvas_object_no_render_get(obj) == hide) return; EINA_LIST_FOREACH(ed->groups, l, edg) if (edg != ed) efl_canvas_group_no_render_set(edg->obj, hide); @@ -467,9 +467,9 @@ edje_object_file_get(const Edje_Object *obj, const char **file, const char **gro } EOLIAN static void -_edje_object_evas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) +_edje_object_efl_canvas_object_paragraph_direction_set(Eo *obj, Edje *ed, Evas_BiDi_Direction dir) { - evas_obj_paragraph_direction_set(eo_super(obj, MY_CLASS), dir); + efl_canvas_object_paragraph_direction_set(eo_super(obj, MY_CLASS), dir); /* Make it dirty to recalculate edje. It needs to move text objects according to new paragraph direction */ diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c index a27842d0ef..46ebbde93e 100644 --- a/src/lib/edje/edje_text.c +++ b/src/lib/edje/edje_text.c @@ -331,7 +331,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); efl_text_set(ep->object, text); @@ -345,7 +345,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); @@ -367,7 +367,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); efl_text_set(ep->object, text); @@ -390,7 +390,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); part_get_geometry(ep, &tw, &th); @@ -402,7 +402,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { int current; - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, 10); part_get_geometry(ep, &tw, &th); @@ -424,7 +424,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { current = (top + bottom) / 2; - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, current); part_get_geometry(ep, &tw, &th); @@ -440,7 +440,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { current++; - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, current); part_get_geometry(ep, &tw, &th); @@ -506,7 +506,7 @@ arrange_text: if (inlined_font) efl_text_properties_font_source_set(ep->object, ed->path); else efl_text_properties_font_source_set(ep->object, NULL); - if (ep->part->scale) evas_obj_scale_set(ep->object, TO_DOUBLE(sc)); + if (ep->part->scale) efl_canvas_object_scale_set(ep->object, TO_DOUBLE(sc)); efl_text_properties_font_set(ep->object, font, size); efl_text_set(ep->object, text); diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 07ec9dc432..caae67b060 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -6532,8 +6532,8 @@ _edje_real_part_swallow(Edje *ed, else evas_object_pass_events_set(obj_swallow, 1); _edje_callbacks_focus_add(rp->typedata.swallow->swallowed_object, ed, rp); - evas_obj_anti_alias_set(obj_swallow, rp->part->anti_alias); - evas_obj_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside); + efl_canvas_object_anti_alias_set(obj_swallow, rp->part->anti_alias); + efl_canvas_object_precise_is_inside_set(obj_swallow, rp->part->precise_is_inside); ed->dirty = EINA_TRUE; ed->recalc_call = EINA_TRUE; diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index 6efefa294c..98b4daa6c3 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -254,7 +254,7 @@ _efl_ui_box_eo_base_constructor(Eo *obj, Efl_Ui_Box_Data *pd) { elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME); + efl_canvas_object_type_set(obj, MY_CLASS_NAME); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index b5cc123e5c..1c11d3d9e0 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -1874,7 +1874,7 @@ _efl_ui_flip_eo_base_constructor(Eo *obj, Efl_Ui_Flip_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 8f544c48a3..538c7fe4a9 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -292,7 +292,7 @@ EOLIAN static Eo * _efl_ui_grid_eo_base_constructor(Eo *obj, Efl_Ui_Grid_Data *pd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME); + efl_canvas_object_type_set(obj, MY_CLASS_NAME); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); pd->dir1 = EFL_ORIENT_RIGHT; diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c index 08d29fc4fb..8069f01be3 100644 --- a/src/lib/elementary/efl_ui_grid_static.c +++ b/src/lib/elementary/efl_ui_grid_static.c @@ -9,7 +9,7 @@ _efl_ui_grid_static_eo_base_constructor(Eo *obj, void *pd EINA_UNUSED) Efl_Ui_Grid_Data *gd; obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME); + efl_canvas_object_type_set(obj, MY_CLASS_NAME); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); gd = eo_data_scope_get(obj, EFL_UI_GRID_CLASS); diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index bfb39495ca..6578c20c7f 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -877,7 +877,7 @@ EOLIAN static Eo * _efl_ui_image_eo_base_constructor(Eo *obj, Efl_Ui_Image_Data *pd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); diff --git a/src/lib/elementary/efl_ui_nstate.c b/src/lib/elementary/efl_ui_nstate.c index ccdcc226a3..ccd60c6769 100644 --- a/src/lib/elementary/efl_ui_nstate.c +++ b/src/lib/elementary/efl_ui_nstate.c @@ -35,7 +35,7 @@ EOLIAN static Eo_Base * _efl_ui_nstate_eo_base_constructor(Eo *obj, Efl_Ui_Nstate_Data *pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME); + efl_canvas_object_type_set(obj, MY_CLASS_NAME); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); //TODO: Add ATSPI call here diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 7473281a5c..617458a5b3 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -4081,7 +4081,7 @@ EOLIAN static Eo * _efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index f5a0280d95..1a694bd836 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4279,7 +4279,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W eo_parent_set(obj, ecore_evas_get(tmp_sd.ee)); eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); if (getenv("ELM_FIRST_FRAME")) diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 946f7975cb..a2140edf7a 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -47,7 +47,7 @@ enum Efl.Ui.Win.Type just like any other object would be, and do other things like applying \@ref Evas_Map effects to it. This is the only type of window that requires the parent parameter of - \@ref elm_win_add to be a valid @Evas.Object.]] + \@ref elm_win_add to be a valid @Efl.Canvas.Object.]] socket_image, [[The window is rendered onto an image buffer and can be shown other process's plug image object. No actual window is created for this type, instead the window and all of its @@ -401,7 +401,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, @endcode */ values { - icon: Evas.Object @nullable; [[The Evas image object to use for an icon.]] + icon: Efl.Canvas.Object @nullable; [[The Evas image object to use for an icon.]] } } get { @@ -411,7 +411,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, the object to use for the window icon. ]] values { - icon: const(Evas.Object) @nullable; [[The Evas image object to use for an icon.]] + icon: const(Efl.Canvas.Object) @nullable; [[The Evas image object to use for an icon.]] } } } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index f9e3d76d7c..fb26c19dec 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -415,7 +415,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd) sd->first_filter = EINA_TRUE; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c index b7f2c6c18e..7d3a8b9f86 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -1177,7 +1177,7 @@ EOLIAN static Eo * _elm_ctxpopup_eo_base_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 1944e9ac8a..68f5535713 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -2017,7 +2017,7 @@ _elm_fileselector_eo_base_constructor(Eo *obj, Elm_Fileselector_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER); diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index ff18f2d15b..abf4cb3d91 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -275,7 +275,7 @@ _elm_fileselector_button_eo_base_constructor(Eo *obj, Elm_Fileselector_Button_Da obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 970c5bcbe1..3d36e5ea20 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -389,7 +389,7 @@ EOLIAN static Eo * _elm_fileselector_entry_eo_base_constructor(Eo *obj, Elm_Fileselector_Entry_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING); diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index fc3b4ba249..4b6df50265 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -615,7 +615,7 @@ EOLIAN static Eo * _elm_hoversel_eo_base_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 5932ca2824..9fed32ab87 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -1702,7 +1702,7 @@ EOLIAN static Eo * _elm_multibuttonentry_eo_base_constructor(Eo *obj, Elm_Multibuttonentry_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 7f53e7dbb4..dc867a7767 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -1593,7 +1593,7 @@ _elm_naviframe_eo_base_constructor(Eo *obj, Elm_Naviframe_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index a4e9551ee2..e901acafc7 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -680,7 +680,7 @@ EOLIAN static Eo * _elm_player_eo_base_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 7e2861f777..f5dfb03f1c 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1614,7 +1614,7 @@ EOLIAN static Eo * _elm_popup_eo_base_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h index 0e84d6ecda..b9d17497cf 100644 --- a/src/lib/elementary/elementary_config.h +++ b/src/lib/elementary/elementary_config.h @@ -8,4 +8,4 @@ */ #define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme" -#define EVAS_OBJECT_PROTECTED +#define EFL_CANVAS_OBJECT_PROTECTED diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c index a3ee86529d..dcae9481a3 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -1245,7 +1245,7 @@ EOLIAN static Eo * _elm_access_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 4301c5e417..face9848b4 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -540,7 +540,7 @@ EOLIAN static Eo * _elm_actionslider_eo_base_constructor(Eo *obj, Elm_Actionslider_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); diff --git a/src/lib/elementary/elm_app_server_view.eo b/src/lib/elementary/elm_app_server_view.eo index 52a1194fde..6aad03e108 100644 --- a/src/lib/elementary/elm_app_server_view.eo +++ b/src/lib/elementary/elm_app_server_view.eo @@ -44,7 +44,7 @@ class Elm.App.Server.View (Eo.Base) set { } values { - win: Evas.Object; + win: Efl.Canvas.Object; } } @property id { diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c index 5b8e684119..a019102f55 100644 --- a/src/lib/elementary/elm_bg.c +++ b/src/lib/elementary/elm_bg.c @@ -123,7 +123,7 @@ _elm_bg_eo_base_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED) { elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED); obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index cbba1960b9..c6e635cb78 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -438,7 +438,7 @@ _elm_box_eo_base_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) { elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo index c99ccade4e..96ad6051a5 100644 --- a/src/lib/elementary/elm_box.eo +++ b/src/lib/elementary/elm_box.eo @@ -139,7 +139,7 @@ class Elm.Box (Elm.Widget) You must free this list with eina_list_free() once you are done with it. ]] - return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; + return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; } } pack_end { @@ -160,7 +160,7 @@ class Elm.Box (Elm.Widget) ]] params { - @in subobj: Evas.Object; [[The object to add to the box]] + @in subobj: Efl.Canvas.Object; [[The object to add to the box]] } } unpack_all { @@ -188,7 +188,7 @@ class Elm.Box (Elm.Widget) ]] params { - @in subobj: Evas.Object; [[The object to unpack]] + @in subobj: Efl.Canvas.Object; [[The object to unpack]] } } pack_after { @@ -209,8 +209,8 @@ class Elm.Box (Elm.Widget) ]] params { - @in subobj: Evas.Object; [[The object to add to the box]] - @in after: Evas.Object; [[The object after which to add it]] + @in subobj: Efl.Canvas.Object; [[The object to add to the box]] + @in after: Efl.Canvas.Object; [[The object after which to add it]] } } pack_start { @@ -232,7 +232,7 @@ class Elm.Box (Elm.Widget) ]] params { - @in subobj: Evas.Object; [[The object to add to the box]] + @in subobj: Efl.Canvas.Object; [[The object to add to the box]] } } recalculate { @@ -265,8 +265,8 @@ class Elm.Box (Elm.Widget) ]] params { - @in subobj: Evas.Object; [[The object to add to the box]] - @in before: Evas.Object; [[The object before which to add it]] + @in subobj: Efl.Canvas.Object; [[The object to add to the box]] + @in before: Efl.Canvas.Object; [[The object before which to add it]] } } clear { diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index 4c7a848a4a..e6177257d2 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -228,7 +228,7 @@ EOLIAN static Eo * _elm_bubble_eo_base_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); diff --git a/src/lib/elementary/elm_button.c b/src/lib/elementary/elm_button.c index 252956cb6c..fd6668068e 100644 --- a/src/lib/elementary/elm_button.c +++ b/src/lib/elementary/elm_button.c @@ -335,7 +335,7 @@ EOLIAN static Eo * _elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index 08096dc475..405165fd8f 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -1593,7 +1593,7 @@ _elm_calendar_eo_base_constructor(Eo *obj, Elm_Calendar_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR); diff --git a/src/lib/elementary/elm_check.c b/src/lib/elementary/elm_check.c index 21c0096352..9b10a3f99b 100644 --- a/src/lib/elementary/elm_check.c +++ b/src/lib/elementary/elm_check.c @@ -367,7 +367,7 @@ EOLIAN static Eo * _elm_check_eo_base_constructor(Eo *obj, Elm_Check_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX); diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index b9923085e4..23e2a04f75 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -798,7 +798,7 @@ EOLIAN static Eo * _elm_clock_eo_base_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT); diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index abda3735e9..aab7340d0a 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2216,7 +2216,7 @@ EOLIAN static Eo * _elm_colorselector_eo_base_constructor(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER); diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index c512aa5a13..4cc2a05380 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -995,7 +995,7 @@ EOLIAN static Eo * _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 12d12e2132..e993ac0ed8 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -63,7 +63,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati ]] } values { - parent: Evas.Object; [[The parent to use.]] + parent: Efl.Canvas.Object; [[The parent to use.]] } } @property direction_priority { @@ -175,7 +175,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati params { @in label: string; [[The Label of the new item]] - @in icon: Evas.Object @optional; [[Icon to be set on new item]] + @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]] @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]] @in data: const(void_ptr) @optional; [[Data passed to $func]] } @@ -194,7 +194,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Efl.Orientati params { @in label: string; [[The Label of the new item]] - @in icon: Evas.Object @optional; [[Icon to be set on new item]] + @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item]] @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected]] @in data: const(void_ptr) @optional; [[Data passed to $func]] } diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c index 907a052931..0698e1d517 100644 --- a/src/lib/elementary/elm_datetime.c +++ b/src/lib/elementary/elm_datetime.c @@ -892,7 +892,7 @@ EOLIAN static Eo * _elm_datetime_eo_base_constructor(Eo *obj, Elm_Datetime_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR); diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 0102a23c7c..48f84fef81 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -461,7 +461,7 @@ EOLIAN static Eo * _elm_dayselector_eo_base_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 959e0188fc..36fbf59bc9 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -1463,7 +1463,7 @@ EOLIAN static Eo * _elm_diskselector_eo_base_constructor(Eo *obj, Elm_Diskselector_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo index 274f52b4e5..92146a1961 100644 --- a/src/lib/elementary/elm_diskselector.eo +++ b/src/lib/elementary/elm_diskselector.eo @@ -179,7 +179,7 @@ class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, return: Elm.Widget.Item; params { @in label: string; [[The label of the diskselector item.]] - @in icon: Evas.Object @optional; [[The icon object to use at left side of the item. An + @in icon: Efl.Canvas.Object @optional; [[The icon object to use at left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add(). ]] @in func: Evas_Smart_Cb @optional; [[The function to call when the item is selected.]] diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index c9100daa09..0c5e25c7b2 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -3951,7 +3951,7 @@ EOLIAN static Eo * _elm_entry_eo_base_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 69b86adb59..8fdba32d90 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -381,7 +381,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, ]] } values { - parent: Evas.Object @nullable; [[The object to use as parent for the hover.]] + parent: Efl.Canvas.Object @nullable; [[The object to use as parent for the hover.]] } } @property prediction_allow { @@ -574,7 +574,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, change the internal textblock object). This applies to all cursors returned from textblock calls, and all the other derivative values. ]] - return: Evas.Object; + return: Efl.Canvas.Object; } } @property cursor_geometry { diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 0da66390bc..d4003c1474 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -670,7 +670,7 @@ _elm_flipselector_eo_base_constructor(Eo *obj, Elm_Flipselector_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c index 4e5f02a038..b89d5a23fd 100644 --- a/src/lib/elementary/elm_frame.c +++ b/src/lib/elementary/elm_frame.c @@ -202,7 +202,7 @@ EOLIAN static Eo * _elm_frame_eo_base_constructor(Eo *obj, Elm_Frame_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME); diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index edbb52a6df..4e509647cc 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -4357,7 +4357,7 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE); diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 8ff492d6b1..ab4c99cd78 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -201,7 +201,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item) floating "orphans" that can be re-used elsewhere if the user wants to.]] params { - @out l: own(list<own(Evas.Object)>); [[The contents list to return.]] + @out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]] } } } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 18ec3d9ef9..ac67e68ed3 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -5708,7 +5708,7 @@ _elm_genlist_eo_base_constructor(Eo *obj, Elm_Genlist_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index 1decfa5aab..324ebd532d 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -326,7 +326,7 @@ class Elm.Genlist.Item(Elm.Widget.Item) elsewhere if the user wants to. ]] params { - @out l: own(list<own(Evas.Object)>); [[The contents list to return.]] + @out l: own(list<own(Efl.Canvas.Object)>); [[The contents list to return.]] } } update { diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index a0f9e30a42..5711a4b68c 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -3825,7 +3825,7 @@ EOLIAN static Eo * _elm_gesture_layer_eo_base_constructor(Eo *obj, Elm_Gesture_Layer_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo index 988e86b152..8d63081391 100644 --- a/src/lib/elementary/elm_gesture_layer.eo +++ b/src/lib/elementary/elm_gesture_layer.eo @@ -121,7 +121,7 @@ class Elm.Gesture_Layer (Elm.Widget) ]] return: bool; [[$true on success, $false otherwise.]] params { - @in target: Evas.Object; [[The object to attach.]] + @in target: Efl.Canvas.Object; [[The object to attach.]] } } cb_del { diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index dfddc9df31..c376fa8d78 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -358,7 +358,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, ((version > 0) && (version <= 3)) ? version : EVAS_GL_GLES_2_X; _elm_glview_constructor(obj, sd); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); eo_event_callback_add(obj, EO_EVENT_CALLBACK_ADD, _cb_added, NULL); diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 349408a683..d68625b3a0 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -169,7 +169,7 @@ EOLIAN static Eo * _elm_grid_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); return obj; diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo index db3397cfe9..a0c1d628c1 100644 --- a/src/lib/elementary/elm_grid.eo +++ b/src/lib/elementary/elm_grid.eo @@ -25,7 +25,7 @@ class Elm.Grid (Elm.Widget) It's possible to remove objects from the grid when walking this list, but these removals won't be reflected on it. ]] - return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; + return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; } } clear { @@ -37,13 +37,13 @@ class Elm.Grid (Elm.Widget) unpack { [[Unpack a child from a grid object]] params { - @in subobj: Evas.Object; [[The child to unpack]] + @in subobj: Efl.Canvas.Object; [[The child to unpack]] } } pack { [[Pack child at given position and size]] params { - @in subobj: Evas.Object; [[The child to pack.]] + @in subobj: Efl.Canvas.Object; [[The child to pack.]] @in x: Evas.Coord; [[The virtual x coord at which to pack it.]] @in y: Evas.Coord; [[The virtual y coord at which to pack it.]] @in w: Evas.Coord; [[The virtual width at which to pack it.]] diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 2d554891cf..729cddff44 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -671,7 +671,7 @@ EOLIAN static Eo * _elm_hover_eo_base_constructor(Eo *obj, Elm_Hover_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index 135c342c79..04dcfe6186 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -25,7 +25,7 @@ class Elm.Hover (Elm.Layout, Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action [[Get the target object for the hover.]] } values { - target: Evas.Object; [[The target object.]] + target: Efl.Canvas.Object; [[The target object.]] } } best_content_location_get @const { diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index 9d4b2fceac..c11b44588a 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -30,7 +30,7 @@ class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable, get { } values { - parent: Evas.Object @nullable; [[The parent to use]] + parent: Efl.Canvas.Object @nullable; [[The parent to use]] } } @property expanded { diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index ff9d1d6e42..168e243ad0 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -617,7 +617,7 @@ _elm_icon_eo_base_constructor(Eo *obj, Elm_Icon_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 5b2536d4b2..cfdd9b344d 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -1259,7 +1259,7 @@ EOLIAN static Eo * _elm_index_eo_base_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR); diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c index 5c1e166cce..32c2b3d97f 100644 --- a/src/lib/elementary/elm_interface_scrollable.c +++ b/src/lib/elementary/elm_interface_scrollable.c @@ -234,7 +234,7 @@ EOLIAN static Eo * _elm_pan_eo_base_constructor(Eo *obj, Elm_Pan_Smart_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_PAN_CLASS)); - evas_obj_type_set(obj, MY_PAN_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_PAN_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); return obj; diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index b9b3a85a3e..f1b74adf63 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -382,7 +382,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group) set { } values { - pan: Evas.Object @nullable; + pan: Efl.Canvas.Object @nullable; } } @property page_change_cb { @@ -467,7 +467,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group) set { } values { - content: Evas.Object @nullable; + content: Efl.Canvas.Object @nullable; } } @property edge_left_cb { @@ -522,8 +522,8 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group) set { } values { - edje_object: Evas.Object; - hit_rectangle: Evas.Object; + edje_object: Efl.Canvas.Object; + hit_rectangle: Efl.Canvas.Object; } } @property last_page { diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index 38908d8b3a..28df916036 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -116,7 +116,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) } obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); return obj; diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index 12e5707c00..d95ce92020 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -414,7 +414,7 @@ EOLIAN static Eo * _elm_label_eo_base_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL); diff --git a/src/lib/elementary/elm_layout.c b/src/lib/elementary/elm_layout.c index 9d87908f72..4ffc97e1fd 100644 --- a/src/lib/elementary/elm_layout.c +++ b/src/lib/elementary/elm_layout.c @@ -1899,7 +1899,7 @@ _elm_layout_eo_base_constructor(Eo *obj, Elm_Layout_Smart_Data *sd) { sd->obj = obj; obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); diff --git a/src/lib/elementary/elm_layout.eo b/src/lib/elementary/elm_layout.eo index e7e52c4908..92b4fb9f8a 100644 --- a/src/lib/elementary/elm_layout.eo +++ b/src/lib/elementary/elm_layout.eo @@ -94,7 +94,7 @@ class Elm.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File) hooking callbacks to signals, etc.) can be done with proper elementary functions. ]] - return: Evas.Object; [[An Evas_Object with the edje layout + return: Efl.Canvas.Object; [[An Evas_Object with the edje layout settings loaded \@ref elm_layout_file_set.]] } } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index 29ac55cea5..7c3a072095 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2553,7 +2553,7 @@ EOLIAN static Eo * _elm_list_eo_base_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index 6b48304316..11de7b6c37 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -228,8 +228,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, params { @in before: Elm.Widget.Item; [[The list item to insert before.]] @in label: string; [[The label of the list item.]] - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] - @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] } @@ -275,8 +275,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, params { @in after: Elm.Widget.Item; [[The list item to insert after.]] @in label: string; [[The label of the list item.]] - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] - @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] } @@ -345,8 +345,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] params { @in label: string; [[The label of the list item.]] - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] - @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] } @@ -376,8 +376,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] params { @in label: string; [[The label of the list item.]] - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] - @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] } @@ -414,8 +414,8 @@ class Elm.List (Elm.Layout, Elm.Interface_Scrollable, return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] params { @in label: string; [[The label of the list item.]] - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] - @in end: Evas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in end: Efl.Canvas.Object @optional; [[The icon object to use for the right side of the item. An icon can be any Evas object.]] @in func: Evas_Smart_Cb @optional; [[The function to call when the item is clicked.]] @in data: const(void_ptr) @optional; [[The data to associate with the item for related callbacks.]] @in cmp_func: Eina_Compare_Cb; [[The comparing function to be used to sort list diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo index 939048bdab..755b7ec864 100644 --- a/src/lib/elementary/elm_list_item.eo +++ b/src/lib/elementary/elm_list_item.eo @@ -53,7 +53,7 @@ class Elm.List.Item(Elm.Widget.Item) ]] } values { - obj: Evas.Object; [[The base Edje object associated with the item.]] + obj: Efl.Canvas.Object; [[The base Edje object associated with the item.]] } } @property prev { diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 3888d6c058..7466cc961a 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -4236,7 +4236,7 @@ _elm_map_eo_base_constructor(Eo *obj, Elm_Map_Data *sd) obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index a8b0b926b2..cc9311b1ff 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -348,7 +348,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, } track_add { [[Add a track on the map.]] - return: Evas.Object; [[The route object. This is an elm object of type Route.]] + return: Efl.Canvas.Object; [[The route object. This is an elm object of type Route.]] params { @in emap: void_ptr; [[The emap route object.]] } @@ -547,7 +547,7 @@ class Elm.Map (Elm.Widget, Elm.Interface_Scrollable, track_remove { [[Remove a track from the map.]] params { - @in route: Evas.Object; [[The track to remove.]] + @in route: Efl.Canvas.Object; [[The track to remove.]] } } overlay_route_add { diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index e98c3fef66..c6e1fa200f 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -316,7 +316,7 @@ EOLIAN static Eo * _elm_mapbuf_eo_base_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); return obj; diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 358d1634db..04e33cc6a5 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -786,7 +786,7 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd) Eo *parent = NULL; obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = eo_parent_get(obj); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU); diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo index d187779392..3aae16a355 100644 --- a/src/lib/elementary/elm_menu_item.eo +++ b/src/lib/elementary/elm_menu_item.eo @@ -69,7 +69,7 @@ class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection) Warning: Don't manipulate this object! ]] - return: Evas.Object; [[The base Edje object containing the + return: Efl.Canvas.Object; [[The base Edje object containing the swallowed content associated with the item.]] } } diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index 5c7e5bf9f3..db17a9b144 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -71,7 +71,7 @@ class Elm.Multibuttonentry (Elm.Layout) get { [[Get the entry of the multibuttonentry object]] - return: Evas.Object; [[The entry object, or NULL if none]] + return: Efl.Canvas.Object; [[The entry object, or NULL if none]] } } @property selected_item { diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index 95c54c6e04..83c1f2d009 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -73,7 +73,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) is complete. ]] - return: Evas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]] + return: Efl.Canvas.Object; [[$NULL or the content object(if the elm_naviframe_content_preserve_on_pop_get is true).]] } item_insert_before { [[Insert a new item into the naviframe before item $before. @@ -85,9 +85,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) params { @in before: Elm.Widget.Item; [[The naviframe item to insert before.]] @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]] - @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] - @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] - @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] + @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] + @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] + @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] @in item_style: string @nullable; [[The current item style name. $NULL would be default.]] } } @@ -106,9 +106,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] params { @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]] - @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] - @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] - @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] + @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] + @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] + @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] @in item_style: string @nullable; [[The current item style name. $NULL would be default.]] } } @@ -116,7 +116,7 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) [[Simple version of item_promote.]] params { - @in content: Evas.Object; + @in content: Efl.Canvas.Object; } } item_insert_after { @@ -132,9 +132,9 @@ class Elm.Naviframe (Elm.Layout, Elm.Interface.Atspi_Widget_Action) params { @in after: Elm.Widget.Item; [[The naviframe item to insert after.]] @in title_label: string @optional; [[The label in the title area. The name of the title label part is "elm.text.title"]] - @in prev_btn: Evas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] - @in next_btn: Evas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] - @in content: Evas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] + @in prev_btn: Efl.Canvas.Object @nullable; [[The button to go to the previous item. If it is NULL, then naviframe will create a back button automatically. The name of the prev_btn part is "elm.swallow.prev_btn"]] + @in next_btn: Efl.Canvas.Object @nullable; [[The button to go to the next item. Or It could be just an extra function button. The name of the next_btn part is "elm.swallow.next_btn"]] + @in content: Efl.Canvas.Object; [[The main content object. The name of content part is "elm.swallow.content"]] @in item_style: string @nullable; [[The current item style name. $NULL would be default.]] } } diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index 810e71e52c..ed376194e8 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -494,7 +494,7 @@ EOLIAN static Eo * _elm_notify_eo_base_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); return obj; diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 5a057e3e67..2e20914531 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1174,7 +1174,7 @@ EOLIAN static Eo * _elm_panel_eo_base_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); diff --git a/src/lib/elementary/elm_panes.c b/src/lib/elementary/elm_panes.c index f9c406d6f5..d8f7c4fdb7 100644 --- a/src/lib/elementary/elm_panes.c +++ b/src/lib/elementary/elm_panes.c @@ -331,7 +331,7 @@ EOLIAN static Eo * _elm_panes_eo_base_constructor(Eo *obj, Elm_Panes_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index 0436a3dc37..cd1c3118ac 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -304,7 +304,7 @@ EOLIAN static Eo * _elm_photo_eo_base_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c index 139c5111ef..ca0f3864da 100644 --- a/src/lib/elementary/elm_photocam.c +++ b/src/lib/elementary/elm_photocam.c @@ -1511,7 +1511,7 @@ EOLIAN static Eo * _elm_photocam_eo_base_constructor(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index b456137f29..6d442c5abc 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -134,7 +134,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, modify it. It is for inspection only, and hooking callbacks to. Nothing else. It may be deleted at any time as well. ]] - return: Evas.Object; [[The internal image object handle or $null]] + return: Efl.Canvas.Object; [[The internal image object handle or $null]] } } @property image_size { diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 3dc73f7014..9654577b64 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -144,7 +144,7 @@ EOLIAN static Eo * _elm_plug_eo_base_constructor(Eo *obj, void *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo index 9e3a60ff80..8f077da72f 100644 --- a/src/lib/elementary/elm_plug.eo +++ b/src/lib/elementary/elm_plug.eo @@ -16,7 +16,7 @@ class Elm.Plug (Elm.Widget, Efl.Ui.Clickable) Note: Be careful to not manipulate it, as it is under control of elementary. ]] - return: Evas.Object; [[The inlined image object or $null.]] + return: Efl.Canvas.Object; [[The inlined image object or $null.]] } } connect { diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 9d4aa06d38..90745ca7b3 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -153,7 +153,7 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action) return: Elm.Widget.Item; [[A handle to the item added or $null on errors.]] params { @in label: string; [[The Label of the new item.]] - @in icon: Evas.Object @optional; [[Icon to be set on new item.]] + @in icon: Efl.Canvas.Object @optional; [[Icon to be set on new item.]] @in func: Evas_Smart_Cb @optional; [[Convenience function called when item selected.]] @in data: const(void_ptr) @optional; [[Data passed to $func above.]] } diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index dfca0e11c9..120141feae 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -516,7 +516,7 @@ EOLIAN static Eo * _elm_prefs_eo_base_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT); diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo index 16060fc095..b93070173e 100644 --- a/src/lib/elementary/elm_prefs.eo +++ b/src/lib/elementary/elm_prefs.eo @@ -119,7 +119,7 @@ class Elm.Prefs (Elm.Widget, Efl.File) @since 1.8]] - return: const(Evas.Object); [[A valid widget handle, on success, or $NULL, otherwise]] + return: const(Efl.Canvas.Object); [[A valid widget handle, on success, or $NULL, otherwise]] params { @in name: string; [[The name of the item (as declared in the prefs collection) to get object from]] } @@ -151,7 +151,7 @@ class Elm.Prefs (Elm.Widget, Efl.File) return: bool; [[$true, on success, $false otherwise]] params { @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]] - @in child: Evas.Object; [[The object to occupy the item]] + @in child: Efl.Canvas.Object; [[The object to occupy the item]] } } item_editable_set { @@ -182,7 +182,7 @@ class Elm.Prefs (Elm.Widget, Efl.File) @since 1.8]] - return: Evas.Object; [[The unswallowed object, or NULL on errors]] + return: Efl.Canvas.Object; [[The unswallowed object, or NULL on errors]] params { @in name: string; [[the name of the SWALLOW item (as declared in the prefs collection)]] } diff --git a/src/lib/elementary/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c index 3913d1337e..4c07e9dd24 100644 --- a/src/lib/elementary/elm_progressbar.c +++ b/src/lib/elementary/elm_progressbar.c @@ -359,7 +359,7 @@ EOLIAN static Eo * _elm_progressbar_eo_base_constructor(Eo *obj, Elm_Progressbar_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR); diff --git a/src/lib/elementary/elm_radio.c b/src/lib/elementary/elm_radio.c index 28fbc8e4eb..5b1dd018aa 100644 --- a/src/lib/elementary/elm_radio.c +++ b/src/lib/elementary/elm_radio.c @@ -276,7 +276,7 @@ EOLIAN static Eo * _elm_radio_eo_base_constructor(Eo *obj, Elm_Radio_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON); diff --git a/src/lib/elementary/elm_radio.eo b/src/lib/elementary/elm_radio.eo index 1be44f4093..043c36a763 100644 --- a/src/lib/elementary/elm_radio.eo +++ b/src/lib/elementary/elm_radio.eo @@ -57,7 +57,7 @@ class Elm.Radio (Elm.Check, Elm.Interface.Atspi_Widget_Action) @property selected_object { get { [[Get the selected radio object.]] - return: Evas.Object; [[The selected radio object]] + return: Efl.Canvas.Object; [[The selected radio object]] } } group_add { diff --git a/src/lib/elementary/elm_route.c b/src/lib/elementary/elm_route.c index 4e78c00a5e..85a20731d5 100644 --- a/src/lib/elementary/elm_route.c +++ b/src/lib/elementary/elm_route.c @@ -186,7 +186,7 @@ EOLIAN static Eo * _elm_route_eo_base_constructor(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 3f173ae340..7f03561a2e 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -951,7 +951,7 @@ EOLIAN static Eo * _elm_scroller_eo_base_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE); diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 0b31ff4e7d..20c1f0f0c1 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -706,7 +706,7 @@ _elm_segment_control_eo_base_constructor(Eo *obj, Elm_Segment_Control_Data *sd E { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo index 55390f65ed..b0de254139 100644 --- a/src/lib/elementary/elm_segment_control.eo +++ b/src/lib/elementary/elm_segment_control.eo @@ -57,7 +57,7 @@ class Elm.Segment_Control (Elm.Layout) return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] params { - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] @in label: string @optional; [[The label of the item.]] @in idx: int; [[Item position. Value should be between 0 and items count.]] } @@ -115,7 +115,7 @@ class Elm.Segment_Control (Elm.Layout) return: Elm.Widget.Item; [[The created item or $NULL upon failure.]] params { - @in icon: Evas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] + @in icon: Efl.Canvas.Object @optional; [[The icon object to use for the left side of the item. An icon can be any Evas object, but usually it is an icon created with elm_icon_add().]] @in label: string @optional; [[The label of the item. Note that, NULL is different from empty string "".]] } } @@ -126,7 +126,7 @@ class Elm.Segment_Control (Elm.Layout) it was created, with function elm_segment_control_item_add(), or later with function elm_object_item_part_content_set(). If no icon was passed as argument, it will return $NULL.]] - return: Evas.Object; [[The left side icon associated to the item at $index.]] + return: Efl.Canvas.Object; [[The left side icon associated to the item at $index.]] params { @in idx: int; [[The index of the segment item.]] } diff --git a/src/lib/elementary/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo index 4caccc11d4..e8f175a1ac 100644 --- a/src/lib/elementary/elm_segment_control_item.eo +++ b/src/lib/elementary/elm_segment_control_item.eo @@ -15,8 +15,8 @@ class Elm.Segment_Control.Item(Elm.Widget.Item) object_get @const { [[Get the real Evas(Edje) object created to implement the view of a given segment_control item. - Base object is the @Evas.Object that represents that item.]] - return: Evas.Object; [[The base Edje object associated with $it]] + Base object is the @Efl.Canvas.Object that represents that item.]] + return: Efl.Canvas.Object; [[The base Edje object associated with $it]] } selected_set { [[Set the selected state of an item. diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index a79f20ae14..e7b5e710d9 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -98,7 +98,7 @@ EOLIAN static Eo * _elm_separator_eo_base_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR); return obj; diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c index b499e9f77a..cb61366a5d 100644 --- a/src/lib/elementary/elm_slider.c +++ b/src/lib/elementary/elm_slider.c @@ -1286,7 +1286,7 @@ EOLIAN static Eo * _elm_slider_eo_base_constructor(Eo *obj, Elm_Slider_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index 729378525f..0efebad999 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -389,7 +389,7 @@ EOLIAN static Eo * _elm_slideshow_eo_base_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); diff --git a/src/lib/elementary/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo index e03a9f2b33..7510a88cc2 100644 --- a/src/lib/elementary/elm_slideshow_item.eo +++ b/src/lib/elementary/elm_slideshow_item.eo @@ -25,7 +25,7 @@ class Elm.Slideshow.Item(Elm.Widget.Item) lower level callbacks for events on that object. Do not delete this object under any circumstances.]] - return: Evas.Object; + return: Efl.Canvas.Object; } } implements { diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index bb5c44990f..f7e306081f 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1451,7 +1451,7 @@ EOLIAN static Eo * _elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON); diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index 1e8cafe226..e5efebdc0e 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -222,7 +222,7 @@ EOLIAN static Eo * _elm_table_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); return obj; diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo index b2064d547d..9050ea2e35 100644 --- a/src/lib/elementary/elm_table.eo +++ b/src/lib/elementary/elm_table.eo @@ -51,7 +51,7 @@ class Elm.Table (Elm.Widget) } child_get @const { [[Get child object of table at given coordinates.]] - return: Evas.Object; [[Child of object if find if not return $null.]] + return: Efl.Canvas.Object; [[Child of object if find if not return $null.]] params { @in col: int; [[Column number of child object.]] @in row: int; [[Row number of child object.]] @@ -68,7 +68,7 @@ class Elm.Table (Elm.Widget) means only takes that 1 cell. ]] params { - @in subobj: Evas.Object; [[The subobject to be modified in the table.]] + @in subobj: Efl.Canvas.Object; [[The subobject to be modified in the table.]] @in column: int; [[Column number.]] @in row: int; [[Row number.]] @in colspan: int; @@ -79,7 +79,7 @@ class Elm.Table (Elm.Widget) pack_get { [[Get the packing location of an existing child of the table.]] params { - @in subobj: Evas.Object; [[The subobject to be modified in the table.]] + @in subobj: Efl.Canvas.Object; [[The subobject to be modified in the table.]] @out column: int; [[Column number.]] @out row: int; [[Row number.]] @out colspan: int; @@ -90,7 +90,7 @@ class Elm.Table (Elm.Widget) unpack { [[Remove child from table.]] params { - @in subobj: Evas.Object; [[The subobject.]] + @in subobj: Efl.Canvas.Object; [[The subobject.]] } } pack { @@ -108,7 +108,7 @@ class Elm.Table (Elm.Widget) able to fit in 16bits will result in failure. ]] params { - @in subobj: Evas.Object; [[The subobject to be added to the table.]] + @in subobj: Efl.Canvas.Object; [[The subobject to be added to the table.]] @in column: int; [[Column number.]] @in row: int; [[Row number.]] @in colspan: int; diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index b9393977e8..c0a5767471 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -583,7 +583,7 @@ EOLIAN static Eo * _elm_thumb_eo_base_constructor(Eo *obj, Elm_Thumb_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, "Elm_Thumb"); + efl_canvas_object_type_set(obj, "Elm_Thumb"); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 787ce908db..599f349e59 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3094,7 +3094,7 @@ EOLIAN static Eo * _elm_toolbar_eo_base_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR); diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index f508135acc..f3f4282c90 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -136,7 +136,7 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation, get { } values { - parent: Evas.Object; [[The parent of the menu objects.]] + parent: Efl.Canvas.Object; [[The parent of the menu objects.]] } } @property standard_priority { diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo index 55746e6184..6f9f641a15 100644 --- a/src/lib/elementary/elm_toolbar_item.eo +++ b/src/lib/elementary/elm_toolbar_item.eo @@ -18,7 +18,7 @@ struct Elm.Toolbar.Item.State ]] label: string; icon_str: string; - icon: Evas.Object; + icon: Efl.Canvas.Object; func: Evas_Smart_Cb ; data: const(void_ptr); } @@ -122,7 +122,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item) ]] } values { - obj: Evas.Object; [[The base Edje object associated with $it.]] + obj: Efl.Canvas.Object; [[The base Edje object associated with $it.]] } } @property icon_object { @@ -133,7 +133,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item) ]] } values { - obj: Evas.Object; [[The icon object.]] + obj: Efl.Canvas.Object; [[The icon object.]] } } @property separator { @@ -162,7 +162,7 @@ class Elm.Toolbar.Item(Elm.Widget.Item) ]] } values { - menu: Evas.Object; [[Item's menu object or $null on failure.]] + menu: Efl.Canvas.Object; [[Item's menu object or $null on failure.]] } } @property state { diff --git a/src/lib/elementary/elm_video.c b/src/lib/elementary/elm_video.c index 41ea4ce820..1ba65d7b6d 100644 --- a/src/lib/elementary/elm_video.c +++ b/src/lib/elementary/elm_video.c @@ -283,7 +283,7 @@ EOLIAN static Eo * _elm_video_eo_base_constructor(Eo *obj, Elm_Video_Data *_pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); diff --git a/src/lib/elementary/elm_video.eo b/src/lib/elementary/elm_video.eo index cda43aef37..31f1f349b0 100644 --- a/src/lib/elementary/elm_video.eo +++ b/src/lib/elementary/elm_video.eo @@ -36,7 +36,7 @@ class Elm.Video (Elm.Layout, Efl.File, @property emotion { get { [[Get the underlying Emotion object.]] - return: Evas.Object; [[the underlying Emotion object.]] + return: Efl.Canvas.Object; [[the underlying Emotion object.]] } } @property title { diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo index 1c2bd19231..fee6e6a815 100644 --- a/src/lib/elementary/elm_view_form.eo +++ b/src/lib/elementary/elm_view_form.eo @@ -17,7 +17,7 @@ class Elm.View.Form (Eo.Base) ]] params { @in propname: string; [[Property name]] - @in evas: Evas.Object; [[Evas widget]] + @in evas: Efl.Canvas.Object; [[Evas widget]] } } } diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo index 29329128b6..3e0292ca97 100644 --- a/src/lib/elementary/elm_view_list.eo +++ b/src/lib/elementary/elm_view_list.eo @@ -9,7 +9,7 @@ class Elm.View.List (Eo.Base) @since 1.11 ]] params { - @in genlist: Evas.Object; [[Genlist object]] + @in genlist: Efl.Canvas.Object; [[Genlist object]] @in item_type: Elm.Genlist.Item.Type; [[Item type]] @in item_style: string; [[The current item style name. $null would be default.]] } @@ -20,7 +20,7 @@ class Elm.View.List (Eo.Base) @since 1.11 ]] params { - @out widget: Evas.Object; [[Returned widget]] + @out widget: Efl.Canvas.Object; [[Returned widget]] } } property_connect { diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo index b0f01d4a10..685e6a4b80 100644 --- a/src/lib/elementary/elm_web.eo +++ b/src/lib/elementary/elm_web.eo @@ -307,7 +307,7 @@ class Elm.Web (Elm.Widget) return the internal reference. Be careful using it as it may interfere with elm_web behavior. ]] - return: Evas.Object; [[The internal ewk_view object or $null + return: Efl.Canvas.Object; [[The internal ewk_view object or $null if it does not exist. (Failure to create or Elementary compiled without ewebkit)]] diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c index 008893aa98..f561fb562b 100644 --- a/src/lib/elementary/elm_web2.c +++ b/src/lib/elementary/elm_web2.c @@ -96,7 +96,7 @@ _elm_web_eo_base_constructor(Eo *obj, Elm_Web_Data *sd) { obj = eo_constructor(eo_super(obj, MY_CLASS)); sd->obj = obj; - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks); elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER); diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 34e78feda2..8d1d8b28e8 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -105,10 +105,10 @@ static void _propagate_event(void *data, const Eo_Event *event); EO_CALLBACKS_ARRAY_DEFINE(elm_widget_subitems_callbacks, - { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }, + { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }, { EFL_GFX_EVENT_HIDE, _on_sub_obj_hide }); EO_CALLBACKS_ARRAY_DEFINE(efl_subitems_callbacks, - { EVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }); + { EFL_CANVAS_OBJECT_EVENT_DEL, _on_sub_obj_del }); EO_CALLBACKS_ARRAY_DEFINE(focus_callbacks, { EFL_EVENT_KEY_DOWN, _propagate_event }, { EFL_EVENT_KEY_UP, _propagate_event }, @@ -574,7 +574,7 @@ _elm_widget_efl_canvas_group_group_no_render_set(Eo *obj, Elm_Widget_Smart_Data EINA_ITERATOR_FOREACH(it, o) { if (evas_object_data_get(o, "_elm_leaveme")) continue; - evas_obj_no_render_set(o, hide); + efl_canvas_object_no_render_set(o, hide); } eina_iterator_free(it); } @@ -626,7 +626,7 @@ _elm_widget_efl_canvas_group_group_member_add(Eo *obj, Elm_Widget_Smart_Data *_p evas_object_color_get(obj, &r, &g, &b, &a); evas_object_color_set(child, r, g, b, a); - evas_obj_no_render_set(child, evas_obj_no_render_get(obj)); + efl_canvas_object_no_render_set(child, efl_canvas_object_no_render_get(obj)); evas_object_clip_set(child, evas_object_clip_get(obj)); if (evas_object_visible_get(obj)) @@ -4427,7 +4427,7 @@ EO_CALLBACKS_ARRAY_DEFINE(tracker_callbacks, { EFL_GFX_EVENT_MOVE, _track_obj_view_update }, { EFL_GFX_EVENT_SHOW, _track_obj_view_update }, { EFL_GFX_EVENT_HIDE, _track_obj_view_update }, - { EVAS_OBJECT_EVENT_DEL, _track_obj_view_del }); + { EFL_CANVAS_OBJECT_EVENT_DEL, _track_obj_view_del }); static void _track_obj_view_del(void *data, const Eo_Event *event EINA_UNUSED) @@ -5812,7 +5812,7 @@ _elm_widget_eo_base_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSED) sd->on_create = EINA_TRUE; obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = eo_parent_get(obj); elm_obj_widget_parent_set(obj, parent); diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 274b0574cc..7d3da020b4 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -159,12 +159,12 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter the list of objects. The previous list will be deleted and this list will be managed by elementary. After it is set, don't modify it.]] values { - objs: list<Evas.Object>; [[Chain of objects to pass focus]] + objs: list<Efl.Canvas.Object>; [[Chain of objects to pass focus]] } } get { values { - objs: const(list<Evas.Object>); [[Chain of objects]] + objs: const(list<Efl.Canvas.Object>); [[Chain of objects]] } } } @@ -209,7 +209,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter legacy: elm_widget_parent_get; /* Needed because we don't do duplication removal for legacy names. */ } values { - parent: Evas.Object @nullable; + parent: Efl.Canvas.Object @nullable; } } @property access_info { @@ -261,7 +261,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter return: bool; } values { - edj: Evas.Object; + edj: Efl.Canvas.Object; wname: string; welement: string; wstyle: string; @@ -271,7 +271,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter set { } values { - sobj: Evas.Object @nullable; + sobj: Efl.Canvas.Object @nullable; } } @property display_mode { @@ -309,7 +309,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter set { } values { - sobj: Evas.Object @nullable; + sobj: Efl.Canvas.Object @nullable; sub_obj: bool; } } @@ -327,7 +327,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter [[Function to operate on a given widget's scrollabe children when necessary. Warning: free the returned list with eina_list_free().]] - return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; + return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; } } @property scroll_hold { @@ -373,7 +373,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } @property top { get { - return: Evas.Object; + return: Efl.Canvas.Object; } } @property focus_order { @@ -388,7 +388,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } @property can_focus_child_list { get { - return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; + return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; } } @property focused_item { @@ -407,7 +407,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } @property parent_widget { get @virtual_pure { - return: Evas.Object; + return: Efl.Canvas.Object; legacy: null; } } @@ -419,7 +419,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter @property focused_object { [[Current focused object in object tree.]] get { - return: Evas.Object; [[Current focused or $null, if there is no focused object.]] + return: Efl.Canvas.Object; [[Current focused or $null, if there is no focused object.]] } } @property parent2 { @@ -428,7 +428,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter get { } values { - parent: Evas.Object @nullable; + parent: Efl.Canvas.Object @nullable; } } @property part_text { @@ -444,7 +444,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } } newest_focus_order_get @const { - return: Evas.Object; + return: Efl.Canvas.Object; params { @out newest_focus_order: uint; @in can_focus_only: bool; @@ -462,7 +462,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter @since 1.8]] params { - @in next: Evas.Object @nullable; [[Focus next object]] + @in next: Efl.Canvas.Object @nullable; [[Focus next object]] @in dir: Elm.Focus_Direction; [[Focus direction]] } } @@ -470,7 +470,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter [[Get the next object with specific focus direction. @since 1.8]] - return: Evas.Object; [[Focus next object]] + return: Efl.Canvas.Object; [[Focus next object]] params { @in dir: Elm.Focus_Direction; [[Focus direction]] } @@ -503,8 +503,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter Note: On focus cycle, only will be evaluated children of this container.]] params { - @in child: Evas.Object; [[The child to be added in custom chain.]] - @in relative_child: Evas.Object @optional; [[The relative object to position the child.]] + @in child: Efl.Canvas.Object; [[The child to be added in custom chain.]] + @in relative_child: Efl.Canvas.Object @optional; [[The relative object to position the child.]] } } part_text_translate { @@ -535,7 +535,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter [['Virtual' function handling sub objects being added.]] return: bool; params { - @in sobj: Evas.Object; + @in sobj: Efl.Canvas.Object; } } focus_direction_manager_is { @@ -546,7 +546,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter event { [['Virtual' function handling input events on the widget.]] params { - @in source: Evas.Object; + @in source: Efl.Canvas.Object; @in type: Evas.Callback_Type; @in event_info: void_ptr; } @@ -604,9 +604,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter focus_direction @virtual_pure { [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]] params { - @in base: const(Evas.Object); + @in base: const(Efl.Canvas.Object); @in degree: double; - @out direction: Evas.Object; + @out direction: Efl.Canvas.Object; @out direction_item: Elm.Widget.Item; @out weight: double; } @@ -633,7 +633,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter return: bool; } name_find @const { - return: Evas.Object; + return: Efl.Canvas.Object; params { @in name: string; @in recurse: int; @@ -642,11 +642,11 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter focus_list_direction_get @const { return: bool; params { - @in base: const(Evas.Object); + @in base: const(Efl.Canvas.Object); @in items: const(list<Eo.Base>); @in list_data_get: list_data_get_func_type; @in degree: double; - @out direction: Evas.Object; + @out direction: Efl.Canvas.Object; @out direction_item: Elm.Widget.Item; @out weight: double; } @@ -687,7 +687,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter return: bool; params { @in dir: Elm.Focus_Direction; - @out next: Evas.Object; + @out next: Efl.Canvas.Object; @out next_item: Elm.Widget.Item; } } @@ -729,7 +729,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter [['Virtual' function handling passing focus to sub-objects.]] params { @in dir: Elm.Focus_Direction; - @out next: Evas.Object; + @out next: Efl.Canvas.Object; @out next_item: Elm.Widget.Item; } return: bool; @@ -740,7 +740,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter @in items: const(list<Eo.Base>); @in list_data_get: list_data_get_func_type; @in dir: Elm.Focus_Direction; - @out next: Evas.Object; + @out next: Efl.Canvas.Object; @out next_item: Elm.Widget.Item; } } @@ -754,9 +754,9 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter focus_direction_get @const { return: bool; params { - @in base: const(Evas.Object); + @in base: const(Efl.Canvas.Object); @in degree: double; - @out direction: Evas.Object; + @out direction: Efl.Canvas.Object; @out direction_item: Elm.Widget.Item; @out weight: double; } @@ -783,7 +783,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter [['Virtual' function handling sub objects being removed.]] return: bool; params { - @in sobj: Evas.Object; + @in sobj: Efl.Canvas.Object; } } tooltip_add { @@ -803,8 +803,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter Note: On focus cycle, only will be evaluated children of this container.]] params { - @in child: Evas.Object; [[The child to be added in custom chain.]] - @in relative_child: Evas.Object @optional; [[The relative object to position the child.]] + @in child: Efl.Canvas.Object; [[The child to be added in custom chain.]] + @in relative_child: Efl.Canvas.Object @optional; [[The relative object to position the child.]] } } @property focus_move_policy { diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo index ea87eef9fa..ba81cc96a4 100644 --- a/src/lib/elementary/elm_widget_item.eo +++ b/src/lib/elementary/elm_widget_item.eo @@ -108,7 +108,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, part: string @nullable; [[The content part name (NULL for the default content)]] } values { - content: Evas.Object; [[The content of the object item]] + content: Efl.Canvas.Object; [[The content of the object item]] } } @property part_text { @@ -189,14 +189,14 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, [[Get highlight order @since 1.8]] - return: const(list<Evas.Object>); + return: const(list<Efl.Canvas.Object>); } access_order_set { [[Set highlight order @since 1.8]] params { - @in objs: own(list<Evas.Object>); [[Order of objects to pass highlight]] + @in objs: own(list<Efl.Canvas.Object>); [[Order of objects to pass highlight]] } } widget_get @const { @@ -204,7 +204,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, Note: This returns the widget object itself that an item belongs to. Note: Every elm_object_item supports this API]] - return: Evas.Object; [[The widget object]] + return: Efl.Canvas.Object; [[The widget object]] } del { [[Delete the given item.]] @@ -260,7 +260,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, params { part: string; [[The content part name to unset (NULL for the default content)]] } - return: Evas.Object; + return: Efl.Canvas.Object; } part_text_custom_update @protected { [[Update additional text part content]] @@ -322,7 +322,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, [[Get an accessible object of the object item. @since 1.8]] - return: Evas.Object; [[Accessible object of the object item or NULL for any error]] + return: Efl.Canvas.Object; [[Accessible object of the object item or NULL for any error]] } domain_translatable_part_text_set { [[Set the text for an object item's part, marking it as translatable. @@ -408,7 +408,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, See: @.track_get @since 1.8]] - return: Evas.Object; [[The track object]] + return: Efl.Canvas.Object; [[The track object]] } untrack { [[This retrieve the track object of the item. @@ -472,7 +472,7 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, [[Register object item as an accessible object. @since 1.8]] - return: Evas.Object; [[Accessible object of the object item or NULL for any error]] + return: Efl.Canvas.Object; [[Accessible object of the object item or NULL for any error]] } access_unregister { [[Unregister accessible object of the object item. @@ -498,14 +498,14 @@ class Elm.Widget.Item(Eo.Base, Elm.Interface.Atspi_Accessible, params { dir: Elm.Focus_Direction; [[Focus direction]] } - return: Evas.Object; [[Focus next object]] + return: Efl.Canvas.Object; [[Focus next object]] } focus_next_object_set { [[Set the next object with specific focus direction. @since 1.16]] params { - next: Evas.Object @nullable; [[Focus next object]] + next: Efl.Canvas.Object @nullable; [[Focus next object]] dir: Elm.Focus_Direction; [[Focus direction]] } } diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h index abbd9ffff4..c98e6674e1 100644 --- a/src/lib/elementary/elm_win_legacy.h +++ b/src/lib/elementary/elm_win_legacy.h @@ -400,7 +400,7 @@ EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj); EAPI Ecore_Win32_Window *elm_win_win32_window_get(const Evas_Object *obj); /** - * @brief Get the Ecore_Cocoa_Window of an Evas.Object. + * @brief Get the Ecore_Cocoa_Window of an Efl.Canvas.Object. * * @return The Ecore_Cocoa_Window of @c obj. * diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 1b3364ca07..b1ce922aa0 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c @@ -2,7 +2,7 @@ # include "config.h" #endif -#define EVAS_OBJECT_PROTECTED +#define EFL_CANVAS_OBJECT_PROTECTED #include <Evas.h> #include <Ecore.h> @@ -246,7 +246,7 @@ EOLIAN static Eo * _emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, E_OBJ_NAME); + efl_canvas_object_type_set(obj, E_OBJ_NAME); return obj; } diff --git a/src/lib/ephysics/ephysics_body.cpp b/src/lib/ephysics/ephysics_body.cpp index c2120265c0..98da084ae3 100644 --- a/src/lib/ephysics/ephysics_body.cpp +++ b/src/lib/ephysics/ephysics_body.cpp @@ -890,7 +890,7 @@ err_body: } static void -_ephysics_body_evas_obj_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_ephysics_body_efl_canvas_object_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { EPhysics_Body *body = (EPhysics_Body *) data; @@ -1214,7 +1214,7 @@ _ephysics_body_move(EPhysics_Body *body, Evas_Coord x, Evas_Coord y, Evas_Coord } static void -_ephysics_body_evas_obj_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +_ephysics_body_efl_canvas_object_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { EPhysics_Body *body = (EPhysics_Body *) data; int w, h; @@ -1329,9 +1329,9 @@ _ephysics_body_del(EPhysics_Body *body) if (body->evas_obj) { evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL, - _ephysics_body_evas_obj_del_cb); + _ephysics_body_efl_canvas_object_del_cb); evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE, - _ephysics_body_evas_obj_resize_cb); + _ephysics_body_efl_canvas_object_resize_cb); if (body->faces_slices) evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESTACK, @@ -1372,7 +1372,7 @@ _ephysics_body_del(EPhysics_Body *body) } static void -_ephysics_body_evas_obj_map_apply(EPhysics_Body *body, Evas_Map *map, Evas_Object *obj, Eina_Bool bfc, Eina_Bool update_cw) +_ephysics_body_efl_canvas_object_map_apply(EPhysics_Body *body, Evas_Map *map, Evas_Object *obj, Eina_Bool bfc, Eina_Bool update_cw) { EPhysics_Camera *camera = ephysics_world_camera_get(body->world); @@ -1504,7 +1504,7 @@ _ephysics_cylinder_face_objs_update(EPhysics_Body *body) evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(), bx, by, z); - _ephysics_body_evas_obj_map_apply(body, map, obj, EINA_TRUE, + _ephysics_body_efl_canvas_object_map_apply(body, map, obj, EINA_TRUE, EINA_FALSE); } } @@ -1624,7 +1624,7 @@ _ephysics_box_face_objs_update(EPhysics_Body *body) evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(), x, y, z); - _ephysics_body_evas_obj_map_apply(body, map, obj, EINA_TRUE, + _ephysics_body_efl_canvas_object_map_apply(body, map, obj, EINA_TRUE, EINA_FALSE); } } @@ -1680,7 +1680,7 @@ _ephysics_body_evas_object_update(EPhysics_Body *body, Evas_Object *evas_obj) evas_map_util_quat_rotate(map, quat.x(), -quat.y(), quat.z(), -quat.w(), bx, by, z); - _ephysics_body_evas_obj_map_apply(body, map, evas_obj, + _ephysics_body_efl_canvas_object_map_apply(body, map, evas_obj, body->back_face_culling, EINA_TRUE); } @@ -3392,9 +3392,9 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B { evas_object_map_enable_set(body->evas_obj, EINA_FALSE); evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_DEL, - _ephysics_body_evas_obj_del_cb); + _ephysics_body_efl_canvas_object_del_cb); evas_object_event_callback_del(body->evas_obj, EVAS_CALLBACK_RESIZE, - _ephysics_body_evas_obj_resize_cb); + _ephysics_body_efl_canvas_object_resize_cb); if (body->default_face) { evas_object_event_callback_del(body->evas_obj, @@ -3406,7 +3406,7 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B body->evas_obj = evas_obj; evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_DEL, - _ephysics_body_evas_obj_del_cb, body); + _ephysics_body_efl_canvas_object_del_cb, body); if (body->soft_body) { @@ -3430,7 +3430,7 @@ ephysics_body_evas_object_set(EPhysics_Body *body, Evas_Object *evas_obj, Eina_B _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate); ephysics_world_lock_release(body->world); evas_object_event_callback_add(body->evas_obj, EVAS_CALLBACK_RESIZE, - _ephysics_body_evas_obj_resize_cb, body); + _ephysics_body_efl_canvas_object_resize_cb, body); } EAPI Evas_Object * @@ -3450,9 +3450,9 @@ ephysics_body_evas_object_unset(EPhysics_Body *body) if (obj) { evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, - _ephysics_body_evas_obj_del_cb); + _ephysics_body_efl_canvas_object_del_cb); evas_object_event_callback_del(obj, EVAS_CALLBACK_RESIZE, - _ephysics_body_evas_obj_resize_cb); + _ephysics_body_efl_canvas_object_resize_cb); evas_object_map_enable_set(obj, EINA_FALSE); } @@ -5162,7 +5162,7 @@ _ephysics_body_soft_sphere_face_evas_object_set(EPhysics_Body *body, EPhysics_Bo _ephysics_body_geometry_set(body, obj_x, obj_y, bz, obj_w, obj_h, bd, rate); ephysics_world_lock_release(body->world); evas_object_event_callback_add(evas_obj, EVAS_CALLBACK_RESIZE, - _ephysics_body_evas_obj_resize_cb, body); + _ephysics_body_efl_canvas_object_resize_cb, body); DBG("Soft sphere's face evas object set."); } diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 296f49f8fa..28e88c2f8c 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -160,7 +160,8 @@ typedef struct _Evas_Public_Data Evas_Public_Data; * An Evas Object handle. * @ingroup Evas_Object_Group */ -typedef Eo Evas_Object; +typedef Eo Efl_Canvas_Object; +typedef Efl_Canvas_Object Evas_Object; /* These defines are used in H files generated by Eolian to avoid * redefinition of types */ diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index cde534e39c..3af5ca00f6 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -64,7 +64,7 @@ #include "canvas/evas_common_interface.eo.h" -#include "canvas/evas_object.eo.h" +#include "canvas/efl_canvas_object.eo.h" #endif /* EFL_EO_API_SUPPORT */ #ifdef EFL_BETA_API_SUPPORT diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 14bc7736b3..f1ba3e1559 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -1424,7 +1424,7 @@ typedef enum EVAS_RENDER_TINT = 8, /** DEPRECATED. d = d*s + d*(1 - sa) + s*(1 - da) */ EVAS_RENDER_TINT_REL = 9, /** DEPRECATED. d = d*(1 - sa + s) */ EVAS_RENDER_MASK = 10, /** DEPRECATED. d = d*sa. For masking support, please - * use Evas.Object.clip_set or EDC "clip_to" instead. + * use Efl.Canvas.Object.clip_set or EDC "clip_to" instead. */ EVAS_RENDER_MUL = 11 /** DEPRECATED. d = d*s */ } Evas_Render_Op; @@ -1472,7 +1472,7 @@ EAPI Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj); EAPI Eina_Bool evas_object_static_clip_get(const Evas_Object *obj); #include "canvas/evas_common_interface.eo.legacy.h" -#include "canvas/evas_object.eo.legacy.h" +#include "canvas/efl_canvas_object.eo.legacy.h" /** * @} diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo index 5a1a4050e8..1dfcf59728 100644 --- a/src/lib/evas/canvas/efl_canvas_group.eo +++ b/src/lib/evas/canvas/efl_canvas_group.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Group (Evas.Object) +class Efl.Canvas.Group (Efl.Canvas.Object) { [[A group object is a container of other canvas objects. Its children move along their parent, are often clipped with a common clipper. @@ -84,7 +84,7 @@ class Efl.Canvas.Group (Evas.Object) legacy: null; } values { - clip: Evas.Object; + clip: Efl.Canvas.Object; } } @property group_color { @@ -145,7 +145,7 @@ class Efl.Canvas.Group (Evas.Object) See also @.group_member_del.]] params { - @in sub_obj: Evas.Object @nonull; [[The member object.]] + @in sub_obj: Efl.Canvas.Object @nonull; [[The member object.]] } legacy: null; } @@ -171,7 +171,7 @@ class Efl.Canvas.Group (Evas.Object) See also @.group_member_add for more details.]] params { - @in sub_obj: Evas.Object; [[the member object.]] + @in sub_obj: Efl.Canvas.Object; [[the member object.]] } legacy: null; } @@ -184,7 +184,7 @@ class Efl.Canvas.Group (Evas.Object) class.constructor; class.destructor; Eo.Base.constructor; - Evas.Object.paragraph_direction.set; - Evas.Object.paragraph_direction.get; + Efl.Canvas.Object.paragraph_direction.set; + Efl.Canvas.Object.paragraph_direction.get; } } diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c index bcb31732de..d492cf1a95 100644 --- a/src/lib/evas/canvas/efl_canvas_image.c +++ b/src/lib/evas/canvas/efl_canvas_image.c @@ -6,7 +6,7 @@ Eina_Bool _evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); Evas_Image_Load_Opts lo; @@ -54,7 +54,7 @@ _efl_canvas_image_efl_file_mmap_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSE Eina_Bool _evas_image_file_set(Eo *eo_obj, const char *file, const char *key) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); Evas_Image_Load_Opts lo; const char *file2; @@ -139,7 +139,7 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel) } // FIXME: if already busy preloading, then dont request again until // preload done - 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 (cancel) { if (o->preloading) @@ -161,7 +161,7 @@ _image_preload_internal(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool cancel) void _evas_image_load_async_start(Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -177,7 +177,7 @@ _efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj, void *_pd EINA_UNU void _evas_image_load_async_cancel(Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -193,7 +193,7 @@ _efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj, void *_pd EINA_UN void _evas_image_load_dpi_set(Eo *eo_obj, double dpi) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (dpi == o->load_opts->dpi) return; @@ -235,7 +235,7 @@ _efl_canvas_image_efl_image_load_load_dpi_get(Eo *eo_obj, void *_pd EINA_UNUSED void _evas_image_load_size_set(Eo *eo_obj, int w, int h) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if ((o->load_opts->w == w) && (o->load_opts->h == h)) return; @@ -282,7 +282,7 @@ _efl_canvas_image_efl_image_load_load_size_get(Eo *eo_obj, void *_pd EINA_UNUSED void _evas_image_load_scale_down_set(Eo *eo_obj, int scale_down) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (o->load_opts->scale_down_by == scale_down) return; @@ -324,7 +324,7 @@ _efl_canvas_image_efl_image_load_load_scale_down_get(Eo *eo_obj, void *_pd EINA_ void _evas_image_load_region_set(Eo *eo_obj, int x, int y, int w, int h) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if ((o->load_opts->region.x == x) && (o->load_opts->region.y == y) && @@ -375,7 +375,7 @@ _efl_canvas_image_efl_image_load_load_region_get(Eo *eo_obj, void *_pd EINA_UNUS void _evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool enable) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (o->load_opts->orientation == !!enable) return; @@ -409,7 +409,7 @@ _efl_canvas_image_efl_image_load_load_orientation_get(Eo *eo_obj, void *_pd EINA Eina_Bool _evas_image_load_region_support_get(const Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); return ENFN->image_can_region_get(ENDT, o->engine_data); @@ -425,7 +425,7 @@ _efl_canvas_image_efl_image_load_load_region_support_get(Eo *eo_obj, void *_pd E Eina_Bool _evas_image_animated_get(const Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!ENFN->image_animated_get) @@ -443,14 +443,14 @@ _efl_canvas_image_efl_image_animated_animated_get(Eo *eo_obj, void *_pd EINA_UNU int _evas_image_animated_frame_count_get(const Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!ENFN->image_animated_frame_count_get || !evas_object_image_animated_get(eo_obj)) return -1; - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); return ENFN->image_animated_frame_count_get(ENDT, o->engine_data); } @@ -463,7 +463,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_count_get(Eo *eo_obj, void * Efl_Image_Animated_Loop_Hint _evas_image_animated_loop_type_get(const Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!ENFN->image_animated_loop_type_get || @@ -482,7 +482,7 @@ _efl_canvas_image_efl_image_animated_animated_loop_type_get(Eo *eo_obj, void *_p int _evas_image_animated_loop_count_get(const Eo *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!ENFN->image_animated_loop_count_get || @@ -501,7 +501,7 @@ _efl_canvas_image_efl_image_animated_animated_loop_count_get(Eo *eo_obj, void *_ double _evas_image_animated_frame_duration_get(const Eo *eo_obj, int start_frame, int frame_num) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); int frame_count = 0; @@ -525,7 +525,7 @@ _efl_canvas_image_efl_image_animated_animated_frame_duration_get(Eo *eo_obj, voi Eina_Bool _evas_image_animated_frame_set(Eo *eo_obj, int frame_index) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); int frame_count = 0; @@ -742,7 +742,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_data_set(Eo *eo_obj, void *_pd EINA_UNUS void *pixels, int w, int h, int stride, Efl_Gfx_Colorspace cspace) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); return _image_pixels_set(obj, o, pixels, w, h, stride, cspace, EINA_FALSE); @@ -753,7 +753,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS const void *pixels, int w, int h, int stride, Efl_Gfx_Colorspace cspace) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); return _image_pixels_set(obj, o, (void *) pixels, w, h, stride, cspace, EINA_TRUE); @@ -762,7 +762,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd EINA_UNUS EOLIAN static void * _efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj, void *_pd EINA_UNUSED EINA_UNUSED) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!o->buffer_data_set || !o->engine_data || !ENFN->image_data_direct) @@ -778,7 +778,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED, int x, int y, int w, int h, Efl_Gfx_Colorspace cspace, int *stride) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); int len = 0, s = 0, width = 0, height = 0; void *data = NULL; @@ -820,7 +820,7 @@ EOLIAN static Eina_Bool _efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED, void *data, int length) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!ENFN->image_data_unmap || !o->engine_data) diff --git a/src/lib/evas/canvas/efl_canvas_image_internal.eo b/src/lib/evas/canvas/efl_canvas_image_internal.eo index 22903aeeaa..4d2676bc24 100644 --- a/src/lib/evas/canvas/efl_canvas_image_internal.eo +++ b/src/lib/evas/canvas/efl_canvas_image_internal.eo @@ -1,4 +1,4 @@ -abstract Efl.Canvas.Image.Internal (Evas.Object, Efl.Canvas.Filter.Internal, +abstract Efl.Canvas.Image.Internal (Efl.Canvas.Object, Efl.Canvas.Filter.Internal, Efl.Image, Efl.Gfx.Buffer, Efl.Gfx.Fill, Efl.Gfx.View, Efl.Orientation, Efl.Flipable, diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index c362bb3920..63fa0b9d42 100644 --- a/src/lib/evas/canvas/evas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -1,12 +1,11 @@ import evas_types; import efl_text_types; -abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, - Efl.Animator, Efl.Input.Interface, Efl.Gfx.Size.Hint) +abstract Efl.Canvas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, + Efl.Gfx.Stack, Efl.Animator, Efl.Input.Interface, + Efl.Gfx.Size.Hint) { legacy_prefix: evas_object; - eo_prefix: evas_obj; - event_prefix: evas_object; data: Evas_Object_Protected_Data; methods { legacy_ctor @protected @beta { @@ -238,7 +237,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, */ } values { - clip: Evas.Object @nonull; [[The object to clip $obj by.]] + clip: Efl.Canvas.Object @nonull; [[The object to clip $obj by.]] } } @property repeat_events { @@ -479,7 +478,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, See also @.clip and @.clip_unset. ]] legacy: null; - return: iterator<Evas.Object> @warn_unused; [[An iterator over the + return: iterator<Efl.Canvas.Object> @warn_unused; [[An iterator over the list of objects clipped by $obj.]] } } @@ -496,7 +495,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, Efl.Gfx, Efl.Gfx.Stack, legacy: evas_object_smart_parent_get; } values { - parent: Evas.Object; [[The parent smart object of $obj or $null.]] + parent: Efl.Canvas.Object; [[The parent smart object of $obj or $null.]] } } /* FIXME: is this really necessary? */ diff --git a/src/lib/evas/canvas/efl_canvas_polygon.eo b/src/lib/evas/canvas/efl_canvas_polygon.eo index 8b46f24320..41cb74e4c9 100644 --- a/src/lib/evas/canvas/efl_canvas_polygon.eo +++ b/src/lib/evas/canvas/efl_canvas_polygon.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Polygon (Evas.Object) +class Efl.Canvas.Polygon (Efl.Canvas.Object) { [[Low-level polygon object]] diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c index e7a0fb1dc9..d0b6a2e217 100644 --- a/src/lib/evas/canvas/efl_canvas_proxy.c +++ b/src/lib/evas/canvas/efl_canvas_proxy.c @@ -6,7 +6,7 @@ Eina_Bool _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (obj->delete_me && eo_src) { @@ -15,7 +15,7 @@ _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src) } if (eo_src) { - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); if (src->delete_me) { WRN("Setting object %p to deleted image source %p", eo_src, eo_obj); @@ -79,7 +79,7 @@ void _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip) { Evas_Object_Protected_Data *src_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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); source_clip = !!source_clip; @@ -89,7 +89,7 @@ _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip) if (!o->cur->source) return; - src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); evas_object_change(o->cur->source, src_obj); } @@ -115,7 +115,7 @@ _efl_canvas_proxy_source_clip_get(Eo *eo_obj, void *_pd EINA_UNUSED) void _evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); source_events = !!source_events; @@ -139,7 +139,7 @@ _efl_canvas_proxy_source_events_set(Eo *eo_obj, void *_pd EINA_UNUSED, Eina_Bool Eina_Bool _evas_image_proxy_source_events_get(const Eo *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); return obj->proxy->src_events; } @@ -163,7 +163,7 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox if (!o->cur->source) return; - cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + cur_source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write) { @@ -215,8 +215,8 @@ _evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_prox void _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) { - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); - Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS); Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EFL_CANVAS_IMAGE_INTERNAL_CLASS); _evas_image_file_set(eo_proxy, NULL, NULL); @@ -244,7 +244,7 @@ _evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src) static inline void * _proxy_image_get(Evas_Image_Data *o) { - Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); Evas_Image_Data *source_img = NULL; if (!source) @@ -266,7 +266,7 @@ _efl_canvas_proxy_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED, int x, int y, int w, int h, Efl_Gfx_Colorspace cspace, int *stride) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); int len = 0, s = 0, width = 0, height = 0; void *image, *data = NULL; @@ -315,7 +315,7 @@ EOLIAN static Eina_Bool _efl_canvas_proxy_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd EINA_UNUSED, void *data, int length) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!ENFN->image_data_unmap || !o->engine_data) @@ -344,7 +344,7 @@ _evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void o->proxyerror = 1; } - proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); + proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS); func = proxy->layer->evas->engine.func; func->context_color_set(output, context, 0, 0, 0, 255); func->context_multiplier_unset(output, context); diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo index 45a283a0c9..caae9e7767 100644 --- a/src/lib/evas/canvas/efl_canvas_proxy.eo +++ b/src/lib/evas/canvas/efl_canvas_proxy.eo @@ -13,9 +13,9 @@ class Efl.Canvas.Proxy (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer) The proxy object will mirror the rendering contents of a given source object in its drawing region, without affecting that - source in any way. The source must be another valid @Evas.Object. + source in any way. The source must be another valid @Efl.Canvas.Object. Other effects may be applied to the proxy, such as a map (see - @Evas.Object.map) to create a reflection of the original object + @Efl.Canvas.Object.map) to create a reflection of the original object (for example). Any existing source object will be removed after this call. @@ -30,7 +30,7 @@ class Efl.Canvas.Proxy (Efl.Canvas.Image.Internal, Efl.Gfx.Buffer) } get {} values { - src: Evas.Object @nonull; [[Source object to use for the proxy.]] + src: Efl.Canvas.Object @nonull; [[Source object to use for the proxy.]] } } @property source_clip { diff --git a/src/lib/evas/canvas/efl_canvas_rectangle.eo b/src/lib/evas/canvas/efl_canvas_rectangle.eo index 901c83ca17..3e8e81ae55 100644 --- a/src/lib/evas/canvas/efl_canvas_rectangle.eo +++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Rectangle (Evas.Object) +class Efl.Canvas.Rectangle (Efl.Canvas.Object) { implements { Eo.Base.constructor; diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.c b/src/lib/evas/canvas/efl_canvas_scene3d.c index 4e3d5f3a91..367e50277c 100644 --- a/src/lib/evas/canvas/efl_canvas_scene3d.c +++ b/src/lib/evas/canvas/efl_canvas_scene3d.c @@ -6,7 +6,7 @@ EOLIAN static void _efl_canvas_scene3d_scene3d_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Canvas3D_Scene *scene) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); Evas_Image_Load_Opts lo; @@ -141,7 +141,7 @@ _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj, void _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); Evas_Canvas3D_Scene_Data *pd_scene = eo_data_scope_get(scene, EVAS_CANVAS3D_SCENE_CLASS); diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.c b/src/lib/evas/canvas/efl_canvas_snapshot.c index 11fdf9e425..aa877c37c0 100644 --- a/src/lib/evas/canvas/efl_canvas_snapshot.c +++ b/src/lib/evas/canvas/efl_canvas_snapshot.c @@ -11,9 +11,9 @@ _efl_canvas_snapshot_eo_base_constructor(Eo *eo_obj, void *pd EINA_UNUSED) eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); if (!eo_obj) return NULL; - evas_obj_pass_events_set(eo_obj, EINA_TRUE); + efl_canvas_object_pass_events_set(eo_obj, EINA_TRUE); - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); EINA_COW_STATE_WRITE_BEGIN(obj, sw, cur) sw->snapshot = EINA_TRUE; EINA_COW_STATE_WRITE_END(obj, sw, cur); diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.c b/src/lib/evas/canvas/efl_canvas_surface_tbm.c index c4dcb6f15b..9a9fd54198 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_tbm.c +++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.c @@ -13,7 +13,7 @@ _efl_canvas_surface_tbm_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data Evas_Object_Protected_Data *obj; eo = eo_constructor(eo_super(eo, MY_CLASS)); - obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (!obj) return NULL; if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_TBM)) @@ -32,7 +32,7 @@ _efl_canvas_surface_tbm_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Tbm_Data * { Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_TBM); eo_data_unref(eo, pd->base); diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.c b/src/lib/evas/canvas/efl_canvas_surface_wayland.c index 3b1b3584df..d93f439152 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_wayland.c +++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.c @@ -13,7 +13,7 @@ _efl_canvas_surface_wayland_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_Wayla Evas_Object_Protected_Data *obj; eo = eo_constructor(eo_super(eo, MY_CLASS)); - obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (!obj) return NULL; if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_WL)) @@ -32,7 +32,7 @@ _efl_canvas_surface_wayland_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_Waylan { Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_WL); eo_data_unref(eo, pd->base); diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.c b/src/lib/evas/canvas/efl_canvas_surface_x11.c index 5796b9eb0f..3c01a2d823 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_x11.c +++ b/src/lib/evas/canvas/efl_canvas_surface_x11.c @@ -14,7 +14,7 @@ _efl_canvas_surface_x11_eo_base_constructor(Eo *eo, Efl_Canvas_Surface_X11_Data Evas_Object_Protected_Data *obj; eo = eo_constructor(eo_super(eo, MY_CLASS)); - obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (!obj) return NULL; if (!ENFN->image_native_init(ENDT, EVAS_NATIVE_SURFACE_X11)) @@ -34,7 +34,7 @@ _efl_canvas_surface_x11_eo_base_destructor(Eo *eo, Efl_Canvas_Surface_X11_Data * { Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); ENFN->image_native_shutdown(ENDT, EVAS_NATIVE_SURFACE_X11); eo_data_unref(eo, pd->base); diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo index 42925e79c2..9d87467944 100644 --- a/src/lib/evas/canvas/efl_canvas_text.eo +++ b/src/lib/evas/canvas/efl_canvas_text.eo @@ -1,6 +1,6 @@ struct Efl.Canvas.Text.Style; -class Efl.Canvas.Text (Evas.Object, Efl.Text) +class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text) { legacy_prefix: evas_object_textblock; methods { @@ -135,7 +135,7 @@ class Efl.Canvas.Text (Evas.Object, Efl.Text) @since 1.15 ]] params { - @in eo_obs: Evas.Object; + @in eo_obs: Efl.Canvas.Object; } return: bool; [[$true on success, $false otherwise.]] } @@ -145,7 +145,7 @@ class Efl.Canvas.Text (Evas.Object, Efl.Text) @since 1.15 ]] params { - @in eo_obs: Evas.Object; + @in eo_obs: Efl.Canvas.Object; } return: bool; [[$true on success, $false otherwise.]] } @@ -298,8 +298,8 @@ class Efl.Canvas.Text (Evas.Object, Efl.Text) Eo.Base.constructor; Eo.Base.destructor; Eo.Base.dbg_info_get; - Evas.Object.paragraph_direction.set; - Evas.Object.paragraph_direction.get; + Efl.Canvas.Object.paragraph_direction.set; + Efl.Canvas.Object.paragraph_direction.get; Efl.Text.text.set; Efl.Text.text.get; } diff --git a/src/lib/evas/canvas/efl_canvas_text_cursor.eo b/src/lib/evas/canvas/efl_canvas_text_cursor.eo index d83102cc4f..dcdb1369d6 100644 --- a/src/lib/evas/canvas/efl_canvas_text_cursor.eo +++ b/src/lib/evas/canvas/efl_canvas_text_cursor.eo @@ -17,7 +17,7 @@ class Efl.Canvas.Text.Cursor (Eo.Base) legacy: null; } values { - tb: const(Evas.Object); [[The text object]] /* XXX: It should be textblock only. */ + tb: const(Efl.Canvas.Object); [[The text object]] /* XXX: It should be textblock only. */ } } @property position { diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index 5f352afd58..7213736f64 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -191,10 +191,10 @@ class Evas.Box (Efl.Canvas.Group.Clipped) } internal_remove { [[No description supplied by the EAPI.]] - return: Evas.Object; + return: Efl.Canvas.Object; legacy: null; params { - @in child: Evas.Object; + @in child: Efl.Canvas.Object; } } layout_flow_vertical { @@ -232,8 +232,8 @@ class Evas.Box (Efl.Canvas.Group.Clipped) return: Evas_Object_Box_Option *; [[A box option bound to the recently added box item or $null, on errors]] params { - @in child: Evas.Object @nonull; [[A child Evas object to be made a member of $o.]] - @in reference: const(Evas.Object) @nonull; [[The child object to place this new one after.]] + @in child: Efl.Canvas.Object @nonull; [[A child Evas object to be made a member of $o.]] + @in reference: const(Efl.Canvas.Object) @nonull; [[The child object to place this new one after.]] } } remove_all { @@ -252,7 +252,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) [[Get an iterator to walk the list of children of a given box object. Note: Do not remove or delete objects while walking the list.]] - return: free(own(iterator<Evas.Object>), eina_iterator_free) + return: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free) @warn_unused; [[An iterator on $o's child objects, on success, or $null, on errors.]] } add_to { @@ -261,7 +261,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) This is a helper function that has the same effect of putting a new box object into $parent by use of evas_object_smart_member_add.]] - return: Evas.Object @warn_unused; [[$null on error, a pointer to a new box object on + return: Efl.Canvas.Object @warn_unused; [[$null on error, a pointer to a new box object on success.]] } append { @@ -280,7 +280,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) return: Evas_Object_Box_Option *; [[A box option bound to the recently added box item or $null, on errors.]] params { - @in child: Evas.Object @nonull; [[A child Evas object to be made a member of $o.]] + @in child: Efl.Canvas.Object @nonull; [[A child Evas object to be made a member of $o.]] } } option_property_id_get @const { @@ -316,7 +316,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) return: Evas_Object_Box_Option *; [[A box option bound to the recently added box item or $null, on errors.]] params { - @in child: Evas.Object @nonull; [[A child Evas object to be made a member of $o.]] + @in child: Efl.Canvas.Object @nonull; [[A child Evas object to be made a member of $o.]] } } accessor_new @const { @@ -324,7 +324,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) list of children of a given box object. Note: Do not remove or delete objects while walking the list.]] - return: free(own(accessor<Evas.Object>), eina_accessor_free) + return: free(own(accessor<Efl.Canvas.Object>), eina_accessor_free) @warn_unused; [[An accessor on $o's child objects, on success, or $null, on errors.]] } @@ -333,7 +333,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) legacy: null; return: Evas_Object_Box_Option *; params { - @in child: Evas.Object; + @in child: Efl.Canvas.Object; } } option_property_vset { @@ -358,7 +358,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) internal_remove_at { [[No description supplied by the EAPI.]] legacy: null; - return: Evas.Object; + return: Efl.Canvas.Object; params { @in pos: uint; } @@ -407,7 +407,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) legacy: null; return: Evas_Object_Box_Option *; params { - @in child: Evas.Object; + @in child: Efl.Canvas.Object; @in pos: uint; } } @@ -428,8 +428,8 @@ class Evas.Box (Efl.Canvas.Group.Clipped) return: Evas_Object_Box_Option *; [[A box option bound to the recently added box item or $null, on errors.]] params { - @in child: Evas.Object @nonull; [[A child Evas object to be made a member of $o.]] - @in reference: const(Evas.Object) @nonull; [[The child object to place this new one before.]] + @in child: Efl.Canvas.Object @nonull; [[A child Evas object to be made a member of $o.]] + @in reference: const(Efl.Canvas.Object) @nonull; [[The child object to place this new one before.]] } } option_property_name_get @const { @@ -453,8 +453,8 @@ class Evas.Box (Efl.Canvas.Group.Clipped) legacy: null; return: Evas_Object_Box_Option *; params { - @in child: Evas.Object; - @in reference: const(Evas.Object); + @in child: Efl.Canvas.Object; + @in reference: const(Efl.Canvas.Object); } } layout_homogeneous_horizontal { @@ -499,7 +499,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) legacy: null; return: Evas_Object_Box_Option*; params { - @in child: Evas.Object; + @in child: Efl.Canvas.Object; } } layout_homogeneous_max_size_vertical { @@ -520,8 +520,8 @@ class Evas.Box (Efl.Canvas.Group.Clipped) legacy: null; return: Evas_Object_Box_Option *; params { - @in child: Evas.Object; - @in reference: const(Evas.Object); + @in child: Efl.Canvas.Object; + @in reference: const(Efl.Canvas.Object); } } insert_at { @@ -542,7 +542,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) return: Evas_Object_Box_Option *; [[A box option bound to the recently added box item or $null, on errors.]] params { - @in child: Evas.Object @nonull; [[A child Evas object to be made a member of $o.]] + @in child: Efl.Canvas.Object @nonull; [[A child Evas object to be made a member of $o.]] @in pos: uint; [[The numeric position (starting from $0) to place the new child object at.]] } @@ -552,7 +552,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) legacy: null; return: Evas_Object_Box_Option*; params { - @in child: Evas.Object; + @in child: Efl.Canvas.Object; } } remove { @@ -569,7 +569,7 @@ class Evas.Box (Efl.Canvas.Group.Clipped) return: bool; [[$true on success, $false otherwise.]] params { - @in child: Evas.Object @nonull; [[The handle to the child object to be removed.]] + @in child: Efl.Canvas.Object @nonull; [[The handle to the child object to be removed.]] } } layout_stack { diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 0ee1847747..00a5e6270c 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -1,4 +1,4 @@ -#define EVAS_OBJECT_BETA +#define EFL_CANVAS_OBJECT_BETA #define EVAS_CANVAS_BETA #include "evas_common_private.h" @@ -31,27 +31,27 @@ extern Eina_Hash* signals_hash_table; } DEFINE_EVAS_CALLBACKS(EVAS_CALLBACK_LAST, - EVAS_OBJECT_EVENT_MOUSE_IN, - EVAS_OBJECT_EVENT_MOUSE_OUT, - EVAS_OBJECT_EVENT_MOUSE_DOWN, - EVAS_OBJECT_EVENT_MOUSE_UP, - EVAS_OBJECT_EVENT_MOUSE_MOVE, - EVAS_OBJECT_EVENT_MOUSE_WHEEL, - EVAS_OBJECT_EVENT_MULTI_DOWN, - EVAS_OBJECT_EVENT_MULTI_UP, - EVAS_OBJECT_EVENT_MULTI_MOVE, - EVAS_OBJECT_EVENT_FREE, - EVAS_OBJECT_EVENT_KEY_DOWN, - EVAS_OBJECT_EVENT_KEY_UP, - EVAS_OBJECT_EVENT_FOCUS_IN, - EVAS_OBJECT_EVENT_FOCUS_OUT, + EFL_CANVAS_OBJECT_EVENT_MOUSE_IN, + EFL_CANVAS_OBJECT_EVENT_MOUSE_OUT, + EFL_CANVAS_OBJECT_EVENT_MOUSE_DOWN, + EFL_CANVAS_OBJECT_EVENT_MOUSE_UP, + EFL_CANVAS_OBJECT_EVENT_MOUSE_MOVE, + EFL_CANVAS_OBJECT_EVENT_MOUSE_WHEEL, + EFL_CANVAS_OBJECT_EVENT_MULTI_DOWN, + EFL_CANVAS_OBJECT_EVENT_MULTI_UP, + EFL_CANVAS_OBJECT_EVENT_MULTI_MOVE, + EFL_CANVAS_OBJECT_EVENT_FREE, + EFL_CANVAS_OBJECT_EVENT_KEY_DOWN, + EFL_CANVAS_OBJECT_EVENT_KEY_UP, + EFL_CANVAS_OBJECT_EVENT_FOCUS_IN, + EFL_CANVAS_OBJECT_EVENT_FOCUS_OUT, EFL_GFX_EVENT_SHOW, EFL_GFX_EVENT_HIDE, EFL_GFX_EVENT_MOVE, EFL_GFX_EVENT_RESIZE, EFL_GFX_EVENT_RESTACK, - EVAS_OBJECT_EVENT_DEL, - EVAS_OBJECT_EVENT_HOLD, + EFL_CANVAS_OBJECT_EVENT_DEL, + EFL_CANVAS_OBJECT_EVENT_HOLD, EFL_GFX_EVENT_CHANGE_SIZE_HINTS, EFL_IMAGE_EVENT_PRELOAD, EFL_CANVAS_EVENT_FOCUS_IN, @@ -139,7 +139,7 @@ evas_object_event_callback_all_del(Evas_Object *eo_obj) { _eo_evas_object_cb_info *info; Eina_Inlist *itr; - 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->callbacks) return; @@ -293,7 +293,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data if (pevflags) *pevflags = efl_event_flags_get(eo_event_info); } - /* legacy callbacks - relying on Evas.Object events */ + /* legacy callbacks - relying on Efl.Canvas.Object events */ eo_event_callback_call(eo_obj, _legacy_evas_callback_table(type), event_info); if (type == EVAS_CALLBACK_MOUSE_DOWN) @@ -317,7 +317,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && (type <= EVAS_CALLBACK_KEY_UP)) { - Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); evas_object_event_callback_call(obj->smart.parent, smart_parent, type, event_info, event_id, eo_event_desc, eo_event_info); } } @@ -334,7 +334,7 @@ evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type, Eva EAPI void evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) { - 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); MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; @@ -363,7 +363,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type, Eva MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return NULL; 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 NULL; if (!func) return NULL; @@ -394,7 +394,7 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type type MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return NULL; 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 NULL; if (!func) return NULL; diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 8fd5aea395..a2cbb0131e 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -151,7 +151,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, In this example the $event_info is exactly a pointer to that focused rectangle. See the full @ref Example_Evas_Events "example". */ - return: Evas.Object @warn_unused; [[The object that has focus + return: Efl.Canvas.Object @warn_unused; [[The object that has focus or $null if there is not one.]] } } @@ -171,7 +171,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, \@ref evas_object_layer_set, \@ref evas_object_below_get, \@ref evas_object_above_get. ]] - return: Evas.Object @warn_unused; [[A pointer to the highest object + return: Efl.Canvas.Object @warn_unused; [[A pointer to the highest object on it (if any) or $null otherwise.]] } } @@ -350,7 +350,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, See also \@ref evas_object_layer_get, \@ref evas_object_layer_set, \@ref evas_object_below_get, \@ref evas_object_below_set. ]] - return: Evas.Object @warn_unused; [[ + return: Efl.Canvas.Object @warn_unused; [[ A pointer to the lowest object on it, if any, or $null otherwise. ]] @@ -422,9 +422,9 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, It will not append to the list pass events as hidden objects. Call eina_list_free on the returned list after usage. ]] - return: list<Evas.Object> @warn_unused; + return: list<Efl.Canvas.Object> @warn_unused; params { - @in stop: Evas.Object; [[An Evas Object where to stop searching.]] + @in stop: Efl.Canvas.Object; [[An Evas Object where to stop searching.]] @in x: int; [[The horizontal coordinate of the position.]] @in y: int; [[The vertical coordinate of the position.]] } @@ -515,7 +515,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, objects, acting only on the ones at the "top level", with regard to object parenting. ]] - return: list<Evas.Object> @warn_unused; [[ + return: list<Efl.Canvas.Object> @warn_unused; [[ The list of Evas objects that are over the given position in $e. ]] params { @@ -671,7 +671,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, objects, acting only on the ones at the "top level", with regard to object parenting. ]] - return: Evas.Object @warn_unused; [[The Evas object that is over all other objects at the given position.]] + return: Efl.Canvas.Object @warn_unused; [[The Evas object that is over all other objects at the given position.]] params { @in x: Evas.Coord; [[The horizontal coordinate of the position.]] @in y: Evas.Coord; [[The vertical coordinate of the position.]] @@ -712,7 +712,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, ]] } objects_in_rectangle_get @const { - return: list<Evas.Object> @warn_unused; + return: list<Efl.Canvas.Object> @warn_unused; params { @in x: Evas.Coord; @in y: Evas.Coord; @@ -731,7 +731,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, name is returned is undefined, so only use this if you can ensure the object name is unique. ]] - return: Evas.Object @warn_unused; [[ + return: Efl.Canvas.Object @warn_unused; [[ If successful, the Evas object with the given name. Otherwise, $null. ]] @@ -1049,7 +1049,7 @@ class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator, objects, acting only on the ones at the "top level", with regard to object parenting. ]] - return: Evas.Object @warn_unused; [[ + return: Efl.Canvas.Object @warn_unused; [[ The Evas object that is over all other objects at the given rectangular region. ]] diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c index 8d980f3bb2..b67d451f52 100644 --- a/src/lib/evas/canvas/evas_canvas3d_scene.c +++ b/src/lib/evas/canvas/evas_canvas3d_scene.c @@ -37,7 +37,7 @@ _evas_canvas3d_scene_evas_canvas3d_object_change_notify(Eo *eo_obj EINA_UNUSED, EINA_LIST_FOREACH(pd->images, l, eo) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); evas_object_change(eo, obj); } } diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.c b/src/lib/evas/canvas/evas_canvas3d_texture.c index 289e9ac4c6..dd9e737141 100644 --- a/src/lib/evas/canvas/evas_canvas3d_texture.c +++ b/src/lib/evas/canvas/evas_canvas3d_texture.c @@ -20,7 +20,7 @@ _texture_proxy_set(Evas_Canvas3D_Texture *texture, Evas_Object *eo_src, Evas_Obj static inline void _texture_proxy_unset(Evas_Canvas3D_Texture_Data *texture) { - Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(texture->source, EFL_CANVAS_OBJECT_CLASS); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src); { @@ -67,7 +67,7 @@ _texture_proxy_subrender(Evas_Canvas3D_Texture *obj) // TODO: replace this function by evas_render_proxy_subrender (as appropriate) - source = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); is_image = eo_isa(pd->source, EFL_CANVAS_IMAGE_INTERNAL_CLASS); @@ -226,7 +226,7 @@ _evas_canvas3d_texture_evas_canvas3d_object_update_notify(Eo *obj, Evas_Canvas3D Eo *evas = NULL; evas = evas_common_evas_get(obj); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); if (pd->engine_data == NULL) { @@ -424,7 +424,7 @@ _evas_canvas3d_texture_source_set(Eo *obj , Evas_Canvas3D_Texture_Data *pd, Evas return; } - src = eo_data_scope_get(source, EVAS_OBJECT_CLASS); + src = eo_data_scope_get(source, EFL_CANVAS_OBJECT_CLASS); if (src->delete_me) { @@ -452,7 +452,7 @@ _evas_canvas3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex if (pd->source == NULL) return; - src_obj = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); + src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); if (src_obj->proxy->src_invisible == !visible) return; @@ -474,7 +474,7 @@ _evas_canvas3d_texture_source_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Tex if (pd->source == NULL) return EINA_FALSE; - src_obj = eo_data_scope_get(pd->source, EVAS_OBJECT_CLASS); + src_obj = eo_data_scope_get(pd->source, EFL_CANVAS_OBJECT_CLASS); return !src_obj->proxy->src_invisible; } diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo b/src/lib/evas/canvas/evas_canvas3d_texture.eo index cd0a5a1b8a..7d74e620a7 100644 --- a/src/lib/evas/canvas/evas_canvas3d_texture.eo +++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo @@ -76,7 +76,7 @@ class Evas.Canvas3D.Texture (Evas.Canvas3D.Object, Evas.Common_Interface) ]] params { - @in source: Evas.Object; [[Source evas object to be used as + @in source: Efl.Canvas.Object; [[Source evas object to be used as the texture data.]] } } diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index dd98ede361..b4b899b682 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -178,7 +178,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D if (obj->smart.parent) { Evas_Object_Protected_Data *smart_parent_obj = - eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); evas_object_child_map_across_mark (eo_obj, obj, smart_parent_obj->map->cur.map_parent, 0, NULL); } @@ -189,7 +189,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D } static void -_evas_object_clip_mask_unset(Evas_Object_Protected_Data *obj) +_efl_canvas_object_clip_mask_unset(Evas_Object_Protected_Data *obj) { if (!obj || !obj->mask->is_mask) return; if (obj->clip.clipees) return; @@ -216,7 +216,7 @@ extern const char *o_image_type; static void _clipper_del_cb(void *data, const Eo_Event *event); EOLIAN void -_evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) +_efl_canvas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip) { Evas_Object_Protected_Data *clip; Evas_Public_Data *e; @@ -233,7 +233,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * evas_object_async_block(obj); - clip = eo_data_scope_get(eo_clip, EVAS_OBJECT_CLASS); + clip = eo_data_scope_get(eo_clip, EFL_CANVAS_OBJECT_CLASS); if (obj->cur->clipper && obj->cur->clipper->object == eo_clip) return; if (eo_obj == eo_clip) { @@ -318,7 +318,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * } } - _evas_object_clip_mask_unset(obj->cur->clipper); + _efl_canvas_object_clip_mask_unset(obj->cur->clipper); } evas_object_change(obj->cur->clipper->object, obj->cur->clipper); evas_object_change(eo_obj, obj); @@ -395,7 +395,7 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * } EOLIAN Evas_Object * -_evas_object_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->cur->clipper) return obj->cur->clipper->object; @@ -403,7 +403,7 @@ _evas_object_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) } EOLIAN void -_evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) { if (!obj->cur->clipper) return; evas_object_async_block(obj); @@ -448,7 +448,7 @@ _evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj) } } - _evas_object_clip_mask_unset(obj->cur->clipper); + _efl_canvas_object_clip_mask_unset(obj->cur->clipper); } evas_object_change(obj->cur->clipper->object, obj->cur->clipper); @@ -481,11 +481,11 @@ static void _clipper_del_cb(void *data, const Eo_Event *event) { Evas_Object *eo_obj = data; - 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_clip_unset(eo_obj, obj); + _efl_canvas_object_clip_unset(eo_obj, obj); if (obj->prev->clipper && (obj->prev->clipper->object == event->object)) { // not removing cb since it's the del cb... it can't be called again! @@ -496,7 +496,7 @@ _clipper_del_cb(void *data, const Eo_Event *event) } void -_evas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev) +_efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev) { if (obj->prev->clipper) { @@ -563,7 +563,7 @@ _clipee_iterator_free(Clipee_Iterator *it) } EOLIAN Eina_Iterator * -_evas_object_clipees_get(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_clipees_get(Eo *eo_obj, Evas_Object_Protected_Data *obj) { Clipee_Iterator *it; @@ -584,13 +584,13 @@ _evas_object_clipees_get(Eo *eo_obj, Evas_Object_Protected_Data *obj) } EOLIAN Eina_Bool -_evas_object_clipees_has(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_clipees_has(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return (obj->clip.clipees ? EINA_TRUE : EINA_FALSE); } EOLIAN void -_evas_object_no_render_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enable) +_efl_canvas_object_no_render_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enable) { obj->no_render = enable; if (obj->is_smart) @@ -598,7 +598,7 @@ _evas_object_no_render_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Boo } EOLIAN Eina_Bool -_evas_object_no_render_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_no_render_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->no_render; } diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index f0d8a951fe..9c39b60aa9 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -31,7 +31,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte { if (obj->smart.parent) { - Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed); } @@ -292,9 +292,9 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object_Protected_Data *child; @@ -333,7 +333,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) { @@ -352,7 +352,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); ev->canvas = point; _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, &ev->canvas.y, @@ -372,9 +372,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->cur.canvas; Efl_Event_Pointer *pe = NULL; @@ -397,7 +397,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if ((evas_object_clippers_is_visible(eo_child, child) || child->mouse_grabbed) && @@ -423,7 +423,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, { eo_child = outs->data; outs = eina_list_remove(outs, eo_child); - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if ((child->mouse_grabbed == 0) && (!e->delete_me)) { if (child->mouse_in) continue; @@ -457,7 +457,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); ev->cur.canvas = point; @@ -503,7 +503,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, int event_id2 = _evas_event_counter; EINA_LIST_FOREACH(ins, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) { if (!child->mouse_in) @@ -545,9 +545,9 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Efl_Event_Pointer *pe = NULL; @@ -567,7 +567,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(copy, l, eo_child) { if (src->delete_me) break; - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) || (child->mouse_grabbed > 0)) @@ -599,9 +599,9 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, static void _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); if (obj->layer->evas->is_frozen) return; @@ -611,7 +611,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo) { if (src->delete_me) return; - child = eo_data_scope_get(child_eo, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(child_eo, EFL_CANVAS_OBJECT_CLASS); evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev, event_id, NULL, NULL); if (src->layer->evas->delete_me) break; @@ -623,9 +623,9 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Efl_Event_Pointer *pe = NULL; @@ -643,7 +643,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(copy, l, eo_child) { if (src->delete_me) return; - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); ev->canvas = point; _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, @@ -662,9 +662,9 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->canvas; Efl_Event_Pointer *pe = NULL; @@ -683,7 +683,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) { child->mouse_grabbed += (addgrab + 1); @@ -701,7 +701,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, &ev->canvas.x, &ev->canvas.y, child->mouse_grabbed); - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id, pe, parent_pe); if (e->delete_me) break; } @@ -716,9 +716,9 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->canvas; Efl_Event_Pointer *pe = NULL; @@ -738,7 +738,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(copy, l, eo_child) { ev->canvas = point; - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if (((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) || (child->mouse_grabbed > 0)) @@ -764,9 +764,9 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->cur.canvas; Efl_Event_Pointer *pe = NULL; @@ -790,7 +790,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); if (((evas_object_clippers_is_visible(eo_child, child)) || ((child->mouse_grabbed) && (!evas_event_passes_through(eo_child, child)) && @@ -802,7 +802,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, &ev->cur.canvas.x, &ev->cur.canvas.y, child->mouse_grabbed); - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe); if (e->delete_me || e->is_frozen) break; } @@ -823,7 +823,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); ev->cur.canvas = point; if (evas_object_is_in_output_rect(eo_child, child, @@ -843,7 +843,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, &ev->cur.canvas.x, &ev->cur.canvas.y, child->mouse_grabbed); - child = eo_data_scope_get(eo_child, EVAS_OBJECT_CLASS); + child = eo_data_scope_get(eo_child, EFL_CANVAS_OBJECT_CLASS); EV_CALL(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id, pe, parent_pe); if (e->delete_me || e->is_frozen) break; } @@ -871,9 +871,9 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Efl_Event_Pointer *pe = NULL; @@ -901,7 +901,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(ins, l, eo_child) { Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, - EVAS_OBJECT_CLASS); + EFL_CANVAS_OBJECT_CLASS); if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) { if(child->mouse_in) continue; @@ -933,9 +933,9 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id, Efl_Event_Pointer *parent_pe) { - 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); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CANVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Efl_Event_Pointer *pe = NULL; @@ -956,7 +956,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, EINA_LIST_FOREACH(copy, l, eo_child) { Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, - EVAS_OBJECT_CLASS); + EFL_CANVAS_OBJECT_CLASS); if (!child->mouse_in) continue; child->mouse_in = 0; @@ -1192,7 +1192,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) { @@ -1207,7 +1207,7 @@ _canvas_event_feed_mouse_down_internal(Eo *eo_e, int b, Evas_Button_Flags flags, } EINA_LIST_FOREACH(copy, l, 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->delete_me) continue; ev.canvas.x = e->pointer.x; ev.canvas.y = e->pointer.y; @@ -1269,7 +1269,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, ll, 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 ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside)) { if (!obj->mouse_in) continue; @@ -1313,7 +1313,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data, EINA_LIST_FOREACH(ins, l, eo_obj_itr) { - Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EFL_CANVAS_OBJECT_CLASS); if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr)) { if (obj_itr->mouse_in) continue; @@ -1406,7 +1406,7 @@ _canvas_event_feed_mouse_up_internal(Eo *eo_e, int b, Evas_Button_Flags flags, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) && (obj->mouse_grabbed > 0)) @@ -1541,7 +1541,7 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, int direction, int z, EINA_LIST_FOREACH(copy, l, 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 (!evas_event_freezes_through(eo_obj, obj)) { ev.canvas.x = e->pointer.x; @@ -1625,7 +1625,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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 ((!e->is_frozen) && (evas_object_clippers_is_visible(eo_obj, obj) || obj->mouse_grabbed) && @@ -1690,7 +1690,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int Evas_Object *eo_obj; eo_obj = outs->data; outs = eina_list_remove(outs, 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->mouse_grabbed == 0) && (!e->delete_me)) { if (!obj->mouse_in) continue; @@ -1772,7 +1772,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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) continue; /* if its under the pointer and its visible and its in the new */ @@ -1831,7 +1831,7 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, Evas_Public_Data *e, int x, int /* go thru our current list of ins */ EINA_LIST_FOREACH(ins, l, 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 its not in the old list of ins send an enter event */ if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { @@ -1944,7 +1944,7 @@ nogrep: eo_below_obj = evas_object_below_get(nogrep_obj); if (eo_below_obj) { - Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EFL_CANVAS_OBJECT_CLASS); ins = _evas_event_object_list_raw_in_get(eo_e, NULL, EINA_INLIST_GET(below_obj), NULL, e->pointer.x, e->pointer.y, @@ -1962,7 +1962,7 @@ nogrep: EINA_LIST_FOREACH(lst, l, 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 its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -2016,7 +2016,7 @@ nogrep: /* go thru our current list of ins */ EINA_LIST_FOREACH(newin, l, 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 its not in the old list of ins send an enter event */ if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { @@ -2101,7 +2101,7 @@ _canvas_event_feed_mouse_in_internal(Eo *eo_e, unsigned int timestamp, const voi ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y); EINA_LIST_FOREACH(ins, l, 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 (!eina_list_data_find(e->pointer.object.in, eo_obj)) { if (obj->mouse_in) continue; @@ -2172,7 +2172,7 @@ _canvas_event_feed_mouse_out_internal(Eo *eo_e, unsigned int timestamp, const vo copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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->mouse_in) continue; obj->mouse_in = 0; if (!obj->delete_me) @@ -2261,7 +2261,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) { obj->mouse_grabbed += addgrab + 1; @@ -2270,7 +2270,7 @@ _canvas_event_feed_multi_down_internal(Evas *eo_e, void *_pd, } EINA_LIST_FOREACH(copy, l, 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); ev.canvas.x = x; ev.canvas.y = y; ev.canvas.xsub = fx; @@ -2369,7 +2369,7 @@ _canvas_event_feed_multi_up_internal(Evas *eo_e, void *_pd, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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); ev.canvas.x = x; ev.canvas.y = y; ev.canvas.xsub = fx; @@ -2476,7 +2476,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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 ((evas_object_clippers_is_visible(eo_obj, obj) || obj->mouse_grabbed) && (!evas_event_passes_through(eo_obj, obj)) && @@ -2542,7 +2542,7 @@ _canvas_event_feed_multi_move_internal(Eo *eo_e, void *_pd, int d, int x, copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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 its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -2684,7 +2684,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, { if (!(e->modifiers.mask & g->not_modifiers)) { - Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(g->object, object_obj)) { @@ -2708,7 +2708,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, l = eina_list_next(l); if (g->delete_me) { - Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS); evas_key_grab_free(g->object, g_object_obj, g->keyname, g->modifiers, g->not_modifiers); } @@ -2719,7 +2719,7 @@ _canvas_event_feed_key_down_internal(Eo *eo_e, if (!ke) EV_DEL(eo_event_info); if ((e->focused) && (!exclusive)) { - Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) { EV_CALL(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN, @@ -2811,7 +2811,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, (!(e->modifiers.mask & g->not_modifiers)) && (!strcmp(keyname, g->keyname))) { - Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(g->object, object_obj)) { @@ -2837,7 +2837,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, if (gr->delete_me) { Evas_Object_Protected_Data *gr_object_obj = - eo_data_scope_get(gr->object, EVAS_OBJECT_CLASS); + eo_data_scope_get(gr->object, EFL_CANVAS_OBJECT_CLASS); evas_key_grab_free(gr->object, gr_object_obj, gr->keyname, gr->modifiers, gr->not_modifiers); } @@ -2847,7 +2847,7 @@ _canvas_event_feed_key_up_internal(Eo *eo_e, } if ((e->focused) && (!exclusive)) { - Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EFL_CANVAS_OBJECT_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) { evas_object_event_callback_call @@ -2926,7 +2926,7 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, 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 ( !evas_event_freezes_through(eo_obj, obj)) { evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, @@ -2971,7 +2971,7 @@ _canvas_event_feed_axis_update_internal(Evas *eo_e, Evas_Public_Data *e, unsigne EINA_LIST_FOREACH(copy, l, 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 (!evas_event_freezes_through(eo_obj, obj)) { evas_object_event_callback_call(eo_obj, obj, @@ -3013,7 +3013,7 @@ _feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj) } EOLIAN void -_evas_object_freeze_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool freeze) +_efl_canvas_object_freeze_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool freeze) { freeze = !!freeze; if (obj->freeze_events == freeze) return; @@ -3025,13 +3025,13 @@ _evas_object_freeze_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina } EOLIAN Eina_Bool -_evas_object_freeze_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_freeze_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->freeze_events; } EOLIAN void -_evas_object_pass_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool pass) +_efl_canvas_object_pass_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool pass) { pass = !!pass; if (obj->pass_events == pass) return; @@ -3041,13 +3041,13 @@ _evas_object_pass_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_B } EOLIAN Eina_Bool -_evas_object_pass_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_pass_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->pass_events; } EOLIAN void -_evas_object_repeat_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool repeat) +_efl_canvas_object_repeat_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool repeat) { repeat = !!repeat; if (obj->repeat_events == repeat) return; @@ -3056,25 +3056,25 @@ _evas_object_repeat_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina } EOLIAN Eina_Bool -_evas_object_repeat_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_repeat_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->repeat_events; } EOLIAN void -_evas_object_propagate_events_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool prop) +_efl_canvas_object_propagate_events_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool prop) { obj->no_propagate = !prop; } EOLIAN Eina_Bool -_evas_object_propagate_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_propagate_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return !(obj->no_propagate); } EOLIAN void -_evas_object_pointer_mode_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Pointer_Mode setting) +_efl_canvas_object_pointer_mode_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Pointer_Mode setting) { int addgrab; Evas_Object *cobj; @@ -3124,7 +3124,7 @@ _evas_object_pointer_mode_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_ /* only change objects past it */ EINA_LIST_FOREACH(l->next, l, cobj) { - cobj_data = eo_data_scope_get(cobj, EVAS_OBJECT_CLASS); + cobj_data = eo_data_scope_get(cobj, EFL_CANVAS_OBJECT_CLASS); if (!cobj_data->mouse_grabbed) continue; cobj_data->mouse_grabbed -= addgrab; cobj_data->layer->evas->pointer.mouse_grabbed -= addgrab; @@ -3143,7 +3143,7 @@ _evas_object_pointer_mode_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_ } EOLIAN Evas_Object_Pointer_Mode -_evas_object_pointer_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_pointer_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->pointer_mode; } diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c index ee78921910..f2296f6213 100644 --- a/src/lib/evas/canvas/evas_filter_mixin.c +++ b/src/lib/evas/canvas/evas_filter_mixin.c @@ -76,7 +76,7 @@ static void _render_post_cb(void *data, const Eo_Event *event EINA_UNUSED) { Eo *eo_obj = data; - 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); Evas_Filter_Data *pd = eo_data_scope_get(eo_obj, MY_CLASS); Eina_List *post_data; Evas_Filter_Post_Render_Data *task; @@ -97,7 +97,7 @@ static void _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) { Eo *eo_obj = data; - 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); Evas_Filter_Data *pd = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Filter_Post_Render_Data *post_data; @@ -122,8 +122,8 @@ _filter_source_hash_free_cb(void *data) Evas_Object_Protected_Data *proxy, *source; Evas_Filter_Data *pd; - proxy = eo_data_scope_get(pb->eo_proxy, EVAS_OBJECT_CLASS); - source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS); + proxy = eo_data_scope_get(pb->eo_proxy, EFL_CANVAS_OBJECT_CLASS); + source = eo_data_scope_get(pb->eo_source, EFL_CANVAS_OBJECT_CLASS); if (source) { @@ -249,7 +249,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, iter = eina_hash_iterator_data_new(pd->data->sources); EINA_ITERATOR_FOREACH(iter, pb) { - source = eo_data_scope_get(pb->eo_source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(pb->eo_source, EFL_CANVAS_OBJECT_CLASS); if (source->changed) { redraw = EINA_TRUE; @@ -355,7 +355,7 @@ EOLIAN static void _efl_canvas_filter_internal_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd, const char *code, const char *name) { - 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); Evas_Filter_Program *pgm = NULL; Evas_Object_Filter_Data *fcow; Eina_Bool alpha; @@ -409,13 +409,13 @@ EOLIAN static void _efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd, const char *name, Efl_Gfx *eo_source) { - 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); Evas_Filter_Proxy_Binding *pb, *pb_old = NULL; Evas_Object_Protected_Data *source = NULL; Evas_Object_Filter_Data *fcow = NULL; if (eo_source) - source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(eo_source, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); if (!name) @@ -503,7 +503,7 @@ _efl_canvas_filter_internal_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Fil const char *next_state, double next_val, double pos) { - 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); evas_object_async_block(obj); if ((cur_state != pd->data->state.cur.name) || (cur_val != pd->data->state.cur.value) || @@ -596,7 +596,7 @@ _efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd EOLIAN static void _efl_canvas_filter_internal_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd) { - 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); Evas_Filter_Data_Binding *db; Eina_Inlist *il; diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c index 939a6d2fb1..1d9be2911e 100644 --- a/src/lib/evas/canvas/evas_focus.c +++ b/src/lib/evas/canvas/evas_focus.c @@ -8,7 +8,7 @@ /* public calls */ EOLIAN void -_evas_object_key_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool focus) +_efl_canvas_object_key_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool focus) { int event_id = 0; @@ -47,7 +47,7 @@ _evas_object_key_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Boo } EOLIAN Eina_Bool -_evas_object_key_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_key_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->focused; } diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index 0f1c27c4ad..75546ebf50 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -1427,7 +1427,7 @@ evas_font_path_global_list(void) void evas_font_object_rehint(Evas_Object *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->is_smart) { EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj) diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo index b65ac05212..71979157b0 100644 --- a/src/lib/evas/canvas/evas_grid.eo +++ b/src/lib/evas/canvas/evas_grid.eo @@ -50,7 +50,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) list, but these removals won't be reflected on it. @since 1.1]] - return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; + return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; } } accessor_new @const { @@ -59,7 +59,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) Note: Do not remove or delete objects while walking the list. @since 1.1]] - return: free(own(accessor<Evas.Object>), eina_accessor_free) + return: free(own(accessor<Efl.Canvas.Object>), eina_accessor_free) @warn_unused; } clear { @@ -77,7 +77,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) Note: Do not remove or delete objects while walking the list. @since 1.1]] - return: free(own(iterator<Evas.Object>), eina_iterator_free) + return: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free) @warn_unused; } add_to { @@ -87,7 +87,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) @since 1.1]] - return: Evas.Object @warn_unused; + return: Efl.Canvas.Object @warn_unused; } unpack { [[Remove child from grid. @@ -100,7 +100,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) return: bool; [[1 on success, 0 on failure.]] params { - @in child: Evas.Object @nonull; + @in child: Efl.Canvas.Object @nonull; } } pack_get @const { @@ -112,7 +112,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) @since 1.1]] return: bool; [[1 on success, 0 on failure.]] params { - @in child: Evas.Object; [[The grid child to query for coordinates.]] + @in child: Efl.Canvas.Object; [[The grid child to query for coordinates.]] @out x: int; [[The pointer to where the x coordinate will be returned.]] @out y: int; [[The pointer to where the y coordinate will be returned.]] @out w: int; [[The pointer to where the width will be returned.]] @@ -126,7 +126,7 @@ class Evas.Grid (Efl.Canvas.Group.Clipped) return: bool; [[1 on success, 0 on failure.]] params { - @in child: Evas.Object @nonull; [[The child object to add.]] + @in child: Efl.Canvas.Object @nonull; [[The child object to add.]] @in x: int; [[The virtual x coordinate of the child.]] @in y: int; [[The virtual y coordinate of the child.]] @in w: int; [[The virtual width of the child.]] diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index 08c5b90576..f077771423 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -1,4 +1,4 @@ -#define EVAS_OBJECT_BETA +#define EFL_CANVAS_OBJECT_BETA #include "evas_image_private.h" #include "evas_image.eo.h" @@ -20,7 +20,7 @@ evas_object_image_add(Evas *eo_e) EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL); return eo_add(EVAS_IMAGE_CLASS, eo_e, efl_gfx_fill_auto_set(eo_self, EINA_FALSE), - evas_obj_legacy_ctor(eo_self)); + efl_canvas_object_legacy_ctor(eo_self)); } EAPI Evas_Object * @@ -28,7 +28,7 @@ evas_object_image_filled_add(Evas *eo_e) { EINA_SAFETY_ON_FALSE_RETURN_VAL(eo_isa(eo_e, EVAS_CANVAS_CLASS), NULL); return eo_add(EVAS_IMAGE_CLASS, eo_e, - evas_obj_legacy_ctor(eo_self)); + efl_canvas_object_legacy_ctor(eo_self)); } EAPI void @@ -370,7 +370,7 @@ evas_object_image_snapshot_set(Evas_Object *eo, Eina_Bool s) { EVAS_IMAGE_API(eo); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); if (obj->cur->snapshot == s) return; @@ -384,7 +384,7 @@ evas_object_image_snapshot_get(const Evas_Object *eo) { EVAS_IMAGE_API(eo, EINA_FALSE); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); return obj->cur->snapshot; } @@ -482,7 +482,7 @@ evas_object_image_native_surface_get(const Evas_Object *eo_obj) EAPI void evas_object_image_pixels_get_callback_set(Eo *eo_obj, Evas_Object_Image_Pixels_Get_Cb func, void *data) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -497,7 +497,7 @@ evas_object_image_pixels_get_callback_set(Eo *eo_obj, Evas_Object_Image_Pixels_G EAPI void evas_object_image_pixels_dirty_set(Eo *eo_obj, Eina_Bool dirty) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -518,7 +518,7 @@ evas_object_image_pixels_dirty_get(const Eo *eo_obj) EAPI void evas_object_image_data_set(Eo *eo_obj, void *data) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); void *p_data; Eina_Bool resize_call = EINA_FALSE; @@ -614,7 +614,7 @@ evas_object_image_data_get(const Eo *eo_obj, Eina_Bool for_writing) if (!o->engine_data) return NULL; - 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 (for_writing) evas_object_async_block(obj); if (for_writing) evas_render_rendering_wait(obj->layer->evas); @@ -655,7 +655,7 @@ evas_object_image_data_get(const Eo *eo_obj, Eina_Bool for_writing) EAPI void evas_object_image_data_copy_set(Eo *eo_obj, void *data) { - 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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!data) return; @@ -709,7 +709,7 @@ evas_object_image_size_set(Evas_Object *eo_obj, int w, int h) { EVAS_IMAGE_API(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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); int stride = 0; @@ -776,7 +776,7 @@ evas_object_image_colorspace_set(Evas_Object *eo_obj, Evas_Colorspace cspace) { EVAS_IMAGE_API(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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -797,7 +797,7 @@ evas_object_image_video_surface_set(Evas_Object *eo_obj, Evas_Video_Surface *sur { EVAS_IMAGE_LEGACY_API(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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -867,7 +867,7 @@ evas_object_image_video_surface_caps_set(Evas_Object *eo_obj, unsigned int caps) { EVAS_IMAGE_LEGACY_API(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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); evas_object_async_block(obj); @@ -919,7 +919,7 @@ evas_object_image_source_visible_set(Evas_Object *eo, Eina_Bool visible) EVAS_IMAGE_LEGACY_API(eo); - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EFL_CANVAS_OBJECT_CLASS); Evas_Object_Protected_Data *src_obj; Evas_Image_Data *o; @@ -927,7 +927,7 @@ evas_object_image_source_visible_set(Evas_Object *eo, Eina_Bool visible) if (!o->cur->source) return; visible = !!visible; - src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); if (src_obj->proxy->src_invisible == !visible) return; evas_object_async_block(obj); @@ -957,7 +957,7 @@ evas_object_image_source_visible_get(const Evas_Object *eo) o = eo_data_scope_get(eo, EFL_CANVAS_IMAGE_INTERNAL_CLASS); if (!o->cur->source) visible = EINA_FALSE; - src_obj = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + src_obj = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); if (src_obj) visible = !src_obj->proxy->src_invisible; else visible = EINA_FALSE; @@ -970,7 +970,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace) { EVAS_IMAGE_LEGACY_API(eo_obj, NULL); - 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); Evas_Image_Data *o; void *engine_data; DATA32 *data; @@ -1009,7 +1009,7 @@ evas_object_image_reload(Evas_Object *eo_obj) { EVAS_IMAGE_LEGACY_API(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); Evas_Image_Data *o; evas_object_async_block(obj); @@ -1045,7 +1045,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p { EVAS_IMAGE_LEGACY_API(eo_obj, 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); Evas_Image_Data *o; static int warned = 0; diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h index 3713d0e13e..b262999e84 100644 --- a/src/lib/evas/canvas/evas_image_private.h +++ b/src/lib/evas/canvas/evas_image_private.h @@ -6,7 +6,7 @@ */ #define EFL_CANVAS_FILTER_INTERNAL_PROTECTED -#define EVAS_OBJECT_PROTECTED +#define EFL_CANVAS_OBJECT_PROTECTED #include "evas_common_private.h" diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c index 8a1575c018..1a1ba6a3fe 100644 --- a/src/lib/evas/canvas/evas_key_grab.c +++ b/src/lib/evas/canvas/evas_key_grab.c @@ -132,7 +132,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers); if (!g) return; - Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS); g_object->grabs = eina_list_remove(g_object->grabs, g); obj->layer->evas->grabs = eina_list_remove(obj->layer->evas->grabs, g); if (g->keyname) free(g->keyname); @@ -142,7 +142,7 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c /* public calls */ EOLIAN Eina_Bool -_evas_object_key_grab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) +_efl_canvas_object_key_grab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) { /* MEM OK */ Evas_Key_Grab *g; @@ -153,7 +153,7 @@ _evas_object_key_grab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *k } EOLIAN void -_evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) +_efl_canvas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) { /* MEM OK */ Evas_Key_Grab *g; @@ -162,7 +162,7 @@ _evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char if (!keyname) return; g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers); if (!g) return; - Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EFL_CANVAS_OBJECT_CLASS); if (g_object->layer->evas->walking_grabs) { if (!g->delete_me) diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c index 7d6ff67cbf..12c8b2fb34 100644 --- a/src/lib/evas/canvas/evas_layer.c +++ b/src/lib/evas/canvas/evas_layer.c @@ -149,8 +149,8 @@ evas_layer_del(Evas_Layer *lay) static void _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); - Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *par_obj = eo_data_scope_get(par, EFL_CANVAS_OBJECT_CLASS); if (obj->delete_me) return; if (obj->cur->layer == l) return; @@ -185,7 +185,7 @@ evas_object_layer_set(Evas_Object *obj, short l) } EOLIAN void -_evas_object_efl_gfx_stack_layer_set(Eo *eo_obj, +_efl_canvas_object_efl_gfx_stack_layer_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, short l) { @@ -251,12 +251,12 @@ evas_object_layer_get(const Evas_Object *obj) } EOLIAN short -_evas_object_efl_gfx_stack_layer_get(Eo *eo_obj EINA_UNUSED, +_efl_canvas_object_efl_gfx_stack_layer_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->smart.parent) { - Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); return smart_parent_obj->cur->layer; } return obj->cur->layer; diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo index 2356c1b225..3988b5a451 100644 --- a/src/lib/evas/canvas/evas_line.eo +++ b/src/lib/evas/canvas/evas_line.eo @@ -1,6 +1,6 @@ import evas_types; -class Evas.Line (Evas.Object) +class Evas.Line (Efl.Canvas.Object) { legacy_prefix: evas_object_line; eo_prefix: evas_obj_line; diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 2251e8deaf..3e967044bf 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -682,7 +682,7 @@ _image_data_regenerate(Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_change(eo_obj, obj); #define CHECK(TYPE, STRUCT, REGEN) \ if (eo_isa(eo_obj, TYPE))\ 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; diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c index f3933c81b9..632f97fad5 100644 --- a/src/lib/evas/canvas/evas_name.c +++ b/src/lib/evas/canvas/evas_name.c @@ -4,8 +4,8 @@ EAPI void evas_object_name_set(Evas_Object *eo_obj, const char *name) { - Evas_Object_Protected_Data *obj = eo_isa(eo_obj, EVAS_OBJECT_CLASS) ? - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS) : NULL; + Evas_Object_Protected_Data *obj = eo_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ? + eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; if (!obj) return; if (obj->name) { @@ -25,8 +25,8 @@ evas_object_name_set(Evas_Object *eo_obj, const char *name) EAPI const char * evas_object_name_get(const Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_isa(eo_obj, EVAS_OBJECT_CLASS) ? - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS) : NULL; + Evas_Object_Protected_Data *obj = eo_isa(eo_obj, EFL_CANVAS_OBJECT_CLASS) ? + eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; if (!obj) return NULL; return obj->name; } diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index 3884284be5..63b6ca4f73 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -460,7 +460,7 @@ _evas_box_eo_base_constructor(Eo *obj, Evas_Object_Box_Data *class_data EINA_UNU { obj = eo_constructor(eo_super(obj, MY_CLASS)); evas_object_smart_callbacks_descriptions_set(obj, _signals); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 80dff1f6cf..2bfd1faab5 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -171,7 +171,7 @@ _init_cow(void) EOLIAN static Eo * _efl_canvas_image_internal_eo_base_constructor(Eo *eo_obj, Evas_Image_Data *o) { - 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); Evas_Colorspace cspace; eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); @@ -344,7 +344,7 @@ _evas_image_done_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Dat void _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orient orient) { - 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); int iw, ih; if (o->cur->orient == orient) return; @@ -492,7 +492,7 @@ _efl_canvas_image_internal_eo_base_dbg_info_get(Eo *eo_obj, Evas_Image_Data *o, EOLIAN static void _efl_canvas_image_internal_efl_image_border_set(Eo *eo_obj, Evas_Image_Data *o, int l, int r, int t, int b) { - 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 (l < 0) l = 0; if (r < 0) r = 0; @@ -528,7 +528,7 @@ _efl_canvas_image_internal_efl_image_border_get(Eo *eo_obj EINA_UNUSED, Evas_Ima EOLIAN static void _efl_canvas_image_internal_efl_image_border_center_fill_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Gfx_Border_Fill_Mode _fill) { - 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); Evas_Border_Fill_Mode fill = (Evas_Border_Fill_Mode) _fill; if (fill == o->cur->border.fill) return; @@ -550,7 +550,7 @@ _efl_canvas_image_internal_efl_image_border_center_fill_get(Eo *eo_obj EINA_UNUS EOLIAN static void _efl_canvas_image_internal_efl_gfx_fill_fill_auto_set(Eo *eo_obj, Evas_Image_Data* o, Eina_Bool setting) { - 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); setting = !!setting; o->filled_set = 1; if (o->filled == setting) return; @@ -582,7 +582,7 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_auto_get(Eo *eo_obj EINA_UNUSED, Ev EOLIAN static void _efl_canvas_image_internal_efl_image_border_scale_set(Eo *eo_obj, Evas_Image_Data *o, double scale) { - 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 (scale == o->cur->border.scale) return; evas_object_async_block(obj); @@ -603,7 +603,7 @@ _efl_canvas_image_internal_efl_image_border_scale_get(Eo *eo_obj EINA_UNUSED, Ev void _evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int h) { - 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 (w == 0) return; if (h == 0) return; @@ -657,9 +657,9 @@ _efl_canvas_image_internal_efl_gfx_view_view_size_get(Eo *eo_obj, Evas_Image_Dat Evas_Object_Protected_Data *source = NULL; Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); if (o->cur->source) - source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); if (o->cur->scene) { @@ -695,7 +695,7 @@ _efl_canvas_image_internal_efl_gfx_view_view_size_get(Eo *eo_obj, Evas_Image_Dat EOLIAN static void _efl_canvas_image_internal_efl_gfx_buffer_buffer_update_add(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int h) { - 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); Eina_Rectangle *r; int cnt; @@ -738,7 +738,7 @@ _efl_canvas_image_internal_efl_gfx_buffer_buffer_update_add(Eo *eo_obj, Evas_Ima EOLIAN static void _efl_canvas_image_internal_efl_gfx_buffer_alpha_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool has_alpha) { - 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); evas_object_async_block(obj); if ((o->preloading) && (o->engine_data)) @@ -790,7 +790,7 @@ _efl_canvas_image_internal_efl_gfx_buffer_alpha_get(Eo *eo_obj EINA_UNUSED, Evas EOLIAN static void _efl_canvas_image_internal_efl_image_smooth_scale_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Bool smooth_scale) { - 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); evas_object_async_block(obj); if (((smooth_scale) && (o->cur->smooth_scale)) || @@ -830,8 +830,8 @@ _efl_canvas_image_internal_efl_file_save(const Eo *eo_obj, Evas_Image_Data *o, c int imagew, imageh; void *pixels; - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); - Evas_Object_Protected_Data *source = (o->cur->source ? eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS) : NULL); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *source = (o->cur->source ? eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS) : NULL); evas_object_async_block(obj); @@ -1017,7 +1017,7 @@ Eina_Bool _evas_image_native_surface_set(Eo *eo_obj, Evas_Native_Surface *surf) { Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); - 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); evas_object_async_block(obj); evas_object_event_callback_del_full (eo_obj, EVAS_CALLBACK_DEL, _on_image_native_surface_del, NULL); @@ -1038,7 +1038,7 @@ _evas_image_native_surface_set(Eo *eo_obj, Evas_Native_Surface *surf) Evas_Native_Surface * _evas_image_native_surface_get(const Evas_Object *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Native_Surface *surf = NULL; @@ -1051,7 +1051,7 @@ _evas_image_native_surface_get(const Evas_Object *eo_obj) EOLIAN static void _efl_canvas_image_internal_efl_image_scale_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Image_Scale_Hint hint) { - 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); evas_object_async_block(obj); if (o->scale_hint == hint) return; o->scale_hint = hint; @@ -1084,7 +1084,7 @@ _efl_canvas_image_internal_efl_image_scale_hint_get(Eo *eo_obj EINA_UNUSED, Evas EOLIAN static void _efl_canvas_image_internal_efl_image_content_hint_set(Eo *eo_obj, Evas_Image_Data *o, Efl_Image_Content_Hint hint) { - 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); evas_object_async_block(obj); if (o->content_hint == hint) return; o->content_hint = hint; @@ -1357,7 +1357,7 @@ evas_object_image_figure_y_fill(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro static void evas_object_image_init(Evas_Object *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); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -1367,7 +1367,7 @@ evas_object_image_init(Evas_Object *eo_obj) EOLIAN static void _efl_canvas_image_internal_eo_base_destructor(Eo *eo_obj, Evas_Image_Data *o EINA_UNUSED) { - 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->legacy) evas_object_image_video_surface_set(eo_obj, NULL); @@ -1623,7 +1623,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, EOLIAN static void _efl_canvas_image_internal_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Image_Data *o) { - 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); o->changed = 1; evas_object_change(eo_obj, obj); @@ -1649,7 +1649,7 @@ _efl_canvas_image_internal_efl_canvas_filter_internal_filter_input_render(Eo *eo int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, Eina_Bool do_async) { - 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); Evas_Filter_Context *filter = _filter; void *surface, *output; Eina_Bool input_stolen; @@ -1787,7 +1787,7 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object_Protected_Data *source = (o->cur->source ? - eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS): + eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS): NULL); if (source && (source->type == o_type)) oi = eo_data_scope_get(o->cur->source, MY_CLASS); @@ -2154,7 +2154,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, /* Proxy: Do it early */ if (o->cur->source) { - Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); if (source->proxy->redraw || source->changed) { /* XXX: Do I need to sort out the map here? */ @@ -2493,7 +2493,7 @@ evas_object_image_is_opaque(Evas_Object *eo_obj EINA_UNUSED, // FIXME: use proxy if (o->cur->source) { - Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *cur_source = eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS); EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write) { state_write->opaque = evas_object_is_opaque(o->cur->source, cur_source); @@ -2683,7 +2683,7 @@ evas_object_image_is_inside(Evas_Object *eo_obj, */ Evas_Object_Protected_Data *source = (o->cur->source ? - eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS): + eo_data_scope_get(o->cur->source, EFL_CANVAS_OBJECT_CLASS): NULL); if (o->cur->scene) @@ -3176,7 +3176,7 @@ _evas_object_image_preloading_set(Evas_Object *eo_obj, Eina_Bool preloading) void _evas_object_image_preloading_check(Evas_Object *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (ENFN->image_load_error_get) o->load_error = ENFN->image_load_error_get(ENDT, o->engine_data); @@ -3192,7 +3192,7 @@ _evas_object_image_video_parent_get(Evas_Object *eo_obj) void _evas_object_image_video_overlay_show(Evas_Object *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (obj->cur->cache.clip.x != obj->prev->cache.clip.x || @@ -3231,7 +3231,7 @@ _evas_object_image_video_overlay_show(Evas_Object *eo_obj) void _evas_object_image_video_overlay_hide(Evas_Object *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (o->video_visible || o->created) @@ -3248,7 +3248,7 @@ _evas_object_image_video_overlay_hide(Evas_Object *eo_obj) void _evas_object_image_video_overlay_do(Evas_Object *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); Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Public_Data *e = obj->layer->evas; diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index 7a0da25113..8c2144b441 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -6,7 +6,7 @@ void evas_object_inform_call_show(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, _evas_event_counter, NULL, NULL); @@ -16,7 +16,7 @@ evas_object_inform_call_show(Evas_Object *eo_obj) void evas_object_inform_call_hide(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, _evas_event_counter, NULL, NULL); @@ -35,7 +35,7 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob void evas_object_inform_call_resize(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, _evas_event_counter, NULL, NULL); @@ -45,7 +45,7 @@ evas_object_inform_call_resize(Evas_Object *eo_obj) void evas_object_inform_call_restack(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, _evas_event_counter, NULL, NULL); @@ -55,7 +55,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj) void evas_object_inform_call_changed_size_hints(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, _evas_event_counter, NULL, NULL); @@ -65,7 +65,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj) void evas_object_inform_call_image_preloaded(Evas_Object *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); EINA_SAFETY_ON_NULL_RETURN(obj); if (!_evas_object_image_preloading_get(eo_obj)) return; @@ -80,7 +80,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj) void evas_object_inform_call_image_unloaded(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, _evas_event_counter, NULL, NULL); @@ -90,7 +90,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj) void evas_object_inform_call_image_resize(Evas_Object *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); _evas_object_event_new(); evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, _evas_event_counter, NULL, NULL); _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c index 7da2935035..485a1db49f 100644 --- a/src/lib/evas/canvas/evas_object_intercept.c +++ b/src/lib/evas/canvas/evas_object_intercept.c @@ -9,7 +9,7 @@ static void evas_object_intercept_deinit(Evas_Object *eo_obj); static void evas_object_intercept_init(Evas_Object *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->interceptors) obj->interceptors = evas_mem_calloc(sizeof(Evas_Intercept_Func)); } @@ -17,7 +17,7 @@ evas_object_intercept_init(Evas_Object *eo_obj) static void evas_object_intercept_deinit(Evas_Object *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->interceptors) return; if ((obj->interceptors->show.func) || (obj->interceptors->hide.func) || @@ -41,7 +41,7 @@ evas_object_intercept_deinit(Evas_Object *eo_obj) void evas_object_intercept_cleanup(Evas_Object *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->interceptors) free(obj->interceptors); } @@ -203,7 +203,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected 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 (!func) return; \ evas_object_intercept_init(eo_obj); \ if (!obj->interceptors) return; \ @@ -220,7 +220,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ return NULL; \ 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 (!func) return NULL; \ if (!obj->interceptors) return NULL; \ obj->interceptors->Lower_Type.func = NULL; \ diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c index 26dd5c7acb..a528d08719 100644 --- a/src/lib/evas/canvas/evas_object_line.c +++ b/src/lib/evas/canvas/evas_object_line.c @@ -113,7 +113,7 @@ _evas_line_xy_set(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord x1, Evas_Coord y1, 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 ((x1 == (obj->cur->geometry.x + o->cur.x1)) && (y1 == (obj->cur->geometry.y + o->cur.y1)) && @@ -197,7 +197,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y const Evas_Line_Data *o = _pd; - 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 (x1) *x1 = obj->cur->geometry.x + o->cur.x1; if (y1) *y1 = obj->cur->geometry.y + o->cur.y1; if (x2) *x2 = obj->cur->geometry.x + o->cur.x2; @@ -208,7 +208,7 @@ _evas_line_xy_get(Eo *eo_obj, Evas_Line_Data *_pd, Evas_Coord *x1, Evas_Coord *y static void evas_object_line_init(Evas_Object *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); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index fa2a1a8ba4..08005e1da7 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -1,5 +1,5 @@ -#define EVAS_OBJECT_PROTECTED -#define EVAS_OBJECT_BETA +#define EFL_CANVAS_OBJECT_PROTECTED +#define EFL_CANVAS_OBJECT_BETA #define EFL_GFX_SIZE_HINT_PROTECTED #include "evas_common_private.h" @@ -7,7 +7,7 @@ EVAS_MEMPOOL(_mp_sh); -#define MY_CLASS EVAS_OBJECT_CLASS +#define MY_CLASS EFL_CANVAS_OBJECT_CLASS #define MY_CLASS_NAME "Evas_Object" @@ -148,12 +148,12 @@ EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del }); EOLIAN static Eo * -_evas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { Eo *parent = NULL; eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); - evas_obj_type_set(eo_obj, MY_CLASS_NAME); + efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME); eo_manual_free_set(eo_obj, EINA_TRUE); parent = eo_parent_get(eo_obj); @@ -226,7 +226,7 @@ evas_object_cur_prev(Evas_Object *eo_obj) map_write->prev = map_write->cur; EINA_COW_WRITE_END(evas_object_map_cow, obj->map, map_write); } - _evas_object_clip_prev_reset(obj, EINA_TRUE); + _efl_canvas_object_clip_prev_reset(obj, EINA_TRUE); eina_cow_memcpy(evas_object_state_cow, (const Eina_Cow_Data **) &obj->prev, obj->cur); } @@ -735,7 +735,7 @@ evas_object_del(Evas_Object *eo_obj) } EOLIAN static void -_evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return; @@ -810,7 +810,7 @@ _evas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) } if (obj->cur->clipper) evas_object_clip_unset(eo_obj); - _evas_object_clip_prev_reset(obj, EINA_FALSE); + _efl_canvas_object_clip_prev_reset(obj, EINA_FALSE); evas_object_map_set(eo_obj, NULL); if (obj->is_smart) evas_object_smart_del(eo_obj); @@ -829,8 +829,8 @@ end: } EOLIAN static void -_evas_object_efl_gfx_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, - int x, int y, int w, int h) +_efl_canvas_object_efl_gfx_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, + int x, int y, int w, int h) { efl_gfx_position_set(obj, x, y); efl_gfx_size_set(obj, w, h); @@ -852,8 +852,8 @@ evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) } EOLIAN static void -_evas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, - Evas_Coord x, Evas_Coord y) +_efl_canvas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, + Evas_Coord x, Evas_Coord y) { Eina_Bool is, was = EINA_FALSE; @@ -875,7 +875,7 @@ _evas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, if ((obj->cur->geometry.x == x) && (obj->cur->geometry.y == y)) return; Evas_Map *map; - map = (Evas_Map *) evas_obj_map_get(eo_obj); + map = (Evas_Map *) efl_canvas_object_map_get(eo_obj); if (map && map->move_sync.enabled) { Evas_Coord diff_x = x - obj->cur->geometry.x; @@ -943,8 +943,8 @@ evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) } EOLIAN static void -_evas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, - Evas_Coord w, Evas_Coord h) +_efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, + Evas_Coord w, Evas_Coord h) { Eina_Bool is, was = EINA_FALSE; Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; @@ -1023,8 +1023,8 @@ _evas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, } EOLIAN void -_evas_object_efl_gfx_geometry_get(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, - int *x, int *y, int *w, int *h) +_efl_canvas_object_efl_gfx_geometry_get(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, + int *x, int *y, int *w, int *h) { efl_gfx_position_get(obj, x, y); efl_gfx_size_get(obj, w, h); @@ -1044,9 +1044,9 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y } EOLIAN static void -_evas_object_efl_gfx_position_get(Eo *obj EINA_UNUSED, - Evas_Object_Protected_Data *pd, - Evas_Coord *x, Evas_Coord *y) +_efl_canvas_object_efl_gfx_position_get(Eo *obj EINA_UNUSED, + Evas_Object_Protected_Data *pd, + Evas_Coord *x, Evas_Coord *y) { if ((pd->delete_me) || (!pd->layer)) { @@ -1060,9 +1060,9 @@ _evas_object_efl_gfx_position_get(Eo *obj EINA_UNUSED, } EOLIAN static void -_evas_object_efl_gfx_size_get(Eo *obj EINA_UNUSED, - Evas_Object_Protected_Data *pd, - Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_get(Eo *obj EINA_UNUSED, + Evas_Object_Protected_Data *pd, + Evas_Coord *w, Evas_Coord *h) { if (pd->delete_me) { @@ -1092,7 +1092,7 @@ _evas_object_size_hint_alloc(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protec } EOLIAN static Evas_Display_Mode -_evas_object_size_hint_display_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_size_hint_display_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (!obj) return EVAS_DISPLAY_MODE_NONE; if ((!obj->size_hints) || obj->delete_me) @@ -1101,7 +1101,7 @@ _evas_object_size_hint_display_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Prot } EOLIAN static void -_evas_object_size_hint_display_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Display_Mode dispmode) +_efl_canvas_object_size_hint_display_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Display_Mode dispmode) { if (!obj) return; if (obj->delete_me) return; @@ -1114,7 +1114,7 @@ _evas_object_size_hint_display_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Prot } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_restricted_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1127,7 +1127,7 @@ _evas_object_efl_gfx_size_hint_hint_restricted_min_get(Eo *eo_obj EINA_UNUSED, E } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) +_efl_canvas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; @@ -1141,7 +1141,7 @@ _evas_object_efl_gfx_size_hint_hint_restricted_min_set(Eo *eo_obj, Evas_Object_P } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_combined_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1154,7 +1154,7 @@ _evas_object_efl_gfx_size_hint_hint_combined_min_get(Eo *eo_obj EINA_UNUSED, Eva } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_hint_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1167,7 +1167,7 @@ _evas_object_efl_gfx_size_hint_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_ } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) +_efl_canvas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; @@ -1181,7 +1181,7 @@ _evas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Da } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_request_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_hint_hint_request_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1194,7 +1194,7 @@ _evas_object_efl_gfx_size_hint_hint_request_get(Eo *eo_obj EINA_UNUSED, Evas_Obj } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_request_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) +_efl_canvas_object_efl_gfx_size_hint_hint_request_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; @@ -1208,7 +1208,7 @@ _evas_object_efl_gfx_size_hint_hint_request_set(Eo *eo_obj, Evas_Object_Protecte } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_hint_hint_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1221,7 +1221,7 @@ _evas_object_efl_gfx_size_hint_hint_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_ } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) +_efl_canvas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; @@ -1235,7 +1235,7 @@ _evas_object_efl_gfx_size_hint_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Da } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect *aspect, Evas_Coord *w, Evas_Coord *h) +_efl_canvas_object_efl_gfx_size_hint_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect *aspect, Evas_Coord *w, Evas_Coord *h) { if ((!obj->size_hints) || obj->delete_me) { @@ -1250,7 +1250,7 @@ _evas_object_efl_gfx_size_hint_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Obje } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect aspect, Evas_Coord w, Evas_Coord h) +_efl_canvas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Size_Hint_Aspect aspect, Evas_Coord w, Evas_Coord h) { if (obj->delete_me) return; @@ -1265,7 +1265,7 @@ _evas_object_efl_gfx_size_hint_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_align_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) +_efl_canvas_object_efl_gfx_size_hint_hint_align_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) { if ((!obj->size_hints) || obj->delete_me) { @@ -1278,7 +1278,7 @@ _evas_object_efl_gfx_size_hint_hint_align_get(Eo *eo_obj EINA_UNUSED, Evas_Objec } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) +_efl_canvas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) { if (obj->delete_me) return; @@ -1292,7 +1292,7 @@ _evas_object_efl_gfx_size_hint_hint_align_set(Eo *eo_obj, Evas_Object_Protected_ } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_weight_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) +_efl_canvas_object_efl_gfx_size_hint_hint_weight_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y) { if ((!obj->size_hints) || obj->delete_me) { @@ -1305,7 +1305,7 @@ _evas_object_efl_gfx_size_hint_hint_weight_get(Eo *eo_obj EINA_UNUSED, Evas_Obje } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) +_efl_canvas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y) { if (obj->delete_me) return; @@ -1319,7 +1319,7 @@ _evas_object_efl_gfx_size_hint_hint_weight_set(Eo *eo_obj, Evas_Object_Protected } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_margin_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) +_efl_canvas_object_efl_gfx_size_hint_hint_margin_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) { if ((!obj->size_hints) || obj->delete_me) { @@ -1336,7 +1336,7 @@ _evas_object_efl_gfx_size_hint_hint_margin_get(Eo *eo_obj EINA_UNUSED, Evas_Obje } EOLIAN static void -_evas_object_efl_gfx_size_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) +_efl_canvas_object_efl_gfx_size_hint_hint_margin_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) { if (obj->delete_me) return; @@ -1374,7 +1374,7 @@ evas_object_visible_get(const Evas_Object *obj) } static void -_evas_object_efl_gfx_visible_set(Eo *eo_obj, +_efl_canvas_object_efl_gfx_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool visible) { @@ -1552,8 +1552,8 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) } static Eina_Bool -_evas_object_efl_gfx_visible_get(Eo *eo_obj EINA_UNUSED, - Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_visible_get(Eo *eo_obj EINA_UNUSED, + Evas_Object_Protected_Data *obj) { if (obj->delete_me) return EINA_FALSE; return obj->cur->visible; @@ -1566,8 +1566,8 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a) } EOLIAN static void -_evas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, - int r, int g, int b, int a) +_efl_canvas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, + int r, int g, int b, int a) { if (obj->delete_me) return; if (r > 255) r = 255; @@ -1627,13 +1627,13 @@ _evas_object_efl_gfx_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, } EOLIAN static Eina_Bool -_evas_object_efl_gfx_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd, - const char *part, - int r, int g, int b, int a) +_efl_canvas_object_efl_gfx_color_part_set(Eo *obj, Evas_Object_Protected_Data *pd, + const char *part, + int r, int g, int b, int a) { if (part) return EINA_FALSE; - _evas_object_efl_gfx_color_set(obj, pd, r, g, b, a); + _efl_canvas_object_efl_gfx_color_set(obj, pd, r, g, b, a); return EINA_TRUE; } @@ -1644,7 +1644,7 @@ evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) } EOLIAN static void -_evas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED, +_efl_canvas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, int *r, int *g, int *b, int *a) { @@ -1663,19 +1663,19 @@ _evas_object_efl_gfx_color_get(Eo *eo_obj EINA_UNUSED, } EOLIAN static Eina_Bool -_evas_object_efl_gfx_color_part_get(Eo *obj, - Evas_Object_Protected_Data *pd, - const char *part, - int *r, int *g, int *b, int *a) +_efl_canvas_object_efl_gfx_color_part_get(Eo *obj, + Evas_Object_Protected_Data *pd, + const char *part, + int *r, int *g, int *b, int *a) { if (part) return EINA_FALSE; - _evas_object_efl_gfx_color_get(obj, pd, r, g, b, a); + _efl_canvas_object_efl_gfx_color_get(obj, pd, r, g, b, a); return EINA_TRUE; } EOLIAN static void -_evas_object_anti_alias_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool anti_alias) +_efl_canvas_object_anti_alias_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool anti_alias) { if (obj->delete_me) return; anti_alias = !!anti_alias; @@ -1692,14 +1692,14 @@ _evas_object_anti_alias_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bo } EOLIAN static Eina_Bool -_evas_object_anti_alias_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_anti_alias_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->delete_me) return EINA_FALSE; return obj->cur->anti_alias; } EOLIAN static void -_evas_object_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale) +_efl_canvas_object_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale) { if (obj->delete_me) return; if (obj->cur->scale == scale) return; @@ -1716,7 +1716,7 @@ _evas_object_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale } EOLIAN static double -_evas_object_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->delete_me) return 1.0; return obj->cur->scale; @@ -1739,7 +1739,7 @@ _render_op_set(Evas_Object_Protected_Data *obj, Evas_Render_Op render_op) } EOLIAN static void -_evas_object_render_op_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Render_Op rop) +_efl_canvas_object_render_op_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Efl_Gfx_Render_Op rop) { _render_op_set(obj, _gfx_to_evas_render_op(rop)); } @@ -1752,7 +1752,7 @@ evas_object_render_op_set(Evas_Object *eo_obj, Evas_Render_Op render_op) } EOLIAN static Efl_Gfx_Render_Op -_evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return _evas_to_gfx_render_op(obj->cur->render_op); } @@ -1760,11 +1760,11 @@ _evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *o EAPI Evas_Render_Op evas_object_render_op_get(const Evas_Object *eo_obj) { - return _gfx_to_evas_render_op(evas_obj_render_op_get(eo_obj)); + return _gfx_to_evas_render_op(efl_canvas_object_render_op_get(eo_obj)); } EOLIAN static void -_evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root) +_efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root) { eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); @@ -1793,7 +1793,7 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI name = eo_name_get(eo_obj); // evas_object_name_get(eo_obj); efl_gfx_position_get(eo_obj, &x, &y); efl_gfx_size_get(eo_obj, &w, &h); - scale = evas_obj_scale_get(eo_obj); + scale = efl_canvas_object_scale_get(eo_obj); efl_gfx_size_hint_restricted_min_get(eo_obj, &minw, &minh); efl_gfx_size_hint_max_get(eo_obj, &maxw, &maxh); efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); @@ -1801,11 +1801,11 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI efl_gfx_size_hint_weight_get(eo_obj, &dblw, &dblh); efl_gfx_color_get(eo_obj, &r, &g, &b, &a); focus = evas_object_focus_get(eo_obj); - m = evas_obj_pointer_mode_get(eo_obj); - pass_event = evas_obj_pass_events_get(eo_obj); - repeat_event = evas_obj_repeat_events_get(eo_obj); - propagate_event = evas_obj_propagate_events_get(eo_obj); - clipees_has = evas_obj_clipees_has(eo_obj); + m = efl_canvas_object_pointer_mode_get(eo_obj); + pass_event = efl_canvas_object_pass_events_get(eo_obj); + repeat_event = efl_canvas_object_repeat_events_get(eo_obj); + propagate_event = efl_canvas_object_propagate_events_get(eo_obj); + clipees_has = efl_canvas_object_clipees_has(eo_obj); EO_DBG_INFO_APPEND(group, "Visibility", EINA_VALUE_TYPE_CHAR, visible); @@ -1880,7 +1880,7 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI EO_DBG_INFO_APPEND(group, "Has clipees", EINA_VALUE_TYPE_CHAR, clipees_has); Evas_Object *clipper = NULL; - clipper = evas_obj_clip_get(eo_obj); + clipper = efl_canvas_object_clip_get(eo_obj); EO_DBG_INFO_APPEND(group, "Clipper", EINA_VALUE_TYPE_UINT64, (uintptr_t) clipper); const Evas_Map *map = evas_object_map_get(eo_obj); @@ -1912,8 +1912,8 @@ _evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EI } } -static Evas * -_evas_object_evas_common_interface_evas_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +EOLIAN static Evas * +_efl_canvas_object_evas_common_interface_evas_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if ((obj->delete_me) || (!obj->layer)) return NULL; return obj->layer->evas->evas; @@ -2084,7 +2084,7 @@ _evas_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, } EOLIAN static void -_evas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type) +_efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type) { if (eo_finalized_get(eo_obj)) { @@ -2095,14 +2095,14 @@ _evas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *t } EOLIAN static void -_evas_object_precise_is_inside_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool precise) +_efl_canvas_object_precise_is_inside_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool precise) { evas_object_async_block(obj); obj->precise_is_inside = precise; } EOLIAN static Eina_Bool -_evas_object_precise_is_inside_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_precise_is_inside_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->precise_is_inside; } @@ -2122,7 +2122,7 @@ _is_frame_flag_set(Evas_Object_Protected_Data *obj, Eina_Bool is_frame) } EOLIAN static void -_evas_object_is_frame_object_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool is_frame) +_efl_canvas_object_is_frame_object_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool is_frame) { Evas_Coord x, y; @@ -2135,32 +2135,32 @@ _evas_object_is_frame_object_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Ei } EOLIAN static Eina_Bool -_evas_object_is_frame_object_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_is_frame_object_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { return obj->is_frame; } EOLIAN static Evas_Object * -_evas_object_render_parent_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) +_efl_canvas_object_render_parent_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (!obj) return NULL; return obj->smart.parent; } EOLIAN static void -_evas_object_paragraph_direction_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_BiDi_Direction dir EINA_UNUSED) +_efl_canvas_object_paragraph_direction_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_BiDi_Direction dir EINA_UNUSED) { return; } EOLIAN static Evas_BiDi_Direction -_evas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) +_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) { return EVAS_BIDI_DIRECTION_NEUTRAL; } EOLIAN static void -_evas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj) { EINA_SAFETY_ON_FALSE_RETURN(!eo_finalized_get(eo_obj)); obj->legacy = EINA_TRUE; @@ -2275,4 +2275,4 @@ evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y) efl_gfx_size_hint_align_get(obj, x, y); } -#include "canvas/evas_object.eo.c" +#include "canvas/efl_canvas_object.eo.c" diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c index 95c95bedf5..03aa31fc5c 100644 --- a/src/lib/evas/canvas/evas_object_polygon.c +++ b/src/lib/evas/canvas/evas_object_polygon.c @@ -100,7 +100,7 @@ _efl_canvas_polygon_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *cla EOLIAN static void _efl_canvas_polygon_point_add(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd, Evas_Coord x, Evas_Coord y) { - 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); Efl_Canvas_Polygon_Data *o = _pd; Efl_Canvas_Polygon_Point *p; Evas_Coord min_x, max_x, min_y, max_y; @@ -207,7 +207,7 @@ _efl_canvas_polygon_point_add(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd, Evas_Coo EOLIAN static void _efl_canvas_polygon_points_clear(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd) { - 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); Efl_Canvas_Polygon_Data *o = _pd; void *list_data; int is, was; @@ -252,7 +252,7 @@ _efl_canvas_polygon_points_clear(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd) static void evas_object_polygon_init(Evas_Object *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); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -262,7 +262,7 @@ evas_object_polygon_init(Evas_Object *eo_obj) EOLIAN static void _efl_canvas_polygon_eo_base_destructor(Eo *eo_obj, Efl_Canvas_Polygon_Data *_pd EINA_UNUSED) { - 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); evas_object_polygon_free(eo_obj, obj, obj->private_data); eo_destructor(eo_super(eo_obj, MY_CLASS)); diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index d764547db5..122d755176 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -113,7 +113,7 @@ _efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data static void evas_object_rectangle_init(Evas_Object *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); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index 8462adcc8c..832babc07f 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -215,8 +215,8 @@ EOLIAN static void _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Object *eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); - Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EFL_CANVAS_OBJECT_CLASS); Evas_Smart_Data *member_o = NULL; if (obj->delete_me) @@ -294,7 +294,7 @@ evas_object_smart_member_del(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 (!obj->smart.parent) return; Evas_Object *smart_obj = obj->smart.parent; @@ -305,13 +305,13 @@ evas_object_smart_member_del(Evas_Object *eo_obj) EOLIAN static void _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Object *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); Evas_Smart_Data *member_o; if (!obj->smart.parent) return; evas_object_async_block(obj); - Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart = eo_data_scope_get(smart_obj, EFL_CANVAS_OBJECT_CLASS); if (smart->smart.smart && smart->smart.smart->smart_class->member_del) smart->smart.smart->smart_class->member_del(smart_obj, eo_obj); @@ -444,7 +444,7 @@ EOLIAN static Eina_Iterator* _efl_canvas_group_group_children_iterate(const Eo *eo_obj, Evas_Smart_Data *priv) { Evas_Object_Smart_Iterator *it; - 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 (!priv->contained) return NULL; @@ -592,7 +592,7 @@ _efl_canvas_group_eo_base_constructor(Eo *eo_obj, Evas_Smart_Data *class_data EI eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); evas_object_smart_init(eo_obj); - evas_obj_type_set(eo_obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME_LEGACY); efl_canvas_group_add(eo_obj); return eo_obj; @@ -603,7 +603,7 @@ _efl_canvas_group_group_add(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->add) s->smart_class->add(eo_obj); } @@ -618,7 +618,7 @@ _efl_canvas_group_group_resize(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_ { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->resize) s->smart_class->resize(eo_obj, w, h); } @@ -628,7 +628,7 @@ _efl_canvas_group_group_move(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Evas_Co { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->move) s->smart_class->move(eo_obj, x, y); } @@ -638,7 +638,7 @@ _efl_canvas_group_group_show(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->show) s->smart_class->show(eo_obj); } @@ -648,7 +648,7 @@ _efl_canvas_group_group_hide(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->hide) s->smart_class->hide(eo_obj); } @@ -658,7 +658,7 @@ _efl_canvas_group_group_color_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, in { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->color_set) s->smart_class->color_set(eo_obj, r, g, b, a); } @@ -668,7 +668,7 @@ _efl_canvas_group_group_clip_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, Eva { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->clip_set) s->smart_class->clip_set(eo_obj, clip); } @@ -678,7 +678,7 @@ _efl_canvas_group_group_clip_unset(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { // If this function is reached, so we do nothing except trying to call // the function of the legacy smart class. - 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); Evas_Smart *s = obj->smart.smart; if (s && s->smart_class->clip_unset) s->smart_class->clip_unset(eo_obj); } @@ -699,7 +699,7 @@ _efl_canvas_group_group_no_render_set(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), obj2) { if (cso_clipper != obj2->object) - evas_obj_no_render_set(obj2->object, hide); + efl_canvas_object_no_render_set(obj2->object, hide); } } @@ -874,7 +874,7 @@ evas_object_smart_callbacks_descriptions_get(const Eo *eo_obj, const Evas_Smart_ if (class_descriptions) *class_descriptions = NULL; if (class_count) *class_count = 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->smart.smart && class_descriptions) *class_descriptions = obj->smart.smart->callbacks.array; if (obj->smart.smart && class_count) @@ -898,7 +898,7 @@ evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name, return; } - 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 (class_description) *class_description = evas_smart_cb_description_find (&obj->smart.smart->callbacks, name); @@ -911,7 +911,7 @@ evas_object_smart_callback_description_find(const Eo *eo_obj, const char *name, EOLIAN static void _efl_canvas_group_group_need_recalculate_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool value) { - 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); // XXX: do i need this? if (!obj || !obj->layer || obj->delete_me) return; @@ -947,7 +947,7 @@ _efl_canvas_group_group_need_recalculate_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_ EOLIAN static void _efl_canvas_group_group_calculate(Eo *eo_obj, Evas_Smart_Data *o) { - 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->smart.smart || !obj->smart.smart->smart_class->calculate) return; @@ -992,7 +992,7 @@ evas_call_smarts_calculate(Evas *eo_e) /* move the item to the processed list */ o = EINA_CLIST_ENTRY(elem, Evas_Smart_Data, calc_entry); eina_clist_remove(&o->calc_entry); - obj = eo_data_scope_get(o->object, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(o->object, EFL_CANVAS_OBJECT_CLASS); if (obj->delete_me) continue; eina_clist_add_tail(&e->calc_done, &o->calc_entry); @@ -1023,7 +1023,7 @@ evas_call_smarts_calculate(Evas *eo_e) EOLIAN static void _efl_canvas_group_group_change(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) { - 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); evas_object_async_block(obj); evas_object_change(eo_obj, obj); efl_canvas_group_need_recalculate_set(eo_obj, 1); @@ -1032,7 +1032,7 @@ _efl_canvas_group_group_change(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED) Eina_Bool evas_object_smart_changed_get(Evas_Object *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); Evas_Object_Protected_Data *o2; Eina_Bool has_map = EINA_FALSE; @@ -1062,7 +1062,7 @@ evas_object_smart_changed_get(Evas_Object *eo_obj) void evas_object_smart_del(Evas_Object *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); Evas_Smart_Data *sobj; Evas_Smart *s; unsigned int i; @@ -1247,7 +1247,7 @@ evas_object_smart_bounding_box_get(Evas_Object *eo_obj, void evas_object_smart_cleanup(Evas_Object *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->smart.parent) evas_object_smart_member_del(eo_obj); @@ -1290,7 +1290,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_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); Evas_Object_Protected_Data *member; if (pass_events) @@ -1315,7 +1315,7 @@ void evas_object_smart_member_raise(Evas_Object *eo_member) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_demote(o->contained, EINA_INLIST_GET(member)); } @@ -1324,7 +1324,7 @@ void evas_object_smart_member_lower(Evas_Object *eo_member) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_promote(o->contained, EINA_INLIST_GET(member)); } @@ -1333,8 +1333,8 @@ void evas_object_smart_member_stack_above(Evas_Object *eo_member, Evas_Object *eo_other) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); - Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EFL_CANVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member)); o->contained = eina_inlist_append_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other)); @@ -1344,8 +1344,8 @@ void evas_object_smart_member_stack_below(Evas_Object *eo_member, Evas_Object *eo_other) { Evas_Smart_Data *o; - Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EVAS_OBJECT_CLASS); - Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *member = eo_data_scope_get(eo_member, EFL_CANVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *other = eo_data_scope_get(eo_other, EFL_CANVAS_OBJECT_CLASS); o = eo_data_scope_get(member->smart.parent, MY_CLASS); o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(member)); o->contained = eina_inlist_prepend_relative(o->contained, EINA_INLIST_GET(member), EINA_INLIST_GET(other)); @@ -1455,7 +1455,7 @@ evas_object_smart_bounding_box_update(Evas_Object *eo_obj, Evas_Object_Protected static void evas_object_smart_init(Evas_Object *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); obj->is_smart = EINA_TRUE; /* set up methods (compulsory) */ obj->func = &object_func; @@ -1550,9 +1550,10 @@ _efl_canvas_group_group_paragraph_direction_set_internal(Eo *eo_obj, } EOLIAN static void -_efl_canvas_group_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o, Evas_BiDi_Direction dir) +_efl_canvas_group_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Data *o, + Evas_BiDi_Direction dir) { - 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); Evas_Smart_Data *parent; if ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) || @@ -1589,7 +1590,7 @@ _efl_canvas_group_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Smart_Dat } EOLIAN static Evas_BiDi_Direction -_efl_canvas_group_evas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) +_efl_canvas_group_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) { return o->paragraph_direction; } diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c index 18ed6bbf7a..a43a36a095 100644 --- a/src/lib/evas/canvas/evas_object_smart_clipped.c +++ b/src/lib/evas/canvas/evas_object_smart_clipped.c @@ -66,7 +66,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj) evas_object_resize(cso->clipper, 200000, 200000); evas_object_pass_events_set(cso->clipper, 1); evas_object_hide(cso->clipper); /* show when have something clipped to it */ - evas_obj_no_render_set(cso->clipper, 1); + efl_canvas_object_no_render_set(cso->clipper, 1); evas_object_smart_data_set(eo_obj, cso); } diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index cad89cc3f7..b62b531b80 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -260,7 +260,7 @@ _on_child_hints_changed(void *data, const Eo_Event *event EINA_UNUSED) } EO_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks, - { EVAS_OBJECT_EVENT_DEL, _on_child_del }, + { EFL_CANVAS_OBJECT_EVENT_DEL, _on_child_del }, { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } ); @@ -967,7 +967,7 @@ EOLIAN static Eo * _evas_table_eo_base_constructor(Eo *obj, Evas_Table_Data *class_data EINA_UNUSED) { obj = eo_constructor(eo_super(obj, MY_CLASS)); - evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY); + efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); return obj; } diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 6491653b4c..59ffdc62bd 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -151,7 +151,7 @@ _evas_object_text_char_coords_get(const Evas_Object *eo_obj, const Evas_Text_Data *o, size_t pos, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { - 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); Evas_Object_Text_Item *it; EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) @@ -272,7 +272,7 @@ static int _evas_object_text_last_up_to_pos(const Evas_Object *eo_obj, const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy) { - 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); Evas_Object_Text_Item *it; int pos = -1; @@ -328,7 +328,7 @@ _evas_object_text_char_at_coords(const Evas_Object *eo_obj, const Evas_Text_Data *o, Evas_Coord cx, Evas_Coord cy, Evas_Coord *rx, Evas_Coord *ry, Evas_Coord *rw, Evas_Coord *rh) { - 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); Evas_Object_Text_Item *it; EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it) @@ -388,7 +388,7 @@ _evas_text_eo_base_constructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) EOLIAN static void _evas_text_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Text_Data *o, const char *font_source) { - 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 ((o->cur.source) && (font_source) && (!strcmp(o->cur.source, font_source))) return; @@ -410,7 +410,7 @@ _evas_text_efl_text_properties_font_source_get(Eo *eo_obj EINA_UNUSED, Evas_Text EOLIAN static void _evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const char *font, Evas_Font_Size size) { - 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); Eina_Bool is, was = EINA_FALSE; Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; Eina_Bool source_invisible = EINA_FALSE; @@ -687,7 +687,7 @@ _evas_object_text_pad_get(const Eo *eo_obj, Evas_Text_Data *o, int *l, int *r, i static void _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *text) { - 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); EvasBiDiStrIndex *v_to_l = NULL; Evas_Coord advance = 0, width = 0; size_t pos, visual_pos; @@ -974,7 +974,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t EOLIAN static void _evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h) { - 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); evas_object_async_block(obj); EINA_COW_STATE_WRITE_BEGIN(obj, state_write, cur) @@ -990,7 +990,7 @@ _evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, int w, int h) EOLIAN static void _evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis) { - 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 (o->cur.ellipsis == ellipsis) return; @@ -1032,7 +1032,7 @@ _evas_text_eo_base_dbg_info_get(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED, Eo_Db EOLIAN static void _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text) { - 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); int is, was, len; Eina_Unicode *text; @@ -1077,7 +1077,7 @@ _evas_text_efl_text_text_set(Eo *eo_obj, Evas_Text_Data *o, const char *_text) EOLIAN static void _evas_text_bidi_delimiters_set(Eo *eo_obj, Evas_Text_Data *o, const char *delim) { - 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); evas_object_async_block(obj); eina_stringshare_replace(&o->bidi_delimiters, delim); } @@ -1098,7 +1098,7 @@ EOLIAN static Evas_BiDi_Direction _evas_text_direction_get(Eo *eo_obj, Evas_Text_Data *o) { #ifdef BIDI_SUPPORT - 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 (o->inherit_paragraph_direction) { @@ -1152,7 +1152,7 @@ _evas_text_max_descent_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) EOLIAN static Evas_Coord _evas_text_inset_get(Eo *eo_obj, Evas_Text_Data *o) { - 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); Evas_Coord inset = 0; if (!o->font) return inset; if (!o->items) return inset; @@ -1200,7 +1200,7 @@ _evas_text_char_pos_get(const Eo *eo_obj, Evas_Text_Data *o, int pos, Evas_Coord if (!o->font) return ret; if (!o->items || (pos < 0)) return ret; - 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); Eina_Bool int_ret = _evas_object_text_char_coords_get(eo_obj, o, (size_t) pos, &x, &y, &w, &h); @@ -1267,7 +1267,7 @@ _evas_text_char_coords_get(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Ev rw += rx; rx = 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 ((rx + rw) > obj->cur->geometry.w) rw = obj->cur->geometry.w - rx; if (rw < 0) rw = 0; if (ry < 0) @@ -1289,7 +1289,7 @@ _evas_text_char_coords_get(const Eo *eo_obj, Evas_Text_Data *o, Evas_Coord x, Ev EOLIAN static void _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style) { - 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); int pl = 0, pr = 0, pt = 0, pb = 0, l = 0, r = 0, t = 0, b = 0; int w = 0, h = 0; @@ -1318,7 +1318,7 @@ _evas_text_style_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o) EOLIAN static void _evas_text_shadow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a) { - 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 ((o->cur.shadow.r == r) && (o->cur.shadow.g == g) && (o->cur.shadow.b == b) && (o->cur.shadow.a == a)) return; @@ -1343,7 +1343,7 @@ _evas_text_shadow_color_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, int *r, i EOLIAN static void _evas_text_glow_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a) { - 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 ((o->cur.glow.r == r) && (o->cur.glow.g == g) && (o->cur.glow.b == b) && (o->cur.glow.a == a)) return; @@ -1368,7 +1368,7 @@ _evas_text_glow_color_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, int *r, int EOLIAN static void _evas_text_glow2_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a) { - 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 ((o->cur.glow2.r == r) && (o->cur.glow2.g == g) && (o->cur.glow2.b == b) && (o->cur.glow2.a == a)) return; @@ -1393,7 +1393,7 @@ _evas_text_glow2_color_get(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, int *r, in EOLIAN static void _evas_text_outline_color_set(Eo *eo_obj, Evas_Text_Data *o, int r, int g, int b, int a) { - 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 ((o->cur.outline.r == r) && (o->cur.outline.g == g) && (o->cur.outline.b == b) && (o->cur.outline.a == a)) return; @@ -1588,7 +1588,7 @@ evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int static void evas_object_text_init(Evas_Object *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); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -1607,7 +1607,7 @@ evas_object_text_init(Evas_Object *eo_obj) EOLIAN static void _evas_text_eo_base_destructor(Eo *eo_obj, Evas_Text_Data *o EINA_UNUSED) { - 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); evas_object_text_free(eo_obj, obj); eo_destructor(eo_super(eo_obj, MY_CLASS)); } @@ -1665,7 +1665,7 @@ evas_font_draw_async_check(Evas_Object_Protected_Data *obj, EOLIAN static void _evas_text_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Text_Data *o) { - 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); _evas_object_text_items_clear(o); o->changed = 1; @@ -2177,7 +2177,7 @@ evas_object_text_scale_update(Evas_Object *eo_obj, void _evas_object_text_rehint(Evas_Object *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); Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); int is, was; @@ -2210,7 +2210,7 @@ _evas_object_text_rehint(Evas_Object *eo_obj) static void _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text) { - 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); Evas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); @@ -2353,10 +2353,11 @@ evas_object_text_filter_source_set(Evas_Object *obj, const char *name, Evas_Obje } EOLIAN static void -_evas_text_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data *o, Evas_BiDi_Direction dir) +_evas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data *o, + Evas_BiDi_Direction dir) { #ifdef BIDI_SUPPORT - 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 ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) || (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT))) @@ -2392,8 +2393,8 @@ _evas_text_evas_object_paragraph_direction_set(Eo *eo_obj, Evas_Text_Data *o, Ev } EOLIAN static Evas_BiDi_Direction -_evas_text_evas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, - Evas_Text_Data *o) +_evas_text_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, + Evas_Text_Data *o) { return o->paragraph_direction; } diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index dbd032b4a9..a4e53d70a8 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -869,7 +869,7 @@ _nodes_clear(const Evas_Object *eo_obj) static void _format_unref_free(const Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) { - 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); fmt->ref--; if (fmt->ref > 0) return; if (fmt->font.fdesc) evas_font_desc_unref(fmt->font.fdesc); @@ -2620,7 +2620,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char static Evas_Object_Textblock_Format * _format_dup(Evas_Object *eo_obj, const Evas_Object_Textblock_Format *fmt) { - 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); Evas_Object_Textblock_Format *fmt2; fmt2 = calloc(1, sizeof(Evas_Object_Textblock_Format)); @@ -2705,7 +2705,7 @@ _layout_format_ascent_descent_adjust(const Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) { int ascent, descent; - 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 (fmt->font.font) { @@ -2770,7 +2770,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj, else { Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); asc = ENFN->font_max_ascent_get(ENDT, it->format->font.font); } @@ -2792,7 +2792,7 @@ _layout_item_max_ascent_descent_calc(const Evas_Object *eo_obj, else { Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); desc = ENFN->font_max_descent_get(ENDT, it->format->font.font); } @@ -2845,7 +2845,7 @@ _layout_item_ascent_descent_adjust(const Evas_Object *eo_obj, if (fmt) { Evas_Object_Protected_Data *obj = - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); asc = ENFN->font_ascent_get(ENDT, fmt->font.font); desc = ENFN->font_descent_get(ENDT, fmt->font.font); } @@ -3421,7 +3421,7 @@ _layout_calculate_format_item_size(const Evas_Object *eo_obj, Evas_Coord *maxascent, Evas_Coord *maxdescent, Evas_Coord *_y, Evas_Coord *_w, Evas_Coord *_h) { - 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); /* Adjust sizes according to current line height/scale */ Evas_Coord w, h; const char *p, *s; @@ -3783,7 +3783,7 @@ _layout_text_cutoff_get(Ctxt *c, Evas_Object_Textblock_Format *fmt, c->marginr - c->x - ti->x_adjustment; if (x < 0) x = 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); return ENFN->font_last_up_to_pos(ENDT, fmt->font.font, &ti->text_props, x, 0); } @@ -3893,7 +3893,7 @@ _text_item_update_sizes(Ctxt *c, Evas_Object_Textblock_Text_Item *ti) int dx = 0, minx = 0, maxx = 0, shx1, shx2; tw = th = 0; - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); if (fmt->font.font) ENFN->font_string_size_get(ENDT, fmt->font.font, &ti->text_props, &tw, &th); @@ -4126,7 +4126,7 @@ skip: script = evas_common_language_script_type_get(str, script_len); - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); while (script_len > 0) { Evas_Font_Instance *cur_fi = NULL; @@ -4228,7 +4228,7 @@ _layout_format_item_add(Ctxt *c, Evas_Object_Textblock_Node_Format *n, const cha static void _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) { - 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); void *of; of = fmt->font.font; @@ -4830,7 +4830,7 @@ _layout_ellipsis_item_new(Ctxt *c, const Evas_Object_Textblock_Item *cur_it) if (ellip_ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); /* It's only 1 char anyway, we don't need the run end. */ (void) ENFN->font_run_end_get(ENDT, ellip_ti->parent.format->font.font, &script_fi, &cur_fi, @@ -5015,7 +5015,7 @@ _item_get_cutoff(Ctxt *c, Evas_Object_Textblock_Item *it, Evas_Coord x) { int pos = -1; Evas_Object_Textblock_Text_Item *ti; - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); ti = (it->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(it) : NULL; if (ti && ti->parent.format->font.font) @@ -5992,7 +5992,7 @@ _layout_pre(Ctxt *c, int *style_pad_l, int *style_pad_r, int *style_pad_t, static void _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret) { - 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); Efl_Canvas_Text_Data *o = eo_data_ref(eo_obj, MY_CLASS); Ctxt ctxt, *c; int style_pad_l = 0, style_pad_r = 0, style_pad_t = 0, style_pad_b = 0; @@ -6187,7 +6187,7 @@ _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret) static void _relayout(const Evas_Object *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); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h, &o->formatted.w, &o->formatted.h); @@ -6221,7 +6221,7 @@ _relayout(const Evas_Object *eo_obj) static inline void _relayout_if_needed(Evas_Object *eo_obj, const Efl_Canvas_Text_Data *o) { - 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); evas_object_textblock_coords_recalc(eo_obj, obj, obj->private_data); if (!o->formatted.valid) @@ -6331,7 +6331,7 @@ evas_object_textblock_add(Evas *e) EOLIAN static Eo * _efl_canvas_text_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED) { - 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); Efl_Canvas_Text_Data *o; eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); @@ -6389,7 +6389,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) EINA_LIST_FOREACH(ts->objects, l, eo_obj) { Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); - 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); evas_object_async_block(obj); _evas_textblock_invalidate_all(o); _evas_textblock_changed(o, eo_obj); @@ -6624,7 +6624,7 @@ _textblock_style_generic_set(Evas_Object *eo_obj, Evas_Textblock_Style *ts, EAPI void evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts) { - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); _textblock_style_generic_set(eo_obj, (Evas_Textblock_Style *) ts, &(o->style)); @@ -6652,7 +6652,7 @@ EOLIAN static void _efl_canvas_text_style_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, const char *key, const char *style) { // FIXME: Make key value behaviour. - 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); evas_object_async_block(obj); Evas_Textblock_Style *ts; @@ -6703,7 +6703,7 @@ end: EAPI Evas_Textblock_Style * evas_object_textblock_style_get(const Eo *eo_obj EINA_UNUSED) { - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); return o->style; @@ -6722,7 +6722,7 @@ EAPI void evas_object_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Style *ts) { Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); - 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); evas_object_async_block(obj); Evas_Textblock_Style *old_ts = _style_by_key_find(o, _STYLE_USER); @@ -6740,7 +6740,7 @@ evas_object_textblock_style_user_push(Eo *eo_obj, Evas_Textblock_Style *ts) EAPI const Evas_Textblock_Style* evas_object_textblock_style_user_peek(const Eo *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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER); @@ -6750,7 +6750,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj) EAPI void evas_object_textblock_style_user_pop(Eo *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); evas_object_async_block(obj); efl_canvas_text_style_set(eo_obj, _STYLE_USER, NULL); @@ -6760,7 +6760,7 @@ EAPI void evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch) { Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); - 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); evas_object_async_block(obj); if (o->repch) eina_stringshare_del(o->repch); if (ch) o->repch = eina_stringshare_add(ch); @@ -6773,7 +6773,7 @@ evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch) EOLIAN static void _efl_canvas_text_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Eina_Bool mode) { - 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); evas_object_async_block(obj); if (o->legacy_newline == mode) return; @@ -6799,7 +6799,7 @@ EAPI void evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align) { Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); - 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); evas_object_async_block(obj); if (align < 0.0) align = 0.0; else if (align > 1.0) align = 1.0; @@ -6818,7 +6818,7 @@ evas_object_textblock_valign_get(const Efl_Canvas_Text *obj) EOLIAN static void _efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, const char *delim) { - 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); evas_object_async_block(obj); eina_stringshare_replace(&o->bidi_delimiters, delim); } @@ -7038,7 +7038,7 @@ _prepend_escaped_char(Efl_Canvas_Text_Cursor *cur_obj, const char *s, EAPI void evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) { - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (text == o->markup_text) @@ -7087,7 +7087,7 @@ evas_object_textblock_text_markup_prepend(Efl_Canvas_Text_Cursor *cur_obj, const Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return; Evas_Object *eo_obj = cur->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); evas_object_async_block(obj); TB_HEAD(); if (text) @@ -7293,7 +7293,7 @@ evas_object_textblock_text_markup_get(Eo *eo_obj) Evas_Object_Textblock_Node_Text *n; Eina_Strbuf *txt = NULL; - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); const char *markup; @@ -7605,7 +7605,7 @@ _obstacle_del_cb(void *data, const Eo_Event *event) static void _obstacle_clear(Eo *eo_obj, Evas_Textblock_Obstacle *obs) { - eo_event_callback_del(obs->eo_obs, EVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); + eo_event_callback_del(obs->eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); } static void @@ -7632,7 +7632,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj, { Evas_Textblock_Obstacle *obs; - if (!eo_isa(eo_obs, EVAS_OBJECT_CLASS)) + if (!eo_isa(eo_obs, EFL_CANVAS_OBJECT_CLASS)) return EINA_FALSE; obs = _obstacle_find(obj, eo_obs); if (obs) return EINA_FALSE; @@ -7641,7 +7641,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj, if (!obs) return EINA_FALSE; obs->eo_obs = eo_obs; - eo_event_callback_add(eo_obs, EVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); + eo_event_callback_add(eo_obs, EFL_CANVAS_OBJECT_EVENT_DEL, _obstacle_del_cb, eo_obj); obj->obstacles = eina_list_append(obj->obstacles, obs); _obstacle_update(obs, eo_obj); @@ -7657,7 +7657,7 @@ _efl_canvas_text_obstacle_del(Eo *eo_obj, Efl_Canvas_Text_Data *obj, Evas_Textblock_Obstacle *obs; Eina_List *i; - if (!eo_isa(eo_obs, EVAS_OBJECT_CLASS)) + if (!eo_isa(eo_obs, EFL_CANVAS_OBJECT_CLASS)) return EINA_FALSE; EINA_LIST_FOREACH(obj->obstacles, i, obs) @@ -7735,7 +7735,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti) if (hyphen_ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(c->obj, EFL_CANVAS_OBJECT_CLASS); /* It's only 1 char anyway, we don't need the run end. */ (void) ENFN->font_run_end_get(ENDT, hyphen_ti->parent.format->font.font, &script_fi, &cur_fi, @@ -8091,7 +8091,7 @@ EAPI Eina_Bool _evas_textblock_cursor_is_format(const Efl_Canvas_Text_Cursor_Data *cur) { if ((!cur) || (!cur->node)) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); return (_evas_textblock_cursor_node_format_at_pos_get(cur)) ? EINA_TRUE : EINA_FALSE; @@ -8107,7 +8107,7 @@ evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur_obj) EAPI const Eina_List * evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor) { - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (!strcmp(anchor, "a")) @@ -8120,7 +8120,7 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor) EAPI const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_first_get(Evas_Object *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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); return o->format_nodes; @@ -8129,7 +8129,7 @@ evas_textblock_node_format_first_get(Evas_Object *eo_obj) EAPI const Evas_Object_Textblock_Node_Format* evas_textblock_node_format_last_get(Evas_Object *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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL; @@ -8160,7 +8160,7 @@ evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Fo fmt = n; - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); do @@ -8261,7 +8261,7 @@ found: EOLIAN static void _efl_canvas_text_cursor_paragraph_first(Evas_Textblock_Cursor *cur_obj, Efl_Canvas_Text_Cursor_Data *cur) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); cur->node = o->text_nodes; @@ -8275,7 +8275,7 @@ _efl_canvas_text_cursor_paragraph_last(Evas_Textblock_Cursor *cur_obj, Efl_Canva { Evas_Object_Textblock_Node_Text *node; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); node = o->text_nodes; @@ -8299,7 +8299,7 @@ static Eina_Bool _evas_textblock_cursor_paragraph_next(Efl_Canvas_Text_Cursor_Data *cur) { if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); /* If there is a current text node, return the next text node (if exists) @@ -8339,7 +8339,7 @@ _evas_textblock_cursor_paragraph_prev(Efl_Canvas_Text_Cursor_Data *cur) { Evas_Object_Textblock_Node_Text *node; if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); /* If the current node is a text node, just get the prev if any, @@ -8390,7 +8390,7 @@ evas_textblock_cursor_format_next(Evas_Textblock_Cursor *cur_obj) Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); /* If the current node is a format node, just get the next if any, @@ -8429,7 +8429,7 @@ evas_textblock_cursor_format_prev(Evas_Textblock_Cursor *cur_obj) const Evas_Object_Textblock_Node_Format *node; Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); node = evas_textblock_cursor_format_get(cur_obj); @@ -8475,7 +8475,7 @@ evas_textblock_cursor_word_start(Efl_Canvas_Text_Cursor *cur_obj) size_t i; char *breaks; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); @@ -8543,7 +8543,7 @@ evas_textblock_cursor_word_end(Efl_Canvas_Text_Cursor *cur_obj) size_t i; char *breaks; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); @@ -8603,7 +8603,7 @@ _evas_textblock_cursor_char_next(Efl_Canvas_Text_Cursor_Data *cur) const Eina_Unicode *text; if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); @@ -8685,7 +8685,7 @@ static void _evas_textblock_cursor_paragraph_char_first(Efl_Canvas_Text_Cursor_Data *cur) { if (!cur) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); cur->pos = 0; } @@ -8703,7 +8703,7 @@ _evas_textblock_cursor_paragraph_char_last(Efl_Canvas_Text_Cursor_Data *cur) int ind; if (!cur) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node); ind = eina_ustrbuf_length_get(cur->node->unicode); @@ -8758,7 +8758,7 @@ _efl_canvas_text_cursor_line_char_first(Evas_Textblock_Cursor *cur_obj, Efl_Canv Evas_Object_Textblock_Line *ln = NULL; Evas_Object_Textblock_Item *it = NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -8781,7 +8781,7 @@ _evas_textblock_cursor_line_char_last(Efl_Canvas_Text_Cursor_Data *cur) Evas_Object_Textblock_Item *it = NULL; if (!cur) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -9276,7 +9276,7 @@ _efl_canvas_text_cursor_position_get(Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cu size_t npos = 0; if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, 0); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -9295,7 +9295,7 @@ _evas_textblock_cursor_pos_set(Efl_Canvas_Text_Cursor_Data *cur, int _pos) Evas_Object_Textblock_Node_Text *n; size_t pos; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -9350,7 +9350,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur_obj, int line) Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -9445,7 +9445,7 @@ _evas_textblock_cursor_compare(const Efl_Canvas_Text_Cursor_Data *cur1, EOLIAN static int _efl_canvas_text_cursor_compare(const Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cursor_Data *cur, const Efl_Canvas_Text_Cursor *cur2_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Cursor_Data *cur1 = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); @@ -9455,7 +9455,7 @@ _efl_canvas_text_cursor_compare(const Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_C EOLIAN static Eina_Bool _efl_canvas_text_cursor_equal(const Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cursor_Data *cur, const Efl_Canvas_Text_Cursor *cur2_obj) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Cursor_Data *cur2 = eo_data_scope_get(cur2_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); return ((cur->node == cur2->node) && (cur->pos == cur2->pos)); @@ -9726,7 +9726,7 @@ _evas_textblock_cursors_update_offset(const Efl_Canvas_Text_Cursor_Data *cur, static void _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *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); LYDBG("ZZ: invalidate 1 %p\n", eo_obj); o->formatted.valid = 0; o->native.valid = 0; @@ -9762,7 +9762,7 @@ _cursor_text_append(Eo *eo_obj, Efl_Canvas_Text_Cursor_Data *cur, const char *_t if (!cur) return 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); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); evas_object_async_block(obj); orig_text = text = eina_unicode_utf8_to_unicode(_text, &len); @@ -9851,7 +9851,7 @@ _cursor_text_prepend(Eo *eo_obj, Efl_Canvas_Text_Cursor_Data *cur, const char *_ int len; /*append is essentially prepend without advancing */ if (!cur) return 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); evas_object_async_block(obj); len = _cursor_text_append(eo_obj, cur, _text, legacy); if (len == 0) return 0; @@ -10052,7 +10052,7 @@ _evas_textblock_cursor_format_append(Efl_Canvas_Text_Cursor_Data *cur, Eina_Bool is_visible; if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); if ((!format) || (format[0] == 0)) return EINA_FALSE; Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -10196,7 +10196,7 @@ _evas_textblock_cursor_format_prepend(Efl_Canvas_Text_Cursor_Data *cur, const ch Eina_Bool is_visible; if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); /* append is essentially prepend without advancing */ is_visible = _evas_textblock_cursor_format_append(cur, format, NULL, EINA_FALSE); @@ -10224,7 +10224,7 @@ _evas_textblock_cursor_char_delete(Efl_Canvas_Text_Cursor_Data *cur) int chr, ind, ppos; if (!cur || !cur->node) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); n = cur->node; @@ -10321,7 +10321,7 @@ _efl_canvas_text_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *pd E if (!cur1 || !cur1->node) return; if (!cur2 || !cur2->node) return; if (cur1->obj != cur2->obj) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur1->obj, MY_CLASS); if (evas_textblock_cursor_compare(cur1_obj, cur2_obj) > 0) @@ -10431,7 +10431,7 @@ evas_textblock_cursor_content_get(const Evas_Textblock_Cursor *cur_obj) { Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur || !cur->node) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); if (evas_textblock_cursor_format_is_visible_get(cur_obj)) { @@ -10638,7 +10638,7 @@ evas_textblock_cursor_range_formats_get(const Efl_Canvas_Text_Cursor *cur1_obj, if (!cur2 || !cur2->node) return NULL; if (cur1->obj != cur2->obj) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); eo_obj = cur1->obj; TB_HEAD_RETURN(NULL); @@ -10707,7 +10707,7 @@ _evas_textblock_cursor_range_text_get(const Efl_Canvas_Text_Cursor_Data *cur1, c Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(cur1->obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); if (format == EVAS_TEXTBLOCK_TEXT_MARKUP) return _evas_textblock_cursor_range_text_markup_get(cur1, cur2); @@ -10743,7 +10743,7 @@ evas_textblock_cursor_paragraph_text_get(const Evas_Textblock_Cursor *cur_obj) Efl_Canvas_Text_Cursor_Data cur1, cur2; Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, NULL); if (cur->node->utf8) @@ -10767,7 +10767,7 @@ evas_textblock_cursor_paragraph_text_length_get(const Evas_Textblock_Cursor *cur int len; Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, -1); len = eina_ustrbuf_length_get(cur->node->unicode); @@ -10783,7 +10783,7 @@ evas_textblock_cursor_format_get(const Evas_Textblock_Cursor *cur_obj) { Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, NULL); return _evas_textblock_cursor_node_format_at_pos_get(cur); @@ -10834,7 +10834,7 @@ _evas_textblock_cursor_at_format_set(Efl_Canvas_Text_Cursor_Data *cur, const Evas_Object_Textblock_Node_Format *fmt) { if (!fmt || !cur) return; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); cur->node = fmt->text_node; cur->pos = _evas_textblock_node_format_pos_get(fmt); @@ -10853,7 +10853,7 @@ _evas_textblock_cursor_format_is_visible_get(const Efl_Canvas_Text_Cursor_Data * const Eina_Unicode *text; if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, EINA_FALSE); if (!_evas_textblock_cursor_is_format(cur)) return EINA_FALSE; @@ -10903,7 +10903,7 @@ EOLIAN static Eina_Bool _efl_canvas_text_cursor_geometry_get(Eo *cur_obj EINA_UNUSED, Efl_Canvas_Text_Cursor_Data *cur, Efl_Canvas_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2) { if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); evas_object_async_block(obj); @@ -11090,7 +11090,7 @@ evas_textblock_cursor_geometry_get(const Efl_Canvas_Text_Cursor *cur_obj, Evas_C int ret = -1; Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -11214,7 +11214,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat if (pos < 0) pos = 0; if (ti->parent.format->font.font) { - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); query_func(ENDT, ti->parent.format->font.font, &ti->text_props, @@ -11281,7 +11281,7 @@ evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur_obj, Ev { Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); return _evas_textblock_cursor_char_pen_geometry_common_get( ENFN->font_char_coords_get, cur_obj, cx, cy, cw, ch); @@ -11292,7 +11292,7 @@ evas_textblock_cursor_pen_geometry_get(const Evas_Textblock_Cursor *cur_obj, Eva { Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); return _evas_textblock_cursor_char_pen_geometry_common_get( ENFN->font_pen_coords_get, cur_obj, cx, cy, cw, ch); @@ -11307,7 +11307,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur_obj, Ev Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -11347,7 +11347,7 @@ _efl_canvas_text_visible_range_get(Eo *eo_obj EINA_UNUSED, { Evas *eo_e; Evas_Coord cy, ch; - 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); evas_object_async_block(obj); TB_HEAD_RETURN(EINA_FALSE); eo_e = evas_object_evas_get(eo_obj); @@ -11371,7 +11371,7 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur_obj, Evas_Coord Evas_Object_Textblock_Item *it = NULL; Eina_Bool ret = EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -11513,7 +11513,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur_obj, Evas_Coord Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return -1; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -11656,7 +11656,7 @@ _evas_textblock_cursor_range_in_line_geometry_get( cur = (cur1) ? cur1 : cur2; if (!cur) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); /* Find the first and last items */ it1 = it2 = NULL; @@ -11958,7 +11958,7 @@ _efl_canvas_text_range_geometry_get(Eo *eo_obj EINA_UNUSED, if (!cur1 || !cur1->node) return NULL; if (!cur2 || !cur2->node) return NULL; if (cur1->obj != cur2->obj) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); _relayout_if_needed(cur1->obj, o); @@ -12065,7 +12065,7 @@ evas_textblock_cursor_range_geometry_get(const Efl_Canvas_Text_Cursor *cur1_obj, if (!cur1 || !cur1->node) return NULL; if (!cur2 || !cur2->node) return NULL; if (cur1->obj != cur2->obj) return NULL; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur1->obj, MY_CLASS); @@ -12139,7 +12139,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Canvas_Text_Cursor_Dat Evas_Coord x, y, w, h; if (!cur || !_evas_textblock_cursor_format_is_visible_get(cur)) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(cur->obj, MY_CLASS); @@ -12175,7 +12175,7 @@ evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur_obj) Efl_Canvas_Text_Cursor_Data cur2; Efl_Canvas_Text_Cursor_Data *cur = eo_data_scope_get(cur_obj, EFL_CANVAS_TEXT_CURSOR_CLASS); if (!cur) return EINA_FALSE; - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); _evas_textblock_cursor_init(&cur2, cur->obj); @@ -12195,7 +12195,7 @@ evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_ Evas_Object_Textblock_Line *ln; - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); @@ -12217,7 +12217,7 @@ _evas_object_textblock_clear(Evas_Object *eo_obj) Efl_Canvas_Text_Cursor *cur; Efl_Canvas_Text_Cursor_Data *co; - 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); evas_object_async_block(obj); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (o->paragraphs) @@ -12255,7 +12255,7 @@ evas_object_textblock_clear(Evas_Object *eo_obj) EOLIAN static void _efl_canvas_text_size_formatted_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *w, Evas_Coord *h) { - 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); evas_object_async_block(obj); _relayout_if_needed(eo_obj, o); @@ -12494,7 +12494,7 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj, EOLIAN static void _efl_canvas_text_size_native_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *w, Evas_Coord *h) { - 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); evas_object_async_block(obj); if (!o->native.valid) { @@ -12528,7 +12528,7 @@ _efl_canvas_text_size_native_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord EOLIAN static void _efl_canvas_text_style_insets_get(Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) { - 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); evas_object_async_block(obj); _relayout_if_needed(eo_obj, o); @@ -12582,7 +12582,7 @@ _efl_canvas_text_eo_base_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_U static void evas_object_textblock_init(Evas_Object *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); Efl_Canvas_Text_Data *o; static Eina_Bool linebreak_init = EINA_FALSE; @@ -13423,7 +13423,7 @@ evas_object_textblock_scale_update(Evas_Object *eo_obj EINA_UNUSED, void _evas_object_textblock_rehint(Evas_Object *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); Efl_Canvas_Text_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Textblock_Paragraph *par; Evas_Object_Textblock_Line *ln; @@ -13454,12 +13454,12 @@ _evas_object_textblock_rehint(Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_text_evas_object_paragraph_direction_set(Eo *eo_obj, - Efl_Canvas_Text_Data *o, - Evas_BiDi_Direction dir) +_efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, + Efl_Canvas_Text_Data *o, + Evas_BiDi_Direction dir) { #ifdef BIDI_SUPPORT - 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 ((!(o->inherit_paragraph_direction) && (o->paragraph_direction == dir)) || (o->inherit_paragraph_direction && (dir == EVAS_BIDI_DIRECTION_INHERIT))) @@ -13497,8 +13497,8 @@ _efl_canvas_text_evas_object_paragraph_direction_set(Eo *eo_obj, } EOLIAN static Evas_BiDi_Direction -_efl_canvas_text_evas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Text_Data *o) +_efl_canvas_text_efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Text_Data *o) { return o->paragraph_direction; } @@ -13533,7 +13533,7 @@ _efl_canvas_text_cursor_text_append(Efl_Canvas_Text_Cursor_Data *cur, _evas_textblock_cursor_init(&cur2, cur->obj); _evas_textblock_cursor_copy(&cur2, cur); - Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); while (*off) @@ -13581,7 +13581,7 @@ _efl_canvas_text_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUS EOLIAN static const char * _efl_canvas_text_efl_text_text_get(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) { - 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); evas_object_async_block(obj); Evas_Object_Textblock_Node_Text *node; @@ -14005,7 +14005,7 @@ _efl_canvas_text_object_item_geometry_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EI { Efl_Canvas_Text_Cursor_Data cur; - 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); evas_object_async_block(obj); _relayout_if_needed(eo_obj, o); diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index bb7aea686c..d5be2edad6 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -151,7 +151,7 @@ static const Evas_Object_Func object_func = static void evas_object_textgrid_init(Evas_Object *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); /* set up methods (compulsory) */ obj->func = &object_func; obj->private_data = eo_data_ref(eo_obj, MY_CLASS); @@ -243,7 +243,7 @@ evas_object_textgrid_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) EOLIAN static void _evas_textgrid_eo_base_destructor(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UNUSED) { - 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); evas_object_textgrid_free(eo_obj, obj); eo_data_unref(eo_obj, obj->private_data); eo_destructor(eo_super(eo_obj, MY_CLASS)); @@ -913,7 +913,7 @@ EOLIAN static void _evas_textgrid_size_set(Eo *eo_obj, Evas_Textgrid_Data *o, int w, int h) { int i; - 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 ((h <= 0) || (w <= 0)) return; @@ -962,7 +962,7 @@ _evas_textgrid_size_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int *w, i EOLIAN static void _evas_textgrid_efl_text_properties_font_source_set(Eo *eo_obj, Evas_Textgrid_Data *o, const char *font_source) { - 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 ((!font_source) || (!*font_source)) return; @@ -1052,7 +1052,7 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj, const char *font_name, Evas_Font_Size font_size) { - 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); Eina_Bool is, was = EINA_FALSE; Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; Eina_Bool source_invisible = EINA_FALSE; @@ -1261,7 +1261,7 @@ _evas_textgrid_palette_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas_Textgrid_Pale Eina_Array *palette; Evas_Object_Textgrid_Color *color, *c; - 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); int count, i; if ((idx < 0) || (idx > 255)) return; @@ -1383,7 +1383,7 @@ _evas_textgrid_supported_font_styles_set(Eo *eo_obj, Evas_Textgrid_Data *o, Evas /* FIXME: to do */ if (styles) { - 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); o->changed = 1; evas_object_change(eo_obj, obj); } @@ -1408,7 +1408,7 @@ EOLIAN static Evas_Textgrid_Cell* _evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int y) { Evas_Textgrid_Cell *ret; - 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); evas_object_async_block(obj); if ((y < 0) || (y >= o->cur.h)) ret = NULL; @@ -1420,7 +1420,7 @@ _evas_textgrid_cellrow_get(const Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, EOLIAN static void _evas_textgrid_update_add(Eo *eo_obj, Evas_Textgrid_Data *o, int x, int y, int w, int h) { - 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); int i, x2; RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, o->cur.w, o->cur.h); diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c index bc7034f447..9ef7b26eec 100644 --- a/src/lib/evas/canvas/evas_object_vg.c +++ b/src/lib/evas/canvas/evas_object_vg.c @@ -97,7 +97,7 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd) Evas_Object_Protected_Data *obj; Evas *e = evas_object_evas_get(eo_obj); - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); if (pd->engine_data) obj->layer->evas->engine.func->ector_free(pd->engine_data); @@ -111,7 +111,7 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd) Eo * _evas_vg_eo_base_constructor(Eo *eo_obj, Evas_VG_Data *pd) { - 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); eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c index 138c87de41..eb6ec59d01 100644 --- a/src/lib/evas/canvas/evas_render.c +++ b/src/lib/evas/canvas/evas_render.c @@ -256,7 +256,7 @@ _evas_render_had_map(Evas_Object_Protected_Data *obj) static Eina_Bool _evas_render_is_relevant(Evas_Object *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); return ((evas_object_is_visible(eo_obj, obj) && (!obj->cur->have_clipees)) || (evas_object_was_visible(eo_obj, obj) && (!obj->prev->have_clipees))); } @@ -316,7 +316,7 @@ _evas_proxy_redraw_set(Evas_Public_Data *e, Evas_Object_Protected_Data *obj, EINA_LIST_FOREACH(obj->proxy->proxies, l, eo_proxy) { - proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS); + proxy = eo_data_scope_get(eo_proxy, EFL_CANVAS_OBJECT_CLASS); /* Flag need redraw on proxy too */ EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, proxy->proxy, @@ -508,7 +508,7 @@ _evas_render_phase1_object_process(Evas_Public_Data *e, Evas_Object *eo_obj, Eina_Bool map, hmap, can_map; int is_active; - 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); //Need pre render for the children of mapped object. //But only when they have changed. if (mapped_parent && (!obj->changed)) return EINA_FALSE; @@ -950,7 +950,7 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj) Evas_Coord xc1, yc1, xc2, yc2; int i; Eina_Bool nooverlay; - 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); Evas_Object_Protected_Data *tmp = NULL; Evas_Coord imgw, imgh; unsigned int caps; @@ -961,11 +961,11 @@ _evas_render_can_use_overlay(Evas_Public_Data *e, Evas_Object *eo_obj) /* Check if any one is the stack make this object mapped */ eo_tmp = eo_obj; - tmp = eo_data_scope_get(eo_tmp, EVAS_OBJECT_CLASS); + tmp = eo_data_scope_get(eo_tmp, EFL_CANVAS_OBJECT_CLASS); while (tmp && !(_evas_render_has_map(tmp) && !_evas_render_can_map(tmp))) { eo_tmp = tmp->smart.parent; - tmp = eo_data_scope_get(eo_tmp, EVAS_OBJECT_CLASS); + tmp = eo_data_scope_get(eo_tmp, EFL_CANVAS_OBJECT_CLASS); } if (tmp && _evas_render_has_map(tmp) && !_evas_render_can_map(tmp)) @@ -1833,7 +1833,7 @@ evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_ #endif if (!eo_source) return; - source = eo_data_scope_get(eo_source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(eo_source, EFL_CANVAS_OBJECT_CLASS); w = source->cur->geometry.w; h = source->cur->geometry.h; @@ -2123,7 +2123,7 @@ _evas_render_cutout_add(Evas_Public_Data *e, void *context, Evas_Object_Protecte Evas_Object_Protected_Data *oo; eo_oo = obj->object; - oo = eo_data_scope_get(eo_oo, EVAS_OBJECT_CLASS); + oo = eo_data_scope_get(eo_oo, EFL_CANVAS_OBJECT_CLASS); while (oo->cur->clipper) { if ((oo->cur->clipper->map->cur.map_parent @@ -2875,7 +2875,7 @@ evas_render_updates_internal(Evas *eo_e, Evas_Object_Protected_Data *smart_parent; smart_parent = eo_data_scope_get(obj->smart.parent, - EVAS_OBJECT_CLASS); + EFL_CANVAS_OBJECT_CLASS); evas_object_change(obj->smart.parent, smart_parent); } } @@ -3253,7 +3253,7 @@ _evas_canvas_sync(Eo *eo_e, Evas_Public_Data *e) void _evas_render_dump_map_surfaces(Evas_Object *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->map->cur.map) && obj->map->surface) { obj->layer->evas->engine.func->image_free @@ -3377,7 +3377,7 @@ evas_render_object_recalc(Evas_Object *eo_obj) return; MAGIC_CHECK_END(); - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); if ((!obj->changed) && (obj->delete_me < 2)) { Evas_Public_Data *e; diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c index b9d7b3965f..8f3fd54cea 100644 --- a/src/lib/evas/canvas/evas_stack.c +++ b/src/lib/evas/canvas/evas_stack.c @@ -44,7 +44,7 @@ evas_object_raise(Evas_Object *obj) } EOLIAN void -_evas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_stack_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj) { evas_object_async_block(obj); if (evas_object_intercept_call_raise(eo_obj, obj)) return; @@ -97,7 +97,7 @@ evas_object_lower(Evas_Object *obj) } EOLIAN void -_evas_object_efl_gfx_stack_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj) +_efl_canvas_object_efl_gfx_stack_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj) { evas_object_async_block(obj); if (evas_object_intercept_call_lower(eo_obj, obj)) return; @@ -151,7 +151,7 @@ evas_object_stack_above(Evas_Object *obj, Evas_Object *above) } EOLIAN void -_evas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Stack *eo_above) +_efl_canvas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Stack *eo_above) { evas_object_async_block(obj); if (!eo_above) @@ -161,7 +161,7 @@ _evas_object_efl_gfx_stack_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *o } if (eo_obj == eo_above) return; if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return; - Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *above = eo_data_scope_get(eo_above, EFL_CANVAS_OBJECT_CLASS); if ((EINA_INLIST_GET(obj))->prev == EINA_INLIST_GET(above)) { evas_object_inform_call_restack(eo_obj); @@ -233,7 +233,7 @@ evas_object_stack_below(Evas_Object *obj, Evas_Object *below) } EOLIAN void -_evas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Stack *eo_below) +_efl_canvas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Stack *eo_below) { evas_object_async_block(obj); if (!eo_below) @@ -243,7 +243,7 @@ _evas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *o } if (eo_obj == eo_below) return; if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return; - Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *below = eo_data_scope_get(eo_below, EFL_CANVAS_OBJECT_CLASS); if ((EINA_INLIST_GET(obj))->next == EINA_INLIST_GET(below)) { evas_object_inform_call_restack(eo_obj); @@ -315,7 +315,7 @@ evas_object_above_get(const Evas_Object *obj) } EOLIAN Efl_Gfx_Stack * -_evas_object_efl_gfx_stack_above_get(Eo *eo_obj EINA_UNUSED, +_efl_canvas_object_efl_gfx_stack_above_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->smart.parent) @@ -344,7 +344,7 @@ evas_object_below_get(const Evas_Object *obj) } EOLIAN Efl_Gfx_Stack * -_evas_object_efl_gfx_stack_below_get(Eo *eo_obj EINA_UNUSED, +_efl_canvas_object_efl_gfx_stack_below_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) { if (obj->smart.parent) diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index d1de46c8d8..087f40b99c 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -121,7 +121,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped) It's up to the user to destroy it when it no longer needs it. It's possible to remove objects from the table when walking this list, but these removals won't be reflected on it.]] - return: free(own(list<Evas.Object>), eina_list_free) @warn_unused; + return: free(own(list<Efl.Canvas.Object>), eina_list_free) @warn_unused; } } @property child { @@ -135,7 +135,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped) row: ushort; } values { - child: Evas.Object; + child: Efl.Canvas.Object; } } clear { @@ -149,20 +149,20 @@ class Evas.Table (Efl.Canvas.Group.Clipped) [[Get an accessor to get random access to the list of children for the table. Note: Do not remove or delete objects while walking the list.]] - return: free(own(accessor<Evas.Object>), eina_accessor_free) + return: free(own(accessor<Efl.Canvas.Object>), eina_accessor_free) @warn_unused; } iterator_new @const { [[Get an iterator to walk the list of children for the table. Note: Do not remove or delete objects while walking the list.]] - return: free(own(iterator<Evas.Object>), eina_iterator_free) + return: free(own(iterator<Efl.Canvas.Object>), eina_iterator_free) @warn_unused; } add_to { [[Create a table that is child of a given element $parent.]] - return: Evas.Object @warn_unused; + return: Efl.Canvas.Object @warn_unused; } pack_get @const { [[Get packing location of a child of table @@ -170,7 +170,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped) @since 1.1]] return: bool; [[$true on success, $false on failure.]] params { - @in child: Evas.Object; [[The child object to add.]] + @in child: Efl.Canvas.Object; [[The child object to add.]] @out col: ushort; [[pointer to store relative-horizontal position to place child.]] @out row: ushort; [[pointer to store relative-vertical position to place child.]] @out colspan: ushort; [[pointer to store how many relative-horizontal position to use for this child.]] @@ -188,7 +188,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped) return: bool; [[$true on success, $false on failure.]] params { - @in child: Evas.Object @nonull; [[The child object to add.]] + @in child: Efl.Canvas.Object @nonull; [[The child object to add.]] @in col: ushort; [[relative-horizontal position to place child.]] @in row: ushort; [[relative-vertical position to place child.]] @in colspan: ushort; [[how many relative-horizontal position to use for this child.]] @@ -204,7 +204,7 @@ class Evas.Table (Efl.Canvas.Group.Clipped) return: bool; [[$true on success, $false on failure.]] params { - @in child: Evas.Object @nonull; + @in child: Efl.Canvas.Object @nonull; } } count { diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index 47d85c326e..068f0d6646 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -1,4 +1,4 @@ -class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.Internal) +class Evas.Text (Efl.Canvas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.Internal) { legacy_prefix: evas_object_text; eo_prefix: evas_obj_text; @@ -232,10 +232,10 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.I } } char_pos_get @const { - [[Retrieve position and dimension information of a character within a text @Evas.Object + [[Retrieve position and dimension information of a character within a text @Efl.Canvas.Object This function is used to obtain the X, Y, width and height of the character - located at $pos within the @Evas.Object $obj. $obj must be a text object + located at $pos within the @Efl.Canvas.Object $obj. $obj must be a text object Any of the $Evas_Coord parameters ($cx, $cy, $cw, $ch) may be $NULL in which case no value will be assigned to that parameter.]] @@ -264,7 +264,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.I Efl.Canvas.Filter.Internal.filter_input_alpha; Efl.Canvas.Filter.Internal.filter_input_render; Efl.Canvas.Filter.Internal.filter_dirty; - Evas.Object.paragraph_direction.set; - Evas.Object.paragraph_direction.get; + Efl.Canvas.Object.paragraph_direction.set; + Efl.Canvas.Object.paragraph_direction.get; } } diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index 577527fd98..43af7b5066 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -20,7 +20,7 @@ enum Evas.Textgrid.Font_Style { /* XXX: Actual definition is in C. */ struct Evas.Textgrid.Cell; -class Evas.Textgrid (Evas.Object, Efl.Text.Properties) +class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties) { legacy_prefix: evas_object_textgrid; eo_prefix: evas_obj_textgrid; diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo index e78fdc05df..55ca7b875b 100644 --- a/src/lib/evas/canvas/evas_vg.eo +++ b/src/lib/evas/canvas/evas_vg.eo @@ -1,4 +1,4 @@ -class Evas.VG (Evas.Object, Efl.Gfx.Fill, Efl.Gfx.View) +class Evas.VG (Efl.Canvas.Object, Efl.Gfx.Fill, Efl.Gfx.View) { legacy_prefix: evas_object_vg; eo_prefix: evas_obj_vg; diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c index 64aecab8b4..f53587ea5c 100644 --- a/src/lib/evas/canvas/evas_vg_root_node.c +++ b/src/lib/evas/canvas/evas_vg_root_node.c @@ -58,7 +58,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj, else { pd->parent = parent; - pd->data = parent ? eo_data_scope_get(parent, EVAS_OBJECT_CLASS) : NULL; + pd->data = parent ? eo_data_scope_get(parent, EFL_CANVAS_OBJECT_CLASS) : NULL; } } diff --git a/src/lib/evas/filters/evas_filter.c b/src/lib/evas/filters/evas_filter.c index fef55f492d..f369fd02be 100644 --- a/src/lib/evas/filters/evas_filter.c +++ b/src/lib/evas/filters/evas_filter.c @@ -105,13 +105,13 @@ evas_filter_context_proxy_render_all(Evas_Filter_Context *ctx, Eo *eo_obj, Eina_List *li; if (!ctx->has_proxies) return; - obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); EINA_LIST_FOREACH(ctx->buffers, li, fb) if (fb->source) { // TODO: Lock current object as proxyrendering (see image obj) - source = eo_data_scope_get(fb->source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(fb->source, EFL_CANVAS_OBJECT_CLASS); _assert(fb->w == source->cur->geometry.w); _assert(fb->h == source->cur->geometry.h); if (source->proxy->surface && !source->proxy->redraw) diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c index 2b2c4c0f8a..7b33b042e7 100644 --- a/src/lib/evas/filters/evas_filter_parser.c +++ b/src/lib/evas/filters/evas_filter_parser.c @@ -2352,7 +2352,7 @@ _filter_program_buffers_set(Evas_Filter_Program *pgm) Evas_Filter_Proxy_Binding *bind = tup->data; Evas_Object_Protected_Data *obj; - obj = eo_data_scope_get(bind->eo_source, EVAS_OBJECT_CLASS); + obj = eo_data_scope_get(bind->eo_source, EFL_CANVAS_OBJECT_CLASS); buf->w = obj->cur->geometry.w; buf->h = obj->cur->geometry.h; } @@ -2874,7 +2874,7 @@ _buffers_update(Evas_Filter_Context *ctx, Evas_Filter_Program *pgm) fb->source_name = eina_stringshare_ref(pb->name); fb->ctx->has_proxies = EINA_TRUE; - source = eo_data_scope_get(fb->source, EVAS_OBJECT_CLASS); + source = eo_data_scope_get(fb->source, EFL_CANVAS_OBJECT_CLASS); if ((source->cur->geometry.w != buf->w) || (source->cur->geometry.h != buf->h)) pgm->changed = EINA_TRUE; diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h index c10962fca3..77158ab434 100644 --- a/src/lib/evas/include/evas_common_private.h +++ b/src/lib/evas/include/evas_common_private.h @@ -55,8 +55,8 @@ # include <Eet.h> #endif -#ifndef EVAS_OBJECT_PROTECTED -# define EVAS_OBJECT_PROTECTED +#ifndef EFL_CANVAS_OBJECT_PROTECTED +# define EFL_CANVAS_OBJECT_PROTECTED #endif #include "Evas.h" diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x index f6cd540475..857a75596e 100644 --- a/src/lib/evas/include/evas_inline.x +++ b/src/lib/evas/include/evas_inline.x @@ -98,7 +98,7 @@ evas_event_freezes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte if (obj->parent_cache.freeze_events_valid) return obj->parent_cache.freeze_events; if (!obj->smart.parent) return 0; - Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); obj->parent_cache.freeze_events = evas_event_freezes_through(obj->smart.parent, smart_parent_pd); obj->parent_cache.freeze_events_valid = EINA_TRUE; @@ -112,7 +112,7 @@ evas_event_passes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected if (obj->parent_cache.pass_events_valid) return obj->parent_cache.pass_events; if (!obj->smart.parent) return 0; - Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + Evas_Object_Protected_Data *smart_parent_pd = eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); obj->parent_cache.pass_events = evas_event_passes_through(obj->smart.parent, smart_parent_pd); obj->parent_cache.pass_events_valid = EINA_TRUE; @@ -130,7 +130,7 @@ evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro if (!obj->smart.parent) return 0; if (obj->mask->is_mask) return 0; Evas_Object_Protected_Data *smart_parent_pd = - eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); obj->parent_cache.src_invisible = evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd); obj->parent_cache.src_invisible_valid = EINA_TRUE; @@ -320,7 +320,7 @@ evas_object_clip_recalc(Evas_Object_Protected_Data *obj) if (EINA_LIKELY(obj->smart.parent != NULL)) { Evas_Object_Protected_Data *parent = - eo_data_scope_get(obj->smart.parent, EVAS_OBJECT_CLASS); + eo_data_scope_get(obj->smart.parent, EFL_CANVAS_OBJECT_CLASS); if (parent->clip.mask) { if (parent->clip.mask != obj->clip.mask) diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h index e6b84a5450..d5dc42f966 100644 --- a/src/lib/evas/include/evas_private.h +++ b/src/lib/evas/include/evas_private.h @@ -5,8 +5,8 @@ # include <config.h> #endif -#ifndef EVAS_OBJECT_PROTECTED -# define EVAS_OBJECT_PROTECTED +#ifndef EFL_CANVAS_OBJECT_PROTECTED +# define EFL_CANVAS_OBJECT_PROTECTED #endif #include "Evas.h" @@ -587,8 +587,8 @@ MAGIC_CHECK_FAILED(o, t, m) // helper function for legacy EAPI implementations #define EVAS_OBJ_GET_OR_RETURN(o, ...) ({ \ - Evas_Object_Protected_Data *_obj = eo_isa(o, EVAS_OBJECT_CLASS) ? \ - eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS) : NULL; \ + Evas_Object_Protected_Data *_obj = eo_isa(o, EFL_CANVAS_OBJECT_CLASS) ? \ + eo_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS) : NULL; \ if (!_obj) { MAGIC_CHECK_FAILED(o,0,0) return __VA_ARGS__; } \ _obj; }) @@ -601,7 +601,7 @@ MAGIC_CHECK_FAILED(o, t, m) /* DEBUG mode: fail, but normally just ERR(). This also returns if NULL. */ #ifdef DEBUG #define EVAS_OBJECT_LEGACY_API(_eo, ...) \ - do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EVAS_OBJECT_CLASS); \ + do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \ if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \ if (EINA_UNLIKELY(!_o->legacy)) { \ char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", eo_class_name_get(_o->object)); \ @@ -610,7 +610,7 @@ MAGIC_CHECK_FAILED(o, t, m) } } while (0) #else #define EVAS_OBJECT_LEGACY_API(_eo, ...) \ - do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EVAS_OBJECT_CLASS); \ + do { Evas_Object_Protected_Data *_o = eo_data_scope_get(_eo, EFL_CANVAS_OBJECT_CLASS); \ if (EINA_UNLIKELY(!_o)) return __VA_ARGS__; \ if (EINA_UNLIKELY(!_o->legacy)) { \ char buf[1024]; snprintf(buf, sizeof(buf), "Calling legacy API on EO object '%s' is not permitted!", eo_class_name_get(_o->object)); \ @@ -1696,7 +1696,7 @@ void _above_get(Eo *obj, void *_pd, va_list *list); void _below_get(Eo *obj, void *_pd, va_list *list); void _smart_move_children_relative(Eo *obj, void *_pd, va_list *list); void _smart_clipped_clipper_get(Eo *obj, void *_pd, va_list *list); -void _evas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev); +void _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bool cur_prev); void _canvas_event_default_flags_set(Eo *e, void *_pd, va_list *list); void _canvas_event_default_flags_get(Eo *e, void *_pd, va_list *list); diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c index 09e41873f7..e3dfd65489 100644 --- a/src/tests/edje/edje_test_edje.c +++ b/src/tests/edje/edje_test_edje.c @@ -181,15 +181,15 @@ START_TEST(edje_test_masking) /* check value of no_render flag as seen from evas land */ sub = edje_object_part_object_get(obj, "mask"); - fail_if(!evas_obj_no_render_get(sub)); + fail_if(!efl_canvas_object_no_render_get(sub)); /* check that text has a clip (based on description.clip_to) */ sub = edje_object_part_object_get(obj, "text"); - fail_if(!evas_obj_clip_get(sub)); + fail_if(!efl_canvas_object_clip_get(sub)); /* test description.clip_to override */ sub = edje_object_part_object_get(obj, "noclip"); - clip2 = evas_obj_clip_get(sub); + clip2 = efl_canvas_object_clip_get(sub); fail_if(clip != clip2); EDJE_TEST_FREE_EVAS(); @@ -212,13 +212,13 @@ START_TEST(edje_test_filters) /* check value of no_render flag as seen from evas land */ sub = edje_object_part_object_get(obj, "mask"); - fail_if(!evas_obj_no_render_get(sub)); + fail_if(!efl_canvas_object_no_render_get(sub)); /* check no_render inheritance */ sub = edje_object_part_object_get(obj, "mask2"); - fail_if(evas_obj_no_render_get(sub)); + fail_if(efl_canvas_object_no_render_get(sub)); sub = edje_object_part_object_get(obj, "mask3"); - fail_if(!evas_obj_no_render_get(sub)); + fail_if(!efl_canvas_object_no_render_get(sub)); /* text part: check filter status */ text = edje_object_part_object_get(obj, "text"); diff --git a/src/tests/eolian/data/class_simple.eo b/src/tests/eolian/data/class_simple.eo index 8a64b92a77..335daf8ba3 100644 --- a/src/tests/eolian/data/class_simple.eo +++ b/src/tests/eolian/data/class_simple.eo @@ -1,7 +1,7 @@ class Class_Simple { [[Class Desc Simple]] legacy_prefix: evas_object_simple; - eo_prefix: evas_obj_simple; + eo_prefix: efl_canvas_object_simple; data: Evas_Simple_Data; methods { @property a @beta { diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c index 5bcbd33e0c..16a799c311 100644 --- a/src/tests/eolian/data/class_simple_ref.c +++ b/src/tests/eolian/data/class_simple_ref.c @@ -1,15 +1,15 @@ Eina_Bool _class_simple_a_set(Eo *obj, Evas_Simple_Data *pd, int value); -EOAPI EO_FUNC_BODYV(evas_obj_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value); +EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_a_set, Eina_Bool, EINA_TRUE, EO_FUNC_CALL(value), int value); int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd); -EOAPI EO_FUNC_BODY_CONST(evas_obj_simple_a_get, int, 100); +EOAPI EO_FUNC_BODY_CONST(efl_canvas_object_simple_a_get, int, 100); void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd); -EOAPI EO_VOID_FUNC_BODY(evas_obj_simple_b_set); +EOAPI EO_VOID_FUNC_BODY(efl_canvas_object_simple_b_set); char * _class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, char *b, double *c, int *d); @@ -19,16 +19,16 @@ static char * __eolian_class_simple_foo(Eo *obj, Evas_Simple_Data *pd, int a, ch return _class_simple_foo(obj, pd, a, b, c, d); } -EOAPI EO_FUNC_BODYV(evas_obj_simple_foo, char *, NULL, EO_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d); +EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_foo, char *, NULL, EO_FUNC_CALL(a, b, c, d), int a, char *b, double *c, int *d); int * _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x); -EOAPI EO_FUNC_BODYV(evas_obj_simple_bar, int *, 0, EO_FUNC_CALL(x), int x); +EOAPI EO_FUNC_BODYV(efl_canvas_object_simple_bar, int *, 0, EO_FUNC_CALL(x), int x); static const Eo_Op_Description _class_simple_op_desc[] = { - EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set), - EO_OP_FUNC(evas_obj_simple_a_get, _class_simple_a_get), - EO_OP_FUNC(evas_obj_simple_foo, __eolian_class_simple_foo), + EO_OP_FUNC(efl_canvas_object_simple_a_set, _class_simple_a_set), + EO_OP_FUNC(efl_canvas_object_simple_a_get, _class_simple_a_get), + EO_OP_FUNC(efl_canvas_object_simple_foo, __eolian_class_simple_foo), }; static const Eo_Class_Description _class_simple_class_desc = { diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h index 43e96fcabb..934f0903a2 100644 --- a/src/tests/eolian/data/class_simple_ref_eo.h +++ b/src/tests/eolian/data/class_simple_ref_eo.h @@ -33,7 +33,7 @@ EWAPI const Eo_Class *class_simple_class_get(void); * * @ingroup Class_Simple */ -EOAPI Eina_Bool evas_obj_simple_a_set(Eo *obj, int value); +EOAPI Eina_Bool efl_canvas_object_simple_a_set(Eo *obj, int value); #endif #ifdef CLASS_SIMPLE_BETA @@ -44,10 +44,10 @@ EOAPI Eina_Bool evas_obj_simple_a_set(Eo *obj, int value); * * @ingroup Class_Simple */ -EOAPI int evas_obj_simple_a_get(const Eo *obj); +EOAPI int efl_canvas_object_simple_a_get(const Eo *obj); #endif -EOAPI void evas_obj_simple_b_set(Eo *obj); +EOAPI void efl_canvas_object_simple_b_set(Eo *obj); #ifdef CLASS_SIMPLE_BETA /** @@ -62,10 +62,10 @@ EOAPI void evas_obj_simple_b_set(Eo *obj); * * @ingroup Class_Simple */ -EOAPI char *evas_obj_simple_foo(Eo *obj, int a, char *b, double *c, int *d); +EOAPI char *efl_canvas_object_simple_foo(Eo *obj, int a, char *b, double *c, int *d); #endif -EOAPI int *evas_obj_simple_bar(Eo *obj, int x); +EOAPI int *efl_canvas_object_simple_bar(Eo *obj, int x); #endif diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 02232f3045..607849307b 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -553,7 +553,7 @@ START_TEST(eolian_simple_parsing) fail_if(eolian_class_type_get(class) != EOLIAN_CLASS_REGULAR); fail_if(eolian_class_inherits_get(class) != NULL); fail_if(strcmp(eolian_class_legacy_prefix_get(class), "evas_object_simple")); - fail_if(strcmp(eolian_class_eo_prefix_get(class), "evas_obj_simple")); + fail_if(strcmp(eolian_class_eo_prefix_get(class), "efl_canvas_object_simple")); fail_if(strcmp(eolian_class_data_type_get(class), "Evas_Simple_Data")); /* c get func */ diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c index 033ffb4aed..d8b64d341a 100644 --- a/src/tests/evas/evas_test_mask.c +++ b/src/tests/evas/evas_test_mask.c @@ -84,7 +84,7 @@ START_TEST(evas_mask_test_setget) } fail_if(i != 1); - it = evas_obj_clipees_get(mask); + it = efl_canvas_object_clipees_get(mask); i = 0; EINA_ITERATOR_FOREACH(it, o) { |