summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorHermet Park <hermet@hermet.pe.kr>2016-08-22 19:00:56 +0900
committerHermet Park <hermet@hermet.pe.kr>2016-08-22 19:00:56 +0900
commit05a29c965a81ba942fef1f7262e9c64a91ffa2f4 (patch)
tree97abbc80d64280d84a9f71da6f24cd56a31ae247 /src/bin
parentffa005ea3de26b4219f32c285cb1665bb1366163 (diff)
fix eo break.
Its api are still unstable. make it work again.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/about.c2
-rw-r--r--src/bin/image_blend_border.c4
-rw-r--r--src/bin/image_blend_border_recolor.c4
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c4
-rw-r--r--src/bin/image_blend_fade_unscaled.c4
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c4
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c4
-rw-r--r--src/bin/image_blend_nearest_scaled.c4
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c4
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c4
-rw-r--r--src/bin/image_blend_occlude1.c4
-rw-r--r--src/bin/image_blend_occlude1_few.c4
-rw-r--r--src/bin/image_blend_occlude1_many.c4
-rw-r--r--src/bin/image_blend_occlude1_very_many.c4
-rw-r--r--src/bin/image_blend_occlude2.c4
-rw-r--r--src/bin/image_blend_occlude2_few.c4
-rw-r--r--src/bin/image_blend_occlude2_many.c4
-rw-r--r--src/bin/image_blend_occlude2_very_many.c4
-rw-r--r--src/bin/image_blend_occlude3.c4
-rw-r--r--src/bin/image_blend_occlude3_few.c4
-rw-r--r--src/bin/image_blend_occlude3_many.c4
-rw-r--r--src/bin/image_blend_occlude3_very_many.c4
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c4
-rw-r--r--src/bin/image_blend_smooth_scaled.c4
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c4
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c4
-rw-r--r--src/bin/image_blend_solid_border.c4
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c4
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c4
-rw-r--r--src/bin/image_blend_solid_middle_border.c4
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c4
-rw-r--r--src/bin/image_blend_solid_unscaled.c4
-rw-r--r--src/bin/image_blend_unscaled.c4
-rw-r--r--src/bin/image_crossfade.c6
-rw-r--r--src/bin/image_data_argb.c4
-rw-r--r--src/bin/image_data_argb_alpha.c4
-rw-r--r--src/bin/image_data_ycbcr601pl.c4
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c4
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c4
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c4
-rw-r--r--src/bin/image_map_3d_1.c4
-rw-r--r--src/bin/image_map_3d_2.c4
-rw-r--r--src/bin/image_map_3d_3.c4
-rw-r--r--src/bin/image_map_3d_4.c4
-rw-r--r--src/bin/image_map_3d_5.c4
-rw-r--r--src/bin/image_map_3d_6.c4
-rw-r--r--src/bin/image_map_3d_flow.c8
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c4
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c4
-rw-r--r--src/bin/image_map_color_alpha_rotate.c4
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c4
-rw-r--r--src/bin/image_map_color_nearest_rotate.c4
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c4
-rw-r--r--src/bin/image_map_color_rotate.c4
-rw-r--r--src/bin/image_map_color_solid_rotate.c4
-rw-r--r--src/bin/image_map_nearest_rotate.c4
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c4
-rw-r--r--src/bin/image_map_rotate.c4
-rw-r--r--src/bin/image_map_solid_rotate.c4
-rw-r--r--src/bin/image_mask.c6
-rw-r--r--src/bin/image_mask_10.c8
-rw-r--r--src/bin/image_mask_11.c8
-rw-r--r--src/bin/image_mask_12.c8
-rw-r--r--src/bin/image_mask_13.c8
-rw-r--r--src/bin/image_mask_2.c6
-rw-r--r--src/bin/image_mask_3.c6
-rw-r--r--src/bin/image_mask_4.c8
-rw-r--r--src/bin/image_mask_5.c8
-rw-r--r--src/bin/image_mask_6.c8
-rw-r--r--src/bin/image_mask_7.c8
-rw-r--r--src/bin/image_mask_8.c8
-rw-r--r--src/bin/image_mask_9.c8
-rw-r--r--src/bin/image_quality_scale.c4
-rw-r--r--src/bin/line_blend.c2
-rw-r--r--src/bin/poly_blend.c4
-rw-r--r--src/bin/proxy_image.c6
-rw-r--r--src/bin/proxy_text_fixed.c4
-rw-r--r--src/bin/proxy_text_random.c4
-rw-r--r--src/bin/rect_blend.c4
-rw-r--r--src/bin/rect_blend_few.c4
-rw-r--r--src/bin/rect_blend_pow2.c4
-rw-r--r--src/bin/rect_blend_pow2_few.c4
-rw-r--r--src/bin/rect_solid.c4
-rw-r--r--src/bin/rect_solid_few.c4
-rw-r--r--src/bin/snapshot_widgets_file_icons.c10
-rw-r--r--src/bin/text_basic.c2
-rw-r--r--src/bin/text_change.c2
-rw-r--r--src/bin/text_styles.c2
-rw-r--r--src/bin/text_styles_different_strings.c2
-rw-r--r--src/bin/textblock_auto_align.c2
-rw-r--r--src/bin/textblock_basic.c2
-rw-r--r--src/bin/textblock_intl.c2
-rw-r--r--src/bin/textblock_text_append.c2
-rw-r--r--src/bin/ui.c26
-rw-r--r--src/bin/vg_basic_circle.c6
-rw-r--r--src/bin/vg_basic_gradient.c8
-rw-r--r--src/bin/vg_basic_rect.c6
-rw-r--r--src/bin/vg_scaled.c8
-rw-r--r--src/bin/widgets_file_icons.c6
-rw-r--r--src/bin/widgets_file_icons_2.c6
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c6
-rw-r--r--src/bin/widgets_file_icons_2_same.c6
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c6
-rw-r--r--src/bin/widgets_file_icons_3.c6
-rw-r--r--src/bin/widgets_file_icons_4.c6
-rw-r--r--src/bin/widgets_list_1.c6
-rw-r--r--src/bin/widgets_list_1_grouped.c6
-rw-r--r--src/bin/widgets_list_2.c6
-rw-r--r--src/bin/widgets_list_2_grouped.c6
-rw-r--r--src/bin/widgets_list_3.c10
-rw-r--r--src/bin/widgets_list_3_grouped.c10
-rw-r--r--src/bin/widgets_list_4.c10
-rw-r--r--src/bin/widgets_list_4_grouped.c10
113 files changed, 286 insertions, 286 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index 46e18fa..c5a780f 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -49,7 +49,7 @@ _setup(void)
49static void 49static void
50_cleanup(void) 50_cleanup(void)
51{ 51{
52 eo_del(o_text); 52 efl_del(o_text);
53 o_text = NULL; 53 o_text = NULL;
54} 54}
55 55
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 2c18889..eb05518 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_image_border_set(o, 6, 6, 6, 6); 29 efl_image_border_set(o, 6, 6, 6, 6);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 853f165..ebdbc77 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("pan.png"), NULL); 28 efl_file_set(o, build_path("pan.png"), NULL);
29 efl_gfx_color_set(o, 64, 64, 64, 255); 29 efl_gfx_color_set(o, 64, 64, 64, 255);
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index ac1f71b..0e76376 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_set(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index f501049..53d436e 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 int a; 26 int a;
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_set(o, build_path("logo.png"), NULL);
@@ -40,7 +40,7 @@ static void _setup(void)
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 int i; 42 int i;
43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 43 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
44} 44}
45 45
46/* loop - do things */ 46/* loop - do things */
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 7ed0300..ca2257a 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 Evas_Object *o; 25 Evas_Object *o;
26 for (i = 0; i < MANYNUM; i++) 26 for (i = 0; i < MANYNUM; i++)
27 { 27 {
28 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 n = rnd() % 100; 30 n = rnd() % 100;
31 w = 3 + ((n * (60 - 3)) / 100); 31 w = 3 + ((n * (60 - 3)) / 100);
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < MANYNUM; i++) efl_del(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 5d87368..10d57d3 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 80a2a64..8f4b1bb 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index bd207e4..d95ac47 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 97bed05..9ce4919 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 0); 29 efl_image_smooth_scale_set(o, 0);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index c83901d..b530c07 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 { 30 {
@@ -50,7 +50,7 @@ static void _setup(void)
50static void _cleanup(void) 50static void _cleanup(void)
51{ 51{
52 int i; 52 int i;
53 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 53 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index db448b5..e48a27f 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 79c2ba7..94d4255 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 3918fcf..d7f538e 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index c25620b..4d2d3d5 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 { 30 {
@@ -50,7 +50,7 @@ static void _setup(void)
50static void _cleanup(void) 50static void _cleanup(void)
51{ 51{
52 int i; 52 int i;
53 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 53 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 1f6ff17..4b73cfe 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index f5ca31d..9d661d4 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 7f515fa..3c4310b 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index c36b694..7423975 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 { 30 {
@@ -50,7 +50,7 @@ static void _setup(void)
50static void _cleanup(void) 50static void _cleanup(void)
51{ 51{
52 int i; 52 int i;
53 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 53 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index c0078d9..0a122d4 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index badd9a5..ab3617e 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 5689be1..4479343 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
@@ -53,7 +53,7 @@ static void _setup(void)
53static void _cleanup(void) 53static void _cleanup(void)
54{ 54{
55 int i; 55 int i;
56 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 56 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
57} 57}
58 58
59/* loop - do things */ 59/* loop - do things */
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 9318df1..6a84b35 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index f777ff2..3888efb 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index b34e8d3..00cdb36 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index e99a94a..bc32293 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_image_smooth_scale_set(o, 1); 29 efl_image_smooth_scale_set(o, 1);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 36bc01b..eca9176 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("frame.png"), NULL); 28 efl_file_set(o, build_path("frame.png"), NULL);
29 efl_image_border_set(o, 8, 8, 8, 8); 29 efl_image_border_set(o, 8, 8, 8, 8);
@@ -36,7 +36,7 @@ static void _setup(void)
36static void _cleanup(void) 36static void _cleanup(void)
37{ 37{
38 int i; 38 int i;
39 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 39 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
40} 40}
41 41
42/* loop - do things */ 42/* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index b119da9..148ee12 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("image.png"), NULL); 30 efl_file_set(o, build_path("image.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index db108d1..f861222 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 int a; 26 int a;
27 27
28 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("image.png"), NULL); 30 efl_file_set(o, build_path("image.png"), NULL);
31 efl_gfx_fill_set(o, 0, 0, 120, 160); 31 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index ad33287..f1c5011 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_set(o, build_path("bar.png"), NULL);
29 efl_image_border_set(o, 6, 6, 6, 6); 29 efl_image_border_set(o, 6, 6, 6, 6);
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index cb74a54..db0b341 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 42 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index cf8cd92..0f31d2b 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 6eb4dfe..7e656ac 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i++) 24 for (i = 0; i < OBNUM; i++)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_set(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -37,7 +37,7 @@ static void _setup(void)
37static void _cleanup(void) 37static void _cleanup(void)
38{ 38{
39 int i; 39 int i;
40 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 40 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
41} 41}
42 42
43/* loop - do things */ 43/* loop - do things */
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index dbbb28b..7eb1606 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,14 +22,14 @@ static void _setup(void)
22{ 22{
23 Evas_Object *o; 23 Evas_Object *o;
24 24
25 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 efl_file_set(o, build_path("im1.png"), NULL); 27 efl_file_set(o, build_path("im1.png"), NULL);
28 efl_gfx_fill_set(o, 0, 0, 720, 420); 28 efl_gfx_fill_set(o, 0, 0, 720, 420);
29 efl_gfx_size_set(o, 720, 420); 29 efl_gfx_size_set(o, 720, 420);
30 efl_gfx_visible_set(o, EINA_TRUE); 30 efl_gfx_visible_set(o, EINA_TRUE);
31 31
32 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
33 o_images[1] = o; 33 o_images[1] = o;
34 efl_file_set(o, build_path("im2.png"), NULL); 34 efl_file_set(o, build_path("im2.png"), NULL);
35 efl_gfx_fill_set(o, 0, 0, 720, 420); 35 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < 2; i++) eo_del(o_images[i]); 46 for (i = 0; i < 2; i++) efl_del(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 9ebf5e0..b96ab75 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 pixels = malloc(sizeof (int) * 640 * 480); 27 pixels = malloc(sizeof (int) * 640 * 480);
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 0); 33 efl_gfx_buffer_alpha_set(o, 0);
@@ -44,7 +44,7 @@ static void _setup(void)
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 int i; 46 int i;
47 for (i = 0; i < 1; i++) eo_del(o_images[i]); 47 for (i = 0; i < 1; i++) efl_del(o_images[i]);
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 8b88394..0493c95 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 pixels = malloc(sizeof (int) * 640 * 480); 27 pixels = malloc(sizeof (int) * 640 * 480);
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 1); 33 efl_gfx_buffer_alpha_set(o, 1);
@@ -44,7 +44,7 @@ static void _setup(void)
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 int i; 46 int i;
47 for (i = 0; i < 1; i++) eo_del(o_images[i]); 47 for (i = 0; i < 1; i++) efl_del(o_images[i]);
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index 526d4c2..2138de3 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 0); 33 efl_gfx_buffer_alpha_set(o, 0);
@@ -77,7 +77,7 @@ static void _setup(void)
77static void _cleanup(void) 77static void _cleanup(void)
78{ 78{
79 int i; 79 int i;
80 for (i = 0; i < 1; i++) eo_del(o_images[i]); 80 for (i = 0; i < 1; i++) efl_del(o_images[i]);
81 // FIXME: the object is not destroyed anymore so we can't free the data 81 // FIXME: the object is not destroyed anymore so we can't free the data
82 /* free(yp); */ 82 /* free(yp); */
83 /* free(up); */ 83 /* free(up); */
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 93417da..3dee9f8 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 0); 33 efl_gfx_buffer_alpha_set(o, 0);
@@ -75,7 +75,7 @@ static void _setup(void)
75static void _cleanup(void) 75static void _cleanup(void)
76{ 76{
77 int i; 77 int i;
78 for (i = 0; i < 1; i++) eo_del(o_images[i]); 78 for (i = 0; i < 1; i++) efl_del(o_images[i]);
79 /* free(yp); */ 79 /* free(yp); */
80 /* free(up); */ 80 /* free(up); */
81 /* free(vp); */ 81 /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index cb0ad52..8c936f6 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 0); 33 efl_gfx_buffer_alpha_set(o, 0);
@@ -74,7 +74,7 @@ static void _setup(void)
74static void _cleanup(void) 74static void _cleanup(void)
75{ 75{
76 int i; 76 int i;
77 for (i = 0; i < 1; i++) eo_del(o_images[i]); 77 for (i = 0; i < 1; i++) efl_del(o_images[i]);
78 /* free(yp); */ 78 /* free(yp); */
79 /* free(up); */ 79 /* free(up); */
80 /* free(vp); */ 80 /* free(vp); */
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 963e30b..b7a4396 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 30 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
31 o_images[i] = o; 31 o_images[i] = o;
32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); 32 efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
33 efl_gfx_buffer_alpha_set(o, 0); 33 efl_gfx_buffer_alpha_set(o, 0);
@@ -75,7 +75,7 @@ static void _setup(void)
75static void _cleanup(void) 75static void _cleanup(void)
76{ 76{
77 int i; 77 int i;
78 for (i = 0; i < 1; i++) eo_del(o_images[i]); 78 for (i = 0; i < 1; i++) efl_del(o_images[i]);
79 /* free(yp); */ 79 /* free(yp); */
80 /* free(up); */ 80 /* free(up); */
81 /* free(vp); */ 81 /* free(vp); */
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index abc2732..4d528e9 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
171{ 171{
172 int i; 172 int i;
173 173
174 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 174 for (i = 0; i < 6; i++) efl_del(c->side[i].o);
175 free(c); 175 free(c);
176} 176}
177 177
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index f83a546..587be91 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
@@ -169,7 +169,7 @@ _cube_free(Cube *c)
169{ 169{
170 int i; 170 int i;
171 171
172 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 172 for (i = 0; i < 6; i++) efl_del(c->side[i].o);
173 free(c); 173 free(c);
174} 174}
175 175
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index fd842c3..83f7026 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
@@ -163,7 +163,7 @@ _cube_free(Cube *c)
163{ 163{
164 int i; 164 int i;
165 165
166 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 166 for (i = 0; i < 6; i++) efl_del(c->side[i].o);
167 free(c); 167 free(c);
168} 168}
169 169
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index b06e700..04b7f81 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
@@ -161,7 +161,7 @@ _cube_free(Cube *c)
161{ 161{
162 int i; 162 int i;
163 163
164 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 164 for (i = 0; i < 6; i++) efl_del(c->side[i].o);
165 free(c); 165 free(c);
166} 166}
167 167
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 2adc07f..66a3710 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
@@ -171,7 +171,7 @@ _cube_free(Cube *c)
171{ 171{
172 int i; 172 int i;
173 173
174 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 174 for (i = 0; i < 6; i++) efl_del(c->side[i].o);
175 free(c); 175 free(c);
176} 176}
177 177
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 7394971..9ec1efe 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
54 { 54 {
55 Evas_Object *o; 55 Evas_Object *o;
56 char buf[256]; 56 char buf[256];
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_set(o, build_path(buf), NULL);
@@ -168,7 +168,7 @@ _cube_free(Cube *c)
168{ 168{
169 int i; 169 int i;
170 170
171 for (i = 0; i < 6; i++) eo_del(c->side[i].o); 171 for (i = 0; i < 6; i++) efl_del(c->side[i].o);
172 free(c); 172 free(c);
173} 173}
174 174
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index b1aca66..378b127 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 char buf[256]; 30 char buf[256];
31 31
32 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 efl_file_set(o, build_path(buf), NULL); 35 efl_file_set(o, build_path(buf), NULL);
@@ -38,7 +38,7 @@ static void _setup(void)
38 efl_image_smooth_scale_set(o, 0); 38 efl_image_smooth_scale_set(o, 0);
39 efl_gfx_visible_set(o, EINA_TRUE); 39 efl_gfx_visible_set(o, EINA_TRUE);
40 40
41 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 41 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
42 o_reflec[i] = o; 42 o_reflec[i] = o;
43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
44 efl_file_set(o, build_path(buf), NULL); 44 efl_file_set(o, build_path(buf), NULL);
@@ -56,8 +56,8 @@ static void _cleanup(void)
56 int i; 56 int i;
57 for (i = 0; i < CNUM; i++) 57 for (i = 0; i < CNUM; i++)
58 { 58 {
59 eo_del(o_images[i]); 59 efl_del(o_images[i]);
60 eo_del(o_reflec[i]); 60 efl_del(o_reflec[i]);
61 } 61 }
62} 62}
63 63
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 5af331b..3ca4c8b 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index f60137f..bf2085a 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index f4c85ab..f0a7599 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 5887202..f456325 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 5a888f3..0c3e13a 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 1408e50..288ef6f 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 0ce0f44..01dcfc1 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 592b2c6..ab5515a 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index 662d490..d080bc0 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index a23b309..5499121 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 42 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index c192ea8..6ed37ab 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_set(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index f673cfc..08ece39 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < (OBNUM / 2); i++) 25 for (i = 0; i < (OBNUM / 2); i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_set(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 120, 160); 30 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 41 for (i = 0; i < (OBNUM / 2); i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 2c041d5..9d51f26 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -23,14 +23,14 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i+= 2) 24 for (i = 0; i < OBNUM; i+= 2)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_visible_set(o, EINA_TRUE);
32 32
33 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("e-logo.png"), NULL); 35 efl_file_set(o, build_path("e-logo.png"), NULL);
36 efl_gfx_fill_set(o, 0, 0, 120, 160); 36 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 4421d8a..41b86eb 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_set(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4); 39 efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 1; i++) eo_del(o_images[i]); 51 for (i = 0; i < 1; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 7449ec7..2626cd2 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index 307ef49..821fb5b 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -49,8 +49,8 @@ static void _setup(void)
49static void _cleanup(void) 49static void _cleanup(void)
50{ 50{
51 int i; 51 int i;
52 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 52 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
53 eo_del(o_mask); 53 efl_del(o_mask);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 0d4fa2c..175cb41 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -49,8 +49,8 @@ static void _setup(void)
49static void _cleanup(void) 49static void _cleanup(void)
50{ 50{
51 int i; 51 int i;
52 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 52 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
53 eo_del(o_mask); 53 efl_del(o_mask);
54} 54}
55 55
56/* loop - do things */ 56/* loop - do things */
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index bf74171..ef38394 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -23,14 +23,14 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i+= 2) 24 for (i = 0; i < OBNUM; i+= 2)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_set(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_visible_set(o, EINA_TRUE);
32 32
33 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("e-logo-2.png"), NULL); 35 efl_file_set(o, build_path("e-logo-2.png"), NULL);
36 efl_gfx_fill_set(o, 0, 0, 120, 160); 36 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 75f9d80..4e45e32 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -23,14 +23,14 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 for (i = 0; i < OBNUM; i+= 2) 24 for (i = 0; i < OBNUM; i+= 2)
25 { 25 {
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
30 efl_gfx_size_set(o, 120, 160); 30 efl_gfx_size_set(o, 120, 160);
31 efl_gfx_visible_set(o, EINA_TRUE); 31 efl_gfx_visible_set(o, EINA_TRUE);
32 32
33 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("logo.png"), NULL); 35 efl_file_set(o, build_path("logo.png"), NULL);
36 efl_gfx_fill_set(o, 0, 0, 120, 160); 36 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index deea90b..c4a01aa 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index f4b0734..facdf61 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index cf5292d..d24bba4 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2); 39 efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index b1701a9..8a85596 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_set(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 120, 160); 29 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_set(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 120, 160); 39 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index d2dbc57..8d586f7 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_set(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 500, 444); 39 efl_gfx_fill_set(o, 0, 0, 500, 444);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 1; i++) eo_del(o_images[i]); 51 for (i = 0; i < 1; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 499e6ce..4d5ac81 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 int i; 23 int i;
24 Evas_Object *o; 24 Evas_Object *o;
25 25
26 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_set(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, 0, 0, 720, 420); 29 efl_gfx_fill_set(o, 0, 0, 720, 420);
@@ -33,7 +33,7 @@ static void _setup(void)
33 33
34 for (i = 0; i < 1; i++) 34 for (i = 0; i < 1; i++)
35 { 35 {
36 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_set(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, 0, 0, 500, 444); 39 efl_gfx_fill_set(o, 0, 0, 500, 444);
@@ -48,8 +48,8 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 1; i++) eo_del(o_images[i]); 51 for (i = 0; i < 1; i++) efl_del(o_images[i]);
52 eo_del(o_mask); 52 efl_del(o_mask);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 1f7e9fe..4eda01f 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 Evas_Object *o; 24 Evas_Object *o;
25 for (i = 0; i < 1; i++) 25 for (i = 0; i < 1; i++)
26 { 26 {
27 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("tp.png"), NULL); 29 efl_file_set(o, build_path("tp.png"), NULL);
30 efl_gfx_fill_set(o, 0, 0, 640, 480); 30 efl_gfx_fill_set(o, 0, 0, 640, 480);
@@ -38,7 +38,7 @@ static void _setup(void)
38static void _cleanup(void) 38static void _cleanup(void)
39{ 39{
40 int i; 40 int i;
41 for (i = 0; i < 1; i++) eo_del(o_images[i]); 41 for (i = 0; i < 1; i++) efl_del(o_images[i]);
42} 42}
43 43
44/* loop - do things */ 44/* loop - do things */
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index 1492ca9..dab8ef0 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
49} 49}
50 50
51#define PI (double) 3.141592654 51#define PI (double) 3.141592654
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 269dacf..3bc3ca7 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -68,7 +68,7 @@ static void _setup(void)
68 { 68 {
69 int r, g, b, a; 69 int r, g, b, a;
70 70
71 o = eo_add(EFL_CANVAS_POLYGON_CLASS, evas); 71 o = efl_add(EFL_CANVAS_POLYGON_CLASS, evas);
72 o_images[i] = o; 72 o_images[i] = o;
73 a = (rnd()&0xff) / 2; 73 a = (rnd()&0xff) / 2;
74 r = ((rnd()&0xff) * a) / 255; 74 r = ((rnd()&0xff) * a) / 255;
@@ -85,7 +85,7 @@ static void _setup(void)
85static void _cleanup(void) 85static void _cleanup(void)
86{ 86{
87 int i; 87 int i;
88 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 88 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
89} 89}
90 90
91/* loop - do things */ 91/* loop - do things */
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 95cd4cf..3538877 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -22,7 +22,7 @@ static void _setup(void)
22 int i; 22 int i;
23 Evas_Object *o,*src; 23 Evas_Object *o,*src;
24 24
25 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
26 efl_file_set(o, build_path("logo.png"), NULL); 26 efl_file_set(o, build_path("logo.png"), NULL);
27 efl_gfx_fill_set(o, 0, 0, 120, 160); 27 efl_gfx_fill_set(o, 0, 0, 120, 160);
28 efl_gfx_size_set(o, 120, 160); 28 efl_gfx_size_set(o, 120, 160);
@@ -32,7 +32,7 @@ static void _setup(void)
32 32
33 for (i = 1; i < OBNUM; i++) 33 for (i = 1; i < OBNUM; i++)
34 { 34 {
35 o = eo_add(EFL_CANVAS_PROXY_CLASS, evas); 35 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
36 o_images[i] = o; 36 o_images[i] = o;
37 efl_canvas_proxy_source_set(o, src); 37 efl_canvas_proxy_source_set(o, src);
38 efl_gfx_size_set(o, 120, 160); 38 efl_gfx_size_set(o, 120, 160);
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 9d77179..66d6fee 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -45,7 +45,7 @@ static void _setup(void)
45 for ( ; i < OBNUM ; i ++) 45 for ( ; i < OBNUM ; i ++)
46 { 46 {
47 s = o_texts[i % st]; 47 s = o_texts[i % st];
48 o = eo_add(EFL_CANVAS_PROXY_CLASS, evas); 48 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
49 o_texts[i] = o; 49 o_texts[i] = o;
50 efl_canvas_proxy_source_set(o, s); 50 efl_canvas_proxy_source_set(o, s);
51 /* FIXME s == NULL*/ 51 /* FIXME s == NULL*/
@@ -62,7 +62,7 @@ static void _setup(void)
62static void _cleanup(void) 62static void _cleanup(void)
63{ 63{
64 int i; 64 int i;
65 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 65 for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
66} 66}
67 67
68/* loop - do things */ 68/* loop - do things */
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index c7a5d66..453b3b8 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -50,7 +50,7 @@ static void _setup(void)
50 efl_gfx_visible_set(o, EINA_TRUE); 50 efl_gfx_visible_set(o, EINA_TRUE);
51 for (i = 1 ; i < OBNUM ; i ++) 51 for (i = 1 ; i < OBNUM ; i ++)
52 { 52 {
53 o = eo_add(EFL_CANVAS_PROXY_CLASS, evas); 53 o = efl_add(EFL_CANVAS_PROXY_CLASS, evas);
54 o_texts[i] = o; 54 o_texts[i] = o;
55 efl_canvas_proxy_source_set(o, o_texts[0]); 55 efl_canvas_proxy_source_set(o, o_texts[0]);
56 efl_gfx_size_get(o_texts[0], &w, &h); 56 efl_gfx_size_get(o_texts[0], &w, &h);
@@ -71,7 +71,7 @@ static void _setup(void)
71static void _cleanup(void) 71static void _cleanup(void)
72{ 72{
73 int i; 73 int i;
74 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 74 for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
75} 75}
76 76
77/* loop - do things */ 77/* loop - do things */
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index a199668..abaea7f 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 29 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = rnd()&0xff; 31 a = rnd()&0xff;
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 0df2b35..3277454 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 a = rnd()&0xff; 34 a = rnd()&0xff;
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 411a521..79b65cd 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 29 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = 256 - (1 << ((rnd() % 8) + 1)); 31 a = 256 - (1 << ((rnd() % 8) + 1));
32 if (a < 128) a = 128; 32 if (a < 128) a = 128;
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 22f4452..adf9f48 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 if (a < 128) a = 128;
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 1f08255..60b8d8c 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 29 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
30 o_images[i] = o; 30 o_images[i] = o;
31 a = 0xff; 31 a = 0xff;
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 7871ab1..6e8e582 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -29,7 +29,7 @@ static void _setup(void)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 a = 0xff; 34 a = 0xff;
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index ff9a755..ce764c1 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -54,7 +54,7 @@ static void _setup(void)
54 { 54 {
55 Evas_Coord tw, th, cent; 55 Evas_Coord tw, th, cent;
56 56
57 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 o_images[i] = o; 58 o_images[i] = o;
59 efl_file_set(o, build_path(icons[i % 13]), NULL); 59 efl_file_set(o, build_path(icons[i % 13]), NULL);
60 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 60 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -85,7 +85,7 @@ static void _setup(void)
85 "blur { 5, dst = a, color = '#ff0' }" 85 "blur { 5, dst = a, color = '#ff0' }"
86 ; 86 ;
87 87
88 o = eo_add(EFL_CANVAS_SNAPSHOT_CLASS, evas); 88 o = efl_add(EFL_CANVAS_SNAPSHOT_CLASS, evas);
89 o_snap = o; 89 o_snap = o;
90 efl_gfx_visible_set(o, EINA_TRUE); 90 efl_gfx_visible_set(o, EINA_TRUE);
91 efl_gfx_position_set(o, 50, 50); 91 efl_gfx_position_set(o, 50, 50);
@@ -102,10 +102,10 @@ static void _cleanup(void)
102 int i; 102 int i;
103 for (i = 0; i < NUM; i++) 103 for (i = 0; i < NUM; i++)
104 { 104 {
105 eo_del(o_images[i]); 105 efl_del(o_images[i]);
106 eo_del(o_texts[i]); 106 efl_del(o_texts[i]);
107 } 107 }
108 eo_del(o_snap); 108 efl_del(o_snap);
109} 109}
110 110
111/* loop - do things */ 111/* loop - do things */
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index df6ca78..b72d2a9 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -39,7 +39,7 @@ static void _setup(void)
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 int i; 41 int i;
42 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 42 for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
43} 43}
44 44
45/* loop - do things */ 45/* loop - do things */
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index c3cc4d0..0ad1321 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -57,7 +57,7 @@ static void _setup(void)
57static void _cleanup(void) 57static void _cleanup(void)
58{ 58{
59 int i; 59 int i;
60 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 60 for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
61} 61}
62 62
63/* loop - do things */ 63/* loop - do things */
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index e313e9e..58ce358 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 51 for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 88d7400..8d074ed 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -60,7 +60,7 @@ static void _setup(void)
60static void _cleanup(void) 60static void _cleanup(void)
61{ 61{
62 int i; 62 int i;
63 for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); 63 for (i = 0; i < OBNUM; i++) efl_del(o_texts[i]);
64} 64}
65 65
66/* loop - do things */ 66/* loop - do things */
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index 62a593a..400adeb 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -58,7 +58,7 @@ static void _setup(void)
58/* cleanup */ 58/* cleanup */
59static void _cleanup(void) 59static void _cleanup(void)
60{ 60{
61 eo_del(o_text); 61 efl_del(o_text);
62} 62}
63 63
64/* loop - do things */ 64/* loop - do things */
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 35cf8fa..38d6b49 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -119,7 +119,7 @@ static void _setup(void)
119/* cleanup */ 119/* cleanup */
120static void _cleanup(void) 120static void _cleanup(void)
121{ 121{
122 eo_del(o_text); 122 efl_del(o_text);
123} 123}
124 124
125/* loop - do things */ 125/* loop - do things */
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index a598e56..398754c 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -90,7 +90,7 @@ static void _setup(void)
90/* cleanup */ 90/* cleanup */
91static void _cleanup(void) 91static void _cleanup(void)
92{ 92{
93 eo_del(o_text); 93 efl_del(o_text);
94} 94}
95 95
96/* loop - do things */ 96/* loop - do things */
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 4f11d54..7ab9d19 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -102,7 +102,7 @@ static void _setup(void)
102/* cleanup */ 102/* cleanup */
103static void _cleanup(void) 103static void _cleanup(void)
104{ 104{
105 eo_del(o_text); 105 efl_del(o_text);
106 o_text = NULL; 106 o_text = NULL;
107} 107}
108 108
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 824e33e..fad356f 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test,
362 Menu_Item *mi; 362 Menu_Item *mi;
363 363
364 mi = malloc(sizeof(Menu_Item)); 364 mi = malloc(sizeof(Menu_Item));
365 mi->o_icon = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 365 mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
366 efl_file_set(mi->o_icon, build_path(icon), NULL); 366 efl_file_set(mi->o_icon, build_path(icon), NULL);
367 efl_gfx_size_set(mi->o_icon, 32, 32); 367 efl_gfx_size_set(mi->o_icon, 32, 32);
368 efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32); 368 efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32);
@@ -376,11 +376,11 @@ _ui_menu_item_full_add(Eina_Bool test,
376 376
377#define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func) 377#define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func)
378 378
379EO_CALLBACKS_ARRAY_DEFINE(ui_callbacks, 379EFL_CALLBACKS_ARRAY_DEFINE(ui_callbacks,
380 { EFL_EVENT_KEY_DOWN, _ui_key }, 380 { EFL_EVENT_KEY_DOWN, _ui_key },
381 { EFL_EVENT_POINTER_DOWN, _ui_mouse_down }, 381 { EFL_EVENT_POINTER_DOWN, _ui_mouse_down },
382 { EFL_EVENT_POINTER_UP, _ui_mouse_up }, 382 { EFL_EVENT_POINTER_UP, _ui_mouse_up },
383 { EFL_EVENT_POINTER_MOVE, _ui_mouse_move }); 383 { EFL_EVENT_POINTER_MOVE, _ui_mouse_move });
384 384
385void 385void
386ui_setup(unsigned int ui_w, unsigned int ui_h) 386ui_setup(unsigned int ui_w, unsigned int ui_h)
@@ -391,17 +391,17 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
391 win_w = ui_w; 391 win_w = ui_w;
392 win_h = ui_h; 392 win_h = ui_h;
393 393
394 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 394 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
395 efl_gfx_position_set(o, 0, 0); 395 efl_gfx_position_set(o, 0, 0);
396 efl_gfx_size_set(o, win_w, win_h); 396 efl_gfx_size_set(o, win_w, win_h);
397 efl_gfx_color_set(o, 0, 0, 0, 0); 397 efl_gfx_color_set(o, 0, 0, 0, 0);
398 efl_gfx_stack_layer_set(o, 1000); 398 efl_gfx_stack_layer_set(o, 1000);
399 evas_object_focus_set(o, 1); 399 evas_object_focus_set(o, 1);
400 efl_gfx_visible_set(o, EINA_TRUE); 400 efl_gfx_visible_set(o, EINA_TRUE);
401 eo_event_callback_array_add(o, ui_callbacks(), NULL); 401 efl_event_callback_array_add(o, ui_callbacks(), NULL);
402 o_bg = o; 402 o_bg = o;
403 403
404 o = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 404 o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
405 efl_gfx_position_set(o, 0, 0); 405 efl_gfx_position_set(o, 0, 0);
406 efl_gfx_size_set(o, win_w, win_h); 406 efl_gfx_size_set(o, win_w, win_h);
407 efl_gfx_color_set(o, 255, 255, 255, 255); 407 efl_gfx_color_set(o, 255, 255, 255, 255);
@@ -435,7 +435,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
435 efl_gfx_visible_set(o, EINA_TRUE); 435 efl_gfx_visible_set(o, EINA_TRUE);
436 o_byline = o; 436 o_byline = o;
437 437
438 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 438 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
439 efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2)); 439 efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2));
440 efl_file_set(o, build_path("e-logo.png"), NULL); 440 efl_file_set(o, build_path("e-logo.png"), NULL);
441 efl_gfx_fill_set(o, 0, 0, 120, 160); 441 efl_gfx_fill_set(o, 0, 0, 120, 160);
@@ -445,21 +445,21 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
445 efl_gfx_visible_set(o, EINA_TRUE); 445 efl_gfx_visible_set(o, EINA_TRUE);
446 o_menu_logo = o; 446 o_menu_logo = o;
447 447
448 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 448 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
449 efl_gfx_position_set(o, win_w - 128, - 128); 449 efl_gfx_position_set(o, win_w - 128, - 128);
450 efl_gfx_fill_set(o, 0, 0, 256, 256); 450 efl_gfx_fill_set(o, 0, 0, 256, 256);
451 efl_gfx_size_set(o, 256, 256); 451 efl_gfx_size_set(o, 256, 256);
452 efl_gfx_visible_set(o, EINA_TRUE); 452 efl_gfx_visible_set(o, EINA_TRUE);
453 o_menu_icon = o; 453 o_menu_icon = o;
454 454
455 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 455 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
456 efl_gfx_position_set(o, 0, 0); 456 efl_gfx_position_set(o, 0, 0);
457 efl_file_set(o, build_path("icon_sel.png"), NULL); 457 efl_file_set(o, build_path("icon_sel.png"), NULL);
458 efl_gfx_size_set(o, 48, 48); 458 efl_gfx_size_set(o, 48, 48);
459 efl_gfx_fill_set(o, 0, 0, 48, 48); 459 efl_gfx_fill_set(o, 0, 0, 48, 48);
460 o_menu_icon_sel = o; 460 o_menu_icon_sel = o;
461 461
462 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 462 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
463 efl_gfx_position_set(o, 0, 0); 463 efl_gfx_position_set(o, 0, 0);
464 efl_file_set(o, build_path("text_sel.png"), NULL); 464 efl_file_set(o, build_path("text_sel.png"), NULL);
465 efl_gfx_size_set(o, 96, 32); 465 efl_gfx_size_set(o, 96, 32);
diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c
index 73bb9dd..993b811 100644
--- a/src/bin/vg_basic_circle.c
+++ b/src/bin/vg_basic_circle.c
@@ -30,7 +30,7 @@ static void _setup(void)
30 Eo *vector; 30 Eo *vector;
31 double r = 35, stroke_w = 3; 31 double r = 35, stroke_w = 3;
32 32
33 vector = eo_add(EVAS_VG_CLASS, evas); 33 vector = efl_add(EVAS_VG_CLASS, evas);
34 o_shapes[i] = vector; 34 o_shapes[i] = vector;
35 efl_gfx_size_set(vector, r * 2 + stroke_w * 2, r * 2 + stroke_w * 2); 35 efl_gfx_size_set(vector, r * 2 + stroke_w * 2, r * 2 + stroke_w * 2);
36 efl_gfx_position_set(vector, 0, 0); 36 efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
38 38
39 root = evas_object_vg_root_node_get(vector); 39 root = evas_object_vg_root_node_get(vector);
40 40
41 circle = eo_add(EFL_VG_SHAPE_CLASS, root); 41 circle = efl_add(EFL_VG_SHAPE_CLASS, root);
42 efl_gfx_shape_append_circle(circle, r + stroke_w, r + stroke_w, r); 42 efl_gfx_shape_append_circle(circle, r + stroke_w, r + stroke_w, r);
43 efl_gfx_shape_stroke_width_set(circle, stroke_w); 43 efl_gfx_shape_stroke_width_set(circle, stroke_w);
44 efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128); 44 efl_gfx_shape_stroke_color_set(circle, 128, 0, 128, 128);
@@ -52,7 +52,7 @@ static void _cleanup(void)
52{ 52{
53 unsigned int i; 53 unsigned int i;
54 54
55 for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); 55 for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
56} 56}
57 57
58/* loop - do things */ 58/* loop - do things */
diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c
index b4346cd..da25236 100644
--- a/src/bin/vg_basic_gradient.c
+++ b/src/bin/vg_basic_gradient.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 Eo *vector; 36 Eo *vector;
37 double w = 70, h = 70, stroke_w = 3; 37 double w = 70, h = 70, stroke_w = 3;
38 38
39 vector = eo_add(EVAS_VG_CLASS, evas); 39 vector = efl_add(EVAS_VG_CLASS, evas);
40 o_shapes[i] = vector; 40 o_shapes[i] = vector;
41 efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2); 41 efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
42 efl_gfx_position_set(vector, 0, 0); 42 efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
44 44
45 root = evas_object_vg_root_node_get(vector); 45 root = evas_object_vg_root_node_get(vector);
46 46
47 gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL); 47 gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
48 efl_gfx_gradient_stop_set(gradient, stops, 3); 48 efl_gfx_gradient_stop_set(gradient, stops, 3);
49 efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT); 49 efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
50 efl_gfx_gradient_linear_start_set(gradient, 10, 10); 50 efl_gfx_gradient_linear_start_set(gradient, 10, 10);
51 efl_gfx_gradient_linear_end_set(gradient, 50, 50); 51 efl_gfx_gradient_linear_end_set(gradient, 50, 50);
52 52
53 rect = eo_add(EFL_VG_SHAPE_CLASS, root); 53 rect = efl_add(EFL_VG_SHAPE_CLASS, root);
54 efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); 54 efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
55 efl_vg_shape_fill_set(rect, gradient); 55 efl_vg_shape_fill_set(rect, gradient);
56 efl_gfx_shape_stroke_width_set(rect, stroke_w); 56 efl_gfx_shape_stroke_width_set(rect, stroke_w);
@@ -65,7 +65,7 @@ static void _cleanup(void)
65{ 65{
66 unsigned int i; 66 unsigned int i;
67 67
68 for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); 68 for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
69} 69}
70 70
71/* loop - do things */ 71/* loop - do things */
diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c
index be0b5d8..58318b7 100644
--- a/src/bin/vg_basic_rect.c
+++ b/src/bin/vg_basic_rect.c
@@ -30,7 +30,7 @@ static void _setup(void)
30 Eo *vector; 30 Eo *vector;
31 double w = 70, h = 70, stroke_w = 3; 31 double w = 70, h = 70, stroke_w = 3;
32 32
33 vector = eo_add(EVAS_VG_CLASS, evas); 33 vector = efl_add(EVAS_VG_CLASS, evas);
34 o_shapes[i] = vector; 34 o_shapes[i] = vector;
35 efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2); 35 efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
36 efl_gfx_position_set(vector, 0, 0); 36 efl_gfx_position_set(vector, 0, 0);
@@ -38,7 +38,7 @@ static void _setup(void)
38 38
39 root = evas_object_vg_root_node_get(vector); 39 root = evas_object_vg_root_node_get(vector);
40 40
41 rect = eo_add(EFL_VG_SHAPE_CLASS, root); 41 rect = efl_add(EFL_VG_SHAPE_CLASS, root);
42 efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); 42 efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
43 efl_gfx_shape_stroke_width_set(rect, stroke_w); 43 efl_gfx_shape_stroke_width_set(rect, stroke_w);
44 efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128); 44 efl_gfx_shape_stroke_color_set(rect, 128, 0, 128, 128);
@@ -52,7 +52,7 @@ static void _cleanup(void)
52{ 52{
53 unsigned int i; 53 unsigned int i;
54 54
55 for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); 55 for (i = 0; i < OBNUM; i++) efl_del(o_shapes[i]);
56} 56}
57 57
58/* loop - do things */ 58/* loop - do things */
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
index 451022f..6fd521b 100644
--- a/src/bin/vg_scaled.c
+++ b/src/bin/vg_scaled.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 Eo *vector; 36 Eo *vector;
37 double w = 70, h = 70, stroke_w = 3; 37 double w = 70, h = 70, stroke_w = 3;
38 38
39 vector = eo_add(EVAS_VG_CLASS, evas); 39 vector = efl_add(EVAS_VG_CLASS, evas);
40 o_objects[i] = vector; 40 o_objects[i] = vector;
41 efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2); 41 efl_gfx_size_set(vector, w + stroke_w * 2, h + stroke_w * 2);
42 efl_gfx_position_set(vector, 0, 0); 42 efl_gfx_position_set(vector, 0, 0);
@@ -44,13 +44,13 @@ static void _setup(void)
44 44
45 root = evas_object_vg_root_node_get(vector); 45 root = evas_object_vg_root_node_get(vector);
46 46
47 o_gradient[i] = gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL); 47 o_gradient[i] = gradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL);
48 efl_gfx_gradient_stop_set(gradient, stops, 3); 48 efl_gfx_gradient_stop_set(gradient, stops, 3);
49 efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT); 49 efl_gfx_gradient_spread_set(gradient, EFL_GFX_GRADIENT_SPREAD_REFLECT);
50 efl_gfx_gradient_linear_start_set(gradient, 10, 10); 50 efl_gfx_gradient_linear_start_set(gradient, 10, 10);
51 efl_gfx_gradient_linear_end_set(gradient, 50, 50); 51 efl_gfx_gradient_linear_end_set(gradient, 50, 50);
52 52
53 o_shapes[i] = rect = eo_add(EFL_VG_SHAPE_CLASS, root); 53 o_shapes[i] = rect = efl_add(EFL_VG_SHAPE_CLASS, root);
54 efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10); 54 efl_gfx_shape_append_rect(rect, 0 + stroke_w, 0 + stroke_w, w, h, 10, 10);
55 efl_vg_shape_fill_set(rect, gradient); 55 efl_vg_shape_fill_set(rect, gradient);
56 efl_gfx_shape_stroke_width_set(rect, stroke_w); 56 efl_gfx_shape_stroke_width_set(rect, stroke_w);
@@ -67,7 +67,7 @@ static void _cleanup(void)
67 67
68 for (i = 0; i < OBNUM; i++) 68 for (i = 0; i < OBNUM; i++)
69 { 69 {
70 eo_del(o_objects[i]); 70 efl_del(o_objects[i]);
71 o_objects[i] = NULL; 71 o_objects[i] = NULL;
72 } 72 }
73} 73}
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 367d07e..93633fb 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -46,7 +46,7 @@ static void _setup(void)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_set(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -71,8 +71,8 @@ static void _cleanup(void)
71 int i; 71 int i;
72 for (i = 0; i < NUM; i++) 72 for (i = 0; i < NUM; i++)
73 { 73 {
74 eo_del(o_images[i]); 74 efl_del(o_images[i]);
75 eo_del(o_texts[i]); 75 efl_del(o_texts[i]);
76 } 76 }
77} 77}
78 78
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index bcfe230..e66480f 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -46,7 +46,7 @@ static void _setup(void)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_set(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 efl_del(o_images[i]);
73 eo_del(o_texts[i]); 73 efl_del(o_texts[i]);
74 } 74 }
75} 75}
76 76
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 75a929b..724e7f5 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -46,7 +46,7 @@ static void _setup(void)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_set(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -78,8 +78,8 @@ static void _cleanup(void)
78 int i; 78 int i;
79 for (i = 0; i < NUM; i++) 79 for (i = 0; i < NUM; i++)
80 { 80 {
81 eo_del(o_images[i]); 81 efl_del(o_images[i]);
82 eo_del(o_texts[i]); 82 efl_del(o_texts[i]);
83 } 83 }
84} 84}
85 85
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 83dfeac..1a42604 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 Evas_Object *o; 31 Evas_Object *o;
32 for (i = 0; i < NUM; i++) 32 for (i = 0; i < NUM; i++)
33 { 33 {
34 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 34 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 efl_file_set(o, build_path(icons[i % 1]), NULL); 36 efl_file_set(o, build_path(icons[i % 1]), NULL);
37 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 37 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -54,8 +54,8 @@ static void _cleanup(void)
54 int i; 54 int i;
55 for (i = 0; i < NUM; i++) 55 for (i = 0; i < NUM; i++)
56 { 56 {
57 eo_del(o_images[i]); 57 efl_del(o_images[i]);
58 eo_del(o_texts[i]); 58 efl_del(o_texts[i]);
59 } 59 }
60} 60}
61 61
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 3bcc64d..59af84c 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 Evas_Object *o; 31 Evas_Object *o;
32 for (i = 0; i < NUM; i++) 32 for (i = 0; i < NUM; i++)
33 { 33 {
34 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 34 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 efl_file_set(o, build_path(icons[i % 1]), NULL); 36 efl_file_set(o, build_path(icons[i % 1]), NULL);
37 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 37 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -58,8 +58,8 @@ static void _cleanup(void)
58 int i; 58 int i;
59 for (i = 0; i < NUM; i++) 59 for (i = 0; i < NUM; i++)
60 { 60 {
61 eo_del(o_images[i]); 61 efl_del(o_images[i]);
62 eo_del(o_texts[i]); 62 efl_del(o_texts[i]);
63 } 63 }
64} 64}
65 65
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index b98c38a..8f06902 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -46,7 +46,7 @@ static void _setup(void)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_set(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 efl_del(o_images[i]);
73 eo_del(o_texts[i]); 73 efl_del(o_texts[i]);
74 } 74 }
75} 75}
76 76
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 0c6b923..3fe43ed 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -46,7 +46,7 @@ static void _setup(void)
46 Evas_Object *o; 46 Evas_Object *o;
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_set(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); 52 efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
@@ -69,8 +69,8 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 efl_del(o_images[i]);
73 eo_del(o_texts[i]); 73 efl_del(o_texts[i]);
74 } 74 }
75} 75}
76 76
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 4a9155a..a1377ef 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -62,7 +62,7 @@ static void _setup(void)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_image_border_set(o, 2, 2, 2, 2); 67 efl_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_set(o, build_path("pan.png"), NULL);
@@ -85,8 +85,8 @@ static void _cleanup(void)
85 int i; 85 int i;
86 for (i = 0; i < NUM; i++) 86 for (i = 0; i < NUM; i++)
87 { 87 {
88 eo_del(o_images[i]); 88 efl_del(o_images[i]);
89 eo_del(o_texts[i]); 89 efl_del(o_texts[i]);
90 } 90 }
91} 91}
92 92
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 937727b..34e9ec7 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_image_border_set(o, 2, 2, 2, 2); 67 efl_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_set(o, build_path("pan.png"), NULL);
@@ -93,8 +93,8 @@ static void _cleanup(void)
93 int i; 93 int i;
94 for (i = 0; i < NUM; i++) 94 for (i = 0; i < NUM; i++)
95 { 95 {
96 eo_del(o_images[i]); 96 efl_del(o_images[i]);
97 eo_del(o_texts[i]); 97 efl_del(o_texts[i]);
98 } 98 }
99} 99}
100 100
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index a942052..4338d06 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -62,7 +62,7 @@ static void _setup(void)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_image_border_set(o, 2, 2, 2, 2); 67 efl_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_set(o, build_path("pan.png"), NULL);
@@ -85,8 +85,8 @@ static void _cleanup(void)
85 int i; 85 int i;
86 for (i = 0; i < NUM; i++) 86 for (i = 0; i < NUM; i++)
87 { 87 {
88 eo_del(o_images[i]); 88 efl_del(o_images[i]);
89 eo_del(o_texts[i]); 89 efl_del(o_texts[i]);
90 } 90 }
91} 91}
92 92
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index ec65e20..151172b 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -62,7 +62,7 @@ static void _setup(void)
62 Evas_Object *o; 62 Evas_Object *o;
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_image_border_set(o, 2, 2, 2, 2); 67 efl_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_set(o, build_path("pan.png"), NULL);
@@ -93,8 +93,8 @@ static void _cleanup(void)
93 int i; 93 int i;
94 for (i = 0; i < NUM; i++) 94 for (i = 0; i < NUM; i++)
95 { 95 {
96 eo_del(o_images[i]); 96 efl_del(o_images[i]);
97 eo_del(o_texts[i]); 97 efl_del(o_texts[i]);
98 } 98 }
99} 99}
100 100
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index c5ce307..61075c7 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -83,14 +83,14 @@ static void _setup(void)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_image_border_set(o, 2, 2, 2, 2); 88 efl_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_set(o, build_path("pan.png"), NULL);
90 efl_gfx_size_set(o, win_w, ICON_SIZE); 90 efl_gfx_size_set(o, win_w, ICON_SIZE);
91 efl_gfx_visible_set(o, EINA_TRUE); 91 efl_gfx_visible_set(o, EINA_TRUE);
92 92
93 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_image_border_set(o, 2, 2, 2, 2); 95 efl_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -113,9 +113,9 @@ static void _cleanup(void)
113 int i; 113 int i;
114 for (i = 0; i < NUM; i++) 114 for (i = 0; i < NUM; i++)
115 { 115 {
116 eo_del(o_images[i]); 116 efl_del(o_images[i]);
117 eo_del(o_icons[i]); 117 efl_del(o_icons[i]);
118 eo_del(o_texts[i]); 118 efl_del(o_texts[i]);
119 } 119 }
120} 120}
121 121
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 60582d1..734ba5f 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -83,14 +83,14 @@ static void _setup(void)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_image_border_set(o, 2, 2, 2, 2); 88 efl_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_set(o, build_path("pan.png"), NULL);
90 efl_gfx_size_set(o, win_w, ICON_SIZE); 90 efl_gfx_size_set(o, win_w, ICON_SIZE);
91 efl_gfx_visible_set(o, EINA_TRUE); 91 efl_gfx_visible_set(o, EINA_TRUE);
92 92
93 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_image_border_set(o, 2, 2, 2, 2); 95 efl_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -130,9 +130,9 @@ static void _cleanup(void)
130 int i; 130 int i;
131 for (i = 0; i < NUM; i++) 131 for (i = 0; i < NUM; i++)
132 { 132 {
133 eo_del(o_images[i]); 133 efl_del(o_images[i]);
134 eo_del(o_icons[i]); 134 efl_del(o_icons[i]);
135 eo_del(o_texts[i]); 135 efl_del(o_texts[i]);
136 } 136 }
137} 137}
138 138
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 4d58c75..ef26f69 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -83,14 +83,14 @@ static void _setup(void)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_image_border_set(o, 2, 2, 2, 2); 88 efl_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_set(o, build_path("pan.png"), NULL);
90 efl_gfx_size_set(o, win_w, ICON_SIZE); 90 efl_gfx_size_set(o, win_w, ICON_SIZE);
91 efl_gfx_visible_set(o, EINA_TRUE); 91 efl_gfx_visible_set(o, EINA_TRUE);
92 92
93 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_image_border_set(o, 2, 2, 2, 2); 95 efl_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -111,9 +111,9 @@ static void _setup(void)
111static void _cleanup(void) 111static void _cleanup(void)
112{ 112{
113 int i; 113 int i;
114 for (i = 0; i < NUM; i++) eo_del(o_images[i]); 114 for (i = 0; i < NUM; i++) efl_del(o_images[i]);
115 for (i = 0; i < NUM; i++) eo_del(o_icons[i]); 115 for (i = 0; i < NUM; i++) efl_del(o_icons[i]);
116 for (i = 0; i < NUM; i++) eo_del(o_texts[i]); 116 for (i = 0; i < NUM; i++) efl_del(o_texts[i]);
117} 117}
118 118
119/* loop - do things */ 119/* loop - do things */
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index ac64c93..7afa4ee 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -83,14 +83,14 @@ static void _setup(void)
83 Evas_Object *o; 83 Evas_Object *o;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_image_border_set(o, 2, 2, 2, 2); 88 efl_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_set(o, build_path("pan.png"), NULL);
90 efl_gfx_size_set(o, win_w, ICON_SIZE); 90 efl_gfx_size_set(o, win_w, ICON_SIZE);
91 efl_gfx_visible_set(o, EINA_TRUE); 91 efl_gfx_visible_set(o, EINA_TRUE);
92 92
93 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_image_border_set(o, 2, 2, 2, 2); 95 efl_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_set(o, build_path(icons[i % 13]), NULL);
@@ -129,9 +129,9 @@ static void _cleanup(void)
129 int i; 129 int i;
130 for (i = 0; i < NUM; i++) 130 for (i = 0; i < NUM; i++)
131 { 131 {
132 eo_del(o_images[i]); 132 efl_del(o_images[i]);
133 eo_del(o_icons[i]); 133 efl_del(o_icons[i]);
134 eo_del(o_texts[i]); 134 efl_del(o_texts[i]);
135 } 135 }
136} 136}
137 137