summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-07-19 18:21:56 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-07-19 19:03:49 +0900
commit95d6a6cd9a390af5f603879cd56f030ef6842289 (patch)
treeed284627807e3ed1a909d8180394ee3755d5523f
parente79517e4902225f80a7162def3993a7058eea742 (diff)
Fix compilation for git master (1.18-alpha)
-rw-r--r--src/bin/about.c10
-rw-r--r--src/bin/font_effect_blur_alpha.c2
-rw-r--r--src/bin/font_effect_blur_color.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.c8
-rw-r--r--src/bin/image_data_ycbcr601pl_map_solid_rotate.c8
-rw-r--r--src/bin/image_data_ycbcr601pl_wide_stride.c4
-rw-r--r--src/bin/image_map_3d_1.c8
-rw-r--r--src/bin/image_map_3d_2.c8
-rw-r--r--src/bin/image_map_3d_3.c8
-rw-r--r--src/bin/image_map_3d_4.c8
-rw-r--r--src/bin/image_map_3d_5.c8
-rw-r--r--src/bin/image_map_3d_6.c8
-rw-r--r--src/bin/image_map_3d_flow.c14
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c8
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c8
-rw-r--r--src/bin/image_map_color_alpha_rotate.c8
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c8
-rw-r--r--src/bin/image_map_color_nearest_rotate.c8
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c8
-rw-r--r--src/bin/image_map_color_rotate.c8
-rw-r--r--src/bin/image_map_color_solid_rotate.c8
-rw-r--r--src/bin/image_map_nearest_rotate.c8
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c8
-rw-r--r--src/bin/image_map_rotate.c8
-rw-r--r--src/bin/image_map_solid_rotate.c8
-rw-r--r--src/bin/image_mask.c8
-rw-r--r--src/bin/image_mask_10.c12
-rw-r--r--src/bin/image_mask_11.c12
-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.c8
-rw-r--r--src/bin/image_mask_3.c8
-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.c12
-rw-r--r--src/bin/image_quality_scale.c4
-rw-r--r--src/bin/line_blend.c2
-rw-r--r--src/bin/poly_blend.c2
-rw-r--r--src/bin/proxy_image.c4
-rw-r--r--src/bin/proxy_image_offscreen.c4
-rw-r--r--src/bin/proxy_text_fixed.c2
-rw-r--r--src/bin/proxy_text_random.c2
-rw-r--r--src/bin/rect_blend.c2
-rw-r--r--src/bin/rect_blend_few.c2
-rw-r--r--src/bin/rect_blend_pow2.c2
-rw-r--r--src/bin/rect_blend_pow2_few.c2
-rw-r--r--src/bin/rect_solid.c2
-rw-r--r--src/bin/rect_solid_few.c2
-rw-r--r--src/bin/snapshot_widgets_file_icons.c4
-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.c12
-rw-r--r--src/bin/textblock_basic.c10
-rw-r--r--src/bin/textblock_intl.c12
-rw-r--r--src/bin/textblock_text_append.c14
-rw-r--r--src/bin/ui.c108
-rw-r--r--src/bin/ui.h2
-rw-r--r--src/bin/vg_basic_circle.c4
-rw-r--r--src/bin/vg_basic_gradient.c4
-rw-r--r--src/bin/vg_basic_rect.c4
-rw-r--r--src/bin/vg_scaled.c4
-rw-r--r--src/bin/widgets_file_icons.c4
-rw-r--r--src/bin/widgets_file_icons_2.c4
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c4
-rw-r--r--src/bin/widgets_file_icons_2_same.c4
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c4
-rw-r--r--src/bin/widgets_file_icons_3.c4
-rw-r--r--src/bin/widgets_file_icons_4.c4
-rw-r--r--src/bin/widgets_list_1.c4
-rw-r--r--src/bin/widgets_list_1_grouped.c4
-rw-r--r--src/bin/widgets_list_2.c4
-rw-r--r--src/bin/widgets_list_2_grouped.c4
-rw-r--r--src/bin/widgets_list_3.c6
-rw-r--r--src/bin/widgets_list_3_grouped.c6
-rw-r--r--src/bin/widgets_list_4.c6
-rw-r--r--src/bin/widgets_list_4_grouped.c6
117 files changed, 370 insertions, 370 deletions
diff --git a/src/bin/about.c b/src/bin/about.c
index 4d0339b..cb6b4a8 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,7 +8,7 @@ _setup(void)
8 Evas_Object *o; 8 Evas_Object *o;
9 Evas_Textblock_Style *st; 9 Evas_Textblock_Style *st;
10 10
11 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 11 o = evas_object_textblock_add(evas);
12 efl_gfx_position_set(o, 10, 40); 12 efl_gfx_position_set(o, 10, 40);
13 efl_gfx_size_set(o, win_w - 20, win_h - 50); 13 efl_gfx_size_set(o, win_w - 20, win_h - 50);
14 efl_gfx_visible_set(o, EINA_TRUE); 14 efl_gfx_visible_set(o, EINA_TRUE);
@@ -21,9 +21,9 @@ _setup(void)
21 "p='+ font=Vera font_size=10 align=left'" 21 "p='+ font=Vera font_size=10 align=left'"
22 "/p='- \n \n'" 22 "/p='- \n \n'"
23 ); 23 );
24 evas_obj_textblock_style_set(o, st); 24 evas_object_textblock_style_set(o, st);
25 evas_obj_textblock_clear(o); 25 evas_object_textblock_clear(o);
26 evas_obj_textblock_text_markup_set 26 evas_object_textblock_text_markup_set
27 (o, "<center>" 27 (o, "<center>"
28 "Enlightenment used to be a window manager project, but " 28 "Enlightenment used to be a window manager project, but "
29 "since has changed a lot to become a miniature desktop and mobile " 29 "since has changed a lot to become a miniature desktop and mobile "
@@ -60,7 +60,7 @@ _loop(double t EINA_UNUSED,
60} 60}
61 61
62static void 62static void
63_key(char *key) 63_key(const char *key)
64{ 64{
65 if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q"))) 65 if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q")))
66 { 66 {
diff --git a/src/bin/font_effect_blur_alpha.c b/src/bin/font_effect_blur_alpha.c
index 9e9598d..48d8714 100644
--- a/src/bin/font_effect_blur_alpha.c
+++ b/src/bin/font_effect_blur_alpha.c
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
60} 60}
61 61
62/* prepend special key handlers if interactive (before STD) */ 62/* prepend special key handlers if interactive (before STD) */
63static void _key(char *key) 63static void _key(const char *key)
64{ 64{
65 KEY_STD; 65 KEY_STD;
66} 66}
diff --git a/src/bin/font_effect_blur_color.c b/src/bin/font_effect_blur_color.c
index 0f7db29..4d49044 100644
--- a/src/bin/font_effect_blur_color.c
+++ b/src/bin/font_effect_blur_color.c
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 2e35a8b..d2d547e 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 670b40a..44094ca 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63} 63}
64 64
65/* prepend special key handlers if interactive (before STD) */ 65/* prepend special key handlers if interactive (before STD) */
66static void _key(char *key) 66static void _key(const char *key)
67{ 67{
68 KEY_STD; 68 KEY_STD;
69} 69}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index fd5d793..29b46d3 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(EVAS_IMAGE_CLASS, evas); 28 o = eo_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);
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64} 64}
65 65
66/* prepend special key handlers if interactive (before STD) */ 66/* prepend special key handlers if interactive (before STD) */
67static void _key(char *key) 67static void _key(const char *key)
68{ 68{
69 KEY_STD; 69 KEY_STD;
70} 70}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index c10accf..37635e6 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index f2d2334..fa20edf 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(EVAS_IMAGE_CLASS, evas); 28 o = eo_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);
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64} 64}
65 65
66/* prepend special key handlers if interactive (before STD) */ 66/* prepend special key handlers if interactive (before STD) */
67static void _key(char *key) 67static void _key(const char *key)
68{ 68{
69 KEY_STD; 69 KEY_STD;
70} 70}
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 6016309..03bb837 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index f43c1c8..4862e94 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index a5747b1..691c056 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index e45f7e3..c9e6b78 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 3df5023..0a2359b 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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 {
@@ -75,7 +75,7 @@ static void _loop(double t, int f)
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index c4f9679..60c9824 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 8d82f27..c2e88b5 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index b6cdd97..b37ef54 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 7df3447..0830d5e 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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 {
@@ -75,7 +75,7 @@ static void _loop(double t, int f)
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index bddcdb6..6a6b7b8 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index cbf2204..a6dd031 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 39f527c..eed135f 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index 9f517c8..f1b2bc1 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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 {
@@ -75,7 +75,7 @@ static void _loop(double t, int f)
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index b4a5514..6bc7456 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 4f2f13e..ac58972 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index a02faf1..a3d96b3 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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 {
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78} 78}
79 79
80/* prepend special key handlers if interactive (before STD) */ 80/* prepend special key handlers if interactive (before STD) */
81static void _key(char *key) 81static void _key(const char *key)
82{ 82{
83 KEY_STD; 83 KEY_STD;
84} 84}
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 67e432d..e1ca524 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 350d581..7c62f58 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 627466a..76eeb97 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index 837042a..5f9c142 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 203e221..c30db86 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 6b32d15..aaaf0b6 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(EVAS_IMAGE_CLASS, evas); 28 o = eo_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);
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64} 64}
65 65
66/* prepend special key handlers if interactive (before STD) */ 66/* prepend special key handlers if interactive (before STD) */
67static void _key(char *key) 67static void _key(const char *key)
68{ 68{
69 KEY_STD; 69 KEY_STD;
70} 70}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index ac46144..4596d7b 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(EVAS_IMAGE_CLASS, evas); 28 o = eo_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);
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63} 63}
64 64
65/* prepend special key handlers if interactive (before STD) */ 65/* prepend special key handlers if interactive (before STD) */
66static void _key(char *key) 66static void _key(const char *key)
67{ 67{
68 KEY_STD; 68 KEY_STD;
69} 69}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 0634837..27e3120 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63} 63}
64 64
65/* prepend special key handlers if interactive (before STD) */ 65/* prepend special key handlers if interactive (before STD) */
66static void _key(char *key) 66static void _key(const char *key)
67{ 67{
68 KEY_STD; 68 KEY_STD;
69} 69}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 8051027..8c5cf49 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -61,7 +61,7 @@ static void _loop(double t, int f)
61} 61}
62 62
63/* prepend special key handlers if interactive (before STD) */ 63/* prepend special key handlers if interactive (before STD) */
64static void _key(char *key) 64static void _key(const char *key)
65{ 65{
66 KEY_STD; 66 KEY_STD;
67} 67}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index e731cc4..6dca757 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59} 59}
60 60
61/* prepend special key handlers if interactive (before STD) */ 61/* prepend special key handlers if interactive (before STD) */
62static void _key(char *key) 62static void _key(const char *key)
63{ 63{
64 KEY_STD; 64 KEY_STD;
65} 65}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 32185dc..e80ecf0 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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);
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59} 59}
60 60
61/* prepend special key handlers if interactive (before STD) */ 61/* prepend special key handlers if interactive (before STD) */
62static void _key(char *key) 62static void _key(const char *key)
63{ 63{
64 KEY_STD; 64 KEY_STD;
65} 65}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index e797a8d..8da4f5c 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(EVAS_IMAGE_CLASS, evas); 25 o = eo_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(EVAS_IMAGE_CLASS, evas); 32 o = eo_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);
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58} 58}
59 59
60/* prepend special key handlers if interactive (before STD) */ 60/* prepend special key handlers if interactive (before STD) */
61static void _key(char *key) 61static void _key(const char *key)
62{ 62{
63 KEY_STD; 63 KEY_STD;
64} 64}
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index cad0095..b4aad27 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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);
@@ -91,7 +91,7 @@ static void _loop(double t, int f)
91} 91}
92 92
93/* prepend special key handlers if interactive (before STD) */ 93/* prepend special key handlers if interactive (before STD) */
94static void _key(char *key) 94static void _key(const char *key)
95{ 95{
96 KEY_STD; 96 KEY_STD;
97} 97}
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index a59f812..598f58f 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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);
@@ -102,7 +102,7 @@ static void _loop(double t, int f)
102} 102}
103 103
104/* prepend special key handlers if interactive (before STD) */ 104/* prepend special key handlers if interactive (before STD) */
105static void _key(char *key) 105static void _key(const char *key)
106{ 106{
107 KEY_STD; 107 KEY_STD;
108} 108}
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index b13d57f..7e41657 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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);
@@ -104,7 +104,7 @@ static void _loop(double t, int f)
104} 104}
105 105
106/* prepend special key handlers if interactive (before STD) */ 106/* prepend special key handlers if interactive (before STD) */
107static void _key(char *key) 107static void _key(const char *key)
108{ 108{
109 KEY_STD; 109 KEY_STD;
110} 110}
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 198a155..bb8dc0f 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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);
@@ -100,14 +100,14 @@ static void _loop(double t, int f)
100 100
101 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 101 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
102 102
103 evas_obj_map_enable_set(o_images[i], 1); 103 evas_object_map_enable_set(o_images[i], 1);
104 evas_obj_map_set(o_images[i], m); 104 evas_object_map_set(o_images[i], m);
105 } 105 }
106 FPS_STD(NAME); 106 FPS_STD(NAME);
107} 107}
108 108
109/* prepend special key handlers if interactive (before STD) */ 109/* prepend special key handlers if interactive (before STD) */
110static void _key(char *key) 110static void _key(const char *key)
111{ 111{
112 KEY_STD; 112 KEY_STD;
113} 113}
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 3670511..4797123 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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);
@@ -98,14 +98,14 @@ static void _loop(double t, int f)
98 98
99 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 99 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
100 100
101 evas_obj_map_enable_set(o_images[i], 1); 101 evas_object_map_enable_set(o_images[i], 1);
102 evas_obj_map_set(o_images[i], m); 102 evas_object_map_set(o_images[i], m);
103 } 103 }
104 FPS_STD(NAME); 104 FPS_STD(NAME);
105} 105}
106 106
107/* prepend special key handlers if interactive (before STD) */ 107/* prepend special key handlers if interactive (before STD) */
108static void _key(char *key) 108static void _key(const char *key)
109{ 109{
110 KEY_STD; 110 KEY_STD;
111} 111}
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index 059e17f..8caa07a 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(EVAS_IMAGE_CLASS, evas); 30 o = eo_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);
@@ -130,7 +130,7 @@ static void _loop(double t, int f)
130} 130}
131 131
132/* prepend special key handlers if interactive (before STD) */ 132/* prepend special key handlers if interactive (before STD) */
133static void _key(char *key) 133static void _key(const char *key)
134{ 134{
135 KEY_STD; 135 KEY_STD;
136} 136}
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 885a902..35a9470 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -130,8 +130,8 @@ _cube_pos(Cube *c,
130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
131 if (evas_map_util_clockwise_get(m)) 131 if (evas_map_util_clockwise_get(m))
132 { 132 {
133 evas_obj_map_enable_set(c->side[i].o, 1); 133 evas_object_map_enable_set(c->side[i].o, 1);
134 evas_obj_map_set(c->side[i].o, m); 134 evas_object_map_set(c->side[i].o, m);
135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
136 } 136 }
137 else 137 else
@@ -219,7 +219,7 @@ static void _loop(double t, int f)
219} 219}
220 220
221/* prepend special key handlers if interactive (before STD) */ 221/* prepend special key handlers if interactive (before STD) */
222static void _key(char *key) 222static void _key(const char *key)
223{ 223{
224 KEY_STD; 224 KEY_STD;
225} 225}
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 27e24ab..caacce5 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -128,8 +128,8 @@ _cube_pos(Cube *c,
128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
129 if (evas_map_util_clockwise_get(m)) 129 if (evas_map_util_clockwise_get(m))
130 { 130 {
131 evas_obj_map_enable_set(c->side[i].o, 1); 131 evas_object_map_enable_set(c->side[i].o, 1);
132 evas_obj_map_set(c->side[i].o, m); 132 evas_object_map_set(c->side[i].o, m);
133 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 133 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
134 } 134 }
135 else 135 else
@@ -217,7 +217,7 @@ static void _loop(double t, int f)
217} 217}
218 218
219/* prepend special key handlers if interactive (before STD) */ 219/* prepend special key handlers if interactive (before STD) */
220static void _key(char *key) 220static void _key(const char *key)
221{ 221{
222 KEY_STD; 222 KEY_STD;
223} 223}
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index aa42e60..c25a891 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -128,8 +128,8 @@ _cube_pos(Cube *c,
128 255, 255, 255, 128 255, 255, 255,
129 20, 20, 20); 129 20, 20, 20);
130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
131 evas_obj_map_enable_set(c->side[i].o, 1); 131 evas_object_map_enable_set(c->side[i].o, 1);
132 evas_obj_map_set(c->side[i].o, m); 132 evas_object_map_set(c->side[i].o, m);
133 133
134 order[i] = i; 134 order[i] = i;
135 for (j = 0; j < 4; j++) 135 for (j = 0; j < 4; j++)
@@ -211,7 +211,7 @@ static void _loop(double t, int f)
211} 211}
212 212
213/* prepend special key handlers if interactive (before STD) */ 213/* prepend special key handlers if interactive (before STD) */
214static void _key(char *key) 214static void _key(const char *key)
215{ 215{
216 KEY_STD; 216 KEY_STD;
217} 217}
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 4c62ba3..d9b468d 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -126,8 +126,8 @@ _cube_pos(Cube *c,
126 255, 255, 255, 126 255, 255, 255,
127 20, 20, 20); 127 20, 20, 20);
128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); 128 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
129 evas_obj_map_enable_set(c->side[i].o, 1); 129 evas_object_map_enable_set(c->side[i].o, 1);
130 evas_obj_map_set(c->side[i].o, m); 130 evas_object_map_set(c->side[i].o, m);
131 131
132 order[i] = i; 132 order[i] = i;
133 for (j = 0; j < 4; j++) 133 for (j = 0; j < 4; j++)
@@ -209,7 +209,7 @@ static void _loop(double t, int f)
209} 209}
210 210
211/* prepend special key handlers if interactive (before STD) */ 211/* prepend special key handlers if interactive (before STD) */
212static void _key(char *key) 212static void _key(const char *key)
213{ 213{
214 KEY_STD; 214 KEY_STD;
215} 215}
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index eb62b87..9c64370 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -130,8 +130,8 @@ _cube_pos(Cube *c,
130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 130 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
131 if (evas_map_util_clockwise_get(m)) 131 if (evas_map_util_clockwise_get(m))
132 { 132 {
133 evas_obj_map_enable_set(c->side[i].o, 1); 133 evas_object_map_enable_set(c->side[i].o, 1);
134 evas_obj_map_set(c->side[i].o, m); 134 evas_object_map_set(c->side[i].o, m);
135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 135 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
136 } 136 }
137 else 137 else
@@ -199,7 +199,7 @@ static void _loop(double t, int f)
199} 199}
200 200
201/* prepend special key handlers if interactive (before STD) */ 201/* prepend special key handlers if interactive (before STD) */
202static void _key(char *key) 202static void _key(const char *key)
203{ 203{
204 KEY_STD; 204 KEY_STD;
205} 205}
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index 64ac13b..ea9d9b1 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -127,8 +127,8 @@ _cube_pos(Cube *c,
127 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); 127 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
128 if (evas_map_util_clockwise_get(m)) 128 if (evas_map_util_clockwise_get(m))
129 { 129 {
130 evas_obj_map_enable_set(c->side[i].o, 1); 130 evas_object_map_enable_set(c->side[i].o, 1);
131 evas_obj_map_set(c->side[i].o, m); 131 evas_object_map_set(c->side[i].o, m);
132 efl_gfx_visible_set(c->side[i].o, EINA_TRUE); 132 efl_gfx_visible_set(c->side[i].o, EINA_TRUE);
133 } 133 }
134 else 134 else
@@ -196,7 +196,7 @@ static void _loop(double t, int f)
196} 196}
197 197
198/* prepend special key handlers if interactive (before STD) */ 198/* prepend special key handlers if interactive (before STD) */
199static void _key(char *key) 199static void _key(const char *key)
200{ 200{
201 KEY_STD; 201 KEY_STD;
202} 202}
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index caf77cb..de7c3d2 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(EVAS_IMAGE_CLASS, evas); 32 o = eo_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(EVAS_IMAGE_CLASS, evas); 41 o = eo_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);
@@ -157,8 +157,8 @@ static void _loop(double t, int f)
157 x + (w / 2), y + (h / 2), 0); 157 x + (w / 2), y + (h / 2), 0);
158 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 158 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
159 159
160 evas_obj_map_enable_set(o_images[i], 1); 160 evas_object_map_enable_set(o_images[i], 1);
161 evas_obj_map_set(o_images[i], m); 161 evas_object_map_set(o_images[i], m);
162 162
163 evas_map_point_coord_set (m, 0, x, yy, -z); 163 evas_map_point_coord_set (m, 0, x, yy, -z);
164 evas_map_point_image_uv_set(m, 0, 0, 256); 164 evas_map_point_image_uv_set(m, 0, 0, 256);
@@ -180,15 +180,15 @@ static void _loop(double t, int f)
180 x + (w / 2), y + (h / 2), 0); 180 x + (w / 2), y + (h / 2), 0);
181 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 181 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
182 182
183 evas_obj_map_enable_set(o_reflec[i], 1); 183 evas_object_map_enable_set(o_reflec[i], 1);
184 evas_obj_map_set(o_reflec[i], m); 184 evas_object_map_set(o_reflec[i], m);
185 } 185 }
186 186
187 FPS_STD(NAME); 187 FPS_STD(NAME);
188} 188}
189 189
190/* prepend special key handlers if interactive (before STD) */ 190/* prepend special key handlers if interactive (before STD) */
191static void _key(char *key) 191static void _key(const char *key)
192{ 192{
193 KEY_STD; 193 KEY_STD;
194} 194}
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index 8c36070..813ab6e 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -68,14 +68,14 @@ static void _loop(double t, int f)
68 68
69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
70 70
71 evas_obj_map_enable_set(o_images[i], 1); 71 evas_object_map_enable_set(o_images[i], 1);
72 evas_obj_map_set(o_images[i], m); 72 evas_object_map_set(o_images[i], m);
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
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 74463cc..75ee3ff 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -68,14 +68,14 @@ static void _loop(double t, int f)
68 68
69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
70 70
71 evas_obj_map_enable_set(o_images[i], 1); 71 evas_object_map_enable_set(o_images[i], 1);
72 evas_obj_map_set(o_images[i], m); 72 evas_object_map_set(o_images[i], m);
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 1e36963..fffe078 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -66,14 +66,14 @@ static void _loop(double t, int f)
66 66
67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
68 68
69 evas_obj_map_enable_set(o_images[i], 1); 69 evas_object_map_enable_set(o_images[i], 1);
70 evas_obj_map_set(o_images[i], m); 70 evas_object_map_set(o_images[i], m);
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
74 74
75/* prepend special key handlers if interactive (before STD) */ 75/* prepend special key handlers if interactive (before STD) */
76static void _key(char *key) 76static void _key(const char *key)
77{ 77{
78 KEY_STD; 78 KEY_STD;
79} 79}
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index 542c3c3..7740047 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -65,14 +65,14 @@ static void _loop(double t, int f)
65 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 65 evas_map_point_color_set(m, 3, 0, 0, 0, 0);
66 66
67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
68 evas_obj_map_enable_set(o_images[i], 1); 68 evas_object_map_enable_set(o_images[i], 1);
69 evas_obj_map_set(o_images[i], m); 69 evas_object_map_set(o_images[i], m);
70 } 70 }
71 FPS_STD(NAME); 71 FPS_STD(NAME);
72} 72}
73 73
74/* prepend special key handlers if interactive (before STD) */ 74/* prepend special key handlers if interactive (before STD) */
75static void _key(char *key) 75static void _key(const char *key)
76{ 76{
77 KEY_STD; 77 KEY_STD;
78} 78}
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index c6582ab..7693119 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -68,14 +68,14 @@ static void _loop(double t, int f)
68 68
69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
70 70
71 evas_obj_map_enable_set(o_images[i], 1); 71 evas_object_map_enable_set(o_images[i], 1);
72 evas_obj_map_set(o_images[i], m); 72 evas_object_map_set(o_images[i], m);
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index a6445d9..cf1a1ca 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -68,14 +68,14 @@ static void _loop(double t, int f)
68 68
69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 69 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
70 70
71 evas_obj_map_enable_set(o_images[i], 1); 71 evas_object_map_enable_set(o_images[i], 1);
72 evas_obj_map_set(o_images[i], m); 72 evas_object_map_set(o_images[i], m);
73 } 73 }
74 FPS_STD(NAME); 74 FPS_STD(NAME);
75} 75}
76 76
77/* prepend special key handlers if interactive (before STD) */ 77/* prepend special key handlers if interactive (before STD) */
78static void _key(char *key) 78static void _key(const char *key)
79{ 79{
80 KEY_STD; 80 KEY_STD;
81} 81}
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 00aae66..056f68b 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -66,14 +66,14 @@ static void _loop(double t, int f)
66 66
67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
68 68
69 evas_obj_map_enable_set(o_images[i], 1); 69 evas_object_map_enable_set(o_images[i], 1);
70 evas_obj_map_set(o_images[i], m); 70 evas_object_map_set(o_images[i], m);
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
74 74
75/* prepend special key handlers if interactive (before STD) */ 75/* prepend special key handlers if interactive (before STD) */
76static void _key(char *key) 76static void _key(const char *key)
77{ 77{
78 KEY_STD; 78 KEY_STD;
79} 79}
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 1931a5e..8c21671 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -66,14 +66,14 @@ static void _loop(double t, int f)
66 66
67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
68 68
69 evas_obj_map_enable_set(o_images[i], 1); 69 evas_object_map_enable_set(o_images[i], 1);
70 evas_obj_map_set(o_images[i], m); 70 evas_object_map_set(o_images[i], m);
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
74 74
75/* prepend special key handlers if interactive (before STD) */ 75/* prepend special key handlers if interactive (before STD) */
76static void _key(char *key) 76static void _key(const char *key)
77{ 77{
78 KEY_STD; 78 KEY_STD;
79} 79}
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index caebe5f..871e4cf 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -63,14 +63,14 @@ static void _loop(double t, int f)
63 63
64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
65 65
66 evas_obj_map_enable_set(o_images[i], 1); 66 evas_object_map_enable_set(o_images[i], 1);
67 evas_obj_map_set(o_images[i], m); 67 evas_object_map_set(o_images[i], m);
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
71 71
72/* prepend special key handlers if interactive (before STD) */ 72/* prepend special key handlers if interactive (before STD) */
73static void _key(char *key) 73static void _key(const char *key)
74{ 74{
75 KEY_STD; 75 KEY_STD;
76} 76}
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 6abafa1..da39642 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -63,14 +63,14 @@ static void _loop(double t, int f)
63 63
64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
65 65
66 evas_obj_map_enable_set(o_images[i], 1); 66 evas_object_map_enable_set(o_images[i], 1);
67 evas_obj_map_set(o_images[i], m); 67 evas_object_map_set(o_images[i], m);
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
71 71
72/* prepend special key handlers if interactive (before STD) */ 72/* prepend special key handlers if interactive (before STD) */
73static void _key(char *key) 73static void _key(const char *key)
74{ 74{
75 KEY_STD; 75 KEY_STD;
76} 76}
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index 1dab593..c21be3a 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -61,14 +61,14 @@ static void _loop(double t, int f)
61 61
62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
63 63
64 evas_obj_map_enable_set(o_images[i], 1); 64 evas_object_map_enable_set(o_images[i], 1);
65 evas_obj_map_set(o_images[i], m); 65 evas_object_map_set(o_images[i], m);
66 } 66 }
67 FPS_STD(NAME); 67 FPS_STD(NAME);
68} 68}
69 69
70/* prepend special key handlers if interactive (before STD) */ 70/* prepend special key handlers if interactive (before STD) */
71static void _key(char *key) 71static void _key(const char *key)
72{ 72{
73 KEY_STD; 73 KEY_STD;
74} 74}
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 411e263..9cf2780 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -61,14 +61,14 @@ static void _loop(double t, int f)
61 61
62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
63 63
64 evas_obj_map_enable_set(o_images[i], 1); 64 evas_object_map_enable_set(o_images[i], 1);
65 evas_obj_map_set(o_images[i], m); 65 evas_object_map_set(o_images[i], m);
66 } 66 }
67 FPS_STD(NAME); 67 FPS_STD(NAME);
68} 68}
69 69
70/* prepend special key handlers if interactive (before STD) */ 70/* prepend special key handlers if interactive (before STD) */
71static void _key(char *key) 71static void _key(const char *key)
72{ 72{
73 KEY_STD; 73 KEY_STD;
74} 74}
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 49eaa2e..094256b 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -23,21 +23,21 @@ 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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(EVAS_IMAGE_CLASS, evas); 33 o = eo_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);
37 efl_gfx_size_set(o, 120, 160); 37 efl_gfx_size_set(o, 120, 160);
38 efl_gfx_visible_set(o, EINA_TRUE); 38 efl_gfx_visible_set(o, EINA_TRUE);
39 39
40 evas_obj_clip_set(o_images[i], o); 40 evas_object_clip_set(o_images[i], o);
41 } 41 }
42 done = 0; 42 done = 0;
43} 43}
@@ -69,7 +69,7 @@ static void _loop(double t, int f)
69} 69}
70 70
71/* prepend special key handlers if interactive (before STD) */ 71/* prepend special key handlers if interactive (before STD) */
72static void _key(char *key) 72static void _key(const char *key)
73{ 73{
74 KEY_STD; 74 KEY_STD;
75} 75}
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 0c12a17..bae3841 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, win_w * 4, win_h * 4); 40 efl_gfx_size_set(o, win_w * 4, win_h * 4);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -70,14 +70,14 @@ static void _loop(double t, int f)
70 win_w * 4, win_h * 4, 0); 70 win_w * 4, win_h * 4, 0);
71 evas_map_util_rotate(m, f, win_w / 2, win_h / 2); 71 evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
72 72
73 evas_obj_map_enable_set(o_images[i], 1); 73 evas_object_map_enable_set(o_images[i], 1);
74 evas_obj_map_set(o_images[i], m); 74 evas_object_map_set(o_images[i], m);
75 } 75 }
76 FPS_STD(NAME); 76 FPS_STD(NAME);
77} 77}
78 78
79/* prepend special key handlers if interactive (before STD) */ 79/* prepend special key handlers if interactive (before STD) */
80static void _key(char *key) 80static void _key(const char *key)
81{ 81{
82 KEY_STD; 82 KEY_STD;
83} 83}
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index fd5a997..2565889 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_size_set(o, 120, 160);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -75,13 +75,13 @@ static void _loop(double t, int f)
75 720, 420, 0); 75 720, 420, 0);
76 evas_map_util_rotate(m, f, win_w / 2, win_h / 2); 76 evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
77 77
78 evas_obj_map_enable_set(o_mask, 1); 78 evas_object_map_enable_set(o_mask, 1);
79 evas_obj_map_set(o_mask, m); 79 evas_object_map_set(o_mask, m);
80 FPS_STD(NAME); 80 FPS_STD(NAME);
81} 81}
82 82
83/* prepend special key handlers if interactive (before STD) */ 83/* prepend special key handlers if interactive (before STD) */
84static void _key(char *key) 84static void _key(const char *key)
85{ 85{
86 KEY_STD; 86 KEY_STD;
87} 87}
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index f989405..624406d 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,13 +33,13 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_size_set(o, 120, 160);
41 efl_image_smooth_scale_set(o, 1); 41 efl_image_smooth_scale_set(o, 1);
42 evas_obj_clip_set(o, o_mask); 42 evas_object_clip_set(o, o_mask);
43 efl_gfx_visible_set(o, EINA_TRUE); 43 efl_gfx_visible_set(o, EINA_TRUE);
44 } 44 }
45 done = 0; 45 done = 0;
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
77} 77}
78 78
79/* prepend special key handlers if interactive (before STD) */ 79/* prepend special key handlers if interactive (before STD) */
80static void _key(char *key) 80static void _key(const char *key)
81{ 81{
82 KEY_STD; 82 KEY_STD;
83} 83}
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index aa1ffcb..f1429d3 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,13 +33,13 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_size_set(o, 120, 160);
41 efl_image_smooth_scale_set(o, 0); 41 efl_image_smooth_scale_set(o, 0);
42 evas_obj_clip_set(o, o_mask); 42 evas_object_clip_set(o, o_mask);
43 efl_gfx_visible_set(o, EINA_TRUE); 43 efl_gfx_visible_set(o, EINA_TRUE);
44 } 44 }
45 done = 0; 45 done = 0;
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
77} 77}
78 78
79/* prepend special key handlers if interactive (before STD) */ 79/* prepend special key handlers if interactive (before STD) */
80static void _key(char *key) 80static void _key(const char *key)
81{ 81{
82 KEY_STD; 82 KEY_STD;
83} 83}
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index 23bce11..aa4256a 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -23,21 +23,21 @@ 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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(EVAS_IMAGE_CLASS, evas); 33 o = eo_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);
37 efl_gfx_size_set(o, 120, 160); 37 efl_gfx_size_set(o, 120, 160);
38 efl_gfx_visible_set(o, EINA_TRUE); 38 efl_gfx_visible_set(o, EINA_TRUE);
39 39
40 evas_obj_clip_set(o_images[i], o); 40 evas_object_clip_set(o_images[i], o);
41 } 41 }
42 done = 0; 42 done = 0;
43} 43}
@@ -69,7 +69,7 @@ static void _loop(double t, int f)
69} 69}
70 70
71/* prepend special key handlers if interactive (before STD) */ 71/* prepend special key handlers if interactive (before STD) */
72static void _key(char *key) 72static void _key(const char *key)
73{ 73{
74 KEY_STD; 74 KEY_STD;
75} 75}
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index d89f99a..23c0037 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -23,21 +23,21 @@ 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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(EVAS_IMAGE_CLASS, evas); 33 o = eo_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);
37 efl_gfx_size_set(o, 120, 160); 37 efl_gfx_size_set(o, 120, 160);
38 efl_gfx_visible_set(o, EINA_TRUE); 38 efl_gfx_visible_set(o, EINA_TRUE);
39 39
40 evas_obj_clip_set(o_images[i], o); 40 evas_object_clip_set(o_images[i], o);
41 } 41 }
42 done = 0; 42 done = 0;
43} 43}
@@ -69,7 +69,7 @@ static void _loop(double t, int f)
69} 69}
70 70
71/* prepend special key handlers if interactive (before STD) */ 71/* prepend special key handlers if interactive (before STD) */
72static void _key(char *key) 72static void _key(const char *key)
73{ 73{
74 KEY_STD; 74 KEY_STD;
75} 75}
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index e2f2087..4c35fc5 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_size_set(o, 120, 160);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71} 71}
72 72
73/* prepend special key handlers if interactive (before STD) */ 73/* prepend special key handlers if interactive (before STD) */
74static void _key(char *key) 74static void _key(const char *key)
75{ 75{
76 KEY_STD; 76 KEY_STD;
77} 77}
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index f30e882..72eab48 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_size_set(o, 120, 160);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71} 71}
72 72
73/* prepend special key handlers if interactive (before STD) */ 73/* prepend special key handlers if interactive (before STD) */
74static void _key(char *key) 74static void _key(const char *key)
75{ 75{
76 KEY_STD; 76 KEY_STD;
77} 77}
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index 054608a..5d60705 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120 / 2, 160 / 2); 40 efl_gfx_size_set(o, 120 / 2, 160 / 2);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71} 71}
72 72
73/* prepend special key handlers if interactive (before STD) */ 73/* prepend special key handlers if interactive (before STD) */
74static void _key(char *key) 74static void _key(const char *key)
75{ 75{
76 KEY_STD; 76 KEY_STD;
77} 77}
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index c33f6e9..95949f4 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, 120, 160); 40 efl_gfx_size_set(o, 120, 160);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -76,7 +76,7 @@ static void _loop(double t, int f)
76} 76}
77 77
78/* prepend special key handlers if interactive (before STD) */ 78/* prepend special key handlers if interactive (before STD) */
79static void _key(char *key) 79static void _key(const char *key)
80{ 80{
81 KEY_STD; 81 KEY_STD;
82} 82}
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index f57de30..2b15e29 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, win_w * 4, win_h * 4); 40 efl_gfx_size_set(o, win_w * 4, win_h * 4);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71} 71}
72 72
73/* prepend special key handlers if interactive (before STD) */ 73/* prepend special key handlers if interactive (before STD) */
74static void _key(char *key) 74static void _key(const char *key)
75{ 75{
76 KEY_STD; 76 KEY_STD;
77} 77}
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 35004dd..72c9835 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(EVAS_IMAGE_CLASS, evas); 26 o = eo_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,12 +33,12 @@ 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(EVAS_IMAGE_CLASS, evas); 36 o = eo_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);
40 efl_gfx_size_set(o, win_w * 4, win_h * 4); 40 efl_gfx_size_set(o, win_w * 4, win_h * 4);
41 evas_obj_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
42 efl_gfx_visible_set(o, EINA_TRUE); 42 efl_gfx_visible_set(o, EINA_TRUE);
43 } 43 }
44 done = 0; 44 done = 0;
@@ -76,13 +76,13 @@ static void _loop(double t, int f)
76 720, 420, 0); 76 720, 420, 0);
77 evas_map_util_rotate(m, f, win_w / 2, win_h / 2); 77 evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
78 78
79 evas_obj_map_enable_set(o_mask, 1); 79 evas_object_map_enable_set(o_mask, 1);
80 evas_obj_map_set(o_mask, m); 80 evas_object_map_set(o_mask, m);
81 FPS_STD(NAME); 81 FPS_STD(NAME);
82} 82}
83 83
84/* prepend special key handlers if interactive (before STD) */ 84/* prepend special key handlers if interactive (before STD) */
85static void _key(char *key) 85static void _key(const char *key)
86{ 86{
87 KEY_STD; 87 KEY_STD;
88} 88}
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 4a25fc0..fd728c1 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(EVAS_IMAGE_CLASS, evas); 27 o = eo_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);
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62} 62}
63 63
64/* prepend special key handlers if interactive (before STD) */ 64/* prepend special key handlers if interactive (before STD) */
65static void _key(char *key) 65static void _key(const char *key)
66{ 66{
67 KEY_STD; 67 KEY_STD;
68} 68}
diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c
index c4c635d..5dde7ff 100644
--- a/src/bin/line_blend.c
+++ b/src/bin/line_blend.c
@@ -97,7 +97,7 @@ static void _loop(double t, int f)
97} 97}
98 98
99/* prepend special key handlers if interactive (before STD) */ 99/* prepend special key handlers if interactive (before STD) */
100static void _key(char *key) 100static void _key(const char *key)
101{ 101{
102 KEY_STD; 102 KEY_STD;
103} 103}
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index b25d0f7..fc89018 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -111,7 +111,7 @@ static void _loop(double t, int f)
111} 111}
112 112
113/* prepend special key handlers if interactive (before STD) */ 113/* prepend special key handlers if interactive (before STD) */
114static void _key(char *key) 114static void _key(const char *key)
115{ 115{
116 KEY_STD; 116 KEY_STD;
117} 117}
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index e5dc63c..cc18a26 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(EVAS_IMAGE_CLASS, evas); 25 o = eo_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);
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
68} 68}
69 69
70/* prepend special key handlers if interactive (before STD) */ 70/* prepend special key handlers if interactive (before STD) */
71static void _key(char *key) 71static void _key(const char *key)
72{ 72{
73 KEY_STD; 73 KEY_STD;
74} 74}
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 0028ad7..ad49564 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 int i; 26 int i;
27 Evas_Object *o,*src; 27 Evas_Object *o,*src;
28 28
29 o = eo_add(EVAS_IMAGE_CLASS, evas); 29 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
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);
32 efl_gfx_size_set(o, 120, 160); 32 efl_gfx_size_set(o, 120, 160);
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71} 71}
72 72
73/* prepend special key handlers if interactive (before STD) */ 73/* prepend special key handlers if interactive (before STD) */
74static void _key(char *key) 74static void _key(const char *key)
75{ 75{
76 KEY_STD; 76 KEY_STD;
77} 77}
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 75bb523..aa9e517 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -83,7 +83,7 @@ static void _loop(double t, int f)
83} 83}
84 84
85/* prepend special key handlers if interactive (before STD) */ 85/* prepend special key handlers if interactive (before STD) */
86static void _key(char *key) 86static void _key(const char *key)
87{ 87{
88 KEY_STD; 88 KEY_STD;
89} 89}
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 34a39aa..49e106a 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -100,7 +100,7 @@ static void _loop(double t, int f)
100} 100}
101 101
102/* prepend special key handlers if interactive (before STD) */ 102/* prepend special key handlers if interactive (before STD) */
103static void _key(char *key) 103static void _key(const char *key)
104{ 104{
105 KEY_STD; 105 KEY_STD;
106} 106}
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index f6a906d..37e083a 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67} 67}
68 68
69/* prepend special key handlers if interactive (before STD) */ 69/* prepend special key handlers if interactive (before STD) */
70static void _key(char *key) 70static void _key(const char *key)
71{ 71{
72 KEY_STD; 72 KEY_STD;
73} 73}
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 5ea4a33..9071cd5 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70} 70}
71 71
72/* prepend special key handlers if interactive (before STD) */ 72/* prepend special key handlers if interactive (before STD) */
73static void _key(char *key) 73static void _key(const char *key)
74{ 74{
75 KEY_STD; 75 KEY_STD;
76} 76}
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index e5c846e..fad51a3 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
68} 68}
69 69
70/* prepend special key handlers if interactive (before STD) */ 70/* prepend special key handlers if interactive (before STD) */
71static void _key(char *key) 71static void _key(const char *key)
72{ 72{
73 KEY_STD; 73 KEY_STD;
74} 74}
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 3df015f..9094036 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -71,7 +71,7 @@ static void _loop(double t, int f)
71} 71}
72 72
73/* prepend special key handlers if interactive (before STD) */ 73/* prepend special key handlers if interactive (before STD) */
74static void _key(char *key) 74static void _key(const char *key)
75{ 75{
76 KEY_STD; 76 KEY_STD;
77} 77}
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index 3b5102e..ba7b6a3 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67} 67}
68 68
69/* prepend special key handlers if interactive (before STD) */ 69/* prepend special key handlers if interactive (before STD) */
70static void _key(char *key) 70static void _key(const char *key)
71{ 71{
72 KEY_STD; 72 KEY_STD;
73} 73}
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index c87f6ed..171fd49 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70} 70}
71 71
72/* prepend special key handlers if interactive (before STD) */ 72/* prepend special key handlers if interactive (before STD) */
73static void _key(char *key) 73static void _key(const char *key)
74{ 74{
75 KEY_STD; 75 KEY_STD;
76} 76}
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index dd4867d..1a51a6f 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(EVAS_IMAGE_CLASS, evas); 57 o = eo_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);
@@ -162,7 +162,7 @@ static void _loop(double t, int f)
162} 162}
163 163
164/* prepend special key handlers if interactive (before STD) */ 164/* prepend special key handlers if interactive (before STD) */
165static void _key(char *key) 165static void _key(const char *key)
166{ 166{
167 KEY_STD; 167 KEY_STD;
168} 168}
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 2757ca5..55e9caa 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
60} 60}
61 61
62/* prepend special key handlers if interactive (before STD) */ 62/* prepend special key handlers if interactive (before STD) */
63static void _key(char *key) 63static void _key(const char *key)
64{ 64{
65 KEY_STD; 65 KEY_STD;
66} 66}
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index d64c6e0..0411931 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -83,7 +83,7 @@ static void _loop(double t, int f)
83} 83}
84 84
85/* prepend special key handlers if interactive (before STD) */ 85/* prepend special key handlers if interactive (before STD) */
86static void _key(char *key) 86static void _key(const char *key)
87{ 87{
88 KEY_STD; 88 KEY_STD;
89} 89}
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 593e823..365ab0e 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -69,7 +69,7 @@ static void _loop(double t, int f)
69} 69}
70 70
71/* prepend special key handlers if interactive (before STD) */ 71/* prepend special key handlers if interactive (before STD) */
72static void _key(char *key) 72static void _key(const char *key)
73{ 73{
74 KEY_STD; 74 KEY_STD;
75} 75}
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index f13307e..1c124f0 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -81,7 +81,7 @@ static void _loop(double t, int f)
81} 81}
82 82
83/* prepend special key handlers if interactive (before STD) */ 83/* prepend special key handlers if interactive (before STD) */
84static void _key(char *key) 84static void _key(const char *key)
85{ 85{
86 KEY_STD; 86 KEY_STD;
87} 87}
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index 053380d..e484722 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -23,16 +23,16 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = evas_object_textblock_add(evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 evas_textblock_style_set
30 (st, 30 (st,
31 "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'" 31 "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
32 ); 32 );
33 evas_obj_textblock_style_set(o, st); \ 33 evas_object_textblock_style_set(o, st); \
34 evas_obj_textblock_clear(o); \ 34 evas_object_textblock_clear(o); \
35 evas_obj_textblock_text_markup_set(o, "This is a test of auto alignment in Evas<ps/>" 35 evas_object_textblock_text_markup_set(o, "This is a test of auto alignment in Evas<ps/>"
36 "<br/>" 36 "<br/>"
37 "This text should be left aligned<ps/>" 37 "This text should be left aligned<ps/>"
38 "\xE2\x80\x8FThis text should be right aligned<ps/>" 38 "\xE2\x80\x8FThis text should be right aligned<ps/>"
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 Evas_Coord x, y, w, h, w0, h0; 67 Evas_Coord x, y, w, h, w0, h0;
68 int i = 0; 68 int i = 0;
69 69
70 evas_obj_textblock_size_native_get(o_text, &w0, &h0); 70 evas_object_textblock_size_native_get(o_text, &w0, &h0);
71 w = w0; 71 w = w0;
72 h = h0; 72 h = h0;
73 w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0); 73 w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
@@ -80,7 +80,7 @@ static void _loop(double t, int f)
80} 80}
81 81
82/* prepend special key handlers if interactive (before STD) */ 82/* prepend special key handlers if interactive (before STD) */
83static void _key(char *key) 83static void _key(const char *key)
84{ 84{
85 KEY_STD; 85 KEY_STD;
86} 86}
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 2673ced..52c6af2 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = evas_object_textblock_add(evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 evas_textblock_style_set
@@ -39,9 +39,9 @@ static void _setup(void)
39 "p='+ font=Vera,Kochi font_size=10 align=left'" 39 "p='+ font=Vera,Kochi font_size=10 align=left'"
40 "/p='- \n'" 40 "/p='- \n'"
41 ); 41 );
42 evas_obj_textblock_style_set(o, st); 42 evas_object_textblock_style_set(o, st);
43 evas_obj_textblock_clear(o); 43 evas_object_textblock_clear(o);
44 evas_obj_textblock_text_markup_set(o, "<center><h1>Title</h1></center><br/>" 44 evas_object_textblock_text_markup_set(o, "<center><h1>Title</h1></center><br/>"
45 "<p><tab>A pragraph here <red>red text</red> and stuff.</p>" 45 "<p><tab>A pragraph here <red>red text</red> and stuff.</p>"
46 "<p>And escaping &lt, and &gt, as well as &amp, as <h1>normal.</h1></p>" 46 "<p>And escaping &lt, and &gt, as well as &amp, as <h1>normal.</h1></p>"
47 "<p>If you want a newline use &lt, br&gt, <br/>woo a new line!</p>" 47 "<p>If you want a newline use &lt, br&gt, <br/>woo a new line!</p>"
@@ -143,7 +143,7 @@ static void _loop(double t, int f)
143} 143}
144 144
145/* prepend special key handlers if interactive (before STD) */ 145/* prepend special key handlers if interactive (before STD) */
146static void _key(char *key) 146static void _key(const char *key)
147{ 147{
148 KEY_STD; 148 KEY_STD;
149} 149}
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index 6be8f95..18da6ca 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -23,16 +23,16 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = evas_object_textblock_add(evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 evas_textblock_style_set
30 (st, 30 (st,
31 "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'" 31 "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'"
32 ); 32 );
33 evas_obj_textblock_style_set(o, st); 33 evas_object_textblock_style_set(o, st);
34 evas_obj_textblock_clear(o); 34 evas_object_textblock_clear(o);
35 evas_obj_textblock_text_markup_set(o, "This is a test of International test rendering in Evas<br/>" 35 evas_object_textblock_text_markup_set(o, "This is a test of International test rendering in Evas<br/>"
36 "<br/>" 36 "<br/>"
37 "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'<br/>" 37 "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'<br/>"
38 "German: 'Heizölrückstoßabdämpfung'<br/>" 38 "German: 'Heizölrückstoßabdämpfung'<br/>"
@@ -99,7 +99,7 @@ static void _loop(double t, int f)
99 Evas_Coord x, y, w, h, w0, h0; 99 Evas_Coord x, y, w, h, w0, h0;
100 int i = 0; 100 int i = 0;
101 101
102 evas_obj_textblock_size_native_get(o_text, &w0, &h0); 102 evas_object_textblock_size_native_get(o_text, &w0, &h0);
103 w = w0; 103 w = w0;
104 h = h0; 104 h = h0;
105 x = (win_w / 2) - (w / 2); 105 x = (win_w / 2) - (w / 2);
@@ -113,7 +113,7 @@ static void _loop(double t, int f)
113} 113}
114 114
115/* prepend special key handlers if interactive (before STD) */ 115/* prepend special key handlers if interactive (before STD) */
116static void _key(char *key) 116static void _key(const char *key)
117{ 117{
118 KEY_STD; 118 KEY_STD;
119} 119}
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 589bb5c..e15c5b2 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -23,16 +23,16 @@ static void _setup(void)
23 Evas_Object *o; 23 Evas_Object *o;
24 Evas_Textblock_Style *st; 24 Evas_Textblock_Style *st;
25 25
26 o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); 26 o = evas_object_textblock_add(evas);
27 o_text = o; 27 o_text = o;
28 st = evas_textblock_style_new(); 28 st = evas_textblock_style_new();
29 evas_textblock_style_set 29 evas_textblock_style_set
30 (st, 30 (st,
31 "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'" 31 "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
32 ); 32 );
33 evas_obj_textblock_style_set(o, st); \ 33 evas_object_textblock_style_set(o, st); \
34 evas_obj_textblock_clear(o); \ 34 evas_object_textblock_clear(o); \
35 evas_obj_textblock_text_markup_set(o, "This test just appends and removes text from different paragraphs, it's " 35 evas_object_textblock_text_markup_set(o, "This test just appends and removes text from different paragraphs, it's "
36 "not a very visual test, it's included for benchmarking purposes." 36 "not a very visual test, it's included for benchmarking purposes."
37"<ps/>" 37"<ps/>"
38"Enlightenment is the flagship and original name bearer for this project. Once it was just a humble window manager for X11 that wanted to do things differently. To do them better, but it has expanded. This can be confusing so when we refer to Enlightenment, we may mean the project as a whole or just the window manager proper. The libraries behind Enlightenment are referred to as EFL collectively, each with a specific name and purpose." 38"Enlightenment is the flagship and original name bearer for this project. Once it was just a humble window manager for X11 that wanted to do things differently. To do them better, but it has expanded. This can be confusing so when we refer to Enlightenment, we may mean the project as a whole or just the window manager proper. The libraries behind Enlightenment are referred to as EFL collectively, each with a specific name and purpose."
@@ -111,7 +111,7 @@ static void _loop(double t, int f)
111{ 111{
112 Evas_Textblock_Cursor *cur; 112 Evas_Textblock_Cursor *cur;
113 static Evas_Textblock_Cursor *cur2; 113 static Evas_Textblock_Cursor *cur2;
114 cur = evas_obj_textblock_cursor_get(o_text); 114 cur = evas_object_textblock_cursor_get(o_text);
115 evas_textblock_cursor_text_append(cur, "*"); 115 evas_textblock_cursor_text_append(cur, "*");
116 evas_textblock_cursor_char_delete(cur); 116 evas_textblock_cursor_char_delete(cur);
117 117
@@ -119,7 +119,7 @@ static void _loop(double t, int f)
119 if (!o_text) cur2 = NULL; 119 if (!o_text) cur2 = NULL;
120 if (!cur2) 120 if (!cur2)
121 { 121 {
122 cur2 = evas_obj_textblock_cursor_new(o_text); 122 cur2 = evas_object_textblock_cursor_new(o_text);
123 evas_textblock_cursor_paragraph_last(cur2); 123 evas_textblock_cursor_paragraph_last(cur2);
124 evas_textblock_cursor_paragraph_char_first(cur2); 124 evas_textblock_cursor_paragraph_char_first(cur2);
125 } 125 }
@@ -132,7 +132,7 @@ static void _loop(double t, int f)
132} 132}
133 133
134/* prepend special key handlers if interactive (before STD) */ 134/* prepend special key handlers if interactive (before STD) */
135static void _key(char *key) 135static void _key(const char *key)
136{ 136{
137 KEY_STD; 137 KEY_STD;
138} 138}
diff --git a/src/bin/ui.c b/src/bin/ui.c
index f8353cd..824e33e 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -34,7 +34,7 @@ static double menu_anim_sel = 0.0;
34 34
35static double p_fps = 0.0; 35static double p_fps = 0.0;
36 36
37static void (*key_func) (char *key) = NULL; 37static void (*key_func) (const char *key) = NULL;
38static void (*loop_func) (double t, int f) = NULL; 38static void (*loop_func) (double t, int f) = NULL;
39 39
40double weights[] = 40double weights[] =
@@ -255,73 +255,74 @@ _ui_select(void)
255 if (func) func(); 255 if (func) func();
256} 256}
257 257
258static Eina_Bool 258static void
259_ui_key(void *data EINA_UNUSED, const Eo_Event *event) 259_ui_key(void *data EINA_UNUSED, const Eo_Event *event)
260{ 260{
261 Evas_Event_Key_Down *ev = event->info; 261 Efl_Event_Key *ev = event->info;
262 const char *keyname = efl_event_key_name_get(ev);
263
264 if (!keyname) return;
262 265
263 if (key_func) 266 if (key_func)
264 { 267 {
265 key_func(ev->keyname); 268 key_func(keyname);
266 return EINA_TRUE; 269 return;
267 } 270 }
268 271
269 if ((!strcmp(ev->keyname, "Escape")) || 272 if ((!strcmp(keyname, "Escape")) ||
270 (!strcmp(ev->keyname, "q")) || 273 (!strcmp(keyname, "q")) ||
271 (!strcmp(ev->keyname, "Q"))) 274 (!strcmp(keyname, "Q")))
272 { 275 {
273 _ui_exit(); 276 _ui_exit();
277 return;
274 } 278 }
279
275 if (menu_active) 280 if (menu_active)
276 { 281 {
277 if (!strcmp(ev->keyname, "Left")) menu_sel++; 282 if (!strcmp(keyname, "Left")) menu_sel++;
278 else if (!strcmp(ev->keyname, "Right")) menu_sel--; 283 else if (!strcmp(keyname, "Right")) menu_sel--;
279 else if (!strcmp(ev->keyname, "Up")) menu_sel++; 284 else if (!strcmp(keyname, "Up")) menu_sel++;
280 else if (!strcmp(ev->keyname, "Down")) menu_sel--; 285 else if (!strcmp(keyname, "Down")) menu_sel--;
281 else if (!strcmp(ev->keyname, "Home")) menu_sel = eina_list_count(menu) - 1; 286 else if (!strcmp(keyname, "Home")) menu_sel = eina_list_count(menu) - 1;
282 else if (!strcmp(ev->keyname, "End")) menu_sel = 0; 287 else if (!strcmp(keyname, "End")) menu_sel = 0;
283 else if (!strcmp(ev->keyname, "Next")) menu_sel -= 10; 288 else if (!strcmp(keyname, "Next")) menu_sel -= 10;
284 else if (!strcmp(ev->keyname, "Prior")) menu_sel += 10; 289 else if (!strcmp(keyname, "Prior")) menu_sel += 10;
285 if (menu_sel < 0) menu_sel = 0; 290 if (menu_sel < 0) menu_sel = 0;
286 else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1; 291 else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1;
287 menu_anim_sel = menu_sel; 292 menu_anim_sel = menu_sel;
288 if (!strcmp(ev->keyname, "Return")) _ui_select(); 293 if (!strcmp(keyname, "Return")) _ui_select();
289 } 294 }
290
291 return EINA_TRUE;
292} 295}
293 296
294static Evas_Coord down_x, down_y; 297static Evas_Coord down_x, down_y;
295static int down_menu_sel = 0; 298static int down_menu_sel = 0;
296 299
297static Eina_Bool 300static void
298_ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event) 301_ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event)
299{ 302{
300 Evas_Event_Mouse_Down *ev = event->info; 303 Efl_Event_Pointer *ev = event->info;
301 304
302 if (ev->button != 1) return EINA_TRUE; 305 if (efl_event_pointer_button_get(ev) != 1) return;
303 if (menu_active) 306 if (menu_active)
304 { 307 {
305 down_x = ev->canvas.x; 308 efl_event_pointer_position_get(ev, &down_x, &down_y);
306 down_y = ev->canvas.y;
307 down_menu_sel = menu_sel; 309 down_menu_sel = menu_sel;
308 } 310 }
309
310 return EINA_TRUE;
311} 311}
312 312
313static Eina_Bool 313static void
314_ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event) 314_ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
315{ 315{
316 Evas_Event_Mouse_Up *ev = event->info; 316 Efl_Event_Pointer *ev = event->info;
317 317
318 if (ev->button != 1) return EINA_TRUE; 318 if (efl_event_pointer_button_get(ev) != 1) return;
319 if (menu_active) 319 if (menu_active)
320 { 320 {
321 Evas_Coord dx, dy; 321 Evas_Coord dx, dy, x, y;
322 322
323 dx = ev->canvas.x - down_x; 323 efl_event_pointer_position_get(ev, &x, &y);
324 dy = ev->canvas.y - down_y; 324 dx = x - down_x;
325 dy = y - down_y;
325 if ((((dx * dx) + (dy * dy)) < (20 * 20)) && 326 if ((((dx * dx) + (dy * dy)) < (20 * 20)) &&
326 (menu_sel == down_menu_sel)) 327 (menu_sel == down_menu_sel))
327 _ui_select(); 328 _ui_select();
@@ -331,27 +332,26 @@ _ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event)
331 evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL); 332 evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
332 evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL); 333 evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL);
333 } 334 }
334
335 return EINA_TRUE;
336} 335}
337 336
338static Eina_Bool 337static void
339_ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event) 338_ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event)
340{ 339{
341 Evas_Event_Mouse_Move *ev = event->info; 340 Efl_Event_Pointer *ev = event->info;
342 341
343 if (ev->buttons != 1) return EINA_TRUE; 342 if (efl_event_pointer_button_get(ev) != 1) return;
344 if (menu_active) 343 if (menu_active)
345 { 344 {
346 menu_sel = down_menu_sel + ((ev->cur.canvas.x - down_x) / 25); 345 Evas_Coord x;
346
347 efl_event_pointer_position_get(ev, &x, NULL);
348 menu_sel = down_menu_sel + ((x - down_x) / 25);
347 /* scroll */ 349 /* scroll */
348 if (menu_sel < 0) menu_sel = 0; 350 if (menu_sel < 0) menu_sel = 0;
349 else if ((unsigned int)menu_sel >= eina_list_count(menu)) 351 else if ((unsigned int)menu_sel >= eina_list_count(menu))
350 menu_sel = eina_list_count(menu) - 1; 352 menu_sel = eina_list_count(menu) - 1;
351 menu_anim_sel = menu_sel; 353 menu_anim_sel = menu_sel;
352 } 354 }
353
354 return EINA_TRUE;
355} 355}
356 356
357static void 357static void
@@ -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(EVAS_IMAGE_CLASS, evas); 365 mi->o_icon = eo_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);
@@ -377,10 +377,10 @@ _ui_menu_item_full_add(Eina_Bool test,
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, 379EO_CALLBACKS_ARRAY_DEFINE(ui_callbacks,
380 { EVAS_OBJECT_EVENT_KEY_DOWN, _ui_key }, 380 { EFL_EVENT_KEY_DOWN, _ui_key },
381 { EVAS_OBJECT_EVENT_MOUSE_DOWN, _ui_mouse_down }, 381 { EFL_EVENT_POINTER_DOWN, _ui_mouse_down },
382 { EVAS_OBJECT_EVENT_MOUSE_UP, _ui_mouse_up }, 382 { EFL_EVENT_POINTER_UP, _ui_mouse_up },
383 { EVAS_OBJECT_EVENT_MOUSE_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)
@@ -396,7 +396,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
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_obj_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 eo_event_callback_array_add(o, ui_callbacks(), NULL);
402 o_bg = o; 402 o_bg = o;
@@ -414,7 +414,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
414 efl_text_set(o, "EXPEDITE"); 414 efl_text_set(o, "EXPEDITE");
415 efl_gfx_stack_layer_set(o, 100); 415 efl_gfx_stack_layer_set(o, 100);
416 efl_gfx_color_set(o, 0, 0, 0, 100); 416 efl_gfx_color_set(o, 0, 0, 0, 100);
417 evas_obj_pass_events_set(o, 1); 417 evas_object_pass_events_set(o, 1);
418 efl_gfx_size_get(o, &w, &h); 418 efl_gfx_size_get(o, &w, &h);
419 x = (win_w - w) / 2; 419 x = (win_w - w) / 2;
420 y = 0; 420 y = 0;
@@ -427,7 +427,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
427 efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); 427 efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
428 efl_gfx_stack_layer_set(o, 100); 428 efl_gfx_stack_layer_set(o, 100);
429 efl_gfx_color_set(o, 0, 0, 0, 60); 429 efl_gfx_color_set(o, 0, 0, 0, 60);
430 evas_obj_pass_events_set(o, 1); 430 evas_object_pass_events_set(o, 1);
431 efl_gfx_size_get(o, &w, NULL); 431 efl_gfx_size_get(o, &w, NULL);
432 x = (win_w - w) / 2; 432 x = (win_w - w) / 2;
433 y = h + 2; 433 y = h + 2;
@@ -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(EVAS_IMAGE_CLASS, evas); 438 o = eo_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(EVAS_IMAGE_CLASS, evas); 448 o = eo_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(EVAS_IMAGE_CLASS, evas); 455 o = eo_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(EVAS_IMAGE_CLASS, evas); 462 o = eo_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);
@@ -471,7 +471,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
471 efl_text_properties_font_set(o, "Vera", 10); 471 efl_text_properties_font_set(o, "Vera", 10);
472 efl_text_set(o, ""); 472 efl_text_set(o, "");
473 efl_gfx_color_set(o, 0, 0, 0, 100); 473 efl_gfx_color_set(o, 0, 0, 0, 100);
474 evas_obj_pass_events_set(o, 1); 474 evas_object_pass_events_set(o, 1);
475 efl_gfx_size_get(o, &w, &h); 475 efl_gfx_size_get(o, &w, &h);
476 x = (win_w - w) / 2; 476 x = (win_w - w) / 2;
477 y = (win_h - h) / 2; 477 y = (win_h - h) / 2;
@@ -652,7 +652,7 @@ ui_menu(void)
652} 652}
653 653
654void 654void
655ui_func_set(void (*kfunc) (char *key), void (*lfunc) (double t, int f)) 655ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f))
656{ 656{
657 key_func = kfunc; 657 key_func = kfunc;
658 loop_func = lfunc; 658 loop_func = lfunc;
diff --git a/src/bin/ui.h b/src/bin/ui.h
index 3f5a2b2..568faf3 100644
--- a/src/bin/ui.h
+++ b/src/bin/ui.h
@@ -19,7 +19,7 @@ extern double weights[];
19void ui_setup(unsigned int ui_w, unsigned int ui_h); 19void ui_setup(unsigned int ui_w, unsigned int ui_h);
20Eina_Bool ui_loop(void *data); 20Eina_Bool ui_loop(void *data);
21void ui_menu(void); 21void ui_menu(void);
22void ui_func_set(void (*kfunc) (char *key), void (*lfunc) (double t, int f)); 22void ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f));
23void ui_fps(double fps); 23void ui_fps(double fps);
24void ui_num(int n); 24void ui_num(int n);
25void ui_all(void); 25void ui_all(void);
diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c
index bd407a1..e5e2fc8 100644
--- a/src/bin/vg_basic_circle.c
+++ b/src/bin/vg_basic_circle.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 efl_gfx_position_set(vector, 0, 0); 36 efl_gfx_position_set(vector, 0, 0);
37 efl_gfx_visible_set(vector, EINA_TRUE); 37 efl_gfx_visible_set(vector, EINA_TRUE);
38 38
39 root = evas_obj_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 = eo_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);
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72} 72}
73 73
74/* prepend special key handlers if interactive (before STD) */ 74/* prepend special key handlers if interactive (before STD) */
75static void _key(char *key) 75static void _key(const char *key)
76{ 76{
77 KEY_STD; 77 KEY_STD;
78} 78}
diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c
index 1a41a6e..35f6e3b 100644
--- a/src/bin/vg_basic_gradient.c
+++ b/src/bin/vg_basic_gradient.c
@@ -42,7 +42,7 @@ static void _setup(void)
42 efl_gfx_position_set(vector, 0, 0); 42 efl_gfx_position_set(vector, 0, 0);
43 efl_gfx_visible_set(vector, EINA_TRUE); 43 efl_gfx_visible_set(vector, EINA_TRUE);
44 44
45 root = evas_obj_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 = eo_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);
@@ -85,7 +85,7 @@ static void _loop(double t, int f)
85} 85}
86 86
87/* prepend special key handlers if interactive (before STD) */ 87/* prepend special key handlers if interactive (before STD) */
88static void _key(char *key) 88static void _key(const char *key)
89{ 89{
90 KEY_STD; 90 KEY_STD;
91} 91}
diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c
index ea594e0..b6560da 100644
--- a/src/bin/vg_basic_rect.c
+++ b/src/bin/vg_basic_rect.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 efl_gfx_position_set(vector, 0, 0); 36 efl_gfx_position_set(vector, 0, 0);
37 efl_gfx_visible_set(vector, EINA_TRUE); 37 efl_gfx_visible_set(vector, EINA_TRUE);
38 38
39 root = evas_obj_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 = eo_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);
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72} 72}
73 73
74/* prepend special key handlers if interactive (before STD) */ 74/* prepend special key handlers if interactive (before STD) */
75static void _key(char *key) 75static void _key(const char *key)
76{ 76{
77 KEY_STD; 77 KEY_STD;
78} 78}
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
index cffbba4..021b38c 100644
--- a/src/bin/vg_scaled.c
+++ b/src/bin/vg_scaled.c
@@ -42,7 +42,7 @@ static void _setup(void)
42 efl_gfx_position_set(vector, 0, 0); 42 efl_gfx_position_set(vector, 0, 0);
43 efl_gfx_visible_set(vector, EINA_TRUE); 43 efl_gfx_visible_set(vector, EINA_TRUE);
44 44
45 root = evas_obj_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 = eo_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);
@@ -101,7 +101,7 @@ static void _loop(double t, int f)
101} 101}
102 102
103/* prepend special key handlers if interactive (before STD) */ 103/* prepend special key handlers if interactive (before STD) */
104static void _key(char *key) 104static void _key(const char *key)
105{ 105{
106 KEY_STD; 106 KEY_STD;
107} 107}
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 222ba53..2c961dc 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(EVAS_IMAGE_CLASS, evas); 49 o = eo_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);
@@ -100,7 +100,7 @@ static void _loop(double t, int f)
100} 100}
101 101
102/* prepend special key handlers if interactive (before STD) */ 102/* prepend special key handlers if interactive (before STD) */
103static void _key(char *key) 103static void _key(const char *key)
104{ 104{
105 KEY_STD; 105 KEY_STD;
106} 106}
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index 60eee48..c409c31 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(EVAS_IMAGE_CLASS, evas); 49 o = eo_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);
@@ -98,7 +98,7 @@ static void _loop(double t, int f)
98} 98}
99 99
100/* prepend special key handlers if interactive (before STD) */ 100/* prepend special key handlers if interactive (before STD) */
101static void _key(char *key) 101static void _key(const char *key)
102{ 102{
103 KEY_STD; 103 KEY_STD;
104} 104}
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index ab50ffd..920108f 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(EVAS_IMAGE_CLASS, evas); 49 o = eo_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);
@@ -107,7 +107,7 @@ static void _loop(double t, int f)
107} 107}
108 108
109/* prepend special key handlers if interactive (before STD) */ 109/* prepend special key handlers if interactive (before STD) */
110static void _key(char *key) 110static void _key(const char *key)
111{ 111{
112 KEY_STD; 112 KEY_STD;
113} 113}
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index e8e2ebb..445db2e 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(EVAS_IMAGE_CLASS, evas); 34 o = eo_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);
@@ -83,7 +83,7 @@ static void _loop(double t, int f)
83} 83}
84 84
85/* prepend special key handlers if interactive (before STD) */ 85/* prepend special key handlers if interactive (before STD) */
86static void _key(char *key) 86static void _key(const char *key)
87{ 87{
88 KEY_STD; 88 KEY_STD;
89} 89}
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index bc1fdd3..040ec13 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(EVAS_IMAGE_CLASS, evas); 34 o = eo_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);
@@ -87,7 +87,7 @@ static void _loop(double t, int f)
87} 87}
88 88
89/* prepend special key handlers if interactive (before STD) */ 89/* prepend special key handlers if interactive (before STD) */
90static void _key(char *key) 90static void _key(const char *key)
91{ 91{
92 KEY_STD; 92 KEY_STD;
93} 93}
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 077335a..24d1928 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(EVAS_IMAGE_CLASS, evas); 49 o = eo_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);
@@ -98,7 +98,7 @@ static void _loop(double t, int f)
98} 98}
99 99
100/* prepend special key handlers if interactive (before STD) */ 100/* prepend special key handlers if interactive (before STD) */
101static void _key(char *key) 101static void _key(const char *key)
102{ 102{
103 KEY_STD; 103 KEY_STD;
104} 104}
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index a4d3e2c..a12e39c 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(EVAS_IMAGE_CLASS, evas); 49 o = eo_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);
@@ -98,7 +98,7 @@ static void _loop(double t, int f)
98} 98}
99 99
100/* prepend special key handlers if interactive (before STD) */ 100/* prepend special key handlers if interactive (before STD) */
101static void _key(char *key) 101static void _key(const char *key)
102{ 102{
103 KEY_STD; 103 KEY_STD;
104} 104}
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 48b9921..544a354 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(EVAS_IMAGE_CLASS, evas); 65 o = eo_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);
@@ -109,7 +109,7 @@ static void _loop(double t, int f)
109} 109}
110 110
111/* prepend special key handlers if interactive (before STD) */ 111/* prepend special key handlers if interactive (before STD) */
112static void _key(char *key) 112static void _key(const char *key)
113{ 113{
114 KEY_STD; 114 KEY_STD;
115} 115}
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index bf664f1..8b86719 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(EVAS_IMAGE_CLASS, evas); 65 o = eo_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);
@@ -117,7 +117,7 @@ static void _loop(double t, int f)
117} 117}
118 118
119/* prepend special key handlers if interactive (before STD) */ 119/* prepend special key handlers if interactive (before STD) */
120static void _key(char *key) 120static void _key(const char *key)
121{ 121{
122 KEY_STD; 122 KEY_STD;
123} 123}
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index dcf8593..3c69564 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(EVAS_IMAGE_CLASS, evas); 65 o = eo_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);
@@ -109,7 +109,7 @@ static void _loop(double t, int f)
109} 109}
110 110
111/* prepend special key handlers if interactive (before STD) */ 111/* prepend special key handlers if interactive (before STD) */
112static void _key(char *key) 112static void _key(const char *key)
113{ 113{
114 KEY_STD; 114 KEY_STD;
115} 115}
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index 4f66149..1521e77 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(EVAS_IMAGE_CLASS, evas); 65 o = eo_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);
@@ -117,7 +117,7 @@ static void _loop(double t, int f)
117} 117}
118 118
119/* prepend special key handlers if interactive (before STD) */ 119/* prepend special key handlers if interactive (before STD) */
120static void _key(char *key) 120static void _key(const char *key)
121{ 121{
122 KEY_STD; 122 KEY_STD;
123} 123}
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index 10764ca..e6620a9 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(EVAS_IMAGE_CLASS, evas); 86 o = eo_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(EVAS_IMAGE_CLASS, evas); 93 o = eo_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);
@@ -139,7 +139,7 @@ static void _loop(double t, int f)
139} 139}
140 140
141/* prepend special key handlers if interactive (before STD) */ 141/* prepend special key handlers if interactive (before STD) */
142static void _key(char *key) 142static void _key(const char *key)
143{ 143{
144 KEY_STD; 144 KEY_STD;
145} 145}
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index ef6f415..780ed0a 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(EVAS_IMAGE_CLASS, evas); 86 o = eo_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(EVAS_IMAGE_CLASS, evas); 93 o = eo_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);
@@ -156,7 +156,7 @@ static void _loop(double t, int f)
156} 156}
157 157
158/* prepend special key handlers if interactive (before STD) */ 158/* prepend special key handlers if interactive (before STD) */
159static void _key(char *key) 159static void _key(const char *key)
160{ 160{
161 KEY_STD; 161 KEY_STD;
162} 162}
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index bc07eb8..9f6cdcc 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(EVAS_IMAGE_CLASS, evas); 86 o = eo_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(EVAS_IMAGE_CLASS, evas); 93 o = eo_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);
@@ -136,7 +136,7 @@ static void _loop(double t, int f)
136} 136}
137 137
138/* prepend special key handlers if interactive (before STD) */ 138/* prepend special key handlers if interactive (before STD) */
139static void _key(char *key) 139static void _key(const char *key)
140{ 140{
141 KEY_STD; 141 KEY_STD;
142} 142}
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index fde06e7..0d60f6e 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(EVAS_IMAGE_CLASS, evas); 86 o = eo_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(EVAS_IMAGE_CLASS, evas); 93 o = eo_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);
@@ -155,7 +155,7 @@ static void _loop(double t, int f)
155} 155}
156 156
157/* prepend special key handlers if interactive (before STD) */ 157/* prepend special key handlers if interactive (before STD) */
158static void _key(char *key) 158static void _key(const char *key)
159{ 159{
160 KEY_STD; 160 KEY_STD;
161} 161}