From 95d6a6cd9a390af5f603879cd56f030ef6842289 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 19 Jul 2016 18:21:56 +0900 Subject: [PATCH] Fix compilation for git master (1.18-alpha) --- src/bin/about.c | 10 +- src/bin/font_effect_blur_alpha.c | 2 +- src/bin/font_effect_blur_color.c | 2 +- src/bin/image_blend_border.c | 4 +- src/bin/image_blend_border_recolor.c | 4 +- src/bin/image_blend_fade_pow2_unscaled.c | 4 +- src/bin/image_blend_fade_unscaled.c | 4 +- src/bin/image_blend_many_smooth_same_scaled.c | 4 +- src/bin/image_blend_nearest_same_scaled.c | 4 +- src/bin/image_blend_nearest_scaled.c | 4 +- .../image_blend_nearest_solid_same_scaled.c | 4 +- src/bin/image_blend_nearest_solid_scaled.c | 4 +- src/bin/image_blend_occlude1.c | 4 +- src/bin/image_blend_occlude1_few.c | 4 +- src/bin/image_blend_occlude1_many.c | 4 +- src/bin/image_blend_occlude1_very_many.c | 4 +- src/bin/image_blend_occlude2.c | 4 +- src/bin/image_blend_occlude2_few.c | 4 +- src/bin/image_blend_occlude2_many.c | 4 +- src/bin/image_blend_occlude2_very_many.c | 4 +- src/bin/image_blend_occlude3.c | 4 +- src/bin/image_blend_occlude3_few.c | 4 +- src/bin/image_blend_occlude3_many.c | 4 +- src/bin/image_blend_occlude3_very_many.c | 4 +- src/bin/image_blend_smooth_same_scaled.c | 4 +- src/bin/image_blend_smooth_scaled.c | 4 +- .../image_blend_smooth_solid_same_scaled.c | 4 +- src/bin/image_blend_smooth_solid_scaled.c | 4 +- src/bin/image_blend_solid_border.c | 4 +- .../image_blend_solid_fade_pow2_unscaled.c | 4 +- src/bin/image_blend_solid_fade_unscaled.c | 4 +- src/bin/image_blend_solid_middle_border.c | 4 +- src/bin/image_blend_solid_middle_unscaled.c | 4 +- src/bin/image_blend_solid_unscaled.c | 4 +- src/bin/image_blend_unscaled.c | 4 +- src/bin/image_crossfade.c | 6 +- src/bin/image_data_argb.c | 4 +- src/bin/image_data_argb_alpha.c | 4 +- src/bin/image_data_ycbcr601pl.c | 4 +- ...data_ycbcr601pl_map_nearest_solid_rotate.c | 8 +- .../image_data_ycbcr601pl_map_solid_rotate.c | 8 +- src/bin/image_data_ycbcr601pl_wide_stride.c | 4 +- src/bin/image_map_3d_1.c | 8 +- src/bin/image_map_3d_2.c | 8 +- src/bin/image_map_3d_3.c | 8 +- src/bin/image_map_3d_4.c | 8 +- src/bin/image_map_3d_5.c | 8 +- src/bin/image_map_3d_6.c | 8 +- src/bin/image_map_3d_flow.c | 14 +-- .../image_map_color_alpha_nearest_rotate.c | 8 +- ...age_map_color_alpha_nearest_solid_rotate.c | 8 +- src/bin/image_map_color_alpha_rotate.c | 8 +- src/bin/image_map_color_alpha_solid_rotate.c | 8 +- src/bin/image_map_color_nearest_rotate.c | 8 +- .../image_map_color_nearest_solid_rotate.c | 8 +- src/bin/image_map_color_rotate.c | 8 +- src/bin/image_map_color_solid_rotate.c | 8 +- src/bin/image_map_nearest_rotate.c | 8 +- src/bin/image_map_nearest_solid_rotate.c | 8 +- src/bin/image_map_rotate.c | 8 +- src/bin/image_map_solid_rotate.c | 8 +- src/bin/image_mask.c | 8 +- src/bin/image_mask_10.c | 12 +- src/bin/image_mask_11.c | 12 +- src/bin/image_mask_12.c | 8 +- src/bin/image_mask_13.c | 8 +- src/bin/image_mask_2.c | 8 +- src/bin/image_mask_3.c | 8 +- src/bin/image_mask_4.c | 8 +- src/bin/image_mask_5.c | 8 +- src/bin/image_mask_6.c | 8 +- src/bin/image_mask_7.c | 8 +- src/bin/image_mask_8.c | 8 +- src/bin/image_mask_9.c | 12 +- src/bin/image_quality_scale.c | 4 +- src/bin/line_blend.c | 2 +- src/bin/poly_blend.c | 2 +- src/bin/proxy_image.c | 4 +- src/bin/proxy_image_offscreen.c | 4 +- src/bin/proxy_text_fixed.c | 2 +- src/bin/proxy_text_random.c | 2 +- src/bin/rect_blend.c | 2 +- src/bin/rect_blend_few.c | 2 +- src/bin/rect_blend_pow2.c | 2 +- src/bin/rect_blend_pow2_few.c | 2 +- src/bin/rect_solid.c | 2 +- src/bin/rect_solid_few.c | 2 +- src/bin/snapshot_widgets_file_icons.c | 4 +- src/bin/text_basic.c | 2 +- src/bin/text_change.c | 2 +- src/bin/text_styles.c | 2 +- src/bin/text_styles_different_strings.c | 2 +- src/bin/textblock_auto_align.c | 12 +- src/bin/textblock_basic.c | 10 +- src/bin/textblock_intl.c | 12 +- src/bin/textblock_text_append.c | 14 +-- src/bin/ui.c | 108 +++++++++--------- src/bin/ui.h | 2 +- src/bin/vg_basic_circle.c | 4 +- src/bin/vg_basic_gradient.c | 4 +- src/bin/vg_basic_rect.c | 4 +- src/bin/vg_scaled.c | 4 +- src/bin/widgets_file_icons.c | 4 +- src/bin/widgets_file_icons_2.c | 4 +- src/bin/widgets_file_icons_2_grouped.c | 4 +- src/bin/widgets_file_icons_2_same.c | 4 +- src/bin/widgets_file_icons_2_same_grouped.c | 4 +- src/bin/widgets_file_icons_3.c | 4 +- src/bin/widgets_file_icons_4.c | 4 +- src/bin/widgets_list_1.c | 4 +- src/bin/widgets_list_1_grouped.c | 4 +- src/bin/widgets_list_2.c | 4 +- src/bin/widgets_list_2_grouped.c | 4 +- src/bin/widgets_list_3.c | 6 +- src/bin/widgets_list_3_grouped.c | 6 +- src/bin/widgets_list_4.c | 6 +- src/bin/widgets_list_4_grouped.c | 6 +- 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) Evas_Object *o; Evas_Textblock_Style *st; - o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); + o = evas_object_textblock_add(evas); efl_gfx_position_set(o, 10, 40); efl_gfx_size_set(o, win_w - 20, win_h - 50); efl_gfx_visible_set(o, EINA_TRUE); @@ -21,9 +21,9 @@ _setup(void) "p='+ font=Vera font_size=10 align=left'" "/p='- \n \n'" ); - evas_obj_textblock_style_set(o, st); - evas_obj_textblock_clear(o); - evas_obj_textblock_text_markup_set + evas_object_textblock_style_set(o, st); + evas_object_textblock_clear(o); + evas_object_textblock_text_markup_set (o, "
" "Enlightenment used to be a window manager project, but " "since has changed a lot to become a miniature desktop and mobile " @@ -60,7 +60,7 @@ _loop(double t EINA_UNUSED, } static void -_key(char *key) +_key(const char *key) { if ((!strcmp(key, "Escape")) || (!strcmp(key, "q")) || (!strcmp(key, "Q"))) { 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("bar.png"), NULL); efl_image_border_set(o, 6, 6, 6, 6); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("pan.png"), NULL); efl_gfx_color_set(o, 64, 64, 64, 255); @@ -63,7 +63,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { int a; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -64,7 +64,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) for (i = 0; i < OBNUM; i++) { int a; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; a = rnd()&0xff; efl_file_set(o, build_path("logo.png"), NULL); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < MANYNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; n = rnd() % 100; w = 3 + ((n * (60 - 3)) / 100); @@ -64,7 +64,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_image_smooth_scale_set(o, 0); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_image_smooth_scale_set(o, 0); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_image_smooth_scale_set(o, 0); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_image_smooth_scale_set(o, 0); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i < (OBNUM / 2)) { @@ -75,7 +75,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i < (OBNUM / 2)) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i < (OBNUM / 2)) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i < (OBNUM / 2)) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i & 0x1) { @@ -75,7 +75,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i & 0x1) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i & 0x1) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i & 0x1) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i > (OBNUM / 2)) { @@ -75,7 +75,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i > (OBNUM / 2)) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i > (OBNUM / 2)) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; if (i > (OBNUM / 2)) { @@ -78,7 +78,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_image_smooth_scale_set(o, 1); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_image_smooth_scale_set(o, 1); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_image_smooth_scale_set(o, 1); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_image_smooth_scale_set(o, 1); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("frame.png"), NULL); efl_image_border_set(o, 8, 8, 8, 8); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { int a; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -64,7 +64,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { int a; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -63,7 +63,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("bar.png"), NULL); efl_image_border_set(o, 6, 6, 6, 6); @@ -63,7 +63,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -61,7 +61,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -59,7 +59,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -59,7 +59,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[0] = o; efl_file_set(o, build_path("im1.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); efl_gfx_size_set(o, 720, 420); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[1] = o; efl_file_set(o, build_path("im2.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -58,7 +58,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) pixels = malloc(sizeof (int) * 640 * 480); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); @@ -91,7 +91,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) pixels = malloc(sizeof (int) * 640 * 480); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 1); @@ -102,7 +102,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); @@ -104,7 +104,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); @@ -100,14 +100,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); @@ -98,14 +98,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); efl_gfx_buffer_alpha_set(o, 0); @@ -130,7 +130,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); @@ -130,8 +130,8 @@ _cube_pos(Cube *c, evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); if (evas_map_util_clockwise_get(m)) { - evas_obj_map_enable_set(c->side[i].o, 1); - evas_obj_map_set(c->side[i].o, m); + evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_set(c->side[i].o, m); efl_gfx_visible_set(c->side[i].o, EINA_TRUE); } else @@ -219,7 +219,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); @@ -128,8 +128,8 @@ _cube_pos(Cube *c, evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); if (evas_map_util_clockwise_get(m)) { - evas_obj_map_enable_set(c->side[i].o, 1); - evas_obj_map_set(c->side[i].o, m); + evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_set(c->side[i].o, m); efl_gfx_visible_set(c->side[i].o, EINA_TRUE); } else @@ -217,7 +217,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); @@ -128,8 +128,8 @@ _cube_pos(Cube *c, 255, 255, 255, 20, 20, 20); evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); - evas_obj_map_enable_set(c->side[i].o, 1); - evas_obj_map_set(c->side[i].o, m); + evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_set(c->side[i].o, m); order[i] = i; for (j = 0; j < 4; j++) @@ -211,7 +211,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); c->side[i].o = o; snprintf(buf, sizeof(buf), "cube%i.png", i + 1); efl_file_set(o, build_path(buf), NULL); @@ -126,8 +126,8 @@ _cube_pos(Cube *c, 255, 255, 255, 20, 20, 20); evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512); - evas_obj_map_enable_set(c->side[i].o, 1); - evas_obj_map_set(c->side[i].o, m); + evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_set(c->side[i].o, m); order[i] = i; for (j = 0; j < 4; j++) @@ -209,7 +209,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); c->side[i].o = o; snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); efl_file_set(o, build_path(buf), NULL); @@ -130,8 +130,8 @@ _cube_pos(Cube *c, evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); if (evas_map_util_clockwise_get(m)) { - evas_obj_map_enable_set(c->side[i].o, 1); - evas_obj_map_set(c->side[i].o, m); + evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_set(c->side[i].o, m); efl_gfx_visible_set(c->side[i].o, EINA_TRUE); } else @@ -199,7 +199,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Object *o; char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); c->side[i].o = o; snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); efl_file_set(o, build_path(buf), NULL); @@ -127,8 +127,8 @@ _cube_pos(Cube *c, evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720); if (evas_map_util_clockwise_get(m)) { - evas_obj_map_enable_set(c->side[i].o, 1); - evas_obj_map_set(c->side[i].o, m); + evas_object_map_enable_set(c->side[i].o, 1); + evas_object_map_set(c->side[i].o, m); efl_gfx_visible_set(c->side[i].o, EINA_TRUE); } else @@ -196,7 +196,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); efl_file_set(o, build_path(buf), NULL); @@ -38,7 +38,7 @@ static void _setup(void) efl_image_smooth_scale_set(o, 0); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_reflec[i] = o; snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); efl_file_set(o, build_path(buf), NULL); @@ -157,8 +157,8 @@ static void _loop(double t, int f) x + (w / 2), y + (h / 2), 0); evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); evas_map_point_coord_set (m, 0, x, yy, -z); evas_map_point_image_uv_set(m, 0, 0, 256); @@ -180,15 +180,15 @@ static void _loop(double t, int f) x + (w / 2), y + (h / 2), 0); evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); - evas_obj_map_enable_set(o_reflec[i], 1); - evas_obj_map_set(o_reflec[i], m); + evas_object_map_enable_set(o_reflec[i], 1); + evas_object_map_set(o_reflec[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -68,14 +68,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -68,14 +68,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -66,14 +66,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -65,14 +65,14 @@ static void _loop(double t, int f) evas_map_point_color_set(m, 3, 0, 0, 0, 0); evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -68,14 +68,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -68,14 +68,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -66,14 +66,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -66,14 +66,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -63,14 +63,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -63,14 +63,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -61,14 +61,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -61,14 +61,14 @@ static void _loop(double t, int f) evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i+= 2) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i + 1] = o; efl_file_set(o, build_path("e-logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_gfx_visible_set(o, EINA_TRUE); - evas_obj_clip_set(o_images[i], o); + evas_object_clip_set(o_images[i], o); } done = 0; } @@ -69,7 +69,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("texture.png"), NULL); efl_gfx_fill_set(o, 0, 0, win_w * 4, win_h * 4); efl_gfx_size_set(o, win_w * 4, win_h * 4); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -70,14 +70,14 @@ static void _loop(double t, int f) win_w * 4, win_h * 4, 0); evas_map_util_rotate(m, f, win_w / 2, win_h / 2); - evas_obj_map_enable_set(o_images[i], 1); - evas_obj_map_set(o_images[i], m); + evas_object_map_enable_set(o_images[i], 1); + evas_object_map_set(o_images[i], m); } FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -75,13 +75,13 @@ static void _loop(double t, int f) 720, 420, 0); evas_map_util_rotate(m, f, win_w / 2, win_h / 2); - evas_obj_map_enable_set(o_mask, 1); - evas_obj_map_set(o_mask, m); + evas_object_map_enable_set(o_mask, 1); + evas_object_map_set(o_mask, m); FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,13 +33,13 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_image_smooth_scale_set(o, 1); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -77,7 +77,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,13 +33,13 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_image_smooth_scale_set(o, 0); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -77,7 +77,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i+= 2) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("image.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i + 1] = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_gfx_visible_set(o, EINA_TRUE); - evas_obj_clip_set(o_images[i], o); + evas_object_clip_set(o_images[i], o); } done = 0; } @@ -69,7 +69,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < OBNUM; i+= 2) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i + 1] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_gfx_visible_set(o, EINA_TRUE); - evas_obj_clip_set(o_images[i], o); + evas_object_clip_set(o_images[i], o); } done = 0; } @@ -69,7 +69,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -71,7 +71,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -71,7 +71,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120 / 2, 160 / 2); efl_gfx_size_set(o, 120 / 2, 160 / 2); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -71,7 +71,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-2.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -76,7 +76,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("texture.png"), NULL); efl_gfx_fill_set(o, 0, 0, 500, 444); efl_gfx_size_set(o, win_w * 4, win_h * 4); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -71,7 +71,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_mask = o; efl_file_set(o, build_path("e-logo-mask.png"), NULL); efl_gfx_fill_set(o, 0, 0, 720, 420); @@ -33,12 +33,12 @@ static void _setup(void) for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("texture.png"), NULL); efl_gfx_fill_set(o, 0, 0, 500, 444); efl_gfx_size_set(o, win_w * 4, win_h * 4); - evas_obj_clip_set(o, o_mask); + evas_object_clip_set(o, o_mask); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -76,13 +76,13 @@ static void _loop(double t, int f) 720, 420, 0); evas_map_util_rotate(m, f, win_w / 2, win_h / 2); - evas_obj_map_enable_set(o_mask, 1); - evas_obj_map_set(o_mask, m); + evas_object_map_enable_set(o_mask, 1); + evas_object_map_set(o_mask, m); FPS_STD(NAME); } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path("tp.png"), NULL); efl_gfx_fill_set(o, 0, 0, 640, 480); @@ -62,7 +62,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o,*src; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); @@ -68,7 +68,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) int i; Evas_Object *o,*src; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_file_set(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); @@ -71,7 +71,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) { Evas_Coord tw, th, cent; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -162,7 +162,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; Evas_Textblock_Style *st; - o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); + o = evas_object_textblock_add(evas); o_text = o; st = evas_textblock_style_new(); evas_textblock_style_set (st, "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'" ); - evas_obj_textblock_style_set(o, st); \ - evas_obj_textblock_clear(o); \ - evas_obj_textblock_text_markup_set(o, "This is a test of auto alignment in Evas" + evas_object_textblock_style_set(o, st); \ + evas_object_textblock_clear(o); \ + evas_object_textblock_text_markup_set(o, "This is a test of auto alignment in Evas" "
" "This text should be left aligned" "\xE2\x80\x8FThis text should be right aligned" @@ -67,7 +67,7 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h, w0, h0; int i = 0; - evas_obj_textblock_size_native_get(o_text, &w0, &h0); + evas_object_textblock_size_native_get(o_text, &w0, &h0); w = w0; h = h0; w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0); @@ -80,7 +80,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; Evas_Textblock_Style *st; - o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); + o = evas_object_textblock_add(evas); o_text = o; st = evas_textblock_style_new(); evas_textblock_style_set @@ -39,9 +39,9 @@ static void _setup(void) "p='+ font=Vera,Kochi font_size=10 align=left'" "/p='- \n'" ); - evas_obj_textblock_style_set(o, st); - evas_obj_textblock_clear(o); - evas_obj_textblock_text_markup_set(o, "

Title


" + evas_object_textblock_style_set(o, st); + evas_object_textblock_clear(o); + evas_object_textblock_text_markup_set(o, "

Title


" "

A pragraph here red text and stuff.

" "

And escaping <, and >, as well as &, as

normal.

" "

If you want a newline use <, br>,
woo a new line!

" @@ -143,7 +143,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; Evas_Textblock_Style *st; - o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); + o = evas_object_textblock_add(evas); o_text = o; st = evas_textblock_style_new(); evas_textblock_style_set (st, "DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'" ); - evas_obj_textblock_style_set(o, st); - evas_obj_textblock_clear(o); - evas_obj_textblock_text_markup_set(o, "This is a test of International test rendering in Evas
" + evas_object_textblock_style_set(o, st); + evas_object_textblock_clear(o); + evas_object_textblock_text_markup_set(o, "This is a test of International test rendering in Evas
" "
" "Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'
" "German: 'Heizölrückstoßabdämpfung'
" @@ -99,7 +99,7 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h, w0, h0; int i = 0; - evas_obj_textblock_size_native_get(o_text, &w0, &h0); + evas_object_textblock_size_native_get(o_text, &w0, &h0); w = w0; h = h0; x = (win_w / 2) - (w / 2); @@ -113,7 +113,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; Evas_Textblock_Style *st; - o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); + o = evas_object_textblock_add(evas); o_text = o; st = evas_textblock_style_new(); evas_textblock_style_set (st, "DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'" ); - evas_obj_textblock_style_set(o, st); \ - evas_obj_textblock_clear(o); \ - evas_obj_textblock_text_markup_set(o, "This test just appends and removes text from different paragraphs, it's " + evas_object_textblock_style_set(o, st); \ + evas_object_textblock_clear(o); \ + evas_object_textblock_text_markup_set(o, "This test just appends and removes text from different paragraphs, it's " "not a very visual test, it's included for benchmarking purposes." "" "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) { Evas_Textblock_Cursor *cur; static Evas_Textblock_Cursor *cur2; - cur = evas_obj_textblock_cursor_get(o_text); + cur = evas_object_textblock_cursor_get(o_text); evas_textblock_cursor_text_append(cur, "*"); evas_textblock_cursor_char_delete(cur); @@ -119,7 +119,7 @@ static void _loop(double t, int f) if (!o_text) cur2 = NULL; if (!cur2) { - cur2 = evas_obj_textblock_cursor_new(o_text); + cur2 = evas_object_textblock_cursor_new(o_text); evas_textblock_cursor_paragraph_last(cur2); evas_textblock_cursor_paragraph_char_first(cur2); } @@ -132,7 +132,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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; static double p_fps = 0.0; -static void (*key_func) (char *key) = NULL; +static void (*key_func) (const char *key) = NULL; static void (*loop_func) (double t, int f) = NULL; double weights[] = @@ -255,73 +255,74 @@ _ui_select(void) if (func) func(); } -static Eina_Bool +static void _ui_key(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Key_Down *ev = event->info; + Efl_Event_Key *ev = event->info; + const char *keyname = efl_event_key_name_get(ev); + + if (!keyname) return; if (key_func) { - key_func(ev->keyname); - return EINA_TRUE; + key_func(keyname); + return; } - if ((!strcmp(ev->keyname, "Escape")) || - (!strcmp(ev->keyname, "q")) || - (!strcmp(ev->keyname, "Q"))) + if ((!strcmp(keyname, "Escape")) || + (!strcmp(keyname, "q")) || + (!strcmp(keyname, "Q"))) { _ui_exit(); + return; } + if (menu_active) { - if (!strcmp(ev->keyname, "Left")) menu_sel++; - else if (!strcmp(ev->keyname, "Right")) menu_sel--; - else if (!strcmp(ev->keyname, "Up")) menu_sel++; - else if (!strcmp(ev->keyname, "Down")) menu_sel--; - else if (!strcmp(ev->keyname, "Home")) menu_sel = eina_list_count(menu) - 1; - else if (!strcmp(ev->keyname, "End")) menu_sel = 0; - else if (!strcmp(ev->keyname, "Next")) menu_sel -= 10; - else if (!strcmp(ev->keyname, "Prior")) menu_sel += 10; + if (!strcmp(keyname, "Left")) menu_sel++; + else if (!strcmp(keyname, "Right")) menu_sel--; + else if (!strcmp(keyname, "Up")) menu_sel++; + else if (!strcmp(keyname, "Down")) menu_sel--; + else if (!strcmp(keyname, "Home")) menu_sel = eina_list_count(menu) - 1; + else if (!strcmp(keyname, "End")) menu_sel = 0; + else if (!strcmp(keyname, "Next")) menu_sel -= 10; + else if (!strcmp(keyname, "Prior")) menu_sel += 10; if (menu_sel < 0) menu_sel = 0; else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1; menu_anim_sel = menu_sel; - if (!strcmp(ev->keyname, "Return")) _ui_select(); + if (!strcmp(keyname, "Return")) _ui_select(); } - - return EINA_TRUE; } static Evas_Coord down_x, down_y; static int down_menu_sel = 0; -static Eina_Bool +static void _ui_mouse_down(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Mouse_Down *ev = event->info; + Efl_Event_Pointer *ev = event->info; - if (ev->button != 1) return EINA_TRUE; + if (efl_event_pointer_button_get(ev) != 1) return; if (menu_active) { - down_x = ev->canvas.x; - down_y = ev->canvas.y; + efl_event_pointer_position_get(ev, &down_x, &down_y); down_menu_sel = menu_sel; } - - return EINA_TRUE; } -static Eina_Bool +static void _ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Mouse_Up *ev = event->info; + Efl_Event_Pointer *ev = event->info; - if (ev->button != 1) return EINA_TRUE; + if (efl_event_pointer_button_get(ev) != 1) return; if (menu_active) { - Evas_Coord dx, dy; + Evas_Coord dx, dy, x, y; - dx = ev->canvas.x - down_x; - dy = ev->canvas.y - down_y; + efl_event_pointer_position_get(ev, &x, &y); + dx = x - down_x; + dy = y - down_y; if ((((dx * dx) + (dy * dy)) < (20 * 20)) && (menu_sel == down_menu_sel)) _ui_select(); @@ -331,27 +332,26 @@ _ui_mouse_up(void *data EINA_UNUSED, const Eo_Event *event) evas_event_feed_key_down(evas, "Escape", "Escape", NULL, NULL, 0, NULL); evas_event_feed_key_up(evas, "Escape", "Escape", NULL, NULL, 0, NULL); } - - return EINA_TRUE; } -static Eina_Bool +static void _ui_mouse_move(void *data EINA_UNUSED, const Eo_Event *event) { - Evas_Event_Mouse_Move *ev = event->info; + Efl_Event_Pointer *ev = event->info; - if (ev->buttons != 1) return EINA_TRUE; + if (efl_event_pointer_button_get(ev) != 1) return; if (menu_active) { - menu_sel = down_menu_sel + ((ev->cur.canvas.x - down_x) / 25); + Evas_Coord x; + + efl_event_pointer_position_get(ev, &x, NULL); + menu_sel = down_menu_sel + ((x - down_x) / 25); /* scroll */ if (menu_sel < 0) menu_sel = 0; else if ((unsigned int)menu_sel >= eina_list_count(menu)) menu_sel = eina_list_count(menu) - 1; menu_anim_sel = menu_sel; } - - return EINA_TRUE; } static void @@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test, Menu_Item *mi; mi = malloc(sizeof(Menu_Item)); - mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); + mi->o_icon = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_file_set(mi->o_icon, build_path(icon), NULL); efl_gfx_size_set(mi->o_icon, 32, 32); efl_gfx_fill_set(mi->o_icon, 0, 0, 32, 32); @@ -377,10 +377,10 @@ _ui_menu_item_full_add(Eina_Bool test, #define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func) EO_CALLBACKS_ARRAY_DEFINE(ui_callbacks, - { EVAS_OBJECT_EVENT_KEY_DOWN, _ui_key }, - { EVAS_OBJECT_EVENT_MOUSE_DOWN, _ui_mouse_down }, - { EVAS_OBJECT_EVENT_MOUSE_UP, _ui_mouse_up }, - { EVAS_OBJECT_EVENT_MOUSE_MOVE, _ui_mouse_move }); + { EFL_EVENT_KEY_DOWN, _ui_key }, + { EFL_EVENT_POINTER_DOWN, _ui_mouse_down }, + { EFL_EVENT_POINTER_UP, _ui_mouse_up }, + { EFL_EVENT_POINTER_MOVE, _ui_mouse_move }); void ui_setup(unsigned int ui_w, unsigned int ui_h) @@ -396,7 +396,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_gfx_size_set(o, win_w, win_h); efl_gfx_color_set(o, 0, 0, 0, 0); efl_gfx_stack_layer_set(o, 1000); - evas_obj_focus_set(o, 1); + evas_object_focus_set(o, 1); efl_gfx_visible_set(o, EINA_TRUE); eo_event_callback_array_add(o, ui_callbacks(), NULL); o_bg = o; @@ -414,7 +414,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_text_set(o, "EXPEDITE"); efl_gfx_stack_layer_set(o, 100); efl_gfx_color_set(o, 0, 0, 0, 100); - evas_obj_pass_events_set(o, 1); + evas_object_pass_events_set(o, 1); efl_gfx_size_get(o, &w, &h); x = (win_w - w) / 2; y = 0; @@ -427,7 +427,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); efl_gfx_stack_layer_set(o, 100); efl_gfx_color_set(o, 0, 0, 0, 60); - evas_obj_pass_events_set(o, 1); + evas_object_pass_events_set(o, 1); efl_gfx_size_get(o, &w, NULL); x = (win_w - w) / 2; y = h + 2; @@ -435,7 +435,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_gfx_visible_set(o, EINA_TRUE); o_byline = o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_gfx_position_set(o, (win_w - 120) / 2, ((win_h - 160) / 2)); efl_file_set(o, build_path("e-logo.png"), NULL); efl_gfx_fill_set(o, 0, 0, 120, 160); @@ -445,21 +445,21 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_gfx_visible_set(o, EINA_TRUE); o_menu_logo = o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_gfx_position_set(o, win_w - 128, - 128); efl_gfx_fill_set(o, 0, 0, 256, 256); efl_gfx_size_set(o, 256, 256); efl_gfx_visible_set(o, EINA_TRUE); o_menu_icon = o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_gfx_position_set(o, 0, 0); efl_file_set(o, build_path("icon_sel.png"), NULL); efl_gfx_size_set(o, 48, 48); efl_gfx_fill_set(o, 0, 0, 48, 48); o_menu_icon_sel = o; - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_gfx_position_set(o, 0, 0); efl_file_set(o, build_path("text_sel.png"), NULL); efl_gfx_size_set(o, 96, 32); @@ -471,7 +471,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_text_properties_font_set(o, "Vera", 10); efl_text_set(o, ""); efl_gfx_color_set(o, 0, 0, 0, 100); - evas_obj_pass_events_set(o, 1); + evas_object_pass_events_set(o, 1); efl_gfx_size_get(o, &w, &h); x = (win_w - w) / 2; y = (win_h - h) / 2; @@ -652,7 +652,7 @@ ui_menu(void) } void -ui_func_set(void (*kfunc) (char *key), void (*lfunc) (double t, int f)) +ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f)) { key_func = kfunc; 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[]; void ui_setup(unsigned int ui_w, unsigned int ui_h); Eina_Bool ui_loop(void *data); void ui_menu(void); -void ui_func_set(void (*kfunc) (char *key), void (*lfunc) (double t, int f)); +void ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f)); void ui_fps(double fps); void ui_num(int n); void 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) efl_gfx_position_set(vector, 0, 0); efl_gfx_visible_set(vector, EINA_TRUE); - root = evas_obj_vg_root_node_get(vector); + root = evas_object_vg_root_node_get(vector); circle = eo_add(EFL_VG_SHAPE_CLASS, root); efl_gfx_shape_append_circle(circle, r + stroke_w, r + stroke_w, r); @@ -72,7 +72,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) efl_gfx_position_set(vector, 0, 0); efl_gfx_visible_set(vector, EINA_TRUE); - root = evas_obj_vg_root_node_get(vector); + root = evas_object_vg_root_node_get(vector); gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL); efl_gfx_gradient_stop_set(gradient, stops, 3); @@ -85,7 +85,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) efl_gfx_position_set(vector, 0, 0); efl_gfx_visible_set(vector, EINA_TRUE); - root = evas_obj_vg_root_node_get(vector); + root = evas_object_vg_root_node_get(vector); rect = eo_add(EFL_VG_SHAPE_CLASS, root); 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) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) efl_gfx_position_set(vector, 0, 0); efl_gfx_visible_set(vector, EINA_TRUE); - root = evas_obj_vg_root_node_get(vector); + root = evas_object_vg_root_node_get(vector); o_gradient[i] = gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL); efl_gfx_gradient_stop_set(gradient, stops, 3); @@ -101,7 +101,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -100,7 +100,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -98,7 +98,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -107,7 +107,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 1]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -83,7 +83,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 1]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -87,7 +87,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -98,7 +98,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_set(o, build_path(icons[i % 13]), NULL); efl_gfx_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE); @@ -98,7 +98,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); @@ -109,7 +109,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); @@ -117,7 +117,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); @@ -109,7 +109,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); @@ -117,7 +117,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); @@ -139,7 +139,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); @@ -156,7 +156,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); @@ -136,7 +136,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; } 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) Evas_Object *o; for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path("pan.png"), NULL); efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_IMAGE_CLASS, evas); + o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; efl_image_border_set(o, 2, 2, 2, 2); efl_file_set(o, build_path(icons[i % 13]), NULL); @@ -155,7 +155,7 @@ static void _loop(double t, int f) } /* prepend special key handlers if interactive (before STD) */ -static void _key(char *key) +static void _key(const char *key) { KEY_STD; }