From 915e09aed3238db97ad77913c0a043b63ab7a770 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 2 Jun 2016 18:55:51 +0900 Subject: [PATCH] Evas: Rename Evas.Rectangle as Efl.Canvas.Rectangle --- src/Makefile_Evas.am | 2 +- src/examples/evas/evas-3d-aabb.c | 2 +- src/examples/evas/evas-3d-cube.c | 2 +- src/examples/evas/evas-3d-cube2.c | 2 +- src/examples/evas/evas-3d-eet.c | 2 +- src/examples/evas/evas-3d-fog.c | 2 +- src/examples/evas/evas-3d-hull.c | 2 +- src/examples/evas/evas-3d-md2.c | 2 +- src/examples/evas/evas-3d-mmap-set.c | 2 +- src/examples/evas/evas-3d-obj.c | 2 +- src/examples/evas/evas-3d-parallax-occlusion.c | 2 +- src/examples/evas/evas-3d-pick.c | 2 +- src/examples/evas/evas-3d-ply.c | 2 +- src/examples/evas/evas-3d-proxy.c | 2 +- src/examples/evas/evas-3d-shadows.c | 2 +- src/examples/evas/evas-3d-static-lod.c | 2 +- src/examples/evas/evas-object-manipulation-eo.c | 4 ++-- src/lib/evas/Evas_Eo.h | 2 +- src/lib/evas/Evas_Legacy.h | 2 +- src/lib/evas/canvas/efl_canvas_rectangle.eo | 6 ++++++ src/lib/evas/canvas/evas_object_rectangle.c | 18 +++++++++--------- src/lib/evas/canvas/evas_rectangle.eo | 8 -------- src/tests/edje/edje_test_edje.c | 2 +- 23 files changed, 36 insertions(+), 38 deletions(-) create mode 100644 src/lib/evas/canvas/efl_canvas_rectangle.eo delete mode 100644 src/lib/evas/canvas/evas_rectangle.eo diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 013ccc0..f1e5332 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -4,7 +4,7 @@ evas_eolian_pub_files = \ lib/evas/canvas/evas_object.eo \ lib/evas/canvas/efl_canvas_polygon.eo \ - lib/evas/canvas/evas_rectangle.eo \ + lib/evas/canvas/efl_canvas_rectangle.eo \ lib/evas/canvas/evas_textblock.eo \ lib/evas/canvas/evas_signal_interface.eo \ lib/evas/canvas/evas_object_smart.eo \ diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index d1dbcb6..cc44d22 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -215,7 +215,7 @@ main(void) evas_canvas3d_scene_camera_node_set(scene, camera_node); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index a2c1365..599467e 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -233,7 +233,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index 451d4d2..b661044 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -234,7 +234,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index 8bf69b4..88cf3e4 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -186,7 +186,7 @@ main(void) evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index 97515fa..a937c45 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -207,7 +207,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index b7f0c24..208c8c0 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -429,7 +429,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 7f4998f..11c549e 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -152,7 +152,7 @@ main(void) evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 91c4e33..8de7012 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -233,7 +233,7 @@ main(void) evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 20, 20, 200, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index ca645c8..268cc9a 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -212,7 +212,7 @@ main(void) evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle MESHES. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index d2c902c..baee68c 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -237,7 +237,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index 201771f..9eb4407 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -167,7 +167,7 @@ main(void) evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add evas objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c index 6c542c3..552f3da 100644 --- a/src/examples/evas/evas-3d-ply.c +++ b/src/examples/evas/evas-3d-ply.c @@ -208,7 +208,7 @@ main(void) evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 100, 100, 100, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 67088c6..b4d5d75 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -214,7 +214,7 @@ main(void) evas = ecore_evas_get(ecore_evas); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index 6f3563b..4f34839 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -639,7 +639,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c index 6d42ad4..a606fdd 100644 --- a/src/examples/evas/evas-3d-static-lod.c +++ b/src/examples/evas/evas-3d-static-lod.c @@ -251,7 +251,7 @@ main(void) _scene_setup(&data); /* Add a background rectangle objects. */ - background = eo_add(EVAS_RECTANGLE_CLASS, evas); + background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_visible_set(background, EINA_TRUE); diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c index 4fe38f4..f0d3efa 100644 --- a/src/examples/evas/evas-object-manipulation-eo.c +++ b/src/examples/evas/evas-object-manipulation-eo.c @@ -174,7 +174,7 @@ main(void) /* Creating object with Eo. * Object must be deleted explixitly at the end of program.*/ - d.bg = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); + d.bg = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); /* Eo-styled way to perform actions on an object*/ evas_obj_name_set(d.bg, "background rectangle"); @@ -235,7 +235,7 @@ main(void) /* solid white clipper (note that it's the default color for a * rectangle) - it won't change clippees' colors, then (multiplying * by 255) */ - d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); + d.clipper = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4); efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 512dd3c..30cd0d2 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -24,7 +24,7 @@ * * @{ */ -#include "canvas/evas_rectangle.eo.h" +#include "canvas/efl_canvas_rectangle.eo.h" /** * @} */ diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 211452a..f4d1998 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -1831,7 +1831,7 @@ EAPI void *evas_object_intercept_focus_set_callback_del(Evas_Object *obj, Evas_O */ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; -#include "canvas/evas_rectangle.eo.legacy.h" +#include "canvas/efl_canvas_rectangle.eo.legacy.h" /** * @} diff --git a/src/lib/evas/canvas/efl_canvas_rectangle.eo b/src/lib/evas/canvas/efl_canvas_rectangle.eo new file mode 100644 index 0000000..901c83c --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo @@ -0,0 +1,6 @@ +class Efl.Canvas.Rectangle (Evas.Object) +{ + implements { + Eo.Base.constructor; + } +} diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c index 37f8266..d764547 100644 --- a/src/lib/evas/canvas/evas_object_rectangle.c +++ b/src/lib/evas/canvas/evas_object_rectangle.c @@ -3,7 +3,7 @@ #include "evas_render2.h" -#define MY_CLASS EVAS_RECTANGLE_CLASS +#define MY_CLASS EFL_CANVAS_RECTANGLE_CLASS /* private magic number for rectangle objects */ static const char o_type[] = "rectangle"; @@ -11,9 +11,9 @@ static const char o_type[] = "rectangle"; const char *o_rect_type = o_type; /* private struct for rectangle object internal data */ -typedef struct _Evas_Rectangle_Data Evas_Rectangle_Data; +typedef struct _Efl_Canvas_Rectangle_Data Efl_Canvas_Rectangle_Data; -struct _Evas_Rectangle_Data +struct _Efl_Canvas_Rectangle_Data { void *engine_data; }; @@ -95,12 +95,12 @@ evas_object_rectangle_add(Evas *e) MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); - Evas_Object *eo_obj = eo_add(EVAS_RECTANGLE_CLASS, e); + Evas_Object *eo_obj = eo_add(EFL_CANVAS_RECTANGLE_CLASS, e); return eo_obj; } EOLIAN static Eo * -_evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED) +_efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED) { eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); @@ -381,21 +381,21 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED, static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj) { - Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (!o) return 0; return MAGIC_OBJ_RECTANGLE; } static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj) { - Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); if (!o) return 0; return MAGIC_OBJ_SHAPE; } static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj) { - Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); return o->engine_data; } @@ -450,4 +450,4 @@ evas_object_rectangle_was_inside(Evas_Object *eo_obj, double x, double y) } #endif -#include "canvas/evas_rectangle.eo.c" +#include "canvas/efl_canvas_rectangle.eo.c" diff --git a/src/lib/evas/canvas/evas_rectangle.eo b/src/lib/evas/canvas/evas_rectangle.eo deleted file mode 100644 index 382772c..0000000 --- a/src/lib/evas/canvas/evas_rectangle.eo +++ /dev/null @@ -1,8 +0,0 @@ -class Evas.Rectangle (Evas.Object) -{ - legacy_prefix: evas_object_rectangle; - eo_prefix: evas_obj_rectangle; - implements { - Eo.Base.constructor; - } -} diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c index 2de5f14..09e4187 100644 --- a/src/tests/edje/edje_test_edje.c +++ b/src/tests/edje/edje_test_edje.c @@ -664,7 +664,7 @@ START_TEST(edje_test_table_eoapi) for (k = 0; k < 2; k++) { i = l*2 + k; - sobjs[i] = eo_add(EVAS_RECTANGLE_CLASS, evas); + sobjs[i] = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); fail_if(!sobjs[i]); efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1); } -- 2.7.4