summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2014-08-22 01:51:47 +0200
committerCedric BAIL <cedric@osg.samsung.com>2014-08-22 18:29:02 +0200
commit74d732c09412a6d3e8b0268631b030b5d9296113 (patch)
tree85f1112d1e8dc6d8e14628f8ec29667185f2bb9b
parent3ef31223f6bbe9565ba41a857eee7926f931eaa5 (diff)
Move to EFL 1.12 interface.
-rw-r--r--configure.ac2
-rw-r--r--src/bin/image_blend_border.c2
-rw-r--r--src/bin/image_blend_border_recolor.c2
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c2
-rw-r--r--src/bin/image_blend_fade_unscaled.c2
-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.c2
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_middle_border.c2
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_unscaled.c2
-rw-r--r--src/bin/image_blend_unscaled.c2
-rw-r--r--src/bin/image_crossfade.c4
-rw-r--r--src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_3d_1.c4
-rw-r--r--src/bin/image_map_3d_2.c2
-rw-r--r--src/bin/image_map_3d_3.c4
-rw-r--r--src/bin/image_map_3d_4.c2
-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.c2
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c2
-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.c2
-rw-r--r--src/bin/image_map_color_solid_rotate.c2
-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.c2
-rw-r--r--src/bin/image_map_solid_rotate.c2
-rw-r--r--src/bin/image_quality_scale.c2
-rw-r--r--src/bin/proxy_image.c2
-rw-r--r--src/bin/proxy_image_offscreen.c2
-rw-r--r--src/bin/proxy_text_fixed.c4
-rw-r--r--src/bin/proxy_text_random.c6
-rw-r--r--src/bin/text_basic.c4
-rw-r--r--src/bin/text_change.c6
-rw-r--r--src/bin/text_styles.c4
-rw-r--r--src/bin/text_styles_different_strings.c4
-rw-r--r--src/bin/ui.c26
-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.c8
-rw-r--r--src/bin/widgets_list_3_grouped.c8
-rw-r--r--src/bin/widgets_list_4.c8
-rw-r--r--src/bin/widgets_list_4_grouped.c8
79 files changed, 168 insertions, 168 deletions
diff --git a/configure.ac b/configure.ac
index bccd4ce..a667680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ esac
50 50
51# EFL dependencies 51# EFL dependencies
52 52
53PKG_CHECK_MODULES([EFL], eina >= 1.7.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99) 53PKG_CHECK_MODULES([EFL], eina >= 1.7.99 efl >= 1.11.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
54 54
55EFL_ENABLE_EO_API_SUPPORT 55EFL_ENABLE_EO_API_SUPPORT
56EFL_ENABLE_BETA_API_SUPPORT 56EFL_ENABLE_BETA_API_SUPPORT
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index d8d1361..4cc7de8 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("bar.png"), NULL), 29 efl_file_set(build_path("bar.png"), NULL),
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_set(6, 6, 6, 6),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 5079bb7..f8a7863 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("pan.png"), NULL), 29 efl_file_set(build_path("pan.png"), NULL),
30 evas_obj_color_set(64, 64, 64, 255), 30 evas_obj_color_set(64, 64, 64, 255),
31 evas_obj_image_border_set(3, 3, 3, 3), 31 evas_obj_image_border_set(3, 3, 3, 3),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 8b2f9a4..ddfae29 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 evas_obj_image_file_set(build_path("logo.png"), NULL), 31 efl_file_set(build_path("logo.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 evas_obj_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 6796b16..a6a476a 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 eo_do(o, 30 eo_do(o,
31 evas_obj_image_file_set(build_path("logo.png"), NULL), 31 efl_file_set(build_path("logo.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160), 33 evas_obj_size_set(120, 160),
34 evas_obj_color_set(a, a, a, a), 34 evas_obj_color_set(a, a, a, a),
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index 380e7ac..571c388 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -31,8 +31,8 @@ static void _setup(void)
31 w = 3 + ((n * (60 - 3)) / 100); 31 w = 3 + ((n * (60 - 3)) / 100);
32 h = 4 + ((n * (80 - 4)) / 100); 32 h = 4 + ((n * (80 - 4)) / 100);
33 eo_do(o, 33 eo_do(o,
34 evas_obj_image_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 evas_obj_image_smooth_scale_set(1), 35 efl_image_smooth_scale_set(1),
36 evas_obj_size_set(w, h), 36 evas_obj_size_set(w, h),
37 evas_obj_image_fill_set(0, 0, w, h), 37 evas_obj_image_fill_set(0, 0, w, h),
38 evas_obj_visibility_set(EINA_TRUE)); 38 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 52b0b09..c70f20b 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 0b32d37..95ce610 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index 2751315..b979feb 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 9aa06de..41c8f35 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(0), 30 efl_image_smooth_scale_set(0),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index e62e520..3510450 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 { 30 {
31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 31 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
32 } 32 }
33 else 33 else
34 { 34 {
@@ -37,7 +37,7 @@ static void _setup(void)
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 eo_do(o,
40 evas_obj_image_file_set(build_path("image.png"), NULL), 40 efl_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y)); 41 evas_obj_position_set(x, y));
42 } 42 }
43 eo_do(o, 43 eo_do(o,
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index b36830e..a454eff 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL)); 34 eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL), 43 efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 6ac4388..9beef4e 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 09feea6..b918d54 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 9dea32d..5f0f425 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 { 30 {
31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 31 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
32 } 32 }
33 else 33 else
34 { 34 {
@@ -37,7 +37,7 @@ static void _setup(void)
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 eo_do(o,
40 evas_obj_image_file_set(build_path("image.png"), NULL), 40 efl_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y)); 41 evas_obj_position_set(x, y));
42 } 42 }
43 eo_do(o, 43 eo_do(o,
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 245a5b3..1699edd 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 9bde567..264ebe7 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index ee25519..7306698 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 5820130..f083a7b 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 { 30 {
31 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 31 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
32 } 32 }
33 else 33 else
34 { 34 {
@@ -37,7 +37,7 @@ static void _setup(void)
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 eo_do(o, 39 eo_do(o,
40 evas_obj_image_file_set(build_path("image.png"), NULL), 40 efl_file_set(build_path("image.png"), NULL),
41 evas_obj_position_set(x, y)); 41 evas_obj_position_set(x, y));
42 } 42 }
43 eo_do(o, 43 eo_do(o,
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 784f0db..076fd0b 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 0119a72..1e34dbc 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index 25bed57..4cce7f8 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL)); 34 eo_do(o, efl_file_set(build_path("logo.png"), NULL));
35 } 35 }
36 else 36 else
37 { 37 {
@@ -40,7 +40,7 @@ static void _setup(void)
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_file_set(build_path("image.png"), NULL), 43 efl_file_set(build_path("image.png"), NULL),
44 evas_obj_position_set(x, y)); 44 evas_obj_position_set(x, y));
45 } 45 }
46 eo_do(o, 46 eo_do(o,
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index ff0bdd5..ac28e68 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 6247db1..b96b911 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 1f24762..783a648 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index d7da8cf..654995f 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -26,8 +26,8 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_smooth_scale_set(1), 30 efl_image_smooth_scale_set(1),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
33 done = 0; 33 done = 0;
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 752bbe5..69cf05c 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("frame.png"), NULL), 29 efl_file_set(build_path("frame.png"), NULL),
30 evas_obj_image_border_set(8, 8, 8, 8), 30 evas_obj_image_border_set(8, 8, 8, 8),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
32 } 32 }
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 4d33565..8215814 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 evas_obj_image_file_set(build_path("image.png"), NULL), 31 efl_file_set(build_path("image.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 evas_obj_size_set(120, 160));
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 5331f39..1815177 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o = eo_add(EVAS_IMAGE_CLASS, evas); 28 o = eo_add(EVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 eo_do(o, 30 eo_do(o,
31 evas_obj_image_file_set(build_path("image.png"), NULL), 31 efl_file_set(build_path("image.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160)); 33 evas_obj_size_set(120, 160));
34 a = rnd()&0xff; 34 a = rnd()&0xff;
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 72e8850..c7fe4da 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("bar.png"), NULL), 29 efl_file_set(build_path("bar.png"), NULL),
30 evas_obj_image_border_set(6, 6, 6, 6), 30 evas_obj_image_border_set(6, 6, 6, 6),
31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID), 31 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index d5c8a19..2e5fa59 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_image_border_set(43, 48, 48, 83), 32 evas_obj_image_border_set(43, 48, 48, 83),
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index fbe7fb3..73f3b00 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("image.png"), NULL), 29 efl_file_set(build_path("image.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index fdd56d1..f12974e 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 o = eo_add(EVAS_IMAGE_CLASS, evas); 26 o = eo_add(EVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 eo_do(o, 28 eo_do(o,
29 evas_obj_image_file_set(build_path("logo.png"), NULL), 29 efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index c0f6e2d..2159cb1 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 eo_do(o, 27 eo_do(o,
28 evas_obj_image_file_set(build_path("im1.png"), NULL), 28 efl_file_set(build_path("im1.png"), NULL),
29 evas_obj_image_fill_set(0, 0, 720, 420), 29 evas_obj_image_fill_set(0, 0, 720, 420),
30 evas_obj_size_set(720, 420), 30 evas_obj_size_set(720, 420),
31 evas_obj_visibility_set(EINA_TRUE)); 31 evas_obj_visibility_set(EINA_TRUE));
@@ -33,7 +33,7 @@ static void _setup(void)
33 o = eo_add(EVAS_IMAGE_CLASS, evas); 33 o = eo_add(EVAS_IMAGE_CLASS, evas);
34 o_images[1] = o; 34 o_images[1] = o;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_image_file_set(build_path("im2.png"), NULL), 36 efl_file_set(build_path("im2.png"), NULL),
37 evas_obj_image_fill_set(0, 0, 720, 420), 37 evas_obj_image_fill_set(0, 0, 720, 420),
38 evas_obj_size_set(720, 420), 38 evas_obj_size_set(720, 420),
39 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
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 dc02971..2800955 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 evas_obj_image_alpha_set(0), 36 evas_obj_image_alpha_set(0),
37 evas_obj_image_fill_set(0, 0, 640, 480), 37 evas_obj_image_fill_set(0, 0, 640, 480),
38 evas_obj_size_set(640, 480), 38 evas_obj_size_set(640, 480),
39 evas_obj_image_smooth_scale_set(0), 39 efl_image_smooth_scale_set(0),
40 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(EINA_TRUE));
41 yp = malloc(640 * 480); 41 yp = malloc(640 * 480);
42 up = malloc(320 * 240); 42 up = malloc(320 * 240);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index f6aed3a..803e4b1 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
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 eo_do(o, 60 eo_do(o,
61 evas_obj_image_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index b1e0efe..29e2229 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -58,7 +58,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
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 eo_do(o, 60 eo_do(o,
61 evas_obj_image_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_visibility_set(EINA_TRUE)); 64 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index c296818..4b2d471 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
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 eo_do(o, 60 eo_do(o,
61 evas_obj_image_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 13547bb..323d35f 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -58,7 +58,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
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 eo_do(o, 60 eo_do(o,
61 evas_obj_image_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 256, 256), 62 evas_obj_image_fill_set(0, 0, 256, 256),
63 evas_obj_size_set(256, 256), 63 evas_obj_size_set(256, 256),
64 evas_obj_visibility_set(EINA_TRUE)); 64 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 606eb18..cb1f5f6 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
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 eo_do(o, 60 eo_do(o,
61 evas_obj_image_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 720, 420), 62 evas_obj_image_fill_set(0, 0, 720, 420),
63 evas_obj_size_set(720, 420), 63 evas_obj_size_set(720, 420),
64 evas_obj_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index ec4693b..8954c02 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
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 eo_do(o, 60 eo_do(o,
61 evas_obj_image_file_set(build_path(buf), NULL), 61 efl_file_set(build_path(buf), NULL),
62 evas_obj_image_fill_set(0, 0, 720, 420), 62 evas_obj_image_fill_set(0, 0, 720, 420),
63 evas_obj_size_set(720, 420), 63 evas_obj_size_set(720, 420),
64 evas_obj_image_smooth_scale_set(0), 64 efl_image_smooth_scale_set(0),
65 evas_obj_visibility_set(EINA_TRUE)); 65 evas_obj_visibility_set(EINA_TRUE));
66 } 66 }
67 POINT(0, 0, -w, -h, -d, 0, 0); 67 POINT(0, 0, -w, -h, -d, 0, 0);
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 2f373f4..f2cdf7a 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -33,20 +33,20 @@ static void _setup(void)
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 eo_do(o, 35 eo_do(o,
36 evas_obj_image_file_set(build_path(buf), NULL), 36 efl_file_set(build_path(buf), NULL),
37 evas_obj_image_fill_set(0, 0, 256, 256), 37 evas_obj_image_fill_set(0, 0, 256, 256),
38 evas_obj_size_set(256, 256), 38 evas_obj_size_set(256, 256),
39 evas_obj_image_smooth_scale_set(0), 39 efl_image_smooth_scale_set(0),
40 evas_obj_visibility_set(EINA_TRUE)); 40 evas_obj_visibility_set(EINA_TRUE));
41 41
42 o = eo_add(EVAS_IMAGE_CLASS, evas); 42 o = eo_add(EVAS_IMAGE_CLASS, evas);
43 o_reflec[i] = o; 43 o_reflec[i] = o;
44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 44 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
45 eo_do(o, 45 eo_do(o,
46 evas_obj_image_file_set(build_path(buf), NULL), 46 efl_file_set(build_path(buf), NULL),
47 evas_obj_image_fill_set(0, 0, 256, 256), 47 evas_obj_image_fill_set(0, 0, 256, 256),
48 evas_obj_size_set(256, 256), 48 evas_obj_size_set(256, 256),
49 evas_obj_image_smooth_scale_set(0), 49 efl_image_smooth_scale_set(0),
50 evas_obj_visibility_set(EINA_TRUE)); 50 evas_obj_visibility_set(EINA_TRUE));
51 } 51 }
52 done = 0; 52 done = 0;
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index c9dfafb..a27addd 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
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 e44b31d..1f8f27b 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 20677f2..40d1f49 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 107e663..7552048 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index e9dfdcd..c09ae09 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 0037a9b..e7fcf7c 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 81ff4ab..7f4969a 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 45e2ed3..8040da3 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index a71fc62..7c98d1f 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("logo.png"), NULL), 30 efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index e94f84d..0a37dd4 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -27,10 +27,10 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_image_smooth_scale_set(0), 33 efl_image_smooth_scale_set(0),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 } 35 }
36 done = 0; 36 done = 0;
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 921522e..58cad97 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 29 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 120, 160), 30 evas_obj_image_fill_set(0, 0, 120, 160),
31 evas_obj_size_set(120, 160), 31 evas_obj_size_set(120, 160),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index d9b61bb..104dd4d 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, 29 eo_do(o,
30 evas_obj_image_file_set(build_path("image.png"), NULL), 30 efl_file_set(build_path("image.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index ba21f73..9f9b775 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = eo_add(EVAS_IMAGE_CLASS, evas); 27 o = eo_add(EVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL), 29 eo_do(o, efl_file_set(build_path("tp.png"), NULL),
30 evas_obj_image_fill_set(0, 0, 640, 480), 30 evas_obj_image_fill_set(0, 0, 640, 480),
31 evas_obj_size_set(640, 480), 31 evas_obj_size_set(640, 480),
32 evas_obj_visibility_set(EINA_TRUE)); 32 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index e61d721..a768c50 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -24,7 +24,7 @@ static void _setup(void)
24 24
25 o = eo_add(EVAS_IMAGE_CLASS, evas); 25 o = eo_add(EVAS_IMAGE_CLASS, evas);
26 eo_do(o, 26 eo_do(o,
27 evas_obj_image_file_set(build_path("logo.png"), NULL), 27 efl_file_set(build_path("logo.png"), NULL),
28 evas_obj_image_fill_set(0, 0, 120, 160), 28 evas_obj_image_fill_set(0, 0, 120, 160),
29 evas_obj_size_set(120, 160), 29 evas_obj_size_set(120, 160),
30 evas_obj_visibility_set(EINA_TRUE)); 30 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 0585c06..45b4f2c 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 Evas_Object *o,*src; 27 Evas_Object *o,*src;
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, evas); 29 o = eo_add(EVAS_IMAGE_CLASS, evas);
30 eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), 30 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_position_set(-400, -300)); 33 evas_obj_position_set(-400, -300));
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 073202d..8443e4b 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -30,8 +30,8 @@ static void _setup(void)
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_text_font_set("Vera-Bold", 20), 33 efl_text_properties_font_set("Vera-Bold", 20),
34 evas_obj_text_set("This is a test string"), 34 efl_text_set("This is a test string"),
35 evas_obj_text_style_set(st), 35 evas_obj_text_style_set(st),
36 evas_obj_color_set(255, 255, 255, 255), 36 evas_obj_color_set(255, 255, 255, 255),
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 6822963..81105f5 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -39,8 +39,8 @@ static void _setup(void)
39 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 39 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
40 40
41 eo_do(o, 41 eo_do(o,
42 evas_obj_text_font_set("Vera-Bold", 20), 42 efl_text_properties_font_set("Vera-Bold", 20),
43 evas_obj_text_set(buf), 43 efl_text_set(buf),
44 evas_obj_color_set(0, 0, 0, 255), 44 evas_obj_color_set(0, 0, 0, 255),
45 evas_obj_size_get(&w, &h)); 45 evas_obj_size_get(&w, &h));
46 x = (win_w / 2) - (w / 2); 46 x = (win_w / 2) - (w / 2);
@@ -93,7 +93,7 @@ static void _loop(double t, int f)
93 strs[rnd() % (sizeof(strs) / sizeof(char *))], 93 strs[rnd() % (sizeof(strs) / sizeof(char *))],
94 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 94 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
95 eo_do(o_texts[0], 95 eo_do(o_texts[0],
96 evas_obj_text_set(buf), 96 efl_text_set(buf),
97 evas_obj_size_get(&w, &h)); 97 evas_obj_size_get(&w, &h));
98 for (i = 1; i < OBNUM; i++) 98 for (i = 1; i < OBNUM; i++)
99 { 99 {
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index b331d6f..be51708 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -27,8 +27,8 @@ static void _setup(void)
27 { 27 {
28 o = eo_add(EVAS_TEXT_CLASS, evas); 28 o = eo_add(EVAS_TEXT_CLASS, evas);
29 o_texts[i] = o; 29 o_texts[i] = o;
30 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), 30 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
31 evas_obj_text_set("This is a test string"), 31 efl_text_set("This is a test string"),
32 evas_obj_color_set(0, 0, 0, 255), 32 evas_obj_color_set(0, 0, 0, 255),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 } 34 }
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index fe725a7..25db3cf 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -34,13 +34,13 @@ static void _setup(void)
34 { 34 {
35 o = eo_add(EVAS_TEXT_CLASS, evas); 35 o = eo_add(EVAS_TEXT_CLASS, evas);
36 o_texts[i] = o; 36 o_texts[i] = o;
37 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20)); 37 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
38 snprintf(buf, sizeof(buf), "%s %s %s %s.", 38 snprintf(buf, sizeof(buf), "%s %s %s %s.",
39 strs[rnd() % (sizeof(strs) / sizeof(char *))], 39 strs[rnd() % (sizeof(strs) / sizeof(char *))],
40 strs[rnd() % (sizeof(strs) / sizeof(char *))], 40 strs[rnd() % (sizeof(strs) / sizeof(char *))],
41 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
42 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 42 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
43 eo_do(o, evas_obj_text_set(buf), 43 eo_do(o, efl_text_set(buf),
44 evas_obj_color_set(0, 0, 0, 255), 44 evas_obj_color_set(0, 0, 0, 255),
45 evas_obj_size_get(&w, &h)); 45 evas_obj_size_get(&w, &h));
46 x = (win_w / 2) - (w / 2); 46 x = (win_w / 2) - (w / 2);
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
77 strs[rnd() % (sizeof(strs) / sizeof(char *))], 77 strs[rnd() % (sizeof(strs) / sizeof(char *))],
78 strs[rnd() % (sizeof(strs) / sizeof(char *))], 78 strs[rnd() % (sizeof(strs) / sizeof(char *))],
79 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 79 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
80 eo_do(o_texts[i], evas_obj_text_set(buf)); 80 eo_do(o_texts[i], efl_text_set(buf));
81 } 81 }
82 FPS_STD(NAME); 82 FPS_STD(NAME);
83} 83}
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index ad893fc..5d5fc25 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -30,8 +30,8 @@ static void _setup(void)
30 o = eo_add(EVAS_TEXT_CLASS, evas); 30 o = eo_add(EVAS_TEXT_CLASS, evas);
31 o_texts[i] = o; 31 o_texts[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_text_font_set("Vera-Bold", 20), 33 efl_text_properties_font_set("Vera-Bold", 20),
34 evas_obj_text_set("This is a test string"), 34 efl_text_set("This is a test string"),
35 evas_obj_text_style_set(st), 35 evas_obj_text_style_set(st),
36 evas_obj_color_set(255, 255, 255, 255), 36 evas_obj_color_set(255, 255, 255, 255),
37 evas_obj_text_shadow_color_set(0, 0, 0, 24), 37 evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 6eb16ca..187c0f5 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -36,13 +36,13 @@ static void _setup(void)
36 { 36 {
37 o = eo_add(EVAS_TEXT_CLASS, evas); 37 o = eo_add(EVAS_TEXT_CLASS, evas);
38 o_texts[i] = o; 38 o_texts[i] = o;
39 eo_do(o, evas_obj_text_font_set("Vera-Bold", 20)); 39 eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
40 snprintf(buf, sizeof(buf), "%s %s %s %s.", 40 snprintf(buf, sizeof(buf), "%s %s %s %s.",
41 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
42 strs[rnd() % (sizeof(strs) / sizeof(char *))], 42 strs[rnd() % (sizeof(strs) / sizeof(char *))],
43 strs[rnd() % (sizeof(strs) / sizeof(char *))], 43 strs[rnd() % (sizeof(strs) / sizeof(char *))],
44 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 44 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
45 eo_do(o, evas_obj_text_set(buf), 45 eo_do(o, efl_text_set(buf),
46 evas_obj_text_style_set(st), 46 evas_obj_text_style_set(st),
47 evas_obj_color_set(255, 255, 255, 255), 47 evas_obj_color_set(255, 255, 255, 255),
48 evas_obj_text_shadow_color_set(0, 0, 0, 24), 48 evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 5e228d2..bffc831 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test,
362 mi = malloc(sizeof(Menu_Item)); 362 mi = malloc(sizeof(Menu_Item));
363 mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); 363 mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
364 eo_unref(mi->o_icon); 364 eo_unref(mi->o_icon);
365 eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL), 365 eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
366 evas_obj_size_set(32, 32), 366 evas_obj_size_set(32, 32),
367 evas_obj_image_fill_set(0, 0, 32, 32)); 367 evas_obj_image_fill_set(0, 0, 32, 32));
368 mi->test = test; 368 mi->test = test;
@@ -412,8 +412,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
412 412
413 o = eo_add(EVAS_TEXT_CLASS, evas); 413 o = eo_add(EVAS_TEXT_CLASS, evas);
414 eo_unref(o); 414 eo_unref(o);
415 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 415 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
416 evas_obj_text_set("EXPEDITE"), 416 efl_text_set("EXPEDITE"),
417 evas_obj_layer_set(100), 417 evas_obj_layer_set(100),
418 evas_obj_color_set(0, 0, 0, 100), 418 evas_obj_color_set(0, 0, 0, 100),
419 evas_obj_pass_events_set(1), 419 evas_obj_pass_events_set(1),
@@ -426,8 +426,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
426 426
427 o = eo_add(EVAS_TEXT_CLASS, evas); 427 o = eo_add(EVAS_TEXT_CLASS, evas);
428 eo_unref(o); 428 eo_unref(o);
429 eo_do(o, evas_obj_text_font_set("Vera", 9), 429 eo_do(o, efl_text_properties_font_set("Vera", 9),
430 evas_obj_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), 430 efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
431 evas_obj_layer_set(100), 431 evas_obj_layer_set(100),
432 evas_obj_color_set(0, 0, 0, 60), 432 evas_obj_color_set(0, 0, 0, 60),
433 evas_obj_pass_events_set(1), 433 evas_obj_pass_events_set(1),
@@ -441,7 +441,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
441 o = eo_add(EVAS_IMAGE_CLASS, evas); 441 o = eo_add(EVAS_IMAGE_CLASS, evas);
442 eo_unref(o); 442 eo_unref(o);
443 eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), 443 eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
444 evas_obj_image_file_set(build_path("e-logo.png"), NULL), 444 efl_file_set(build_path("e-logo.png"), NULL),
445 evas_obj_image_fill_set(0, 0, 120, 160), 445 evas_obj_image_fill_set(0, 0, 120, 160),
446 evas_obj_size_set(120, 160), 446 evas_obj_size_set(120, 160),
447 evas_obj_layer_set(-98), 447 evas_obj_layer_set(-98),
@@ -460,7 +460,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
460 o = eo_add(EVAS_IMAGE_CLASS, evas); 460 o = eo_add(EVAS_IMAGE_CLASS, evas);
461 eo_unref(o); 461 eo_unref(o);
462 eo_do(o, evas_obj_position_set(0, 0), 462 eo_do(o, evas_obj_position_set(0, 0),
463 evas_obj_image_file_set(build_path("icon_sel.png"), NULL), 463 efl_file_set(build_path("icon_sel.png"), NULL),
464 evas_obj_size_set(48, 48), 464 evas_obj_size_set(48, 48),
465 evas_obj_image_fill_set(0, 0, 48, 48)); 465 evas_obj_image_fill_set(0, 0, 48, 48));
466 o_menu_icon_sel = o; 466 o_menu_icon_sel = o;
@@ -468,7 +468,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
468 o = eo_add(EVAS_IMAGE_CLASS, evas); 468 o = eo_add(EVAS_IMAGE_CLASS, evas);
469 eo_unref(o); 469 eo_unref(o);
470 eo_do(o, evas_obj_position_set(0, 0), 470 eo_do(o, evas_obj_position_set(0, 0),
471 evas_obj_image_file_set(build_path("text_sel.png"), NULL), 471 efl_file_set(build_path("text_sel.png"), NULL),
472 evas_obj_size_set(96, 32), 472 evas_obj_size_set(96, 32),
473 evas_obj_image_fill_set(0, 0, 96, 32), 473 evas_obj_image_fill_set(0, 0, 96, 32),
474 evas_obj_image_border_set(7, 7, 7, 7)); 474 evas_obj_image_border_set(7, 7, 7, 7));
@@ -476,8 +476,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
476 476
477 o = eo_add(EVAS_TEXT_CLASS, evas); 477 o = eo_add(EVAS_TEXT_CLASS, evas);
478 eo_unref(o); 478 eo_unref(o);
479 eo_do(o, evas_obj_text_font_set("Vera", 10), 479 eo_do(o, efl_text_properties_font_set("Vera", 10),
480 evas_obj_text_set(""), 480 efl_text_set(""),
481 evas_obj_color_set(0, 0, 0, 100), 481 evas_obj_color_set(0, 0, 0, 100),
482 evas_obj_pass_events_set(1), 482 evas_obj_pass_events_set(1),
483 evas_obj_size_get(&w, &h)); 483 evas_obj_size_get(&w, &h));
@@ -610,7 +610,7 @@ ui_loop(void *data EINA_UNUSED)
610 610
611 o = o_menu_title; 611 o = o_menu_title;
612 eo_do(o, evas_obj_color_set(a, a, a, a), 612 eo_do(o, evas_obj_color_set(a, a, a, a),
613 evas_obj_text_set(mi->text), 613 efl_text_set(mi->text),
614 evas_obj_size_get(&tw, &th)); 614 evas_obj_size_get(&tw, &th));
615 x = (win_w - tw) / 2; 615 x = (win_w - tw) / 2;
616 y = (win_h / 2) + len + 48; 616 y = (win_h / 2) + len + 48;
@@ -628,7 +628,7 @@ ui_loop(void *data EINA_UNUSED)
628 628
629 o = o_menu_icon; 629 o = o_menu_icon;
630 snprintf(buf, 4096, "%s%s", data_dir, mi->icon); 630 snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
631 eo_do(o, evas_obj_image_file_set(buf, NULL), 631 eo_do(o, efl_file_set(buf, NULL),
632 evas_obj_color_set(a / 2, a / 2, a / 2, a / 2)); 632 evas_obj_color_set(a / 2, a / 2, a / 2, a / 2));
633 } 633 }
634 i++; 634 i++;
@@ -649,7 +649,7 @@ ui_menu(void)
649{ 649{
650 eo_do(o_title, evas_obj_visibility_set(EINA_TRUE)); 650 eo_do(o_title, evas_obj_visibility_set(EINA_TRUE));
651 eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE), 651 eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE),
652 evas_obj_text_set 652 efl_text_set
653 ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.")); 653 ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."));
654 menu_active = 1; 654 menu_active = 1;
655 key_func = NULL; 655 key_func = NULL;
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index b8d0b5a..6805d3d 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -48,15 +48,15 @@ static void _setup(void)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 evas_obj_text_set(icons[i % 13]), 59 efl_text_set(icons[i % 13]),
60 evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW), 60 evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW),
61 evas_obj_color_set(255, 255, 255, 255), 61 evas_obj_color_set(255, 255, 255, 255),
62 evas_obj_text_shadow_color_set(0, 0, 0, 24), 62 evas_obj_text_shadow_color_set(0, 0, 0, 24),
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index 3bfea5f..b3e2c0e 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -48,15 +48,15 @@ static void _setup(void)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 evas_obj_text_set(icons[i % 13]), 59 efl_text_set(icons[i % 13]),
60 evas_obj_color_set(0, 0, 0, 255), 60 evas_obj_color_set(0, 0, 0, 255),
61 evas_obj_visibility_set(EINA_TRUE)); 61 evas_obj_visibility_set(EINA_TRUE));
62 } 62 }
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index dcf58c3..0c35a9b 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -48,15 +48,15 @@ static void _setup(void)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 evas_obj_text_set(icons[i % 13]), 59 efl_text_set(icons[i % 13]),
60 evas_obj_color_set(0, 0, 0, 255), 60 evas_obj_color_set(0, 0, 0, 255),
61 evas_obj_visibility_set(EINA_TRUE)); 61 evas_obj_visibility_set(EINA_TRUE));
62 } 62 }
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 67390e8..983b0d8 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -33,15 +33,15 @@ static void _setup(void)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, evas); 34 o = eo_add(EVAS_IMAGE_CLASS, evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL), 36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
38 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 38 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
39 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
40 40
41 o = eo_add(EVAS_TEXT_CLASS, evas); 41 o = eo_add(EVAS_TEXT_CLASS, evas);
42 o_texts[i] = o; 42 o_texts[i] = o;
43 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 43 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
44 evas_obj_text_set(icons[i % 1]), 44 efl_text_set(icons[i % 1]),
45 evas_obj_color_set(0, 0, 0, 255), 45 evas_obj_color_set(0, 0, 0, 255),
46 evas_obj_visibility_set(EINA_TRUE)); 46 evas_obj_visibility_set(EINA_TRUE));
47 } 47 }
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 4c9f60a..23405be 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -33,15 +33,15 @@ static void _setup(void)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, evas); 34 o = eo_add(EVAS_IMAGE_CLASS, evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL), 36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
38 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 38 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
39 evas_obj_visibility_set(EINA_TRUE)); 39 evas_obj_visibility_set(EINA_TRUE));
40 40
41 o = eo_add(EVAS_TEXT_CLASS, evas); 41 o = eo_add(EVAS_TEXT_CLASS, evas);
42 o_texts[i] = o; 42 o_texts[i] = o;
43 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 43 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
44 evas_obj_text_set(icons[i % 1]), 44 efl_text_set(icons[i % 1]),
45 evas_obj_color_set(0, 0, 0, 255), 45 evas_obj_color_set(0, 0, 0, 255),
46 evas_obj_visibility_set(EINA_TRUE)); 46 evas_obj_visibility_set(EINA_TRUE));
47 } 47 }
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index ca25f6d..86f71aa 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -48,15 +48,15 @@ static void _setup(void)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 evas_obj_text_set(icons[i % 13]), 59 efl_text_set(icons[i % 13]),
60 evas_obj_color_set(0, 0, 0, 255), 60 evas_obj_color_set(0, 0, 0, 255),
61 evas_obj_visibility_set(EINA_TRUE)); 61 evas_obj_visibility_set(EINA_TRUE));
62 } 62 }
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 1855431..b186f43 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -48,15 +48,15 @@ static void _setup(void)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
54 evas_obj_visibility_set(EINA_TRUE)); 54 evas_obj_visibility_set(EINA_TRUE));
55 55
56 o = eo_add(EVAS_TEXT_CLASS, evas); 56 o = eo_add(EVAS_TEXT_CLASS, evas);
57 o_texts[i] = o; 57 o_texts[i] = o;
58 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 58 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
59 evas_obj_text_set(icons[i % 13]), 59 efl_text_set(icons[i % 13]),
60 evas_obj_color_set(0, 0, 0, 255), 60 evas_obj_color_set(0, 0, 0, 255),
61 evas_obj_visibility_set(EINA_TRUE)); 61 evas_obj_visibility_set(EINA_TRUE));
62 } 62 }
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 7dbb9bb..546ee90 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -66,14 +66,14 @@ static void _setup(void)
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 evas_obj_image_file_set(build_path("pan.png"), NULL), 69 efl_file_set(build_path("pan.png"), NULL),
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 evas_obj_text_set(labels[i % 26]), 76 efl_text_set(labels[i % 26]),
77 evas_obj_color_set(0, 0, 0, 255), 77 evas_obj_color_set(0, 0, 0, 255),
78 evas_obj_visibility_set(EINA_TRUE)); 78 evas_obj_visibility_set(EINA_TRUE));
79 } 79 }
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index def042c..5c4449d 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -66,14 +66,14 @@ static void _setup(void)
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 evas_obj_image_file_set(build_path("pan.png"), NULL), 69 efl_file_set(build_path("pan.png"), NULL),
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 evas_obj_text_set(labels[i % 26]), 76 efl_text_set(labels[i % 26]),
77 evas_obj_color_set(0, 0, 0, 255), 77 evas_obj_color_set(0, 0, 0, 255),
78 evas_obj_visibility_set(EINA_TRUE)); 78 evas_obj_visibility_set(EINA_TRUE));
79 } 79 }
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 6b29bfe..7c5875f 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -66,14 +66,14 @@ static void _setup(void)
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 evas_obj_image_file_set(build_path("pan.png"), NULL), 69 efl_file_set(build_path("pan.png"), NULL),
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 evas_obj_text_set(labels[i % 26]), 76 efl_text_set(labels[i % 26]),
77 evas_obj_color_set(0, 0, 0, 255), 77 evas_obj_color_set(0, 0, 0, 255),
78 evas_obj_visibility_set(EINA_TRUE)); 78 evas_obj_visibility_set(EINA_TRUE));
79 } 79 }
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 6148364..08de68d 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -66,14 +66,14 @@ static void _setup(void)
66 o_images[i] = o; 66 o_images[i] = o;
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 evas_obj_image_file_set(build_path("pan.png"), NULL), 69 efl_file_set(build_path("pan.png"), NULL),
70 evas_obj_size_set(win_w, ICON_SIZE), 70 evas_obj_size_set(win_w, ICON_SIZE),
71 evas_obj_visibility_set(EINA_TRUE)); 71 evas_obj_visibility_set(EINA_TRUE));
72 72
73 o = eo_add(EVAS_TEXT_CLASS, evas); 73 o = eo_add(EVAS_TEXT_CLASS, evas);
74 o_texts[i] = o; 74 o_texts[i] = o;
75 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 75 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
76 evas_obj_text_set(labels[i % 26]), 76 efl_text_set(labels[i % 26]),
77 evas_obj_color_set(0, 0, 0, 255), 77 evas_obj_color_set(0, 0, 0, 255),
78 evas_obj_visibility_set(EINA_TRUE)); 78 evas_obj_visibility_set(EINA_TRUE));
79 } 79 }
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index e6df6c1..0f0049f 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -87,7 +87,7 @@ static void _setup(void)
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 evas_obj_image_file_set(build_path("pan.png"), NULL), 90 efl_file_set(build_path("pan.png"), NULL),
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
@@ -95,14 +95,14 @@ static void _setup(void)
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
98 evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 98 efl_file_set(build_path(icons[i % 13]), NULL),
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 evas_obj_text_set(labels[i % 26]), 105 efl_text_set(labels[i % 26]),
106 evas_obj_color_set(0, 0, 0, 255), 106 evas_obj_color_set(0, 0, 0, 255),
107 evas_obj_visibility_set(EINA_TRUE)); 107 evas_obj_visibility_set(EINA_TRUE));
108 } 108 }
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 08df2bf..aaf5f39 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -87,7 +87,7 @@ static void _setup(void)
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 evas_obj_image_file_set(build_path("pan.png"), NULL), 90 efl_file_set(build_path("pan.png"), NULL),
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
@@ -95,14 +95,14 @@ static void _setup(void)
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
98 evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 98 efl_file_set(build_path(icons[i % 13]), NULL),
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 evas_obj_text_set(labels[i % 26]), 105 efl_text_set(labels[i % 26]),
106 evas_obj_color_set(0, 0, 0, 255), 106 evas_obj_color_set(0, 0, 0, 255),
107 evas_obj_visibility_set(EINA_TRUE)); 107 evas_obj_visibility_set(EINA_TRUE));
108 } 108 }
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 858d4ec..2211c17 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -87,7 +87,7 @@ static void _setup(void)
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 evas_obj_image_file_set(build_path("pan.png"), NULL), 90 efl_file_set(build_path("pan.png"), NULL),
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
@@ -95,14 +95,14 @@ static void _setup(void)
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
98 evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 98 efl_file_set(build_path(icons[i % 13]), NULL),
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 evas_obj_text_set(labels[i % 26]), 105 efl_text_set(labels[i % 26]),
106 evas_obj_color_set(0, 0, 0, 255), 106 evas_obj_color_set(0, 0, 0, 255),
107 evas_obj_visibility_set(EINA_TRUE)); 107 evas_obj_visibility_set(EINA_TRUE));
108 } 108 }
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 53d3a83..381b887 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -87,7 +87,7 @@ static void _setup(void)
87 o_images[i] = o; 87 o_images[i] = o;
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 evas_obj_image_file_set(build_path("pan.png"), NULL), 90 efl_file_set(build_path("pan.png"), NULL),
91 evas_obj_size_set(win_w, ICON_SIZE), 91 evas_obj_size_set(win_w, ICON_SIZE),
92 evas_obj_visibility_set(EINA_TRUE)); 92 evas_obj_visibility_set(EINA_TRUE));
93 93
@@ -95,14 +95,14 @@ static void _setup(void)
95 o_icons[i] = o; 95 o_icons[i] = o;
96 eo_do(o, evas_obj_image_filled_set(1), 96 eo_do(o, evas_obj_image_filled_set(1),
97 evas_obj_image_border_set(2, 2, 2, 2), 97 evas_obj_image_border_set(2, 2, 2, 2),
98 evas_obj_image_file_set(build_path(icons[i % 13]), NULL), 98 efl_file_set(build_path(icons[i % 13]), NULL),
99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), 99 evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
100 evas_obj_visibility_set(EINA_TRUE)); 100 evas_obj_visibility_set(EINA_TRUE));
101 101
102 o = eo_add(EVAS_TEXT_CLASS, evas); 102 o = eo_add(EVAS_TEXT_CLASS, evas);
103 o_texts[i] = o; 103 o_texts[i] = o;
104 eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), 104 eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
105 evas_obj_text_set(labels[i % 26]), 105 efl_text_set(labels[i % 26]),
106 evas_obj_color_set(0, 0, 0, 255), 106 evas_obj_color_set(0, 0, 0, 255),
107 evas_obj_visibility_set(EINA_TRUE)); 107 evas_obj_visibility_set(EINA_TRUE));
108 } 108 }