From 583d48e3927a39a854519e0185acd8050b0f1240 Mon Sep 17 00:00:00 2001 From: Savio Sena Date: Tue, 23 Sep 2014 21:47:37 -0300 Subject: [PATCH] partially convert _setup implementation. --- src/bin/cxx/image_blend_many_smooth_same_scaled.cc | 6 +++--- src/bin/cxx/image_blend_nearest_same_scaled.cc | 4 ++-- src/bin/cxx/image_blend_nearest_scaled.cc | 6 +++--- src/bin/cxx/image_blend_nearest_solid_same_scaled.cc | 6 +++--- src/bin/cxx/image_blend_nearest_solid_scaled.cc | 6 +++--- src/bin/cxx/image_blend_occlude1.cc | 6 +++--- src/bin/cxx/image_blend_occlude1_few.cc | 6 +++--- src/bin/cxx/image_blend_occlude1_many.cc | 6 +++--- src/bin/cxx/image_blend_occlude1_very_many.cc | 6 +++--- src/bin/cxx/image_blend_occlude2.cc | 6 +++--- src/bin/cxx/image_blend_occlude2_few.cc | 6 +++--- src/bin/cxx/image_blend_occlude2_many.cc | 6 +++--- src/bin/cxx/image_blend_occlude2_very_many.cc | 6 +++--- src/bin/cxx/image_blend_occlude3.cc | 6 +++--- src/bin/cxx/image_blend_occlude3_few.cc | 6 +++--- src/bin/cxx/image_blend_occlude3_many.cc | 6 +++--- src/bin/cxx/image_blend_occlude3_very_many.cc | 6 +++--- src/bin/cxx/image_blend_smooth_same_scaled.cc | 6 +++--- src/bin/cxx/image_blend_smooth_scaled.cc | 6 +++--- src/bin/cxx/image_blend_smooth_solid_same_scaled.cc | 6 +++--- src/bin/cxx/image_blend_smooth_solid_scaled.cc | 6 +++--- src/bin/cxx/image_blend_solid_middle_border.cc | 6 +++--- src/bin/cxx/image_blend_solid_middle_unscaled.cc | 6 +++--- src/bin/cxx/image_blend_unscaled.cc | 6 +++--- src/bin/cxx/image_data_argb.cc | 6 +++--- src/bin/cxx/image_data_argb_alpha.cc | 6 +++--- src/bin/cxx/image_data_ycbcr601pl.cc | 6 +++--- .../cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc | 6 +++--- src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc | 6 +++--- src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc | 6 +++--- src/bin/cxx/image_map_3d_flow.cc | 6 +++--- src/bin/cxx/image_map_color_alpha_nearest_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_alpha_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_alpha_solid_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_nearest_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_nearest_solid_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_rotate.cc | 6 +++--- src/bin/cxx/image_map_color_solid_rotate.cc | 6 +++--- src/bin/cxx/image_map_nearest_rotate.cc | 6 +++--- src/bin/cxx/image_map_nearest_solid_rotate.cc | 6 +++--- src/bin/cxx/image_map_rotate.cc | 6 +++--- src/bin/cxx/image_map_solid_rotate.cc | 6 +++--- src/bin/cxx/image_quality_scale.cc | 6 +++--- src/bin/cxx/line_blend.cc | 6 +++--- src/bin/cxx/proxy_image.cc | 6 +++--- src/bin/cxx/proxy_image_offscreen.cc | 6 +++--- src/bin/cxx/rect_blend.cc | 6 +++--- src/bin/cxx/rect_blend_few.cc | 6 +++--- src/bin/cxx/rect_blend_pow2.cc | 6 +++--- src/bin/cxx/rect_blend_pow2_few.cc | 6 +++--- src/bin/cxx/rect_solid.cc | 6 +++--- src/bin/cxx/rect_solid_few.cc | 6 +++--- src/bin/cxx/widgets_file_icons.cc | 6 +++--- src/bin/cxx/widgets_file_icons_2.cc | 6 +++--- src/bin/cxx/widgets_file_icons_2_grouped.cc | 6 +++--- src/bin/cxx/widgets_file_icons_2_same.cc | 6 +++--- src/bin/cxx/widgets_file_icons_2_same_grouped.cc | 6 +++--- src/bin/cxx/widgets_file_icons_3.cc | 6 +++--- src/bin/cxx/widgets_file_icons_4.cc | 6 +++--- src/bin/cxx/widgets_list_1.cc | 6 +++--- src/bin/cxx/widgets_list_1_grouped.cc | 6 +++--- src/bin/cxx/widgets_list_2.cc | 6 +++--- src/bin/cxx/widgets_list_2_grouped.cc | 6 +++--- src/bin/cxx/widgets_list_3.cc | 6 +++--- src/bin/cxx/widgets_list_3_grouped.cc | 6 +++--- src/bin/cxx/widgets_list_4.cc | 6 +++--- src/bin/cxx/widgets_list_4_grouped.cc | 6 +++--- 68 files changed, 203 insertions(+), 203 deletions(-) diff --git a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc index 5fcf9f0..04334cb 100644 --- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc +++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc @@ -27,11 +27,11 @@ static efl::eina::list images; static void _setup(void) { int i, w, h, n; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < MANYNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); n = rnd() % 100; w = 3 + ((n * (60 - 3)) / 100); h = 4 + ((n * (80 - 4)) / 100); diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc index 83e6008..87aa054 100644 --- a/src/bin/cxx/image_blend_nearest_same_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc @@ -27,8 +27,8 @@ static void _setup(void) Evas_Object *o; for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(0), diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc index a40b184..7add94a 100644 --- a/src/bin/cxx/image_blend_nearest_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_scaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(0), diff --git a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc index b21d7fa..cbffaee 100644 --- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(0), diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc index 3fc0432..9a0e75a 100644 --- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc +++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(0), diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc index b70eed1..2643e5f 100644 --- a/src/bin/cxx/image_blend_occlude1.cc +++ b/src/bin/cxx/image_blend_occlude1.cc @@ -24,12 +24,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc index c02cd9c..b294269 100644 --- a/src/bin/cxx/image_blend_occlude1_few.cc +++ b/src/bin/cxx/image_blend_occlude1_few.cc @@ -27,12 +27,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL)); diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc index f24a649..c601daf 100644 --- a/src/bin/cxx/image_blend_occlude1_many.cc +++ b/src/bin/cxx/image_blend_occlude1_many.cc @@ -27,12 +27,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc index 6432ff3..4c349b7 100644 --- a/src/bin/cxx/image_blend_occlude1_very_many.cc +++ b/src/bin/cxx/image_blend_occlude1_very_many.cc @@ -29,12 +29,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i < (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc index e3c1def..afedeb8 100644 --- a/src/bin/cxx/image_blend_occlude2.cc +++ b/src/bin/cxx/image_blend_occlude2.cc @@ -26,12 +26,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc index f38afc3..a9e31d6 100644 --- a/src/bin/cxx/image_blend_occlude2_few.cc +++ b/src/bin/cxx/image_blend_occlude2_few.cc @@ -29,12 +29,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc index e10becd..af02259 100644 --- a/src/bin/cxx/image_blend_occlude2_many.cc +++ b/src/bin/cxx/image_blend_occlude2_many.cc @@ -29,12 +29,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc index 542c3fb..3b545d9 100644 --- a/src/bin/cxx/image_blend_occlude2_very_many.cc +++ b/src/bin/cxx/image_blend_occlude2_very_many.cc @@ -29,12 +29,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i & 0x1) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc index 04a5859..5b45716 100644 --- a/src/bin/cxx/image_blend_occlude3.cc +++ b/src/bin/cxx/image_blend_occlude3.cc @@ -26,12 +26,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc index 4394f37..183fa98 100644 --- a/src/bin/cxx/image_blend_occlude3_few.cc +++ b/src/bin/cxx/image_blend_occlude3_few.cc @@ -29,12 +29,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc index 082b0b3..da019d0 100644 --- a/src/bin/cxx/image_blend_occlude3_many.cc +++ b/src/bin/cxx/image_blend_occlude3_many.cc @@ -27,12 +27,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc index b2fb5b7..f535a3b 100644 --- a/src/bin/cxx/image_blend_occlude3_very_many.cc +++ b/src/bin/cxx/image_blend_occlude3_very_many.cc @@ -28,12 +28,12 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); if (i > (OBNUM / 2)) { eo_do(o, efl_file_set(build_path("logo.png"), NULL)); diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc index ab513d2..2d0f6f6 100644 --- a/src/bin/cxx/image_blend_smooth_same_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc index e17641e..e32fa5b 100644 --- a/src/bin/cxx/image_blend_smooth_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_scaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), diff --git a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc index 7a26419..d1eb3a0 100644 --- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(1), diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc index b96018e..fdffc39 100644 --- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc +++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(1), diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc index 67da17a..bb668ae 100644 --- a/src/bin/cxx/image_blend_solid_middle_border.cc +++ b/src/bin/cxx/image_blend_solid_middle_border.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("bar.png"), NULL), evas_obj_image_border_set(6, 6, 6, 6), diff --git a/src/bin/cxx/image_blend_solid_middle_unscaled.cc b/src/bin/cxx/image_blend_solid_middle_unscaled.cc index 3147a44..56e54cf 100644 --- a/src/bin/cxx/image_blend_solid_middle_unscaled.cc +++ b/src/bin/cxx/image_blend_solid_middle_unscaled.cc @@ -23,11 +23,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc index ce150e6..0cd86ab 100644 --- a/src/bin/cxx/image_blend_unscaled.cc +++ b/src/bin/cxx/image_blend_unscaled.cc @@ -24,11 +24,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc index 55f5aab..8d3451a 100644 --- a/src/bin/cxx/image_data_argb.cc +++ b/src/bin/cxx/image_data_argb.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc index e6a73bc..bb27ac5 100644 --- a/src/bin/cxx/image_data_argb_alpha.cc +++ b/src/bin/cxx/image_data_argb_alpha.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc index 2e9c35b..05fe9f5 100644 --- a/src/bin/cxx/image_data_ycbcr601pl.cc +++ b/src/bin/cxx/image_data_ycbcr601pl.cc @@ -28,11 +28,11 @@ static void _setup(void) int i, y; FILE *f; unsigned char **data, **lp; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc index 0efd907..c466b90 100644 --- a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc @@ -28,11 +28,11 @@ static void _setup(void) int i, y; FILE *f; unsigned char **data, **lp; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc index 181b223..220067e 100644 --- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc +++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc @@ -28,11 +28,11 @@ static void _setup(void) int i, y; FILE *f; unsigned char **data, **lp; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc index 0a91b74..03b133b 100644 --- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc +++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc @@ -28,11 +28,11 @@ static void _setup(void) int i, y; FILE *f; unsigned char **data, **lp; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc index bc66da8..6b8bb8b 100644 --- a/src/bin/cxx/image_map_3d_flow.cc +++ b/src/bin/cxx/image_map_3d_flow.cc @@ -28,13 +28,13 @@ static Evas_Object *o_reflec[CNUM]; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < CNUM; i++) { char buf[256]; - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); eo_do(o, efl_file_set(build_path(buf), NULL), diff --git a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc index af95e02..070dcc0 100644 --- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc index 1fded4d..5df2770 100644 --- a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc index 0e7c4e4..7b22dd2 100644 --- a/src/bin/cxx/image_map_color_alpha_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc index 684ad5e..847a73f 100644 --- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc index 370639a..784f759 100644 --- a/src/bin/cxx/image_map_color_nearest_rotate.cc +++ b/src/bin/cxx/image_map_color_nearest_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc index 8561c23..b1db671 100644 --- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc index fb5b890..2792dd9 100644 --- a/src/bin/cxx/image_map_color_rotate.cc +++ b/src/bin/cxx/image_map_color_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc index a78b83b..2284e2d 100644 --- a/src/bin/cxx/image_map_color_solid_rotate.cc +++ b/src/bin/cxx/image_map_color_solid_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc index f5807e6..a206f10 100644 --- a/src/bin/cxx/image_map_nearest_rotate.cc +++ b/src/bin/cxx/image_map_nearest_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc index 3d7f9bb..3db5e84 100644 --- a/src/bin/cxx/image_map_nearest_solid_rotate.cc +++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc index f9b08b8..4de82e2 100644 --- a/src/bin/cxx/image_map_rotate.cc +++ b/src/bin/cxx/image_map_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_size_set(120, 160), diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc index 8057d02..4f30977 100644 --- a/src/bin/cxx/image_map_solid_rotate.cc +++ b/src/bin/cxx/image_map_solid_rotate.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < (OBNUM / 2); i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("image.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc index 783a638..3945d60 100644 --- a/src/bin/cxx/image_quality_scale.cc +++ b/src/bin/cxx/image_quality_scale.cc @@ -25,11 +25,11 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < 1; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path("tp.png"), NULL), evas_obj_image_fill_set(0, 0, 640, 480), evas_obj_size_set(640, 480), diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc index 3126659..1f6d3c9 100644 --- a/src/bin/cxx/line_blend.cc +++ b/src/bin/cxx/line_blend.cc @@ -24,14 +24,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_LINE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = (rnd()&0xff) / 2; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc index fe287d9..4f63aa8 100644 --- a/src/bin/cxx/proxy_image.cc +++ b/src/bin/cxx/proxy_image.cc @@ -31,14 +31,14 @@ static void _setup(void) efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_size_set(120, 160), - evas_obj_visibility_set(EINA_TRUE)); + evas::canvas canvas(::eo_ref(G_evas)); src = o; images[0] = src; for (i = 1; i < OBNUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_source_set(src), evas_obj_size_set(120, 160), diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc index 1791bc1..8fc0964 100644 --- a/src/bin/cxx/proxy_image_offscreen.cc +++ b/src/bin/cxx/proxy_image_offscreen.cc @@ -30,13 +30,13 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("logo.png"), NULL), evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_size_set(120, 160), - evas_obj_position_set(-400, -300)); + evas::canvas canvas(::eo_ref(G_evas)); src = o; for (i = 0; i < OBNUM / 2; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_source_set(src, NULL), evas_obj_size_set(120, 160), evas_obj_image_fill_set(0,0,120,160), diff --git a/src/bin/cxx/rect_blend.cc b/src/bin/cxx/rect_blend.cc index 19abb26..c047a0f 100644 --- a/src/bin/cxx/rect_blend.cc +++ b/src/bin/cxx/rect_blend.cc @@ -20,14 +20,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = rnd()&0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/rect_blend_few.cc b/src/bin/cxx/rect_blend_few.cc index 064bdc2..382389a 100644 --- a/src/bin/cxx/rect_blend_few.cc +++ b/src/bin/cxx/rect_blend_few.cc @@ -23,14 +23,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = rnd()&0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/rect_blend_pow2.cc b/src/bin/cxx/rect_blend_pow2.cc index 202bf17..55e536c 100644 --- a/src/bin/cxx/rect_blend_pow2.cc +++ b/src/bin/cxx/rect_blend_pow2.cc @@ -20,14 +20,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; r = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc index 865b846..9cd6f39 100644 --- a/src/bin/cxx/rect_blend_pow2_few.cc +++ b/src/bin/cxx/rect_blend_pow2_few.cc @@ -23,14 +23,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; r = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc index c8c3311..63a3b20 100644 --- a/src/bin/cxx/rect_solid.cc +++ b/src/bin/cxx/rect_solid.cc @@ -20,14 +20,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = 0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc index a454143..3766bda 100644 --- a/src/bin/cxx/rect_solid_few.cc +++ b/src/bin/cxx/rect_solid_few.cc @@ -23,14 +23,14 @@ static efl::eina::list images; static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); srnd(); for (i = 0; i < OBNUM; i++) { int r, g, b, a; - o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); a = 0xff; r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc index fdee3e1..16d10d6 100644 --- a/src/bin/cxx/widgets_file_icons.cc +++ b/src/bin/cxx/widgets_file_icons.cc @@ -43,11 +43,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc index 7677111..1144e3f 100644 --- a/src/bin/cxx/widgets_file_icons_2.cc +++ b/src/bin/cxx/widgets_file_icons_2.cc @@ -43,11 +43,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc index fb68eb6..3a568e0 100644 --- a/src/bin/cxx/widgets_file_icons_2_grouped.cc +++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc @@ -43,11 +43,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc index ef95397..e2bb8c1 100644 --- a/src/bin/cxx/widgets_file_icons_2_same.cc +++ b/src/bin/cxx/widgets_file_icons_2_same.cc @@ -28,11 +28,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc index bb136c6..07d3905 100644 --- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc +++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc @@ -32,11 +32,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_file_icons_3.cc b/src/bin/cxx/widgets_file_icons_3.cc index 5d2577a..d6c683d 100644 --- a/src/bin/cxx/widgets_file_icons_3.cc +++ b/src/bin/cxx/widgets_file_icons_3.cc @@ -43,11 +43,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc index 6a2224f..93955bd 100644 --- a/src/bin/cxx/widgets_file_icons_4.cc +++ b/src/bin/cxx/widgets_file_icons_4.cc @@ -43,11 +43,11 @@ static const char *icons[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE), diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc index 7af70e2..dc0a05f 100644 --- a/src/bin/cxx/widgets_list_1.cc +++ b/src/bin/cxx/widgets_list_1.cc @@ -59,11 +59,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_1_grouped.cc b/src/bin/cxx/widgets_list_1_grouped.cc index ed1ab81..ea41dc5 100644 --- a/src/bin/cxx/widgets_list_1_grouped.cc +++ b/src/bin/cxx/widgets_list_1_grouped.cc @@ -59,11 +59,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc index 770e934..b24baaf 100644 --- a/src/bin/cxx/widgets_list_2.cc +++ b/src/bin/cxx/widgets_list_2.cc @@ -59,11 +59,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc index efbc4fa..cd472df 100644 --- a/src/bin/cxx/widgets_list_2_grouped.cc +++ b/src/bin/cxx/widgets_list_2_grouped.cc @@ -59,11 +59,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_3.cc b/src/bin/cxx/widgets_list_3.cc index f734aa8..2b1aca9 100644 --- a/src/bin/cxx/widgets_list_3.cc +++ b/src/bin/cxx/widgets_list_3.cc @@ -80,11 +80,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_3_grouped.cc b/src/bin/cxx/widgets_list_3_grouped.cc index 71a83a0..a42eade 100644 --- a/src/bin/cxx/widgets_list_3_grouped.cc +++ b/src/bin/cxx/widgets_list_3_grouped.cc @@ -80,11 +80,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc index 8fc332d..4beb5ae 100644 --- a/src/bin/cxx/widgets_list_4.cc +++ b/src/bin/cxx/widgets_list_4.cc @@ -80,11 +80,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), diff --git a/src/bin/cxx/widgets_list_4_grouped.cc b/src/bin/cxx/widgets_list_4_grouped.cc index be4d5d5..5483606 100644 --- a/src/bin/cxx/widgets_list_4_grouped.cc +++ b/src/bin/cxx/widgets_list_4_grouped.cc @@ -80,11 +80,11 @@ static const char *labels[] = static void _setup(void) { int i; - Evas_Object *o; + evas::canvas canvas(::eo_ref(G_evas)); for (i = 0; i < NUM; i++) { - o = eo_add(EVAS_IMAGE_CLASS, G_evas); - images[i] = o; + evas::image o(efl::eo::parent = canvas); + images.push_back(o); eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL),