From 74007f65bca31abd3f0a7aad67829f62397c3877 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 26 May 2016 18:29:05 +0900 Subject: [PATCH] Fix compilation - use eo_unref and buffer map Remove eo api usage for TEXT and LINE objects. This is a very quickly made patch, in order to test. Expedite tests might need to be fixed up a little bit more if we use eo_halt. Running expedite spews out TONS of errors. --- src/bin/about.c | 2 +- src/bin/image_blend_border.c | 2 +- src/bin/image_blend_border_recolor.c | 2 +- src/bin/image_blend_fade_pow2_unscaled.c | 2 +- src/bin/image_blend_fade_unscaled.c | 2 +- src/bin/image_blend_many_smooth_same_scaled.c | 2 +- src/bin/image_blend_nearest_same_scaled.c | 2 +- src/bin/image_blend_nearest_scaled.c | 2 +- src/bin/image_blend_nearest_solid_same_scaled.c | 2 +- src/bin/image_blend_nearest_solid_scaled.c | 2 +- src/bin/image_blend_occlude1.c | 2 +- src/bin/image_blend_occlude1_few.c | 2 +- src/bin/image_blend_occlude1_many.c | 2 +- src/bin/image_blend_occlude1_very_many.c | 2 +- src/bin/image_blend_occlude2.c | 2 +- src/bin/image_blend_occlude2_few.c | 2 +- src/bin/image_blend_occlude2_many.c | 2 +- src/bin/image_blend_occlude2_very_many.c | 2 +- src/bin/image_blend_occlude3.c | 2 +- src/bin/image_blend_occlude3_few.c | 2 +- src/bin/image_blend_occlude3_many.c | 2 +- src/bin/image_blend_occlude3_very_many.c | 2 +- src/bin/image_blend_smooth_same_scaled.c | 2 +- src/bin/image_blend_smooth_scaled.c | 2 +- src/bin/image_blend_smooth_solid_same_scaled.c | 2 +- src/bin/image_blend_smooth_solid_scaled.c | 2 +- src/bin/image_blend_solid_border.c | 2 +- src/bin/image_blend_solid_fade_pow2_unscaled.c | 2 +- src/bin/image_blend_solid_fade_unscaled.c | 2 +- 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 | 2 +- src/bin/image_blend_unscaled.c | 2 +- src/bin/image_crossfade.c | 2 +- src/bin/image_data_argb.c | 15 ++++++++++++--- src/bin/image_data_argb_alpha.c | 16 ++++++++++++---- src/bin/image_data_ycbcr601pl.c | 4 +--- ...ge_data_ycbcr601pl_map_nearest_solid_rotate.c | 9 +++++---- src/bin/image_data_ycbcr601pl_map_solid_rotate.c | 9 +++++---- src/bin/image_data_ycbcr601pl_wide_stride.c | 10 +++++----- src/bin/image_map_3d_1.c | 2 +- src/bin/image_map_3d_2.c | 2 +- src/bin/image_map_3d_3.c | 2 +- src/bin/image_map_3d_4.c | 2 +- src/bin/image_map_3d_5.c | 2 +- src/bin/image_map_3d_6.c | 2 +- src/bin/image_map_3d_flow.c | 4 ++-- src/bin/image_map_color_alpha_nearest_rotate.c | 2 +- .../image_map_color_alpha_nearest_solid_rotate.c | 2 +- src/bin/image_map_color_alpha_rotate.c | 2 +- src/bin/image_map_color_alpha_solid_rotate.c | 2 +- src/bin/image_map_color_nearest_rotate.c | 2 +- src/bin/image_map_color_nearest_solid_rotate.c | 2 +- src/bin/image_map_color_rotate.c | 2 +- src/bin/image_map_color_solid_rotate.c | 2 +- src/bin/image_map_nearest_rotate.c | 2 +- src/bin/image_map_nearest_solid_rotate.c | 2 +- src/bin/image_map_rotate.c | 2 +- src/bin/image_map_solid_rotate.c | 2 +- src/bin/image_mask.c | 2 +- src/bin/image_mask_10.c | 4 ++-- src/bin/image_mask_11.c | 4 ++-- src/bin/image_mask_12.c | 4 ++-- src/bin/image_mask_13.c | 4 ++-- src/bin/image_mask_2.c | 2 +- src/bin/image_mask_3.c | 2 +- src/bin/image_mask_4.c | 4 ++-- src/bin/image_mask_5.c | 4 ++-- src/bin/image_mask_6.c | 4 ++-- src/bin/image_mask_7.c | 4 ++-- src/bin/image_mask_8.c | 4 ++-- src/bin/image_mask_9.c | 4 ++-- src/bin/image_quality_scale.c | 2 +- src/bin/line_blend.c | 10 +++++----- src/bin/poly_blend.c | 2 +- src/bin/proxy_image.c | 2 +- src/bin/proxy_image_offscreen.c | 2 +- src/bin/proxy_text_fixed.c | 14 +++++++------- src/bin/proxy_text_random.c | 4 ++-- 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 | 12 ++++++------ src/bin/text_basic.c | 4 ++-- src/bin/text_change.c | 4 ++-- src/bin/text_styles.c | 14 +++++++------- src/bin/text_styles_different_strings.c | 14 +++++++------- src/bin/textblock_auto_align.c | 2 +- src/bin/textblock_basic.c | 2 +- src/bin/textblock_intl.c | 2 +- src/bin/textblock_text_append.c | 2 +- src/bin/ui.c | 6 +++--- src/bin/vg_basic_circle.c | 2 +- src/bin/vg_basic_gradient.c | 2 +- src/bin/vg_basic_rect.c | 2 +- src/bin/vg_scaled.c | 2 +- src/bin/widgets_file_icons.c | 10 +++++----- src/bin/widgets_file_icons_2.c | 6 +++--- src/bin/widgets_file_icons_2_grouped.c | 6 +++--- src/bin/widgets_file_icons_2_same.c | 6 +++--- src/bin/widgets_file_icons_2_same_grouped.c | 6 +++--- src/bin/widgets_file_icons_3.c | 6 +++--- src/bin/widgets_file_icons_4.c | 6 +++--- src/bin/widgets_list_1.c | 6 +++--- src/bin/widgets_list_1_grouped.c | 6 +++--- src/bin/widgets_list_2.c | 6 +++--- src/bin/widgets_list_2_grouped.c | 6 +++--- src/bin/widgets_list_3.c | 8 ++++---- src/bin/widgets_list_3_grouped.c | 8 ++++---- src/bin/widgets_list_4.c | 8 ++++---- src/bin/widgets_list_4_grouped.c | 8 ++++---- 114 files changed, 229 insertions(+), 212 deletions(-) diff --git a/src/bin/about.c b/src/bin/about.c index f225b4a..4d0339b 100644 --- a/src/bin/about.c +++ b/src/bin/about.c @@ -49,7 +49,7 @@ _setup(void) static void _cleanup(void) { - eo_del(o_text); + eo_unref(o_text); o_text = NULL; } diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c index 9056755..2e35a8b 100644 --- a/src/bin/image_blend_border.c +++ b/src/bin/image_blend_border.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c index 37a8304..670b40a 100644 --- a/src/bin/image_blend_border_recolor.c +++ b/src/bin/image_blend_border_recolor.c @@ -37,7 +37,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c index 48964bf..fd5d793 100644 --- a/src/bin/image_blend_fade_pow2_unscaled.c +++ b/src/bin/image_blend_fade_pow2_unscaled.c @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c index 479e133..c10accf 100644 --- a/src/bin/image_blend_fade_unscaled.c +++ b/src/bin/image_blend_fade_unscaled.c @@ -40,7 +40,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c index 7fb6d5e..f2d2334 100644 --- a/src/bin/image_blend_many_smooth_same_scaled.c +++ b/src/bin/image_blend_many_smooth_same_scaled.c @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]); + for (i = 0; i < MANYNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c index 46dc638..6016309 100644 --- a/src/bin/image_blend_nearest_same_scaled.c +++ b/src/bin/image_blend_nearest_same_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c index 43b0fa1..f43c1c8 100644 --- a/src/bin/image_blend_nearest_scaled.c +++ b/src/bin/image_blend_nearest_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c index 99fad1c..a5747b1 100644 --- a/src/bin/image_blend_nearest_solid_same_scaled.c +++ b/src/bin/image_blend_nearest_solid_same_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c index 561c52d..e45f7e3 100644 --- a/src/bin/image_blend_nearest_solid_scaled.c +++ b/src/bin/image_blend_nearest_solid_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c index 1a7c59d..3df5023 100644 --- a/src/bin/image_blend_occlude1.c +++ b/src/bin/image_blend_occlude1.c @@ -50,7 +50,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c index bec28f5..c4f9679 100644 --- a/src/bin/image_blend_occlude1_few.c +++ b/src/bin/image_blend_occlude1_few.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c index 00c988b..8d82f27 100644 --- a/src/bin/image_blend_occlude1_many.c +++ b/src/bin/image_blend_occlude1_many.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c index 65f7b77..b6cdd97 100644 --- a/src/bin/image_blend_occlude1_very_many.c +++ b/src/bin/image_blend_occlude1_very_many.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c index 7853fcd..7df3447 100644 --- a/src/bin/image_blend_occlude2.c +++ b/src/bin/image_blend_occlude2.c @@ -50,7 +50,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c index 4d5668d..bddcdb6 100644 --- a/src/bin/image_blend_occlude2_few.c +++ b/src/bin/image_blend_occlude2_few.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c index b5e643a..cbf2204 100644 --- a/src/bin/image_blend_occlude2_many.c +++ b/src/bin/image_blend_occlude2_many.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c index 3db2b7f..39f527c 100644 --- a/src/bin/image_blend_occlude2_very_many.c +++ b/src/bin/image_blend_occlude2_very_many.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c index 6c60261..9f517c8 100644 --- a/src/bin/image_blend_occlude3.c +++ b/src/bin/image_blend_occlude3.c @@ -50,7 +50,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c index daf4e68..b4a5514 100644 --- a/src/bin/image_blend_occlude3_few.c +++ b/src/bin/image_blend_occlude3_few.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c index 9485048..4f2f13e 100644 --- a/src/bin/image_blend_occlude3_many.c +++ b/src/bin/image_blend_occlude3_many.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c index 2b1423f..a02faf1 100644 --- a/src/bin/image_blend_occlude3_very_many.c +++ b/src/bin/image_blend_occlude3_very_many.c @@ -53,7 +53,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c index a71d5dc..67e432d 100644 --- a/src/bin/image_blend_smooth_same_scaled.c +++ b/src/bin/image_blend_smooth_same_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c index f6ccf32..350d581 100644 --- a/src/bin/image_blend_smooth_scaled.c +++ b/src/bin/image_blend_smooth_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c index 54512d1..627466a 100644 --- a/src/bin/image_blend_smooth_solid_same_scaled.c +++ b/src/bin/image_blend_smooth_solid_same_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c index 6e3078a..837042a 100644 --- a/src/bin/image_blend_smooth_solid_scaled.c +++ b/src/bin/image_blend_smooth_solid_scaled.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c index b58670f..203e221 100644 --- a/src/bin/image_blend_solid_border.c +++ b/src/bin/image_blend_solid_border.c @@ -36,7 +36,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c index 74cf9ba..6b32d15 100644 --- a/src/bin/image_blend_solid_fade_pow2_unscaled.c +++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c index a0f35d4..ac46144 100644 --- a/src/bin/image_blend_solid_fade_unscaled.c +++ b/src/bin/image_blend_solid_fade_unscaled.c @@ -41,7 +41,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c index b80e615..0634837 100644 --- a/src/bin/image_blend_solid_middle_border.c +++ b/src/bin/image_blend_solid_middle_border.c @@ -27,7 +27,7 @@ static void _setup(void) o_images[i] = o; efl_file_set(o, build_path("bar.png"), NULL); efl_image_border_set(o, 6, 6, 6, 6); - efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); + efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -37,7 +37,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c index 8a2aecd..8051027 100644 --- a/src/bin/image_blend_solid_middle_unscaled.c +++ b/src/bin/image_blend_solid_middle_unscaled.c @@ -29,7 +29,7 @@ static void _setup(void) efl_gfx_fill_set(o, 0, 0, 120, 160); efl_gfx_size_set(o, 120, 160); efl_image_border_set(o, 43, 48, 48, 83); - efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); + efl_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c index 7ad5f02..e731cc4 100644 --- a/src/bin/image_blend_solid_unscaled.c +++ b/src/bin/image_blend_solid_unscaled.c @@ -37,7 +37,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c index 139f565..32185dc 100644 --- a/src/bin/image_blend_unscaled.c +++ b/src/bin/image_blend_unscaled.c @@ -37,7 +37,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c index 2345130..e797a8d 100644 --- a/src/bin/image_crossfade.c +++ b/src/bin/image_crossfade.c @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 2; i++) eo_del(o_images[i]); + for (i = 0; i < 2; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c index 25666fc..cad0095 100644 --- a/src/bin/image_data_argb.c +++ b/src/bin/image_data_argb.c @@ -44,7 +44,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); } /* loop - do things */ @@ -55,6 +55,7 @@ static void _loop(double t, int f) for (i = 0; i < 1; i++) { unsigned int *data, *p; + int length; w = 640; h = 480; @@ -63,7 +64,15 @@ static void _loop(double t, int f) efl_gfx_position_set(o_images[i], x, y); efl_gfx_size_set(o_images[i], w, h); efl_gfx_fill_set(o_images[i], 0, 0, w, h); - data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL); + data = efl_gfx_buffer_map(o_images[i], &length, + EFL_GFX_BUFFER_ACCESS_MODE_WRITE, + 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, + &st); + if (!data) + { + fprintf(stderr, "ERROR: Failed to map image!\n"); + continue; + } st = st >> 2; p = data; for (y = 0; y < h; y++) @@ -75,7 +84,7 @@ static void _loop(double t, int f) } p += (st - w); } - efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888); + efl_gfx_buffer_unmap(o_images[i], data, length); efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); } FPS_STD(NAME); diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c index 6eb8662..a59f812 100644 --- a/src/bin/image_data_argb_alpha.c +++ b/src/bin/image_data_argb_alpha.c @@ -44,7 +44,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); } /* loop - do things */ @@ -55,7 +55,7 @@ static void _loop(double t, int f) for (i = 0; i < 1; i++) { unsigned int *data, *p; - int a, r, g, b; + int a, r, g, b, length; w = 640; h = 480; @@ -64,7 +64,15 @@ static void _loop(double t, int f) efl_gfx_position_set(o_images[i], x, y); efl_gfx_size_set(o_images[i], w, h); efl_gfx_fill_set(o_images[i], 0, 0, w, h); - data = efl_gfx_buffer_get(o_images[i], 1, &w, &h, &st, NULL); + data = efl_gfx_buffer_map(o_images[i], &length, + EFL_GFX_BUFFER_ACCESS_MODE_WRITE, + 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, + &st); + if (!data) + { + fprintf(stderr, "ERROR: Failed to map image!\n"); + continue; + } st = st >> 2; p = data; for (y = 0; y < h; y++) @@ -87,7 +95,7 @@ static void _loop(double t, int f) } p += (st - w); } - efl_gfx_buffer_set(o_images[i], data, w, h, st << 2, EFL_GFX_COLORSPACE_ARGB8888); + efl_gfx_buffer_unmap(o_images[i], data, length); efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); } FPS_STD(NAME); diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c index f28ef97..b13d57f 100644 --- a/src/bin/image_data_ycbcr601pl.c +++ b/src/bin/image_data_ycbcr601pl.c @@ -27,8 +27,6 @@ static void _setup(void) Evas_Object *o; for (i = 0; i < 1; i++) { - unsigned int length; - o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); @@ -79,7 +77,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); // FIXME: the object is not destroyed anymore so we can't free the data /* free(yp); */ /* free(up); */ diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c index e132e77..198a155 100644 --- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c @@ -27,8 +27,6 @@ static void _setup(void) Evas_Object *o; for (i = 0; i < 1; i++) { - unsigned int length; - o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); @@ -65,7 +63,10 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); + efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL); + free(yp); + free(up); + free(vp); } done = 0; } @@ -74,7 +75,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); /* free(yp); */ /* free(up); */ /* free(vp); */ diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c index 28dd6c8..3670511 100644 --- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c @@ -27,8 +27,6 @@ static void _setup(void) Evas_Object *o; for (i = 0; i < 1; i++) { - unsigned int length; - o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); @@ -64,7 +62,10 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); + efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL); + free(yp); + free(up); + free(vp); } done = 0; } @@ -73,7 +74,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); /* free(yp); */ /* free(up); */ /* free(vp); */ diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c index 4599260..059e17f 100644 --- a/src/bin/image_data_ycbcr601pl_wide_stride.c +++ b/src/bin/image_data_ycbcr601pl_wide_stride.c @@ -27,8 +27,6 @@ static void _setup(void) Evas_Object *o; for (i = 0; i < 1; i++) { - unsigned int length; - o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC); @@ -64,8 +62,11 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); + efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL); efl_gfx_buffer_update_add(o_images[i], 0, 0, 320, 480); + free(yp); + free(up); + free(vp); } done = 0; } @@ -74,7 +75,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); /* free(yp); */ /* free(up); */ /* free(vp); */ @@ -88,7 +89,6 @@ static void _loop(double t, int f) for (i = 0; i < 1; i++) { unsigned char **data, **lp; - int stride; w = 640; h = 480; diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c index 03f0986..885a902 100644 --- a/src/bin/image_map_3d_1.c +++ b/src/bin/image_map_3d_1.c @@ -171,7 +171,7 @@ _cube_free(Cube *c) { int i; - for (i = 0; i < 6; i++) eo_del(c->side[i].o); + for (i = 0; i < 6; i++) eo_unref(c->side[i].o); free(c); } diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c index e925987..27e24ab 100644 --- a/src/bin/image_map_3d_2.c +++ b/src/bin/image_map_3d_2.c @@ -169,7 +169,7 @@ _cube_free(Cube *c) { int i; - for (i = 0; i < 6; i++) eo_del(c->side[i].o); + for (i = 0; i < 6; i++) eo_unref(c->side[i].o); free(c); } diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c index c7acb0f..aa42e60 100644 --- a/src/bin/image_map_3d_3.c +++ b/src/bin/image_map_3d_3.c @@ -163,7 +163,7 @@ _cube_free(Cube *c) { int i; - for (i = 0; i < 6; i++) eo_del(c->side[i].o); + for (i = 0; i < 6; i++) eo_unref(c->side[i].o); free(c); } diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c index 3ccf903..4c62ba3 100644 --- a/src/bin/image_map_3d_4.c +++ b/src/bin/image_map_3d_4.c @@ -161,7 +161,7 @@ _cube_free(Cube *c) { int i; - for (i = 0; i < 6; i++) eo_del(c->side[i].o); + for (i = 0; i < 6; i++) eo_unref(c->side[i].o); free(c); } diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c index 529104c..eb62b87 100644 --- a/src/bin/image_map_3d_5.c +++ b/src/bin/image_map_3d_5.c @@ -171,7 +171,7 @@ _cube_free(Cube *c) { int i; - for (i = 0; i < 6; i++) eo_del(c->side[i].o); + for (i = 0; i < 6; i++) eo_unref(c->side[i].o); free(c); } diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c index a6c84cf..64ac13b 100644 --- a/src/bin/image_map_3d_6.c +++ b/src/bin/image_map_3d_6.c @@ -168,7 +168,7 @@ _cube_free(Cube *c) { int i; - for (i = 0; i < 6; i++) eo_del(c->side[i].o); + for (i = 0; i < 6; i++) eo_unref(c->side[i].o); free(c); } diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c index 6f60976..caf77cb 100644 --- a/src/bin/image_map_3d_flow.c +++ b/src/bin/image_map_3d_flow.c @@ -56,8 +56,8 @@ static void _cleanup(void) int i; for (i = 0; i < CNUM; i++) { - eo_del(o_images[i]); - eo_del(o_reflec[i]); + eo_unref(o_images[i]); + eo_unref(o_reflec[i]); } } diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c index c59442b..8c36070 100644 --- a/src/bin/image_map_color_alpha_nearest_rotate.c +++ b/src/bin/image_map_color_alpha_nearest_rotate.c @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c index 230bf90..74463cc 100644 --- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c +++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c index 7483e2e..1e36963 100644 --- a/src/bin/image_map_color_alpha_rotate.c +++ b/src/bin/image_map_color_alpha_rotate.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c index 075a10a..542c3c3 100644 --- a/src/bin/image_map_color_alpha_solid_rotate.c +++ b/src/bin/image_map_color_alpha_solid_rotate.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c index e1b0038..c6582ab 100644 --- a/src/bin/image_map_color_nearest_rotate.c +++ b/src/bin/image_map_color_nearest_rotate.c @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c index c776155..a6445d9 100644 --- a/src/bin/image_map_color_nearest_solid_rotate.c +++ b/src/bin/image_map_color_nearest_solid_rotate.c @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c index 2f5053c..00aae66 100644 --- a/src/bin/image_map_color_rotate.c +++ b/src/bin/image_map_color_rotate.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c index ad7690e..1931a5e 100644 --- a/src/bin/image_map_color_solid_rotate.c +++ b/src/bin/image_map_color_solid_rotate.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c index ead9e9b..caebe5f 100644 --- a/src/bin/image_map_nearest_rotate.c +++ b/src/bin/image_map_nearest_rotate.c @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c index 08f4db2..6abafa1 100644 --- a/src/bin/image_map_nearest_solid_rotate.c +++ b/src/bin/image_map_nearest_solid_rotate.c @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c index 2289781..1dab593 100644 --- a/src/bin/image_map_rotate.c +++ b/src/bin/image_map_rotate.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c index 38302b2..411e263 100644 --- a/src/bin/image_map_solid_rotate.c +++ b/src/bin/image_map_solid_rotate.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); + for (i = 0; i < (OBNUM / 2); i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c index b757324..49eaa2e 100644 --- a/src/bin/image_mask.c +++ b/src/bin/image_mask.c @@ -46,7 +46,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c index 03862d8..0c12a17 100644 --- a/src/bin/image_mask_10.c +++ b/src/bin/image_mask_10.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c index eadacb4..fd5a997 100644 --- a/src/bin/image_mask_11.c +++ b/src/bin/image_mask_11.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c index bba8768..f989405 100644 --- a/src/bin/image_mask_12.c +++ b/src/bin/image_mask_12.c @@ -49,8 +49,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c index 979b0a0..aa1ffcb 100644 --- a/src/bin/image_mask_13.c +++ b/src/bin/image_mask_13.c @@ -49,8 +49,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c index db87b90..23bce11 100644 --- a/src/bin/image_mask_2.c +++ b/src/bin/image_mask_2.c @@ -46,7 +46,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c index a3075af..d89f99a 100644 --- a/src/bin/image_mask_3.c +++ b/src/bin/image_mask_3.c @@ -46,7 +46,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c index 90ab4b5..e2f2087 100644 --- a/src/bin/image_mask_4.c +++ b/src/bin/image_mask_4.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c index 53fa584..f30e882 100644 --- a/src/bin/image_mask_5.c +++ b/src/bin/image_mask_5.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c index 8e5684d..054608a 100644 --- a/src/bin/image_mask_6.c +++ b/src/bin/image_mask_6.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c index 13c8d76..c33f6e9 100644 --- a/src/bin/image_mask_7.c +++ b/src/bin/image_mask_7.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c index b31c624..f57de30 100644 --- a/src/bin/image_mask_8.c +++ b/src/bin/image_mask_8.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c index 9289952..35004dd 100644 --- a/src/bin/image_mask_9.c +++ b/src/bin/image_mask_9.c @@ -48,8 +48,8 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); - eo_del(o_mask); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); + eo_unref(o_mask); } /* loop - do things */ diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c index 34f61fc..4a25fc0 100644 --- a/src/bin/image_quality_scale.c +++ b/src/bin/image_quality_scale.c @@ -38,7 +38,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < 1; i++) eo_del(o_images[i]); + for (i = 0; i < 1; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c index 9deeb18..c4c635d 100644 --- a/src/bin/line_blend.c +++ b/src/bin/line_blend.c @@ -26,14 +26,14 @@ static void _setup(void) { int r, g, b, a; - o = eo_add(EVAS_LINE_CLASS, evas); + o = evas_object_line_add(evas); o_images[i] = o; a = (rnd()&0xff) / 2; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; efl_gfx_color_set(o, r, g, b, a); - evas_obj_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)); + evas_object_line_xy_set(o, ((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)); efl_gfx_visible_set(o, EINA_TRUE); @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } #define PI (double) 3.141592654 @@ -87,11 +87,11 @@ static void _loop(double t, int f) for (i = 0; i < OBNUM; i++) { o = o_images[i]; - evas_obj_line_xy_get(o, &ox1, &oy1, &ox2, &oy2); + evas_object_line_xy_get(o, &ox1, &oy1, &ox2, &oy2); _rotate_point(&ox1, &oy1, i); _rotate_point(&ox2, &oy2, i); - evas_obj_line_xy_set(o, ox1, oy1, ox2, oy2); + evas_object_line_xy_set(o, ox1, oy1, ox2, oy2); } FPS_STD(NAME); } diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c index 5fbadf5..b25d0f7 100644 --- a/src/bin/poly_blend.c +++ b/src/bin/poly_blend.c @@ -85,7 +85,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c index e3ba82a..e5dc63c 100644 --- a/src/bin/proxy_image.c +++ b/src/bin/proxy_image.c @@ -46,7 +46,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c index 626b7d0..0028ad7 100644 --- a/src/bin/proxy_image_offscreen.c +++ b/src/bin/proxy_image_offscreen.c @@ -49,7 +49,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c index 01ce228..75bb523 100644 --- a/src/bin/proxy_text_fixed.c +++ b/src/bin/proxy_text_fixed.c @@ -27,16 +27,16 @@ static void _setup(void) st = EVAS_TEXT_STYLE_SHADOW; for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++) { - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 20); efl_text_set(o, "This is a test string"); - evas_obj_text_style_set(o, st); + evas_object_text_style_set(o, st); efl_gfx_color_set(o, 255, 255, 255, 255); - evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); - evas_obj_text_glow_color_set(o, 100, 80, 40, 100); - evas_obj_text_glow2_color_set(o, 50, 10, 5, 50); - evas_obj_text_outline_color_set(o, 0, 0, 0, 255); + evas_object_text_shadow_color_set(o, 0, 0, 0, 24); + evas_object_text_glow_color_set(o, 100, 80, 40, 100); + evas_object_text_glow2_color_set(o, 50, 10, 5, 50); + evas_object_text_outline_color_set(o, 0, 0, 0, 255); efl_gfx_visible_set(o, EINA_TRUE); st++; } @@ -62,7 +62,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c index 0d58c4a..34a39aa 100644 --- a/src/bin/proxy_text_random.c +++ b/src/bin/proxy_text_random.c @@ -30,7 +30,7 @@ static void _setup(void) "Fiddly", "Family", "Lair", "Monkeys", "Magazine" }; srnd(); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[0] = o; snprintf(buf, sizeof(buf), "%s %s %s %s.", strs[rnd() % (sizeof(strs) / sizeof(char *))], @@ -71,7 +71,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c index 51dcaf6..8471b04 100644 --- a/src/bin/rect_blend.c +++ b/src/bin/rect_blend.c @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c index fac3244..b8bd673 100644 --- a/src/bin/rect_blend_few.c +++ b/src/bin/rect_blend_few.c @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c index 31fef38..735226e 100644 --- a/src/bin/rect_blend_pow2.c +++ b/src/bin/rect_blend_pow2.c @@ -43,7 +43,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c index 214602b..a26fb6b 100644 --- a/src/bin/rect_blend_pow2_few.c +++ b/src/bin/rect_blend_pow2_few.c @@ -46,7 +46,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c index fbd2d46..8e976b7 100644 --- a/src/bin/rect_solid.c +++ b/src/bin/rect_solid.c @@ -42,7 +42,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c index 568c011..af98b49 100644 --- a/src/bin/rect_solid_few.c +++ b/src/bin/rect_solid_few.c @@ -45,7 +45,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_images[i]); } /* loop - do things */ diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c index dbdab77..dd4867d 100644 --- a/src/bin/snapshot_widgets_file_icons.c +++ b/src/bin/snapshot_widgets_file_icons.c @@ -62,13 +62,13 @@ static void _setup(void) efl_gfx_position_set(o, x + 8, y); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); - evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); + evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); efl_gfx_color_set(o, 255, 255, 255, 255); - evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); + evas_object_text_shadow_color_set(o, 0, 0, 0, 24); efl_gfx_visible_set(o, EINA_TRUE); efl_gfx_size_get(o, &tw, &th); cent = ICON_SIZE + 16 - tw / 2; @@ -102,10 +102,10 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } - eo_del(o_snap); + eo_unref(o_snap); } /* loop - do things */ diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c index 31fa0d5..2757ca5 100644 --- a/src/bin/text_basic.c +++ b/src/bin/text_basic.c @@ -25,7 +25,7 @@ static void _setup(void) for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 20); efl_text_set(o, "This is a test string"); @@ -39,7 +39,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/text_change.c b/src/bin/text_change.c index aa7b594..d64c6e0 100644 --- a/src/bin/text_change.c +++ b/src/bin/text_change.c @@ -32,7 +32,7 @@ static void _setup(void) srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 20); snprintf(buf, sizeof(buf), "%s %s %s %s.", @@ -57,7 +57,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c index 44c6576..593e823 100644 --- a/src/bin/text_styles.c +++ b/src/bin/text_styles.c @@ -27,16 +27,16 @@ static void _setup(void) st = EVAS_TEXT_STYLE_SHADOW; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 20); efl_text_set(o, "This is a test string"); - evas_obj_text_style_set(o, st); + evas_object_text_style_set(o, st); efl_gfx_color_set(o, 255, 255, 255, 255); - evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); - evas_obj_text_glow_color_set(o, 100, 80, 40, 100); - evas_obj_text_glow2_color_set(o, 50, 10, 5, 50); - evas_obj_text_outline_color_set(o, 0, 0, 0, 255); + evas_object_text_shadow_color_set(o, 0, 0, 0, 24); + evas_object_text_glow_color_set(o, 100, 80, 40, 100); + evas_object_text_glow2_color_set(o, 50, 10, 5, 50); + evas_object_text_outline_color_set(o, 0, 0, 0, 255); efl_gfx_visible_set(o, EINA_TRUE); st++; if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; @@ -48,7 +48,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c index 48e4fd4..f13307e 100644 --- a/src/bin/text_styles_different_strings.c +++ b/src/bin/text_styles_different_strings.c @@ -34,7 +34,7 @@ static void _setup(void) st = EVAS_TEXT_STYLE_SHADOW; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 20); snprintf(buf, sizeof(buf), "%s %s %s %s.", @@ -43,12 +43,12 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); efl_text_set(o, buf); - evas_obj_text_style_set(o, st); + evas_object_text_style_set(o, st); efl_gfx_color_set(o, 255, 255, 255, 255); - evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); - evas_obj_text_glow_color_set(o, 100, 80, 40, 100); - evas_obj_text_glow2_color_set(o, 50, 10, 5, 50); - evas_obj_text_outline_color_set(o, 0, 0, 0, 255); + evas_object_text_shadow_color_set(o, 0, 0, 0, 24); + evas_object_text_glow_color_set(o, 100, 80, 40, 100); + evas_object_text_glow2_color_set(o, 50, 10, 5, 50); + evas_object_text_outline_color_set(o, 0, 0, 0, 255); efl_gfx_visible_set(o, EINA_TRUE); st++; if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; @@ -60,7 +60,7 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c index d5d6dac..053380d 100644 --- a/src/bin/textblock_auto_align.c +++ b/src/bin/textblock_auto_align.c @@ -58,7 +58,7 @@ static void _setup(void) /* cleanup */ static void _cleanup(void) { - eo_del(o_text); + eo_unref(o_text); } /* loop - do things */ diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c index 3b7bb50..2673ced 100644 --- a/src/bin/textblock_basic.c +++ b/src/bin/textblock_basic.c @@ -119,7 +119,7 @@ static void _setup(void) /* cleanup */ static void _cleanup(void) { - eo_del(o_text); + eo_unref(o_text); } /* loop - do things */ diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c index 1768c86..6be8f95 100644 --- a/src/bin/textblock_intl.c +++ b/src/bin/textblock_intl.c @@ -90,7 +90,7 @@ static void _setup(void) /* cleanup */ static void _cleanup(void) { - eo_del(o_text); + eo_unref(o_text); } /* loop - do things */ diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c index 3168b76..589bb5c 100644 --- a/src/bin/textblock_text_append.c +++ b/src/bin/textblock_text_append.c @@ -102,7 +102,7 @@ static void _setup(void) /* cleanup */ static void _cleanup(void) { - eo_del(o_text); + eo_unref(o_text); o_text = NULL; } diff --git a/src/bin/ui.c b/src/bin/ui.c index 18ea8d6..36286b7 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -409,7 +409,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_gfx_visible_set(o, EINA_TRUE); o_wallpaper = o; - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, "EXPEDITE"); efl_gfx_stack_layer_set(o, 100); @@ -422,7 +422,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_gfx_visible_set(o, EINA_TRUE); o_title = o; - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); efl_text_properties_font_set(o, "Vera", 9); efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."); efl_gfx_stack_layer_set(o, 100); @@ -467,7 +467,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_image_border_set(o, 7, 7, 7, 7); o_menu_text_sel = o; - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); efl_text_properties_font_set(o, "Vera", 10); efl_text_set(o, ""); efl_gfx_color_set(o, 0, 0, 0, 100); diff --git a/src/bin/vg_basic_circle.c b/src/bin/vg_basic_circle.c index a06e4ff..bd407a1 100644 --- a/src/bin/vg_basic_circle.c +++ b/src/bin/vg_basic_circle.c @@ -52,7 +52,7 @@ static void _cleanup(void) { unsigned int i; - for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]); } /* loop - do things */ diff --git a/src/bin/vg_basic_gradient.c b/src/bin/vg_basic_gradient.c index 1a0a0e9..1a41a6e 100644 --- a/src/bin/vg_basic_gradient.c +++ b/src/bin/vg_basic_gradient.c @@ -65,7 +65,7 @@ static void _cleanup(void) { unsigned int i; - for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]); } /* loop - do things */ diff --git a/src/bin/vg_basic_rect.c b/src/bin/vg_basic_rect.c index fa8a21e..ea594e0 100644 --- a/src/bin/vg_basic_rect.c +++ b/src/bin/vg_basic_rect.c @@ -52,7 +52,7 @@ static void _cleanup(void) { unsigned int i; - for (i = 0; i < OBNUM; i++) eo_del(o_shapes[i]); + for (i = 0; i < OBNUM; i++) eo_unref(o_shapes[i]); } /* loop - do things */ diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c index 6ac272e..cffbba4 100644 --- a/src/bin/vg_scaled.c +++ b/src/bin/vg_scaled.c @@ -67,7 +67,7 @@ static void _cleanup(void) for (i = 0; i < OBNUM; i++) { - eo_del(o_objects[i]); + eo_unref(o_objects[i]); o_objects[i] = NULL; } } diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c index 25a5dd3..222ba53 100644 --- a/src/bin/widgets_file_icons.c +++ b/src/bin/widgets_file_icons.c @@ -53,13 +53,13 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); - evas_obj_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); + evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW); efl_gfx_color_set(o, 255, 255, 255, 255); - evas_obj_text_shadow_color_set(o, 0, 0, 0, 24); + evas_object_text_shadow_color_set(o, 0, 0, 0, 24); efl_gfx_visible_set(o, EINA_TRUE); } done = 0; @@ -71,8 +71,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c index 03e715b..60eee48 100644 --- a/src/bin/widgets_file_icons_2.c +++ b/src/bin/widgets_file_icons_2.c @@ -53,7 +53,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); @@ -69,8 +69,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c index 7f14482..ab50ffd 100644 --- a/src/bin/widgets_file_icons_2_grouped.c +++ b/src/bin/widgets_file_icons_2_grouped.c @@ -53,7 +53,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); @@ -78,8 +78,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c index 113cc5b..e8e2ebb 100644 --- a/src/bin/widgets_file_icons_2_same.c +++ b/src/bin/widgets_file_icons_2_same.c @@ -38,7 +38,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 1]); @@ -54,8 +54,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c index 5b631b9..bc1fdd3 100644 --- a/src/bin/widgets_file_icons_2_same_grouped.c +++ b/src/bin/widgets_file_icons_2_same_grouped.c @@ -38,7 +38,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 1]); @@ -58,8 +58,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c index be9f393..077335a 100644 --- a/src/bin/widgets_file_icons_3.c +++ b/src/bin/widgets_file_icons_3.c @@ -53,7 +53,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); @@ -69,8 +69,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c index a23ce7b..a4d3e2c 100644 --- a/src/bin/widgets_file_icons_4.c +++ b/src/bin/widgets_file_icons_4.c @@ -53,7 +53,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, icons[i % 13]); @@ -69,8 +69,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c index 44351b1..48b9921 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c @@ -69,7 +69,7 @@ static void _setup(void) efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -85,8 +85,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c index 3aa8296..bf664f1 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c @@ -69,7 +69,7 @@ static void _setup(void) efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -93,8 +93,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c index f59cbe1..dcf8593 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c @@ -69,7 +69,7 @@ static void _setup(void) efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -85,8 +85,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c index ad3d866..4f66149 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c @@ -69,7 +69,7 @@ static void _setup(void) efl_gfx_size_set(o, win_w, ICON_SIZE); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -93,8 +93,8 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c index 52b6e01..10764ca 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c @@ -97,7 +97,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -113,9 +113,9 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_icons[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_icons[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c index 30bb97f..ef6f415 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c @@ -97,7 +97,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -130,9 +130,9 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_icons[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_icons[i]); + eo_unref(o_texts[i]); } } diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c index 7eb4672..bc07eb8 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c @@ -97,7 +97,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -111,9 +111,9 @@ static void _setup(void) static void _cleanup(void) { int i; - for (i = 0; i < NUM; i++) eo_del(o_images[i]); - for (i = 0; i < NUM; i++) eo_del(o_icons[i]); - for (i = 0; i < NUM; i++) eo_del(o_texts[i]); + for (i = 0; i < NUM; i++) eo_unref(o_images[i]); + for (i = 0; i < NUM; i++) eo_unref(o_icons[i]); + for (i = 0; i < NUM; i++) eo_unref(o_texts[i]); } /* loop - do things */ diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c index 29136e1..fde06e7 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c @@ -97,7 +97,7 @@ static void _setup(void) efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); efl_gfx_visible_set(o, EINA_TRUE); - o = eo_add(EVAS_TEXT_CLASS, evas); + o = evas_object_text_add(evas); o_texts[i] = o; efl_text_properties_font_set(o, "Vera-Bold", 10); efl_text_set(o, labels[i % 26]); @@ -129,9 +129,9 @@ static void _cleanup(void) int i; for (i = 0; i < NUM; i++) { - eo_del(o_images[i]); - eo_del(o_icons[i]); - eo_del(o_texts[i]); + eo_unref(o_images[i]); + eo_unref(o_icons[i]); + eo_unref(o_texts[i]); } }