summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio.sena@acm.org>2014-09-23 21:47:37 -0300
committerSavio Sena <savio.sena@acm.org>2014-09-23 21:47:37 -0300
commit583d48e3927a39a854519e0185acd8050b0f1240 (patch)
treee657c7267b1f1e7f4729b49aaea7f048e06b6d1a
parent365de8d7d34f8ba7fbf8f0a51e598e49a46f6d77 (diff)
partially convert _setup implementation.
-rw-r--r--src/bin/cxx/image_blend_many_smooth_same_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_nearest_same_scaled.cc4
-rw-r--r--src/bin/cxx/image_blend_nearest_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_same_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1_few.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude1_very_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2_few.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude2_very_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3_few.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3_many.cc6
-rw-r--r--src/bin/cxx/image_blend_occlude3_very_many.cc6
-rw-r--r--src/bin/cxx/image_blend_smooth_same_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_smooth_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_same_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_scaled.cc6
-rw-r--r--src/bin/cxx/image_blend_solid_middle_border.cc6
-rw-r--r--src/bin/cxx/image_blend_solid_middle_unscaled.cc6
-rw-r--r--src/bin/cxx/image_blend_unscaled.cc6
-rw-r--r--src/bin/cxx/image_data_argb.cc6
-rw-r--r--src/bin/cxx/image_data_argb_alpha.cc6
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl.cc6
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc6
-rw-r--r--src/bin/cxx/image_map_3d_flow.cc6
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_alpha_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_nearest_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_nearest_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_rotate.cc6
-rw-r--r--src/bin/cxx/image_map_solid_rotate.cc6
-rw-r--r--src/bin/cxx/image_quality_scale.cc6
-rw-r--r--src/bin/cxx/line_blend.cc6
-rw-r--r--src/bin/cxx/proxy_image.cc6
-rw-r--r--src/bin/cxx/proxy_image_offscreen.cc6
-rw-r--r--src/bin/cxx/rect_blend.cc6
-rw-r--r--src/bin/cxx/rect_blend_few.cc6
-rw-r--r--src/bin/cxx/rect_blend_pow2.cc6
-rw-r--r--src/bin/cxx/rect_blend_pow2_few.cc6
-rw-r--r--src/bin/cxx/rect_solid.cc6
-rw-r--r--src/bin/cxx/rect_solid_few.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons_2_grouped.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same_grouped.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons_3.cc6
-rw-r--r--src/bin/cxx/widgets_file_icons_4.cc6
-rw-r--r--src/bin/cxx/widgets_list_1.cc6
-rw-r--r--src/bin/cxx/widgets_list_1_grouped.cc6
-rw-r--r--src/bin/cxx/widgets_list_2.cc6
-rw-r--r--src/bin/cxx/widgets_list_2_grouped.cc6
-rw-r--r--src/bin/cxx/widgets_list_3.cc6
-rw-r--r--src/bin/cxx/widgets_list_3_grouped.cc6
-rw-r--r--src/bin/cxx/widgets_list_4.cc6
-rw-r--r--src/bin/cxx/widgets_list_4_grouped.cc6
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<evas::image> images;
27static void _setup(void) 27static void _setup(void)
28{ 28{
29 int i, w, h, n; 29 int i, w, h, n;
30 Evas_Object *o; 30 evas::canvas canvas(::eo_ref(G_evas));
31 for (i = 0; i < MANYNUM; i++) 31 for (i = 0; i < MANYNUM; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 evas::image o(efl::eo::parent = canvas);
34 images[i] = o; 34 images.push_back(o);
35 n = rnd() % 100; 35 n = rnd() % 100;
36 w = 3 + ((n * (60 - 3)) / 100); 36 w = 3 + ((n * (60 - 3)) / 100);
37 h = 4 + ((n * (80 - 4)) / 100); 37 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)
27 Evas_Object *o; 27 Evas_Object *o;
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("logo.png"), NULL), 33 efl_file_set(build_path("logo.png"), NULL),
34 efl_image_smooth_scale_set(0), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("logo.png"), NULL), 33 efl_file_set(build_path("logo.png"), NULL),
34 efl_image_smooth_scale_set(0), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("image.png"), NULL), 33 efl_file_set(build_path("image.png"), NULL),
34 efl_image_smooth_scale_set(0), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("image.png"), NULL), 33 efl_file_set(build_path("image.png"), NULL),
34 efl_image_smooth_scale_set(0), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 srnd(); 28 srnd();
29 for (i = 0; i < OBNUM; i++) 29 for (i = 0; i < OBNUM; i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 if (i < (OBNUM / 2)) 33 if (i < (OBNUM / 2))
34 { 34 {
35 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 35 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<evas::image> images;
27static void _setup(void) 27static void _setup(void)
28{ 28{
29 int i; 29 int i;
30 Evas_Object *o; 30 evas::canvas canvas(::eo_ref(G_evas));
31 srnd(); 31 srnd();
32 for (i = 0; i < OBNUM; i++) 32 for (i = 0; i < OBNUM; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 if (i < (OBNUM / 2)) 36 if (i < (OBNUM / 2))
37 { 37 {
38 eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL)); 38 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<evas::image> images;
27static void _setup(void) 27static void _setup(void)
28{ 28{
29 int i; 29 int i;
30 Evas_Object *o; 30 evas::canvas canvas(::eo_ref(G_evas));
31 srnd(); 31 srnd();
32 for (i = 0; i < OBNUM; i++) 32 for (i = 0; i < OBNUM; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 if (i < (OBNUM / 2)) 36 if (i < (OBNUM / 2))
37 { 37 {
38 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 38 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<evas::image> images;
29static void _setup(void) 29static void _setup(void)
30{ 30{
31 int i; 31 int i;
32 Evas_Object *o; 32 evas::canvas canvas(::eo_ref(G_evas));
33 srnd(); 33 srnd();
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 evas::image o(efl::eo::parent = canvas);
37 images[i] = o; 37 images.push_back(o);
38 if (i < (OBNUM / 2)) 38 if (i < (OBNUM / 2))
39 { 39 {
40 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 40 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<evas::image> images;
26static void _setup(void) 26static void _setup(void)
27{ 27{
28 int i; 28 int i;
29 Evas_Object *o; 29 evas::canvas canvas(::eo_ref(G_evas));
30 srnd(); 30 srnd();
31 for (i = 0; i < OBNUM; i++) 31 for (i = 0; i < OBNUM; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 evas::image o(efl::eo::parent = canvas);
34 images[i] = o; 34 images.push_back(o);
35 if (i & 0x1) 35 if (i & 0x1)
36 { 36 {
37 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 37 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<evas::image> images;
29static void _setup(void) 29static void _setup(void)
30{ 30{
31 int i; 31 int i;
32 Evas_Object *o; 32 evas::canvas canvas(::eo_ref(G_evas));
33 srnd(); 33 srnd();
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 evas::image o(efl::eo::parent = canvas);
37 images[i] = o; 37 images.push_back(o);
38 if (i & 0x1) 38 if (i & 0x1)
39 { 39 {
40 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 40 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<evas::image> images;
29static void _setup(void) 29static void _setup(void)
30{ 30{
31 int i; 31 int i;
32 Evas_Object *o; 32 evas::canvas canvas(::eo_ref(G_evas));
33 srnd(); 33 srnd();
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 evas::image o(efl::eo::parent = canvas);
37 images[i] = o; 37 images.push_back(o);
38 if (i & 0x1) 38 if (i & 0x1)
39 { 39 {
40 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 40 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<evas::image> images;
29static void _setup(void) 29static void _setup(void)
30{ 30{
31 int i; 31 int i;
32 Evas_Object *o; 32 evas::canvas canvas(::eo_ref(G_evas));
33 srnd(); 33 srnd();
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 evas::image o(efl::eo::parent = canvas);
37 images[i] = o; 37 images.push_back(o);
38 if (i & 0x1) 38 if (i & 0x1)
39 { 39 {
40 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 40 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<evas::image> images;
26static void _setup(void) 26static void _setup(void)
27{ 27{
28 int i; 28 int i;
29 Evas_Object *o; 29 evas::canvas canvas(::eo_ref(G_evas));
30 srnd(); 30 srnd();
31 for (i = 0; i < OBNUM; i++) 31 for (i = 0; i < OBNUM; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 evas::image o(efl::eo::parent = canvas);
34 images[i] = o; 34 images.push_back(o);
35 if (i > (OBNUM / 2)) 35 if (i > (OBNUM / 2))
36 { 36 {
37 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 37 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<evas::image> images;
29static void _setup(void) 29static void _setup(void)
30{ 30{
31 int i; 31 int i;
32 Evas_Object *o; 32 evas::canvas canvas(::eo_ref(G_evas));
33 srnd(); 33 srnd();
34 for (i = 0; i < OBNUM; i++) 34 for (i = 0; i < OBNUM; i++)
35 { 35 {
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 evas::image o(efl::eo::parent = canvas);
37 images[i] = o; 37 images.push_back(o);
38 if (i > (OBNUM / 2)) 38 if (i > (OBNUM / 2))
39 { 39 {
40 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 40 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<evas::image> images;
27static void _setup(void) 27static void _setup(void)
28{ 28{
29 int i; 29 int i;
30 Evas_Object *o; 30 evas::canvas canvas(::eo_ref(G_evas));
31 srnd(); 31 srnd();
32 for (i = 0; i < OBNUM; i++) 32 for (i = 0; i < OBNUM; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 if (i > (OBNUM / 2)) 36 if (i > (OBNUM / 2))
37 { 37 {
38 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 38 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<evas::image> images;
28static void _setup(void) 28static void _setup(void)
29{ 29{
30 int i; 30 int i;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 srnd(); 32 srnd();
33 for (i = 0; i < OBNUM; i++) 33 for (i = 0; i < OBNUM; i++)
34 { 34 {
35 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 35 evas::image o(efl::eo::parent = canvas);
36 images[i] = o; 36 images.push_back(o);
37 if (i > (OBNUM / 2)) 37 if (i > (OBNUM / 2))
38 { 38 {
39 eo_do(o, efl_file_set(build_path("logo.png"), NULL)); 39 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < OBNUM; i++) 29 for (i = 0; i < OBNUM; i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 efl_image_smooth_scale_set(1), 35 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("logo.png"), NULL), 33 efl_file_set(build_path("logo.png"), NULL),
34 efl_image_smooth_scale_set(1), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("image.png"), NULL), 33 efl_file_set(build_path("image.png"), NULL),
34 efl_image_smooth_scale_set(1), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("image.png"), NULL), 33 efl_file_set(build_path("image.png"), NULL),
34 efl_image_smooth_scale_set(1), 34 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("bar.png"), NULL), 33 efl_file_set(build_path("bar.png"), NULL),
34 evas_obj_image_border_set(6, 6, 6, 6), 34 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<evas::image> images;
23static void _setup(void) 23static void _setup(void)
24{ 24{
25 int i; 25 int i;
26 Evas_Object *o; 26 evas::canvas canvas(::eo_ref(G_evas));
27 for (i = 0; i < OBNUM; i++) 27 for (i = 0; i < OBNUM; i++)
28 { 28 {
29 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 29 evas::image o(efl::eo::parent = canvas);
30 images[i] = o; 30 images.push_back(o);
31 eo_do(o, 31 eo_do(o,
32 efl_file_set(build_path("logo.png"), NULL), 32 efl_file_set(build_path("logo.png"), NULL),
33 evas_obj_image_fill_set(0, 0, 120, 160), 33 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 evas::image o(efl::eo::parent = canvas);
31 images[i] = o; 31 images.push_back(o);
32 eo_do(o, 32 eo_do(o,
33 efl_file_set(build_path("logo.png"), NULL), 33 efl_file_set(build_path("logo.png"), NULL),
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 34 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
35 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 34 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
35 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 35 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)
28 int i, y; 28 int i, y;
29 FILE *f; 29 FILE *f;
30 unsigned char **data, **lp; 30 unsigned char **data, **lp;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < 1; i++) 32 for (i = 0; i < 1; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 eo_do(o, 36 eo_do(o,
37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
38 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 38 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)
28 int i, y; 28 int i, y;
29 FILE *f; 29 FILE *f;
30 unsigned char **data, **lp; 30 unsigned char **data, **lp;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < 1; i++) 32 for (i = 0; i < 1; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 eo_do(o, 36 eo_do(o,
37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
38 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 38 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)
28 int i, y; 28 int i, y;
29 FILE *f; 29 FILE *f;
30 unsigned char **data, **lp; 30 unsigned char **data, **lp;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < 1; i++) 32 for (i = 0; i < 1; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 eo_do(o, 36 eo_do(o,
37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
38 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 38 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)
28 int i, y; 28 int i, y;
29 FILE *f; 29 FILE *f;
30 unsigned char **data, **lp; 30 unsigned char **data, **lp;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < 1; i++) 32 for (i = 0; i < 1; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 eo_do(o, 36 eo_do(o,
37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
38 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 38 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];
28static void _setup(void) 28static void _setup(void)
29{ 29{
30 int i; 30 int i;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < CNUM; i++) 32 for (i = 0; i < CNUM; i++)
33 { 33 {
34 char buf[256]; 34 char buf[256];
35 35
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 evas::image o(efl::eo::parent = canvas);
37 images[i] = o; 37 images.push_back(o);
38 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 38 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
39 eo_do(o, 39 eo_do(o,
40 efl_file_set(build_path(buf), NULL), 40 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("image.png"), NULL), 34 efl_file_set(build_path("image.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("image.png"), NULL), 34 efl_file_set(build_path("image.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("image.png"), NULL), 34 efl_file_set(build_path("image.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("image.png"), NULL), 34 efl_file_set(build_path("image.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("logo.png"), NULL), 34 efl_file_set(build_path("logo.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("image.png"), NULL), 34 efl_file_set(build_path("image.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 33 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
35 evas_obj_size_set(120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < (OBNUM / 2); i++) 29 for (i = 0; i < (OBNUM / 2); i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, 33 eo_do(o,
34 efl_file_set(build_path("image.png"), NULL), 34 efl_file_set(build_path("image.png"), NULL),
35 evas_obj_image_fill_set(0, 0, 120, 160), 35 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<evas::image> images;
25static void _setup(void) 25static void _setup(void)
26{ 26{
27 int i; 27 int i;
28 Evas_Object *o; 28 evas::canvas canvas(::eo_ref(G_evas));
29 for (i = 0; i < 1; i++) 29 for (i = 0; i < 1; i++)
30 { 30 {
31 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 31 evas::image o(efl::eo::parent = canvas);
32 images[i] = o; 32 images.push_back(o);
33 eo_do(o, efl_file_set(build_path("tp.png"), NULL), 33 eo_do(o, efl_file_set(build_path("tp.png"), NULL),
34 evas_obj_image_fill_set(0, 0, 640, 480), 34 evas_obj_image_fill_set(0, 0, 640, 480),
35 evas_obj_size_set(640, 480), 35 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<evas::image> images;
24static void _setup(void) 24static void _setup(void)
25{ 25{
26 int i; 26 int i;
27 Evas_Object *o; 27 evas::canvas canvas(::eo_ref(G_evas));
28 srnd(); 28 srnd();
29 for (i = 0; i < OBNUM; i++) 29 for (i = 0; i < OBNUM; i++)
30 { 30 {
31 int r, g, b, a; 31 int r, g, b, a;
32 32
33 o = eo_add(EVAS_LINE_CLASS, G_evas); 33 evas::image o(efl::eo::parent = canvas);
34 images[i] = o; 34 images.push_back(o);
35 a = (rnd()&0xff) / 2; 35 a = (rnd()&0xff) / 2;
36 r = ((rnd()&0xff) * a) / 255; 36 r = ((rnd()&0xff) * a) / 255;
37 g = ((rnd()&0xff) * a) / 255; 37 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)
31 efl_file_set(build_path("logo.png"), NULL), 31 efl_file_set(build_path("logo.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 120, 160), 32 evas_obj_image_fill_set(0, 0, 120, 160),
33 evas_obj_size_set(120, 160), 33 evas_obj_size_set(120, 160),
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas::canvas canvas(::eo_ref(G_evas));
35 src = o; 35 src = o;
36 images[0] = src; 36 images[0] = src;
37 37
38 for (i = 1; i < OBNUM; i++) 38 for (i = 1; i < OBNUM; i++)
39 { 39 {
40 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 40 evas::image o(efl::eo::parent = canvas);
41 images[i] = o; 41 images.push_back(o);
42 eo_do(o, 42 eo_do(o,
43 evas_obj_image_source_set(src), 43 evas_obj_image_source_set(src),
44 evas_obj_size_set(120, 160), 44 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)
30 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 30 eo_do(o, efl_file_set(build_path("logo.png"), NULL),
31 evas_obj_image_fill_set(0, 0, 120, 160), 31 evas_obj_image_fill_set(0, 0, 120, 160),
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_position_set(-400, -300)); 33 evas::canvas canvas(::eo_ref(G_evas));
34 src = o; 34 src = o;
35 35
36 for (i = 0; i < OBNUM / 2; i++) 36 for (i = 0; i < OBNUM / 2; i++)
37 { 37 {
38 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 38 evas::image o(efl::eo::parent = canvas);
39 images[i] = o; 39 images.push_back(o);
40 eo_do(o, evas_obj_image_source_set(src, NULL), 40 eo_do(o, evas_obj_image_source_set(src, NULL),
41 evas_obj_size_set(120, 160), 41 evas_obj_size_set(120, 160),
42 evas_obj_image_fill_set(0,0,120,160), 42 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<evas::image> images;
20static void _setup(void) 20static void _setup(void)
21{ 21{
22 int i; 22 int i;
23 Evas_Object *o; 23 evas::canvas canvas(::eo_ref(G_evas));
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 29 evas::image o(efl::eo::parent = canvas);
30 images[i] = o; 30 images.push_back(o);
31 a = rnd()&0xff; 31 a = rnd()&0xff;
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
33 g = ((rnd()&0xff) * a) / 255; 33 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<evas::image> images;
23static void _setup(void) 23static void _setup(void)
24{ 24{
25 int i; 25 int i;
26 Evas_Object *o; 26 evas::canvas canvas(::eo_ref(G_evas));
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 evas::image o(efl::eo::parent = canvas);
33 images[i] = o; 33 images.push_back(o);
34 a = rnd()&0xff; 34 a = rnd()&0xff;
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 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<evas::image> images;
20static void _setup(void) 20static void _setup(void)
21{ 21{
22 int i; 22 int i;
23 Evas_Object *o; 23 evas::canvas canvas(::eo_ref(G_evas));
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 29 evas::image o(efl::eo::parent = canvas);
30 images[i] = o; 30 images.push_back(o);
31 a = 256 - (1 << ((rnd() % 8) + 1)); 31 a = 256 - (1 << ((rnd() % 8) + 1));
32 if (a < 128) a = 128; 32 if (a < 128) a = 128;
33 r = ((rnd()&0xff) * a) / 255; 33 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<evas::image> images;
23static void _setup(void) 23static void _setup(void)
24{ 24{
25 int i; 25 int i;
26 Evas_Object *o; 26 evas::canvas canvas(::eo_ref(G_evas));
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 evas::image o(efl::eo::parent = canvas);
33 images[i] = o; 33 images.push_back(o);
34 a = 256 - (1 << ((rnd() % 8) + 1)); 34 a = 256 - (1 << ((rnd() % 8) + 1));
35 if (a < 128) a = 128; 35 if (a < 128) a = 128;
36 r = ((rnd()&0xff) * a) / 255; 36 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<evas::image> images;
20static void _setup(void) 20static void _setup(void)
21{ 21{
22 int i; 22 int i;
23 Evas_Object *o; 23 evas::canvas canvas(::eo_ref(G_evas));
24 srnd(); 24 srnd();
25 for (i = 0; i < OBNUM; i++) 25 for (i = 0; i < OBNUM; i++)
26 { 26 {
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 29 evas::image o(efl::eo::parent = canvas);
30 images[i] = o; 30 images.push_back(o);
31 a = 0xff; 31 a = 0xff;
32 r = ((rnd()&0xff) * a) / 255; 32 r = ((rnd()&0xff) * a) / 255;
33 g = ((rnd()&0xff) * a) / 255; 33 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<evas::image> images;
23static void _setup(void) 23static void _setup(void)
24{ 24{
25 int i; 25 int i;
26 Evas_Object *o; 26 evas::canvas canvas(::eo_ref(G_evas));
27 srnd(); 27 srnd();
28 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
29 { 29 {
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 evas::image o(efl::eo::parent = canvas);
33 images[i] = o; 33 images.push_back(o);
34 a = 0xff; 34 a = 0xff;
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 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[] =
43static void _setup(void) 43static void _setup(void)
44{ 44{
45 int i; 45 int i;
46 Evas_Object *o; 46 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 49 evas::image o(efl::eo::parent = canvas);
50 images[i] = o; 50 images.push_back(o);
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
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[] =
43static void _setup(void) 43static void _setup(void)
44{ 44{
45 int i; 45 int i;
46 Evas_Object *o; 46 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 49 evas::image o(efl::eo::parent = canvas);
50 images[i] = o; 50 images.push_back(o);
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
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[] =
43static void _setup(void) 43static void _setup(void)
44{ 44{
45 int i; 45 int i;
46 Evas_Object *o; 46 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 49 evas::image o(efl::eo::parent = canvas);
50 images[i] = o; 50 images.push_back(o);
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
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[] =
28static void _setup(void) 28static void _setup(void)
29{ 29{
30 int i; 30 int i;
31 Evas_Object *o; 31 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < NUM; i++) 32 for (i = 0; i < NUM; i++)
33 { 33 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 34 evas::image o(efl::eo::parent = canvas);
35 images[i] = o; 35 images.push_back(o);
36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
38 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 38 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
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[] =
32static void _setup(void) 32static void _setup(void)
33{ 33{
34 int i; 34 int i;
35 Evas_Object *o; 35 evas::canvas canvas(::eo_ref(G_evas));
36 for (i = 0; i < NUM; i++) 36 for (i = 0; i < NUM; i++)
37 { 37 {
38 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 38 evas::image o(efl::eo::parent = canvas);
39 images[i] = o; 39 images.push_back(o);
40 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 40 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
41 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 41 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
42 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 42 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[] =
43static void _setup(void) 43static void _setup(void)
44{ 44{
45 int i; 45 int i;
46 Evas_Object *o; 46 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 49 evas::image o(efl::eo::parent = canvas);
50 images[i] = o; 50 images.push_back(o);
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
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[] =
43static void _setup(void) 43static void _setup(void)
44{ 44{
45 int i; 45 int i;
46 Evas_Object *o; 46 evas::canvas canvas(::eo_ref(G_evas));
47 for (i = 0; i < NUM; i++) 47 for (i = 0; i < NUM; i++)
48 { 48 {
49 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 49 evas::image o(efl::eo::parent = canvas);
50 images[i] = o; 50 images.push_back(o);
51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL), 51 eo_do(o, efl_file_set(build_path(icons[i % 13]), NULL),
52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 52 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
53 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 53 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
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[] =
59static void _setup(void) 59static void _setup(void)
60{ 60{
61 int i; 61 int i;
62 Evas_Object *o; 62 evas::canvas canvas(::eo_ref(G_evas));
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 65 evas::image o(efl::eo::parent = canvas);
66 images[i] = o; 66 images.push_back(o);
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 efl_file_set(build_path("pan.png"), NULL), 69 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[] =
59static void _setup(void) 59static void _setup(void)
60{ 60{
61 int i; 61 int i;
62 Evas_Object *o; 62 evas::canvas canvas(::eo_ref(G_evas));
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 65 evas::image o(efl::eo::parent = canvas);
66 images[i] = o; 66 images.push_back(o);
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 efl_file_set(build_path("pan.png"), NULL), 69 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[] =
59static void _setup(void) 59static void _setup(void)
60{ 60{
61 int i; 61 int i;
62 Evas_Object *o; 62 evas::canvas canvas(::eo_ref(G_evas));
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 65 evas::image o(efl::eo::parent = canvas);
66 images[i] = o; 66 images.push_back(o);
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 efl_file_set(build_path("pan.png"), NULL), 69 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[] =
59static void _setup(void) 59static void _setup(void)
60{ 60{
61 int i; 61 int i;
62 Evas_Object *o; 62 evas::canvas canvas(::eo_ref(G_evas));
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 65 evas::image o(efl::eo::parent = canvas);
66 images[i] = o; 66 images.push_back(o);
67 eo_do(o, evas_obj_image_filled_set(1), 67 eo_do(o, evas_obj_image_filled_set(1),
68 evas_obj_image_border_set(2, 2, 2, 2), 68 evas_obj_image_border_set(2, 2, 2, 2),
69 efl_file_set(build_path("pan.png"), NULL), 69 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[] =
80static void _setup(void) 80static void _setup(void)
81{ 81{
82 int i; 82 int i;
83 Evas_Object *o; 83 evas::canvas canvas(::eo_ref(G_evas));
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 86 evas::image o(efl::eo::parent = canvas);
87 images[i] = o; 87 images.push_back(o);
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 efl_file_set(build_path("pan.png"), NULL), 90 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[] =
80static void _setup(void) 80static void _setup(void)
81{ 81{
82 int i; 82 int i;
83 Evas_Object *o; 83 evas::canvas canvas(::eo_ref(G_evas));
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 86 evas::image o(efl::eo::parent = canvas);
87 images[i] = o; 87 images.push_back(o);
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 efl_file_set(build_path("pan.png"), NULL), 90 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[] =
80static void _setup(void) 80static void _setup(void)
81{ 81{
82 int i; 82 int i;
83 Evas_Object *o; 83 evas::canvas canvas(::eo_ref(G_evas));
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 86 evas::image o(efl::eo::parent = canvas);
87 images[i] = o; 87 images.push_back(o);
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 efl_file_set(build_path("pan.png"), NULL), 90 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[] =
80static void _setup(void) 80static void _setup(void)
81{ 81{
82 int i; 82 int i;
83 Evas_Object *o; 83 evas::canvas canvas(::eo_ref(G_evas));
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 86 evas::image o(efl::eo::parent = canvas);
87 images[i] = o; 87 images.push_back(o);
88 eo_do(o, evas_obj_image_filled_set(1), 88 eo_do(o, evas_obj_image_filled_set(1),
89 evas_obj_image_border_set(2, 2, 2, 2), 89 evas_obj_image_border_set(2, 2, 2, 2),
90 efl_file_set(build_path("pan.png"), NULL), 90 efl_file_set(build_path("pan.png"), NULL),