summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/examples/evas/evas-3d-aabb.c2
-rw-r--r--src/examples/evas/evas-3d-cube.c2
-rw-r--r--src/examples/evas/evas-3d-cube2.c2
-rw-r--r--src/examples/evas/evas-3d-eet.c2
-rw-r--r--src/examples/evas/evas-3d-fog.c2
-rw-r--r--src/examples/evas/evas-3d-hull.c2
-rw-r--r--src/examples/evas/evas-3d-md2.c2
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c2
-rw-r--r--src/examples/evas/evas-3d-obj.c2
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c2
-rw-r--r--src/examples/evas/evas-3d-pick.c2
-rw-r--r--src/examples/evas/evas-3d-ply.c2
-rw-r--r--src/examples/evas/evas-3d-proxy.c2
-rw-r--r--src/examples/evas/evas-3d-shadows.c2
-rw-r--r--src/examples/evas/evas-3d-static-lod.c2
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c4
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Legacy.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas_rectangle.eo6
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c18
-rw-r--r--src/lib/evas/canvas/evas_rectangle.eo8
-rw-r--r--src/tests/edje/edje_test_edje.c2
23 files changed, 36 insertions, 38 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 013ccc02b6..f1e5332b9d 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -4,7 +4,7 @@
4evas_eolian_pub_files = \ 4evas_eolian_pub_files = \
5 lib/evas/canvas/evas_object.eo \ 5 lib/evas/canvas/evas_object.eo \
6 lib/evas/canvas/efl_canvas_polygon.eo \ 6 lib/evas/canvas/efl_canvas_polygon.eo \
7 lib/evas/canvas/evas_rectangle.eo \ 7 lib/evas/canvas/efl_canvas_rectangle.eo \
8 lib/evas/canvas/evas_textblock.eo \ 8 lib/evas/canvas/evas_textblock.eo \
9 lib/evas/canvas/evas_signal_interface.eo \ 9 lib/evas/canvas/evas_signal_interface.eo \
10 lib/evas/canvas/evas_object_smart.eo \ 10 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 d1dbcb6dd2..cc44d2295d 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -215,7 +215,7 @@ main(void)
215 evas_canvas3d_scene_camera_node_set(scene, camera_node); 215 evas_canvas3d_scene_camera_node_set(scene, camera_node);
216 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 216 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
217 217
218 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 218 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
219 efl_gfx_color_set(background, 0, 0, 0, 255); 219 efl_gfx_color_set(background, 0, 0, 0, 255);
220 efl_gfx_size_set(background, WIDTH, HEIGHT); 220 efl_gfx_size_set(background, WIDTH, HEIGHT);
221 efl_gfx_visible_set(background, EINA_TRUE); 221 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 a2c1365b79..599467e81f 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -233,7 +233,7 @@ main(void)
233 _scene_setup(&data); 233 _scene_setup(&data);
234 234
235 /* Add a background rectangle objects. */ 235 /* Add a background rectangle objects. */
236 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 236 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
237 efl_gfx_color_set(background, 0, 0, 0, 255); 237 efl_gfx_color_set(background, 0, 0, 0, 255);
238 efl_gfx_size_set(background, WIDTH, HEIGHT); 238 efl_gfx_size_set(background, WIDTH, HEIGHT);
239 efl_gfx_visible_set(background, EINA_TRUE); 239 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 451d4d28a2..b66104452f 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -234,7 +234,7 @@ main(void)
234 _scene_setup(&data); 234 _scene_setup(&data);
235 235
236 /* Add a background rectangle objects. */ 236 /* Add a background rectangle objects. */
237 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 237 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
238 efl_gfx_color_set(background, 0, 0, 0, 255); 238 efl_gfx_color_set(background, 0, 0, 0, 255);
239 efl_gfx_size_set(background, WIDTH, HEIGHT); 239 efl_gfx_size_set(background, WIDTH, HEIGHT);
240 efl_gfx_visible_set(background, EINA_TRUE); 240 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 8bf69b46dd..88cf3e4fe7 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -186,7 +186,7 @@ main(void)
186 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 186 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
187 187
188 /* Add a background rectangle objects. */ 188 /* Add a background rectangle objects. */
189 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 189 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
190 efl_gfx_color_set(background, 0, 0, 0, 255); 190 efl_gfx_color_set(background, 0, 0, 0, 255);
191 efl_gfx_size_set(background, WIDTH, HEIGHT); 191 efl_gfx_size_set(background, WIDTH, HEIGHT);
192 efl_gfx_visible_set(background, EINA_TRUE); 192 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 97515fa892..a937c45d37 100644
--- a/src/examples/evas/evas-3d-fog.c
+++ b/src/examples/evas/evas-3d-fog.c
@@ -207,7 +207,7 @@ main(void)
207 _scene_setup(&data); 207 _scene_setup(&data);
208 208
209 /* Add a background rectangle objects. */ 209 /* Add a background rectangle objects. */
210 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 210 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
211 efl_gfx_color_set(background, 0, 0, 0, 255); 211 efl_gfx_color_set(background, 0, 0, 0, 255);
212 efl_gfx_size_set(background, WIDTH, HEIGHT); 212 efl_gfx_size_set(background, WIDTH, HEIGHT);
213 efl_gfx_visible_set(background, EINA_TRUE); 213 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 b7f0c2450b..208c8c0e1e 100644
--- a/src/examples/evas/evas-3d-hull.c
+++ b/src/examples/evas/evas-3d-hull.c
@@ -429,7 +429,7 @@ main(void)
429 _scene_setup(&data); 429 _scene_setup(&data);
430 430
431 /* Add a background rectangle objects. */ 431 /* Add a background rectangle objects. */
432 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 432 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
433 efl_gfx_color_set(background, 0, 0, 0, 255); 433 efl_gfx_color_set(background, 0, 0, 0, 255);
434 efl_gfx_size_set(background, WIDTH, HEIGHT); 434 efl_gfx_size_set(background, WIDTH, HEIGHT);
435 efl_gfx_visible_set(background, EINA_TRUE); 435 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 7f4998f7df..11c549ec0b 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -152,7 +152,7 @@ main(void)
152 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 152 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
153 153
154 /* Add a background rectangle objects. */ 154 /* Add a background rectangle objects. */
155 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 155 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
156 efl_gfx_color_set(background, 0, 0, 0, 255); 156 efl_gfx_color_set(background, 0, 0, 0, 255);
157 efl_gfx_size_set(background, WIDTH, HEIGHT); 157 efl_gfx_size_set(background, WIDTH, HEIGHT);
158 efl_gfx_visible_set(background, EINA_TRUE); 158 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 91c4e33ca3..8de7012ab4 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)
233 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 233 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
234 234
235 /* Add a background rectangle objects. */ 235 /* Add a background rectangle objects. */
236 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 236 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
237 efl_gfx_color_set(background, 20, 20, 200, 255); 237 efl_gfx_color_set(background, 20, 20, 200, 255);
238 efl_gfx_size_set(background, WIDTH, HEIGHT); 238 efl_gfx_size_set(background, WIDTH, HEIGHT);
239 efl_gfx_visible_set(background, EINA_TRUE); 239 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 ca645c865a..268cc9a7eb 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -212,7 +212,7 @@ main(void)
212 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 212 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
213 213
214 /* Add a background rectangle MESHES. */ 214 /* Add a background rectangle MESHES. */
215 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 215 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
216 efl_gfx_color_set(background, 0, 0, 0, 255); 216 efl_gfx_color_set(background, 0, 0, 0, 255);
217 efl_gfx_size_set(background, WIDTH, HEIGHT); 217 efl_gfx_size_set(background, WIDTH, HEIGHT);
218 efl_gfx_visible_set(background, EINA_TRUE); 218 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 d2c902c587..baee68cbe2 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)
237 _scene_setup(&data); 237 _scene_setup(&data);
238 238
239 /* Add a background rectangle objects. */ 239 /* Add a background rectangle objects. */
240 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 240 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
241 efl_gfx_color_set(background, 0, 0, 0, 255); 241 efl_gfx_color_set(background, 0, 0, 0, 255);
242 efl_gfx_size_set(background, WIDTH, HEIGHT); 242 efl_gfx_size_set(background, WIDTH, HEIGHT);
243 efl_gfx_visible_set(background, EINA_TRUE); 243 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 201771fb78..9eb44073f4 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -167,7 +167,7 @@ main(void)
167 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 167 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
168 168
169 /* Add evas objects. */ 169 /* Add evas objects. */
170 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 170 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
171 efl_gfx_color_set(background, 0, 0, 0, 255); 171 efl_gfx_color_set(background, 0, 0, 0, 255);
172 efl_gfx_size_set(background, WIDTH, HEIGHT); 172 efl_gfx_size_set(background, WIDTH, HEIGHT);
173 efl_gfx_visible_set(background, EINA_TRUE); 173 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 6c542c3e63..552f3dacfe 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -208,7 +208,7 @@ main(void)
208 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); 208 evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
209 209
210 /* Add a background rectangle objects. */ 210 /* Add a background rectangle objects. */
211 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 211 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
212 efl_gfx_color_set(background, 100, 100, 100, 255); 212 efl_gfx_color_set(background, 100, 100, 100, 255);
213 efl_gfx_size_set(background, WIDTH, HEIGHT); 213 efl_gfx_size_set(background, WIDTH, HEIGHT);
214 efl_gfx_visible_set(background, EINA_TRUE); 214 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 67088c6550..b4d5d75b1b 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -214,7 +214,7 @@ main(void)
214 evas = ecore_evas_get(ecore_evas); 214 evas = ecore_evas_get(ecore_evas);
215 215
216 /* Add a background rectangle objects. */ 216 /* Add a background rectangle objects. */
217 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 217 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
218 efl_gfx_color_set(background, 0, 0, 0, 255); 218 efl_gfx_color_set(background, 0, 0, 0, 255);
219 efl_gfx_size_set(background, WIDTH, HEIGHT); 219 efl_gfx_size_set(background, WIDTH, HEIGHT);
220 efl_gfx_visible_set(background, EINA_TRUE); 220 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 6f3563be96..4f348392c2 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -639,7 +639,7 @@ main(void)
639 _scene_setup(&data); 639 _scene_setup(&data);
640 640
641 /* Add a background rectangle objects. */ 641 /* Add a background rectangle objects. */
642 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 642 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
643 efl_gfx_color_set(background, 0, 0, 0, 255); 643 efl_gfx_color_set(background, 0, 0, 0, 255);
644 efl_gfx_size_set(background, WIDTH, HEIGHT); 644 efl_gfx_size_set(background, WIDTH, HEIGHT);
645 efl_gfx_visible_set(background, EINA_TRUE); 645 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 6d42ad48a3..a606fdda1c 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)
251 _scene_setup(&data); 251 _scene_setup(&data);
252 252
253 /* Add a background rectangle objects. */ 253 /* Add a background rectangle objects. */
254 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 254 background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
255 efl_gfx_color_set(background, 0, 0, 0, 255); 255 efl_gfx_color_set(background, 0, 0, 0, 255);
256 efl_gfx_size_set(background, WIDTH, HEIGHT); 256 efl_gfx_size_set(background, WIDTH, HEIGHT);
257 efl_gfx_visible_set(background, EINA_TRUE); 257 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 4fe38f44e1..f0d3efa624 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)
174 174
175 /* Creating object with Eo. 175 /* Creating object with Eo.
176 * Object must be deleted explixitly at the end of program.*/ 176 * Object must be deleted explixitly at the end of program.*/
177 d.bg = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); 177 d.bg = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
178 178
179 /* Eo-styled way to perform actions on an object*/ 179 /* Eo-styled way to perform actions on an object*/
180 evas_obj_name_set(d.bg, "background rectangle"); 180 evas_obj_name_set(d.bg, "background rectangle");
@@ -235,7 +235,7 @@ main(void)
235 /* solid white clipper (note that it's the default color for a 235 /* solid white clipper (note that it's the default color for a
236 * rectangle) - it won't change clippees' colors, then (multiplying 236 * rectangle) - it won't change clippees' colors, then (multiplying
237 * by 255) */ 237 * by 255) */
238 d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); 238 d.clipper = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
239 239
240 efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4); 240 efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4);
241 efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); 241 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 512dd3cfc5..30cd0d2f45 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -24,7 +24,7 @@
24 * 24 *
25 * @{ 25 * @{
26 */ 26 */
27#include "canvas/evas_rectangle.eo.h" 27#include "canvas/efl_canvas_rectangle.eo.h"
28/** 28/**
29 * @} 29 * @}
30 */ 30 */
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 211452aceb..f4d19984da 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
1831 */ 1831 */
1832EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; 1832EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
1833 1833
1834#include "canvas/evas_rectangle.eo.legacy.h" 1834#include "canvas/efl_canvas_rectangle.eo.legacy.h"
1835 1835
1836/** 1836/**
1837 * @} 1837 * @}
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 0000000000..901c83ca17
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo
@@ -0,0 +1,6 @@
1class Efl.Canvas.Rectangle (Evas.Object)
2{
3 implements {
4 Eo.Base.constructor;
5 }
6}
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 37f8266eb1..d764547db5 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -3,7 +3,7 @@
3 3
4#include "evas_render2.h" 4#include "evas_render2.h"
5 5
6#define MY_CLASS EVAS_RECTANGLE_CLASS 6#define MY_CLASS EFL_CANVAS_RECTANGLE_CLASS
7 7
8/* private magic number for rectangle objects */ 8/* private magic number for rectangle objects */
9static const char o_type[] = "rectangle"; 9static const char o_type[] = "rectangle";
@@ -11,9 +11,9 @@ static const char o_type[] = "rectangle";
11const char *o_rect_type = o_type; 11const char *o_rect_type = o_type;
12 12
13/* private struct for rectangle object internal data */ 13/* private struct for rectangle object internal data */
14typedef struct _Evas_Rectangle_Data Evas_Rectangle_Data; 14typedef struct _Efl_Canvas_Rectangle_Data Efl_Canvas_Rectangle_Data;
15 15
16struct _Evas_Rectangle_Data 16struct _Efl_Canvas_Rectangle_Data
17{ 17{
18 void *engine_data; 18 void *engine_data;
19}; 19};
@@ -95,12 +95,12 @@ evas_object_rectangle_add(Evas *e)
95 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 95 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
96 return NULL; 96 return NULL;
97 MAGIC_CHECK_END(); 97 MAGIC_CHECK_END();
98 Evas_Object *eo_obj = eo_add(EVAS_RECTANGLE_CLASS, e); 98 Evas_Object *eo_obj = eo_add(EFL_CANVAS_RECTANGLE_CLASS, e);
99 return eo_obj; 99 return eo_obj;
100} 100}
101 101
102EOLIAN static Eo * 102EOLIAN static Eo *
103_evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED) 103_efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED)
104{ 104{
105 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 105 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
106 106
@@ -381,21 +381,21 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
381 381
382static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj) 382static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)
383{ 383{
384 Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 384 Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
385 if (!o) return 0; 385 if (!o) return 0;
386 return MAGIC_OBJ_RECTANGLE; 386 return MAGIC_OBJ_RECTANGLE;
387} 387}
388 388
389static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj) 389static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj)
390{ 390{
391 Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 391 Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
392 if (!o) return 0; 392 if (!o) return 0;
393 return MAGIC_OBJ_SHAPE; 393 return MAGIC_OBJ_SHAPE;
394} 394}
395 395
396static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj) 396static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj)
397{ 397{
398 Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); 398 Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
399 return o->engine_data; 399 return o->engine_data;
400} 400}
401 401
@@ -450,4 +450,4 @@ evas_object_rectangle_was_inside(Evas_Object *eo_obj, double x, double y)
450} 450}
451#endif 451#endif
452 452
453#include "canvas/evas_rectangle.eo.c" 453#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 382772c914..0000000000
--- a/src/lib/evas/canvas/evas_rectangle.eo
+++ /dev/null
@@ -1,8 +0,0 @@
1class Evas.Rectangle (Evas.Object)
2{
3 legacy_prefix: evas_object_rectangle;
4 eo_prefix: evas_obj_rectangle;
5 implements {
6 Eo.Base.constructor;
7 }
8}
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 2de5f147b7..09e41873f7 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)
664 for (k = 0; k < 2; k++) 664 for (k = 0; k < 2; k++)
665 { 665 {
666 i = l*2 + k; 666 i = l*2 + k;
667 sobjs[i] = eo_add(EVAS_RECTANGLE_CLASS, evas); 667 sobjs[i] = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
668 fail_if(!sobjs[i]); 668 fail_if(!sobjs[i]);
669 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1); 669 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1);
670 } 670 }