summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio.sena@acm.org>2014-09-23 04:16:23 -0300
committerSavio Sena <savio.sena@acm.org>2014-09-23 04:16:23 -0300
commit12e33a9c127e6fcecd70aacedc3f5806de9a2355 (patch)
tree8f0e1150eaeb7203531b48c03459ca343431c296
parent95e8ec6f9e66c6291c3cd9f5c61b4b2616906df3 (diff)
Convert all o_images to efl::evas::list<evas::image>.
-rw-r--r--src/bin/cxx/font_effect_blur_alpha.cc18
-rw-r--r--src/bin/cxx/image_blend_many_smooth_same_scaled.cc10
-rw-r--r--src/bin/cxx/image_blend_nearest_same_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_nearest_scaled.cc9
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_same_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude1.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude1_few.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude1_many.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude1_very_many.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude2.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude2_few.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude2_many.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude2_very_many.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude3.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude3_few.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude3_many.cc8
-rw-r--r--src/bin/cxx/image_blend_occlude3_very_many.cc8
-rw-r--r--src/bin/cxx/image_blend_smooth_same_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_smooth_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_same_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_scaled.cc8
-rw-r--r--src/bin/cxx/image_blend_solid_middle_border.cc8
-rw-r--r--src/bin/cxx/image_blend_solid_middle_unscaled.cc8
-rw-r--r--src/bin/cxx/image_blend_unscaled.cc8
-rw-r--r--src/bin/cxx/image_crossfade.cc10
-rw-r--r--src/bin/cxx/image_data_argb.cc10
-rw-r--r--src/bin/cxx/image_data_argb_alpha.cc10
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl.cc12
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc12
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc12
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc18
-rw-r--r--src/bin/cxx/image_map_3d_flow.cc12
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_alpha_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_nearest_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_nearest_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_rotate.cc8
-rw-r--r--src/bin/cxx/image_map_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_quality_scale.cc8
-rw-r--r--src/bin/cxx/line_blend.cc8
-rw-r--r--src/bin/cxx/proxy_image.cc10
-rw-r--r--src/bin/cxx/proxy_image_offscreen.cc8
-rw-r--r--src/bin/cxx/rect_blend.cc8
-rw-r--r--src/bin/cxx/rect_blend_few.cc8
-rw-r--r--src/bin/cxx/rect_blend_pow2.cc8
-rw-r--r--src/bin/cxx/rect_blend_pow2_few.cc8
-rw-r--r--src/bin/cxx/rect_solid.cc8
-rw-r--r--src/bin/cxx/rect_solid_few.cc8
-rw-r--r--src/bin/cxx/widgets_file_icons.cc8
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc8
-rw-r--r--src/bin/cxx/widgets_file_icons_2_grouped.cc12
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same.cc8
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same_grouped.cc65
-rw-r--r--src/bin/cxx/widgets_file_icons_3.cc8
-rw-r--r--src/bin/cxx/widgets_file_icons_4.cc8
-rw-r--r--src/bin/cxx/widgets_list_1.cc8
-rw-r--r--src/bin/cxx/widgets_list_1_grouped.cc10
-rw-r--r--src/bin/cxx/widgets_list_2.cc8
-rw-r--r--src/bin/cxx/widgets_list_2_grouped.cc10
-rw-r--r--src/bin/cxx/widgets_list_3.cc8
-rw-r--r--src/bin/cxx/widgets_list_3_grouped.cc10
-rw-r--r--src/bin/cxx/widgets_list_4.cc8
-rw-r--r--src/bin/cxx/widgets_list_4_grouped.cc10
70 files changed, 331 insertions, 345 deletions
diff --git a/src/bin/cxx/font_effect_blur_alpha.cc b/src/bin/cxx/font_effect_blur_alpha.cc
index ac0f7de..e4937d0 100644
--- a/src/bin/cxx/font_effect_blur_alpha.cc
+++ b/src/bin/cxx/font_effect_blur_alpha.cc
@@ -1,7 +1,19 @@
1#include "main.h"
2 1
3#include "ui.h" 2#ifdef HAVE_CONFIG_H
3# include <config.h>
4#endif
5
6#include "Eo.h"
7#include "Evas.h"
8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
12
13#include "main.h"
4 14
15#define EXPEDITE_CXX_TEST_IMPL
16#include <font_effect_blur_alpha_capi.h>
5 17
6/* standard var */ 18/* standard var */
7static int done = 0; 19static int done = 0;
@@ -52,7 +64,7 @@ static void _key(char *key)
52 KEY_STD; 64 KEY_STD;
53} 65}
54 66
55void FNAME(void) 67extern "C" void FNAME(void)
56{ 68{
57 ui_func_set(_key, _loop); 69 ui_func_set(_key, _loop);
58 _setup(); 70 _setup();
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 bc67572..50f1403 100644
--- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
@@ -21,7 +21,7 @@
21/* standard var */ 21/* standard var */
22static int done = 0; 22static int done = 0;
23/* private data */ 23/* private data */
24static Evas_Object *o_images[MANYNUM]; 24static efl::eina::list<evas::image> images;
25 25
26/* setup */ 26/* setup */
27static void _setup(void) 27static void _setup(void)
@@ -31,7 +31,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = 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);
@@ -49,7 +49,7 @@ static void _setup(void)
49static void _cleanup(void) 49static void _cleanup(void)
50{ 50{
51 int i; 51 int i;
52 for (i = 0; i < MANYNUM; i++) eo_del(o_images[i]); 52 for (i = 0; i < MANYNUM; i++) eo_del(images[i]);
53} 53}
54 54
55/* loop - do things */ 55/* loop - do things */
@@ -59,12 +59,12 @@ static void _loop(double t, int f)
59 Evas_Coord x, y, w, h; 59 Evas_Coord x, y, w, h;
60 for (i = 0; i < MANYNUM; i++) 60 for (i = 0; i < MANYNUM; i++)
61 { 61 {
62 eo_do(o_images[i], evas_obj_size_get(&w, &h)); 62 eo_do(images[i], evas_obj_size_get(&w, &h));
63 x = (win_w / 2) - (w / 2); 63 x = (win_w / 2) - (w / 2);
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y)); 67 eo_do(images[i], evas_obj_position_set(x, y));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc
index b7f267c..4bd2728 100644
--- a/src/bin/cxx/image_blend_nearest_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc
@@ -18,7 +18,7 @@
18/* standard var */ 18/* standard var */
19static int done = 0; 19static int done = 0;
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
62 eo_do(o_images[i], 62 eo_do(images[i],
63 evas_obj_position_set(x, y), 63 evas_obj_position_set(x, y),
64 evas_obj_size_set(w, h), 64 evas_obj_size_set(w, h),
65 evas_obj_image_fill_set(0, 0, w, h)); 65 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc
index 921b4c6..85f2863 100644
--- a/src/bin/cxx/image_blend_nearest_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_scaled.cc
@@ -13,11 +13,12 @@
13#include "main.h" 13#include "main.h"
14 14
15#define EXPEDITE_CXX_TEST_IMPL 15#define EXPEDITE_CXX_TEST_IMPL
16#include <image_blend_nearest_scaled_capi.h>
16 17
17/* standard var */ 18/* standard var */
18static int done = 0; 19static int done = 0;
19/* private data */ 20/* private data */
20static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
21 22
22/* setup */ 23/* setup */
23static void _setup(void) 24static void _setup(void)
@@ -27,7 +28,7 @@ static void _setup(void)
27 for (i = 0; i < OBNUM; i++) 28 for (i = 0; i < OBNUM; i++)
28 { 29 {
29 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 31 images[i] = o;
31 eo_do(o, 32 eo_do(o,
32 efl_file_set(build_path("logo.png"), NULL), 33 efl_file_set(build_path("logo.png"), NULL),
33 efl_image_smooth_scale_set(0), 34 efl_image_smooth_scale_set(0),
@@ -40,7 +41,7 @@ static void _setup(void)
40static void _cleanup(void) 41static void _cleanup(void)
41{ 42{
42 int i; 43 int i;
43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
44} 45}
45 46
46/* loop - do things */ 47/* loop - do things */
@@ -58,7 +59,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 eo_do(o_images[i], 62 eo_do(images[i],
62 evas_obj_position_set(x, y), 63 evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 64 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h)); 65 evas_obj_image_fill_set(0, 0, w, h));
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 0b2b644..6455637 100644
--- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
@@ -18,7 +18,7 @@
18/* standard var */ 18/* standard var */
19static int done = 0; 19static int done = 0;
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
62 eo_do(o_images[i], 62 eo_do(images[i],
63 evas_obj_position_set(x, y), 63 evas_obj_position_set(x, y),
64 evas_obj_size_set(w, h), 64 evas_obj_size_set(w, h),
65 evas_obj_image_fill_set(0, 0, w, h)); 65 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
index c3944db..5798ea8 100644
--- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
@@ -18,7 +18,7 @@
18/* standard var */ 18/* standard var */
19static int done = 0; 19static int done = 0;
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
62 eo_do(o_images[i], 62 eo_do(images[i],
63 evas_obj_position_set(x, y), 63 evas_obj_position_set(x, y),
64 evas_obj_size_set(w, h), 64 evas_obj_size_set(w, h),
65 evas_obj_image_fill_set(0, 0, w, h)); 65 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc
index 82251f5..0776f29 100644
--- a/src/bin/cxx/image_blend_occlude1.cc
+++ b/src/bin/cxx/image_blend_occlude1.cc
@@ -18,7 +18,7 @@
18/* standard var */ 18/* standard var */
19static int done = 0; 19static int done = 0;
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -29,7 +29,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
32 o_images[i] = o; 32 images[i] = 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));
@@ -56,7 +56,7 @@ static void _setup(void)
56static void _cleanup(void) 56static void _cleanup(void)
57{ 57{
58 int i; 58 int i;
59 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 59 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
60} 60}
61 61
62/* loop - do things */ 62/* loop - do things */
@@ -74,7 +74,7 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 y = (win_h / 2) - (h / 2); 75 y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 eo_do(o_images[i], evas_obj_position_set(x, y)); 77 eo_do(images[i], evas_obj_position_set(x, y));
78 } 78 }
79 } 79 }
80 FPS_STD(NAME); 80 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc
index 6cfcf2e..2b6ab47 100644
--- a/src/bin/cxx/image_blend_occlude1_few.cc
+++ b/src/bin/cxx/image_blend_occlude1_few.cc
@@ -21,7 +21,7 @@
21/* standard var */ 21/* standard var */
22static int done = 0; 22static int done = 0;
23/* private data */ 23/* private data */
24static Evas_Object *o_images[OBNUM]; 24static efl::eina::list<evas::image> images;
25 25
26/* setup */ 26/* setup */
27static void _setup(void) 27static void _setup(void)
@@ -32,7 +32,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 35 images[i] = 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));
@@ -59,7 +59,7 @@ static void _setup(void)
59static void _cleanup(void) 59static void _cleanup(void)
60{ 60{
61 int i; 61 int i;
62 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 62 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
63} 63}
64 64
65/* loop - do things */ 65/* loop - do things */
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
78 y = (win_h / 2) - (h / 2); 78 y = (win_h / 2) - (h / 2);
79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
80 eo_do(o_images[i], evas_obj_position_set(x, y)); 80 eo_do(images[i], evas_obj_position_set(x, y));
81 } 81 }
82 } 82 }
83 FPS_STD(NAME); 83 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc
index 17f69fb..9ce7288 100644
--- a/src/bin/cxx/image_blend_occlude1_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_many.cc
@@ -21,7 +21,7 @@
21/* standard var */ 21/* standard var */
22static int done = 0; 22static int done = 0;
23/* private data */ 23/* private data */
24static Evas_Object *o_images[OBNUM]; 24static efl::eina::list<evas::image> images;
25 25
26/* setup */ 26/* setup */
27static void _setup(void) 27static void _setup(void)
@@ -32,7 +32,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 35 images[i] = 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));
@@ -59,7 +59,7 @@ static void _setup(void)
59static void _cleanup(void) 59static void _cleanup(void)
60{ 60{
61 int i; 61 int i;
62 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 62 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
63} 63}
64 64
65/* loop - do things */ 65/* loop - do things */
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
78 y = (win_h / 2) - (h / 2); 78 y = (win_h / 2) - (h / 2);
79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
80 eo_do(o_images[i], evas_obj_position_set(x, y)); 80 eo_do(images[i], evas_obj_position_set(x, y));
81 } 81 }
82 } 82 }
83 FPS_STD(NAME); 83 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc
index f54193d..e1c439a 100644
--- a/src/bin/cxx/image_blend_occlude1_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_very_many.cc
@@ -23,7 +23,7 @@
23/* standard var */ 23/* standard var */
24static int done = 0; 24static int done = 0;
25/* private data */ 25/* private data */
26static Evas_Object *o_images[OBNUM]; 26static efl::eina::list<evas::image> images;
27 27
28/* setup */ 28/* setup */
29static void _setup(void) 29static void _setup(void)
@@ -34,7 +34,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[i] = o; 37 images[i] = 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));
@@ -61,7 +61,7 @@ static void _setup(void)
61static void _cleanup(void) 61static void _cleanup(void)
62{ 62{
63 int i; 63 int i;
64 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 64 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
65} 65}
66 66
67/* loop - do things */ 67/* loop - do things */
@@ -79,7 +79,7 @@ static void _loop(double t, int f)
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
82 eo_do(o_images[i], evas_obj_position_set(x, y)); 82 eo_do(images[i], evas_obj_position_set(x, y));
83 } 83 }
84 } 84 }
85 FPS_STD(NAME); 85 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc
index e1c28c6..5192e93 100644
--- a/src/bin/cxx/image_blend_occlude2.cc
+++ b/src/bin/cxx/image_blend_occlude2.cc
@@ -20,7 +20,7 @@
20/* standard var */ 20/* standard var */
21static int done = 0; 21static int done = 0;
22/* private data */ 22/* private data */
23static Evas_Object *o_images[OBNUM]; 23static efl::eina::list<evas::image> images;
24 24
25/* setup */ 25/* setup */
26static void _setup(void) 26static void _setup(void)
@@ -31,7 +31,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = 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));
@@ -58,7 +58,7 @@ static void _setup(void)
58static void _cleanup(void) 58static void _cleanup(void)
59{ 59{
60 int i; 60 int i;
61 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 61 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
62} 62}
63 63
64/* loop - do things */ 64/* loop - do things */
@@ -76,7 +76,7 @@ static void _loop(double t, int f)
76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
77 y = (win_h / 2) - (h / 2); 77 y = (win_h / 2) - (h / 2);
78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
79 eo_do(o_images[i], evas_obj_position_set(x, y)); 79 eo_do(images[i], evas_obj_position_set(x, y));
80 } 80 }
81 } 81 }
82 FPS_STD(NAME); 82 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc
index f757e08..b75eb59 100644
--- a/src/bin/cxx/image_blend_occlude2_few.cc
+++ b/src/bin/cxx/image_blend_occlude2_few.cc
@@ -23,7 +23,7 @@
23/* standard var */ 23/* standard var */
24static int done = 0; 24static int done = 0;
25/* private data */ 25/* private data */
26static Evas_Object *o_images[OBNUM]; 26static efl::eina::list<evas::image> images;
27 27
28/* setup */ 28/* setup */
29static void _setup(void) 29static void _setup(void)
@@ -34,7 +34,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[i] = o; 37 images[i] = 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));
@@ -61,7 +61,7 @@ static void _setup(void)
61static void _cleanup(void) 61static void _cleanup(void)
62{ 62{
63 int i; 63 int i;
64 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 64 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
65} 65}
66 66
67/* loop - do things */ 67/* loop - do things */
@@ -79,7 +79,7 @@ static void _loop(double t, int f)
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
82 eo_do(o_images[i], evas_obj_position_set(x, y)); 82 eo_do(images[i], evas_obj_position_set(x, y));
83 } 83 }
84 } 84 }
85 FPS_STD(NAME); 85 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc
index 86fcb18..be055ae 100644
--- a/src/bin/cxx/image_blend_occlude2_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_many.cc
@@ -23,7 +23,7 @@
23/* standard var */ 23/* standard var */
24static int done = 0; 24static int done = 0;
25/* private data */ 25/* private data */
26static Evas_Object *o_images[OBNUM]; 26static efl::eina::list<evas::image> images;
27 27
28/* setup */ 28/* setup */
29static void _setup(void) 29static void _setup(void)
@@ -34,7 +34,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[i] = o; 37 images[i] = 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));
@@ -61,7 +61,7 @@ static void _setup(void)
61static void _cleanup(void) 61static void _cleanup(void)
62{ 62{
63 int i; 63 int i;
64 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 64 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
65} 65}
66 66
67/* loop - do things */ 67/* loop - do things */
@@ -79,7 +79,7 @@ static void _loop(double t, int f)
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
82 eo_do(o_images[i], evas_obj_position_set(x, y)); 82 eo_do(images[i], evas_obj_position_set(x, y));
83 } 83 }
84 } 84 }
85 FPS_STD(NAME); 85 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc
index fa96c23..5f4c830 100644
--- a/src/bin/cxx/image_blend_occlude2_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_very_many.cc
@@ -23,7 +23,7 @@
23/* standard var */ 23/* standard var */
24static int done = 0; 24static int done = 0;
25/* private data */ 25/* private data */
26static Evas_Object *o_images[OBNUM]; 26static efl::eina::list<evas::image> images;
27 27
28/* setup */ 28/* setup */
29static void _setup(void) 29static void _setup(void)
@@ -34,7 +34,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[i] = o; 37 images[i] = 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));
@@ -61,7 +61,7 @@ static void _setup(void)
61static void _cleanup(void) 61static void _cleanup(void)
62{ 62{
63 int i; 63 int i;
64 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 64 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
65} 65}
66 66
67/* loop - do things */ 67/* loop - do things */
@@ -79,7 +79,7 @@ static void _loop(double t, int f)
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
82 eo_do(o_images[i], evas_obj_position_set(x, y)); 82 eo_do(images[i], evas_obj_position_set(x, y));
83 } 83 }
84 } 84 }
85 FPS_STD(NAME); 85 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc
index bcddd8d..a118116 100644
--- a/src/bin/cxx/image_blend_occlude3.cc
+++ b/src/bin/cxx/image_blend_occlude3.cc
@@ -20,7 +20,7 @@
20/* standard var */ 20/* standard var */
21static int done = 0; 21static int done = 0;
22/* private data */ 22/* private data */
23static Evas_Object *o_images[OBNUM]; 23static efl::eina::list<evas::image> images;
24 24
25/* setup */ 25/* setup */
26static void _setup(void) 26static void _setup(void)
@@ -31,7 +31,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = 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));
@@ -58,7 +58,7 @@ static void _setup(void)
58static void _cleanup(void) 58static void _cleanup(void)
59{ 59{
60 int i; 60 int i;
61 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 61 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
62} 62}
63 63
64/* loop - do things */ 64/* loop - do things */
@@ -76,7 +76,7 @@ static void _loop(double t, int f)
76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
77 y = (win_h / 2) - (h / 2); 77 y = (win_h / 2) - (h / 2);
78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
79 eo_do(o_images[i], evas_obj_position_set(x, y)); 79 eo_do(images[i], evas_obj_position_set(x, y));
80 } 80 }
81 } 81 }
82 FPS_STD(NAME); 82 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc
index 8920eb6..e842d9c 100644
--- a/src/bin/cxx/image_blend_occlude3_few.cc
+++ b/src/bin/cxx/image_blend_occlude3_few.cc
@@ -23,7 +23,7 @@
23/* standard var */ 23/* standard var */
24static int done = 0; 24static int done = 0;
25/* private data */ 25/* private data */
26static Evas_Object *o_images[OBNUM]; 26static efl::eina::list<evas::image> images;
27 27
28/* setup */ 28/* setup */
29static void _setup(void) 29static void _setup(void)
@@ -34,7 +34,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[i] = o; 37 images[i] = 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));
@@ -61,7 +61,7 @@ static void _setup(void)
61static void _cleanup(void) 61static void _cleanup(void)
62{ 62{
63 int i; 63 int i;
64 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 64 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
65} 65}
66 66
67/* loop - do things */ 67/* loop - do things */
@@ -79,7 +79,7 @@ static void _loop(double t, int f)
79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 79 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
80 y = (win_h / 2) - (h / 2); 80 y = (win_h / 2) - (h / 2);
81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 81 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
82 eo_do(o_images[i], evas_obj_position_set(x, y)); 82 eo_do(images[i], evas_obj_position_set(x, y));
83 } 83 }
84 } 84 }
85 FPS_STD(NAME); 85 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc
index 279bf5d..20ac9e1 100644
--- a/src/bin/cxx/image_blend_occlude3_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_many.cc
@@ -21,7 +21,7 @@
21/* standard var */ 21/* standard var */
22static int done = 0; 22static int done = 0;
23/* private data */ 23/* private data */
24static Evas_Object *o_images[OBNUM]; 24static efl::eina::list<evas::image> images;
25 25
26/* setup */ 26/* setup */
27static void _setup(void) 27static void _setup(void)
@@ -32,7 +32,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 35 images[i] = 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));
@@ -59,7 +59,7 @@ static void _setup(void)
59static void _cleanup(void) 59static void _cleanup(void)
60{ 60{
61 int i; 61 int i;
62 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 62 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
63} 63}
64 64
65/* loop - do things */ 65/* loop - do things */
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 77 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
78 y = (win_h / 2) - (h / 2); 78 y = (win_h / 2) - (h / 2);
79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 79 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
80 eo_do(o_images[i], evas_obj_position_set(x, y)); 80 eo_do(images[i], evas_obj_position_set(x, y));
81 } 81 }
82 } 82 }
83 FPS_STD(NAME); 83 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc
index d4aa5f8..1961938 100644
--- a/src/bin/cxx/image_blend_occlude3_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_very_many.cc
@@ -22,7 +22,7 @@
22/* standard var */ 22/* standard var */
23static int done = 0; 23static int done = 0;
24/* private data */ 24/* private data */
25static Evas_Object *o_images[OBNUM]; 25static efl::eina::list<evas::image> images;
26 26
27/* setup */ 27/* setup */
28static void _setup(void) 28static void _setup(void)
@@ -33,7 +33,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
36 o_images[i] = o; 36 images[i] = 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));
@@ -60,7 +60,7 @@ static void _setup(void)
60static void _cleanup(void) 60static void _cleanup(void)
61{ 61{
62 int i; 62 int i;
63 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 63 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
64} 64}
65 65
66/* loop - do things */ 66/* loop - do things */
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 78 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
79 y = (win_h / 2) - (h / 2); 79 y = (win_h / 2) - (h / 2);
80 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 80 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
81 eo_do(o_images[i], evas_obj_position_set(x, y)); 81 eo_do(images[i], evas_obj_position_set(x, y));
82 } 82 }
83 } 83 }
84 FPS_STD(NAME); 84 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc
index 5177840..5e9dee7 100644
--- a/src/bin/cxx/image_blend_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc
@@ -19,7 +19,7 @@
19/* standard var */ 19/* standard var */
20static int done = 0; 20static int done = 0;
21/* private data */ 21/* private data */
22static Evas_Object *o_images[OBNUM]; 22static efl::eina::list<evas::image> images;
23 23
24/* setup */ 24/* setup */
25static void _setup(void) 25static void _setup(void)
@@ -29,7 +29,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
32 o_images[i] = o; 32 images[i] = 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),
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 45 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
61 y = (win_h / 2) - (h / 2); 61 y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
63 eo_do(o_images[i], 63 eo_do(images[i],
64 evas_obj_position_set(x, y), 64 evas_obj_position_set(x, y),
65 evas_obj_size_set(w, h), 65 evas_obj_size_set(w, h),
66 evas_obj_image_fill_set(0, 0, w, h)); 66 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc
index d5eedce..9c4f3bf 100644
--- a/src/bin/cxx/image_blend_smooth_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_scaled.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = 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 efl_image_smooth_scale_set(1), 33 efl_image_smooth_scale_set(1),
@@ -40,7 +40,7 @@ static void _setup(void)
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 int i; 42 int i;
43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 43 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
44} 44}
45 45
46/* loop - do things */ 46/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 eo_do(o_images[i], 61 eo_do(images[i],
62 evas_obj_position_set(x, y), 62 evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h)); 64 evas_obj_image_fill_set(0, 0, w, h));
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 620d561..f4bf8fe 100644
--- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = o;
31 eo_do(o, 31 eo_do(o,
32 efl_file_set(build_path("image.png"), NULL), 32 efl_file_set(build_path("image.png"), NULL),
33 efl_image_smooth_scale_set(1), 33 efl_image_smooth_scale_set(1),
@@ -40,7 +40,7 @@ static void _setup(void)
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 int i; 42 int i;
43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 43 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
44} 44}
45 45
46/* loop - do things */ 46/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 eo_do(o_images[i], 61 eo_do(images[i],
62 evas_obj_position_set(x, y), 62 evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h)); 64 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
index ec076ff..cb8b75e 100644
--- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = o;
31 eo_do(o, 31 eo_do(o,
32 efl_file_set(build_path("image.png"), NULL), 32 efl_file_set(build_path("image.png"), NULL),
33 efl_image_smooth_scale_set(1), 33 efl_image_smooth_scale_set(1),
@@ -40,7 +40,7 @@ static void _setup(void)
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 int i; 42 int i;
43 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 43 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
44} 44}
45 45
46/* loop - do things */ 46/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 eo_do(o_images[i], 61 eo_do(images[i],
62 evas_obj_position_set(x, y), 62 evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h)); 64 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc
index 012b824..013be0f 100644
--- a/src/bin/cxx/image_blend_solid_middle_border.cc
+++ b/src/bin/cxx/image_blend_solid_middle_border.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = o;
31 eo_do(o, 31 eo_do(o,
32 efl_file_set(build_path("bar.png"), NULL), 32 efl_file_set(build_path("bar.png"), NULL),
33 evas_obj_image_border_set(6, 6, 6, 6), 33 evas_obj_image_border_set(6, 6, 6, 6),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
62 eo_do(o_images[i], 62 eo_do(images[i],
63 evas_obj_position_set(x, y), 63 evas_obj_position_set(x, y),
64 evas_obj_size_set(w, h), 64 evas_obj_size_set(w, h),
65 evas_obj_image_fill_set(0, 0, w, h)); 65 evas_obj_image_fill_set(0, 0, w, h));
diff --git a/src/bin/cxx/image_blend_solid_middle_unscaled.cc b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
index 573b354..3147a44 100644
--- a/src/bin/cxx/image_blend_solid_middle_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = 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),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
60 y = (win_h / 2) - (h / 2); 60 y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
62 eo_do(o_images[i], evas_obj_position_set(x, y)); 62 eo_do(images[i], evas_obj_position_set(x, y));
63 } 63 }
64 FPS_STD(NAME); 64 FPS_STD(NAME);
65} 65}
diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc
index e3259e7..fe7f275 100644
--- a/src/bin/cxx/image_blend_unscaled.cc
+++ b/src/bin/cxx/image_blend_unscaled.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = 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),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 44 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
58 y = (win_h / 2) - (h / 2); 58 y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
60 eo_do(o_images[i], evas_obj_position_set(x, y)); 60 eo_do(images[i], evas_obj_position_set(x, y));
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/cxx/image_crossfade.cc b/src/bin/cxx/image_crossfade.cc
index e871ce7..68b8d63 100644
--- a/src/bin/cxx/image_crossfade.cc
+++ b/src/bin/cxx/image_crossfade.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[2]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -26,7 +26,7 @@ static void _setup(void)
26 Evas_Object *o; 26 Evas_Object *o;
27 27
28 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 28 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
29 o_images[0] = o; 29 images[0] = o;
30 eo_do(o, 30 eo_do(o,
31 efl_file_set(build_path("im1.png"), NULL), 31 efl_file_set(build_path("im1.png"), NULL),
32 evas_obj_image_fill_set(0, 0, 720, 420), 32 evas_obj_image_fill_set(0, 0, 720, 420),
@@ -34,7 +34,7 @@ static void _setup(void)
34 evas_obj_visibility_set(EINA_TRUE)); 34 evas_obj_visibility_set(EINA_TRUE));
35 35
36 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 36 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
37 o_images[1] = o; 37 images[1] = o;
38 eo_do(o, 38 eo_do(o,
39 efl_file_set(build_path("im2.png"), NULL), 39 efl_file_set(build_path("im2.png"), NULL),
40 evas_obj_image_fill_set(0, 0, 720, 420), 40 evas_obj_image_fill_set(0, 0, 720, 420),
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < 2; i++) eo_del(o_images[i]); 51 for (i = 0; i < 2; i++) eo_del(images[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
58 58
59 a = f & 0x1f; 59 a = f & 0x1f;
60 a = ((a << 3) | (a >> 2)) & 0xff; 60 a = ((a << 3) | (a >> 2)) & 0xff;
61 eo_do(o_images[1], evas_obj_color_set(a, a, a, a)); 61 eo_do(images[1], evas_obj_color_set(a, a, a, a));
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
64 64
diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc
index 7c3ca78..45cae0e 100644
--- a/src/bin/cxx/image_data_argb.cc
+++ b/src/bin/cxx/image_data_argb.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < 1; i++) eo_del(o_images[i]); 48 for (i = 0; i < 1; i++) eo_del(images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
@@ -61,7 +61,7 @@ static void _loop(double t, int f)
61 h = 480; 61 h = 480;
62 x = (win_w / 2) - (w / 2); 62 x = (win_w / 2) - (w / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 eo_do(o_images[i], 64 eo_do(images[i],
65 evas_obj_position_set(x, y), 65 evas_obj_position_set(x, y),
66 evas_obj_size_set(w, h), 66 evas_obj_size_set(w, h),
67 evas_obj_image_fill_set(0, 0, w, h), 67 evas_obj_image_fill_set(0, 0, w, h),
@@ -78,7 +78,7 @@ static void _loop(double t, int f)
78 } 78 }
79 p += (st - w); 79 p += (st - w);
80 } 80 }
81 eo_do(o_images[i], 81 eo_do(images[i],
82 evas_obj_image_data_set(data), 82 evas_obj_image_data_set(data),
83 evas_obj_image_data_update_add( 0, 0, w, h)); 83 evas_obj_image_data_update_add( 0, 0, w, h));
84 } 84 }
diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc
index f2cde92..0325fd8 100644
--- a/src/bin/cxx/image_data_argb_alpha.cc
+++ b/src/bin/cxx/image_data_argb_alpha.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = o;
32 eo_do(o, 32 eo_do(o,
33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 33 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888), 34 evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < 1; i++) eo_del(o_images[i]); 48 for (i = 0; i < 1; i++) eo_del(images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
@@ -61,7 +61,7 @@ static void _loop(double t, int f)
61 h = 480; 61 h = 480;
62 x = (win_w / 2) - (w / 2); 62 x = (win_w / 2) - (w / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 eo_do(o_images[i], 64 eo_do(images[i],
65 evas_obj_position_set(x, y), 65 evas_obj_position_set(x, y),
66 evas_obj_size_set(w, h), 66 evas_obj_size_set(w, h),
67 evas_obj_image_fill_set(0, 0, w, h), 67 evas_obj_image_fill_set(0, 0, w, h),
@@ -89,7 +89,7 @@ static void _loop(double t, int f)
89 } 89 }
90 p += (st - w); 90 p += (st - w);
91 } 91 }
92 eo_do(o_images[i], 92 eo_do(images[i],
93 evas_obj_image_data_set(data), 93 evas_obj_image_data_set(data),
94 evas_obj_image_data_update_add( 0, 0, w, h)); 94 evas_obj_image_data_update_add( 0, 0, w, h));
95 } 95 }
diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc
index 70c3736..3f4da71 100644
--- a/src/bin/cxx/image_data_ycbcr601pl.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22static unsigned char *yp = NULL, *up = NULL, *vp = NULL; 22static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
23 23
24/* setup */ 24/* setup */
@@ -31,7 +31,7 @@ static void _setup(void)
31 for (i = 0; i < 1; i++) 31 for (i = 0; i < 1; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = o;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
@@ -51,7 +51,7 @@ static void _setup(void)
51 fread(vp, 320 * 240, 1, f); 51 fread(vp, 320 * 240, 1, f);
52 fclose(f); 52 fclose(f);
53 } 53 }
54 data = evas_object_image_data_get(o_images[i], 1); 54 data = evas_object_image_data_get(images[i], 1);
55 lp = data; 55 lp = data;
56 for (y = 0; y < 480; y++) 56 for (y = 0; y < 480; y++)
57 { 57 {
@@ -68,7 +68,7 @@ static void _setup(void)
68 *lp = vp + (y * 320); 68 *lp = vp + (y * 320);
69 lp++; 69 lp++;
70 } 70 }
71 eo_do(o_images[i], evas_obj_image_data_set(data)); 71 eo_do(images[i], evas_obj_image_data_set(data));
72 } 72 }
73 done = 0; 73 done = 0;
74} 74}
@@ -77,7 +77,7 @@ static void _setup(void)
77static void _cleanup(void) 77static void _cleanup(void)
78{ 78{
79 int i; 79 int i;
80 for (i = 0; i < 1; i++) eo_del(o_images[i]); 80 for (i = 0; i < 1; i++) eo_del(images[i]);
81 free(yp); 81 free(yp);
82 free(up); 82 free(up);
83 free(vp); 83 free(vp);
@@ -94,7 +94,7 @@ static void _loop(double t, int f)
94 h = 480; 94 h = 480;
95 x = (win_w / 2) - (w / 2); 95 x = (win_w / 2) - (w / 2);
96 y = (win_h / 2) - (h / 2); 96 y = (win_h / 2) - (h / 2);
97 eo_do(o_images[i], 97 eo_do(images[i],
98 evas_obj_position_set(x, y), 98 evas_obj_position_set(x, y),
99 evas_obj_size_set(w, h), 99 evas_obj_size_set(w, h),
100 evas_obj_image_fill_set(0, 0, w, h), 100 evas_obj_image_fill_set(0, 0, w, h),
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 1013307..cbdf811 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
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22static unsigned char *yp = NULL, *up = NULL, *vp = NULL; 22static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
23 23
24/* setup */ 24/* setup */
@@ -31,7 +31,7 @@ static void _setup(void)
31 for (i = 0; i < 1; i++) 31 for (i = 0; i < 1; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = o;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
@@ -52,7 +52,7 @@ static void _setup(void)
52 fread(vp, 320 * 240, 1, f); 52 fread(vp, 320 * 240, 1, f);
53 fclose(f); 53 fclose(f);
54 } 54 }
55 data = evas_object_image_data_get(o_images[i], 1); 55 data = evas_object_image_data_get(images[i], 1);
56 lp = data; 56 lp = data;
57 for (y = 0; y < 480; y++) 57 for (y = 0; y < 480; y++)
58 { 58 {
@@ -69,7 +69,7 @@ static void _setup(void)
69 *lp = vp + (y * 320); 69 *lp = vp + (y * 320);
70 lp++; 70 lp++;
71 } 71 }
72 eo_do(o_images[i], evas_obj_image_data_set(data)); 72 eo_do(images[i], evas_obj_image_data_set(data));
73 } 73 }
74 done = 0; 74 done = 0;
75} 75}
@@ -78,7 +78,7 @@ static void _setup(void)
78static void _cleanup(void) 78static void _cleanup(void)
79{ 79{
80 int i; 80 int i;
81 for (i = 0; i < 1; i++) eo_del(o_images[i]); 81 for (i = 0; i < 1; i++) eo_del(images[i]);
82 free(yp); 82 free(yp);
83 free(up); 83 free(up);
84 free(vp); 84 free(vp);
@@ -103,7 +103,7 @@ static void _loop(double t, int f)
103 103
104 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 104 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
105 105
106 eo_do(o_images[i], 106 eo_do(images[i],
107 evas_obj_map_enable_set(1), 107 evas_obj_map_enable_set(1),
108 evas_obj_map_set(m)); 108 evas_obj_map_set(m));
109 } 109 }
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 f1f76ac..fc37d05 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22static unsigned char *yp = NULL, *up = NULL, *vp = NULL; 22static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
23 23
24/* setup */ 24/* setup */
@@ -31,7 +31,7 @@ static void _setup(void)
31 for (i = 0; i < 1; i++) 31 for (i = 0; i < 1; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = o;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
@@ -51,7 +51,7 @@ static void _setup(void)
51 fread(vp, 320 * 240, 1, f); 51 fread(vp, 320 * 240, 1, f);
52 fclose(f); 52 fclose(f);
53 } 53 }
54 data = evas_object_image_data_get(o_images[i], 1); 54 data = evas_object_image_data_get(images[i], 1);
55 lp = data; 55 lp = data;
56 for (y = 0; y < 480; y++) 56 for (y = 0; y < 480; y++)
57 { 57 {
@@ -68,7 +68,7 @@ static void _setup(void)
68 *lp = vp + (y * 320); 68 *lp = vp + (y * 320);
69 lp++; 69 lp++;
70 } 70 }
71 eo_do(o_images[i], evas_obj_image_data_set(data)); 71 eo_do(images[i], evas_obj_image_data_set(data));
72 } 72 }
73 done = 0; 73 done = 0;
74} 74}
@@ -77,7 +77,7 @@ static void _setup(void)
77static void _cleanup(void) 77static void _cleanup(void)
78{ 78{
79 int i; 79 int i;
80 for (i = 0; i < 1; i++) eo_del(o_images[i]); 80 for (i = 0; i < 1; i++) eo_del(images[i]);
81 free(yp); 81 free(yp);
82 free(up); 82 free(up);
83 free(vp); 83 free(vp);
@@ -101,7 +101,7 @@ static void _loop(double t, int f)
101 101
102 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 102 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
103 103
104 eo_do(o_images[i], 104 eo_do(images[i],
105 evas_obj_map_enable_set(1), 105 evas_obj_map_enable_set(1),
106 evas_obj_map_set(m)); 106 evas_obj_map_set(m));
107 } 107 }
diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
index 40f1517..41f3f0f 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22static unsigned char *yp = NULL, *up = NULL, *vp = NULL; 22static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
23 23
24/* setup */ 24/* setup */
@@ -31,7 +31,7 @@ static void _setup(void)
31 for (i = 0; i < 1; i++) 31 for (i = 0; i < 1; i++)
32 { 32 {
33 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 33 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
34 o_images[i] = o; 34 images[i] = o;
35 eo_do(o, 35 eo_do(o,
36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 36 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 37 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
@@ -51,7 +51,7 @@ static void _setup(void)
51 fread(vp, 320 * 240, 1, f); 51 fread(vp, 320 * 240, 1, f);
52 fclose(f); 52 fclose(f);
53 } 53 }
54 data = evas_object_image_data_get(o_images[i], 1); 54 data = evas_object_image_data_get(images[i], 1);
55 if (data) 55 if (data)
56 { 56 {
57 lp = data; 57 lp = data;
@@ -70,7 +70,7 @@ static void _setup(void)
70 *lp = vp + (y * 320); 70 *lp = vp + (y * 320);
71 lp++; 71 lp++;
72 } 72 }
73 eo_do(o_images[i], 73 eo_do(images[i],
74 evas_obj_image_data_set(data), 74 evas_obj_image_data_set(data),
75 evas_obj_image_data_update_add( 0, 0, 320, 480)); 75 evas_obj_image_data_update_add( 0, 0, 320, 480));
76 } 76 }
@@ -82,7 +82,7 @@ static void _setup(void)
82static void _cleanup(void) 82static void _cleanup(void)
83{ 83{
84 int i; 84 int i;
85 for (i = 0; i < 1; i++) eo_del(o_images[i]); 85 for (i = 0; i < 1; i++) eo_del(images[i]);
86 free(yp); 86 free(yp);
87 free(up); 87 free(up);
88 free(vp); 88 free(vp);
@@ -101,7 +101,7 @@ static void _loop(double t, int f)
101 h = 480; 101 h = 480;
102 x = (win_w / 2) - (w / 2); 102 x = (win_w / 2) - (w / 2);
103 y = (win_h / 2) - (h / 2); 103 y = (win_h / 2) - (h / 2);
104 eo_do(o_images[i], 104 eo_do(images[i],
105 evas_obj_position_set(x, y), 105 evas_obj_position_set(x, y),
106 evas_obj_size_set(w, h), 106 evas_obj_size_set(w, h),
107 evas_obj_image_fill_set(0, 0, w, h)); 107 evas_obj_image_fill_set(0, 0, w, h));
@@ -112,8 +112,8 @@ static void _loop(double t, int f)
112 112
113 w &= ~0x1; 113 w &= ~0x1;
114 114
115 eo_do(o_images[i], evas_obj_image_size_set(w, 480)); 115 eo_do(images[i], evas_obj_image_size_set(w, 480));
116 data = evas_object_image_data_get(o_images[i], 1); 116 data = evas_object_image_data_get(images[i], 1);
117 if (data) 117 if (data)
118 { 118 {
119 lp = data; 119 lp = data;
@@ -132,7 +132,7 @@ static void _loop(double t, int f)
132 *lp = vp + (y * 320); 132 *lp = vp + (y * 320);
133 lp++; 133 lp++;
134 } 134 }
135 eo_do(o_images[i], 135 eo_do(images[i],
136 evas_obj_image_data_set(data), 136 evas_obj_image_data_set(data),
137 evas_obj_image_data_update_add( 0, 0, w, 480)); 137 evas_obj_image_data_update_add( 0, 0, w, 480));
138 } 138 }
diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc
index 56b31ea..a243206 100644
--- a/src/bin/cxx/image_map_3d_flow.cc
+++ b/src/bin/cxx/image_map_3d_flow.cc
@@ -20,7 +20,7 @@ static int done = 0;
20#define CNUM 48 20#define CNUM 48
21 21
22/* private data */ 22/* private data */
23static Evas_Object *o_images[CNUM]; 23static efl::eina::list<evas::image> images;
24static Evas_Object *o_reflec[CNUM]; 24static Evas_Object *o_reflec[CNUM];
25 25
26/* setup */ 26/* setup */
@@ -33,7 +33,7 @@ static void _setup(void)
33 char buf[256]; 33 char buf[256];
34 34
35 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 35 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
36 o_images[i] = o; 36 images[i] = o;
37 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 37 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
38 eo_do(o, 38 eo_do(o,
39 efl_file_set(build_path(buf), NULL), 39 efl_file_set(build_path(buf), NULL),
@@ -61,7 +61,7 @@ static void _cleanup(void)
61 int i; 61 int i;
62 for (i = 0; i < CNUM; i++) 62 for (i = 0; i < CNUM; i++)
63 { 63 {
64 eo_del(o_images[i]); 64 eo_del(images[i]);
65 eo_del(o_reflec[i]); 65 eo_del(o_reflec[i]);
66 } 66 }
67} 67}
@@ -133,12 +133,12 @@ static void _loop(double t, int f)
133 133
134 if (c <= 0) 134 if (c <= 0)
135 { 135 {
136 eo_do(o_images[i], evas_obj_raise()); 136 eo_do(images[i], evas_obj_raise());
137 eo_do(o_reflec[i], evas_obj_raise()); 137 eo_do(o_reflec[i], evas_obj_raise());
138 } 138 }
139 else 139 else
140 { 140 {
141 eo_do(o_images[i], evas_obj_lower()); 141 eo_do(images[i], evas_obj_lower());
142 eo_do(o_reflec[i], evas_obj_lower()); 142 eo_do(o_reflec[i], evas_obj_lower());
143 } 143 }
144 144
@@ -162,7 +162,7 @@ static void _loop(double t, int f)
162 x + (w / 2), y + (h / 2), 0); 162 x + (w / 2), y + (h / 2), 0);
163 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512); 163 evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
164 164
165 eo_do(o_images[i], 165 eo_do(images[i],
166 evas_obj_map_enable_set(1), 166 evas_obj_map_enable_set(1),
167 evas_obj_map_set(m)); 167 evas_obj_map_set(m));
168 168
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 b126954..ce9c747 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 46 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72 72
73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
74 74
75 eo_do(o_images[i], 75 eo_do(images[i],
76 evas_obj_map_enable_set(1), 76 evas_obj_map_enable_set(1),
77 evas_obj_map_set(m)); 77 evas_obj_map_set(m));
78 } 78 }
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 d02607e..b302c27 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
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 46 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72 72
73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
74 74
75 eo_do(o_images[i], 75 eo_do(images[i],
76 evas_obj_map_enable_set(1), 76 evas_obj_map_enable_set(1),
77 evas_obj_map_set(m)); 77 evas_obj_map_set(m));
78 } 78 }
diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc
index ba9c7d7..66eb5cc 100644
--- a/src/bin/cxx/image_map_color_alpha_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 45 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70 70
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 72
73 eo_do(o_images[i], 73 eo_do(images[i],
74 evas_obj_map_enable_set(1), 74 evas_obj_map_enable_set(1),
75 evas_obj_map_set(m)); 75 evas_obj_map_set(m));
76 } 76 }
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 03294a1..9d2884a 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 45 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -69,7 +69,7 @@ static void _loop(double t, int f)
69 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 69 evas_map_point_color_set(m, 3, 0, 0, 0, 0);
70 70
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 eo_do(o_images[i], 72 eo_do(images[i],
73 evas_obj_map_enable_set(1), 73 evas_obj_map_enable_set(1),
74 evas_obj_map_set(m)); 74 evas_obj_map_set(m));
75 } 75 }
diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc
index 7496a3f..c5002b5 100644
--- a/src/bin/cxx/image_map_color_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 46 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72 72
73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
74 74
75 eo_do(o_images[i], 75 eo_do(images[i],
76 evas_obj_map_enable_set(1), 76 evas_obj_map_enable_set(1),
77 evas_obj_map_set(m)); 77 evas_obj_map_set(m));
78 } 78 }
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 5c4a356..a98dbe1 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 46 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -72,7 +72,7 @@ static void _loop(double t, int f)
72 72
73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 73 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
74 74
75 eo_do(o_images[i], 75 eo_do(images[i],
76 evas_obj_map_enable_set(1), 76 evas_obj_map_enable_set(1),
77 evas_obj_map_set(m)); 77 evas_obj_map_set(m));
78 } 78 }
diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc
index 3e8712b..4f03ef9 100644
--- a/src/bin/cxx/image_map_color_rotate.cc
+++ b/src/bin/cxx/image_map_color_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 45 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70 70
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 72
73 eo_do(o_images[i], 73 eo_do(images[i],
74 evas_obj_map_enable_set(1), 74 evas_obj_map_enable_set(1),
75 evas_obj_map_set(m)); 75 evas_obj_map_set(m));
76 } 76 }
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index 490dcee..f65db76 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 45 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -70,7 +70,7 @@ static void _loop(double t, int f)
70 70
71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 71 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
72 72
73 eo_do(o_images[i], 73 eo_do(images[i],
74 evas_obj_map_enable_set(1), 74 evas_obj_map_enable_set(1),
75 evas_obj_map_set(m)); 75 evas_obj_map_set(m));
76 } 76 }
diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc
index 098dd8f..d4ffd45 100644
--- a/src/bin/cxx/image_map_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 46 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 67
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 69
70 eo_do(o_images[i], 70 eo_do(images[i],
71 evas_obj_map_enable_set(1), 71 evas_obj_map_enable_set(1),
72 evas_obj_map_set(m)); 72 evas_obj_map_set(m));
73 } 73 }
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index 52192cc..19c7ef4 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 46 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 67
68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 68 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
69 69
70 eo_do(o_images[i], 70 eo_do(images[i],
71 evas_obj_map_enable_set(1), 71 evas_obj_map_enable_set(1),
72 evas_obj_map_set(m)); 72 evas_obj_map_set(m));
73 } 73 }
diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc
index d21c624..13631df 100644
--- a/src/bin/cxx/image_map_rotate.cc
+++ b/src/bin/cxx/image_map_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = o;
32 eo_do(o, efl_file_set(build_path("logo.png"), NULL), 32 eo_do(o, 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),
34 evas_obj_size_set(120, 160), 34 evas_obj_size_set(120, 160),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 44 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64 64
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 66
67 eo_do(o_images[i], evas_obj_map_enable_set(1), 67 eo_do(images[i], evas_obj_map_enable_set(1),
68 evas_obj_map_set(m)); 68 evas_obj_map_set(m));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc
index 3c5f740..41cc9c0 100644
--- a/src/bin/cxx/image_map_solid_rotate.cc
+++ b/src/bin/cxx/image_map_solid_rotate.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[OBNUM]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < (OBNUM / 2); i++) 28 for (i = 0; i < (OBNUM / 2); i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = 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 evas_obj_image_fill_set(0, 0, 120, 160), 34 evas_obj_image_fill_set(0, 0, 120, 160),
@@ -42,7 +42,7 @@ static void _setup(void)
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]); 45 for (i = 0; i < (OBNUM / 2); i++) eo_del(images[i]);
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
65 65
66 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 66 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
67 67
68 eo_do(o_images[i], 68 eo_do(images[i],
69 evas_obj_map_enable_set(1), 69 evas_obj_map_enable_set(1),
70 evas_obj_map_set(m)); 70 evas_obj_map_set(m));
71 } 71 }
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index dc919e6..a322042 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -18,7 +18,7 @@
18static int done = 0; 18static int done = 0;
19 19
20/* private data */ 20/* private data */
21static Evas_Object *o_images[1]; 21static efl::eina::list<evas::image> images;
22 22
23/* setup */ 23/* setup */
24static void _setup(void) 24static void _setup(void)
@@ -28,7 +28,7 @@ static void _setup(void)
28 for (i = 0; i < 1; i++) 28 for (i = 0; i < 1; i++)
29 { 29 {
30 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 30 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
31 o_images[i] = o; 31 images[i] = o;
32 eo_do(o, efl_file_set(build_path("tp.png"), NULL), 32 eo_do(o, efl_file_set(build_path("tp.png"), NULL),
33 evas_obj_image_fill_set(0, 0, 640, 480), 33 evas_obj_image_fill_set(0, 0, 640, 480),
34 evas_obj_size_set(640, 480), 34 evas_obj_size_set(640, 480),
@@ -41,7 +41,7 @@ static void _setup(void)
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 int i; 43 int i;
44 for (i = 0; i < 1; i++) eo_del(o_images[i]); 44 for (i = 0; i < 1; i++) eo_del(images[i]);
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
57 h *= (f / 100.0) * 4.0; 57 h *= (f / 100.0) * 4.0;
58 x = (win_w / 2) - (w / 2); 58 x = (win_w / 2) - (w / 2);
59 y = (win_h / 2) - (h / 2); 59 y = (win_h / 2) - (h / 2);
60 eo_do(o_images[i], evas_obj_position_set(x, y), 60 eo_do(images[i], evas_obj_position_set(x, y),
61 evas_obj_size_set(w, h), 61 evas_obj_size_set(w, h),
62 evas_obj_image_fill_set(0, 0, w, h)); 62 evas_obj_image_fill_set(0, 0, w, h));
63 } 63 }
diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc
index d55673a..eda881d 100644
--- a/src/bin/cxx/line_blend.cc
+++ b/src/bin/cxx/line_blend.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -30,7 +30,7 @@ static void _setup(void)
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_LINE_CLASS, G_evas); 32 o = eo_add(EVAS_LINE_CLASS, G_evas);
33 o_images[i] = o; 33 images[i] = o;
34 a = (rnd()&0xff) / 2; 34 a = (rnd()&0xff) / 2;
35 r = ((rnd()&0xff) * a) / 255; 35 r = ((rnd()&0xff) * a) / 255;
36 g = ((rnd()&0xff) * a) / 255; 36 g = ((rnd()&0xff) * a) / 255;
@@ -52,7 +52,7 @@ static void _setup(void)
52static void _cleanup(void) 52static void _cleanup(void)
53{ 53{
54 int i; 54 int i;
55 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 55 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
56} 56}
57 57
58#define PI (double) 3.141592654 58#define PI (double) 3.141592654
@@ -93,7 +93,7 @@ static void _loop(double t, int f)
93 93
94 for (i = 0; i < OBNUM; i++) 94 for (i = 0; i < OBNUM; i++)
95 { 95 {
96 o = o_images[i]; 96 o = images[i];
97 eo_do(o, evas_obj_line_xy_get(&ox1, &oy1, &ox2, &oy2)); 97 eo_do(o, evas_obj_line_xy_get(&ox1, &oy1, &ox2, &oy2));
98 98
99 _rotate_point(&ox1, &oy1, i); 99 _rotate_point(&ox1, &oy1, i);
diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc
index ddb9797..a316876 100644
--- a/src/bin/cxx/proxy_image.cc
+++ b/src/bin/cxx/proxy_image.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -32,12 +32,12 @@ static void _setup(void)
32 evas_obj_size_set(120, 160), 32 evas_obj_size_set(120, 160),
33 evas_obj_visibility_set(EINA_TRUE)); 33 evas_obj_visibility_set(EINA_TRUE));
34 src = o; 34 src = o;
35 o_images[0] = src; 35 images[0] = src;
36 36
37 for (i = 1; i < OBNUM; i++) 37 for (i = 1; i < OBNUM; i++)
38 { 38 {
39 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 39 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
40 o_images[i] = o; 40 images[i] = o;
41 eo_do(o, 41 eo_do(o,
42 evas_obj_image_source_set(src), 42 evas_obj_image_source_set(src),
43 evas_obj_size_set(120, 160), 43 evas_obj_size_set(120, 160),
@@ -51,7 +51,7 @@ static void _setup(void)
51static void _cleanup(void) 51static void _cleanup(void)
52{ 52{
53 int i; 53 int i;
54 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 54 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
55} 55}
56 56
57/* loop - do things */ 57/* loop - do things */
@@ -67,7 +67,7 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 67 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
68 y = (win_h / 2) - (h / 2); 68 y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 69 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
70 eo_do(o_images[i], evas_obj_position_set(x, y)); 70 eo_do(images[i], evas_obj_position_set(x, y));
71 } 71 }
72 FPS_STD(NAME); 72 FPS_STD(NAME);
73} 73}
diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc
index 04130f9..bf17151 100644
--- a/src/bin/cxx/proxy_image_offscreen.cc
+++ b/src/bin/cxx/proxy_image_offscreen.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -35,7 +35,7 @@ static void _setup(void)
35 for (i = 0; i < OBNUM / 2; i++) 35 for (i = 0; i < OBNUM / 2; i++)
36 { 36 {
37 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 37 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
38 o_images[i] = o; 38 images[i] = o;
39 eo_do(o, evas_obj_image_source_set(src, NULL), 39 eo_do(o, evas_obj_image_source_set(src, NULL),
40 evas_obj_size_set(120, 160), 40 evas_obj_size_set(120, 160),
41 evas_obj_image_fill_set(0,0,120,160), 41 evas_obj_image_fill_set(0,0,120,160),
@@ -48,7 +48,7 @@ static void _setup(void)
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 int i; 50 int i;
51 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 51 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
52} 52}
53 53
54/* loop - do things */ 54/* loop - do things */
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 64 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 66 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y)); 67 eo_do(images[i], evas_obj_position_set(x, y));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
70} 70}
diff --git a/src/bin/cxx/rect_blend.cc b/src/bin/cxx/rect_blend.cc
index 06f3644..6e2dcce 100644
--- a/src/bin/cxx/rect_blend.cc
+++ b/src/bin/cxx/rect_blend.cc
@@ -14,7 +14,7 @@
14/* standard var */ 14/* standard var */
15static int done = 0; 15static int done = 0;
16/* private data */ 16/* private data */
17static Evas_Object *o_images[OBNUM]; 17static efl::eina::list<evas::image> images;
18 18
19/* setup */ 19/* setup */
20static void _setup(void) 20static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = 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;
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -61,7 +61,7 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 y = (win_h / 2) - (h / 2); 62 y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 eo_do(o_images[i], 64 eo_do(images[i],
65 evas_obj_position_set(x, y), 65 evas_obj_position_set(x, y),
66 evas_obj_size_set(w, h)); 66 evas_obj_size_set(w, h));
67 } 67 }
diff --git a/src/bin/cxx/rect_blend_few.cc b/src/bin/cxx/rect_blend_few.cc
index 9ceb71b..181683c 100644
--- a/src/bin/cxx/rect_blend_few.cc
+++ b/src/bin/cxx/rect_blend_few.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -30,7 +30,7 @@ static void _setup(void)
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
33 o_images[i] = o; 33 images[i] = 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;
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
64 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
66 eo_do(o_images[i], evas_obj_position_set(x, y), 66 eo_do(images[i], evas_obj_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 evas_obj_size_set(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
diff --git a/src/bin/cxx/rect_blend_pow2.cc b/src/bin/cxx/rect_blend_pow2.cc
index 5d34a52..8ba5fb0 100644
--- a/src/bin/cxx/rect_blend_pow2.cc
+++ b/src/bin/cxx/rect_blend_pow2.cc
@@ -14,7 +14,7 @@
14/* standard var */ 14/* standard var */
15static int done = 0; 15static int done = 0;
16/* private data */ 16/* private data */
17static Evas_Object *o_images[OBNUM]; 17static efl::eina::list<evas::image> images;
18 18
19/* setup */ 19/* setup */
20static void _setup(void) 20static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = 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;
@@ -44,7 +44,7 @@ static void _setup(void)
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 int i; 46 int i;
47 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 47 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
48} 48}
49 49
50/* loop - do things */ 50/* loop - do things */
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
63 y = (win_h / 2) - (h / 2); 63 y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
65 eo_do(o_images[i], 65 eo_do(images[i],
66 evas_obj_position_set(x, y), 66 evas_obj_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 evas_obj_size_set(w, h));
68 } 68 }
diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc
index 53d0e9e..67a270a 100644
--- a/src/bin/cxx/rect_blend_pow2_few.cc
+++ b/src/bin/cxx/rect_blend_pow2_few.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -30,7 +30,7 @@ static void _setup(void)
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
33 o_images[i] = o; 33 images[i] = 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;
@@ -46,7 +46,7 @@ static void _setup(void)
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 int i; 48 int i;
49 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 49 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
50} 50}
51 51
52/* loop - do things */ 52/* loop - do things */
@@ -64,7 +64,7 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
65 y = (win_h / 2) - (h / 2); 65 y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
67 eo_do(o_images[i], evas_obj_position_set(x, y), 67 eo_do(images[i], evas_obj_position_set(x, y),
68 evas_obj_size_set(w, h)); 68 evas_obj_size_set(w, h));
69 } 69 }
70 FPS_STD(NAME); 70 FPS_STD(NAME);
diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc
index a4df617..fd32d05 100644
--- a/src/bin/cxx/rect_solid.cc
+++ b/src/bin/cxx/rect_solid.cc
@@ -14,7 +14,7 @@
14/* standard var */ 14/* standard var */
15static int done = 0; 15static int done = 0;
16/* private data */ 16/* private data */
17static Evas_Object *o_images[OBNUM]; 17static efl::eina::list<evas::image> images;
18 18
19/* setup */ 19/* setup */
20static void _setup(void) 20static void _setup(void)
@@ -27,7 +27,7 @@ static void _setup(void)
27 int r, g, b, a; 27 int r, g, b, a;
28 28
29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 29 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
30 o_images[i] = o; 30 images[i] = 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;
@@ -43,7 +43,7 @@ static void _setup(void)
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 int i; 45 int i;
46 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 46 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
47} 47}
48 48
49/* loop - do things */ 49/* loop - do things */
@@ -61,7 +61,7 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 y = (win_h / 2) - (h / 2); 62 y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 eo_do(o_images[i], 64 eo_do(images[i],
65 evas_obj_position_set(x, y), 65 evas_obj_position_set(x, y),
66 evas_obj_size_set(w, h)); 66 evas_obj_size_set(w, h));
67 } 67 }
diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc
index ebfd495..0a46888 100644
--- a/src/bin/cxx/rect_solid_few.cc
+++ b/src/bin/cxx/rect_solid_few.cc
@@ -17,7 +17,7 @@
17/* standard var */ 17/* standard var */
18static int done = 0; 18static int done = 0;
19/* private data */ 19/* private data */
20static Evas_Object *o_images[OBNUM]; 20static efl::eina::list<evas::image> images;
21 21
22/* setup */ 22/* setup */
23static void _setup(void) 23static void _setup(void)
@@ -30,7 +30,7 @@ static void _setup(void)
30 int r, g, b, a; 30 int r, g, b, a;
31 31
32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas); 32 o = eo_add(EVAS_RECTANGLE_CLASS, G_evas);
33 o_images[i] = o; 33 images[i] = 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;
@@ -45,7 +45,7 @@ static void _setup(void)
45static void _cleanup(void) 45static void _cleanup(void)
46{ 46{
47 int i; 47 int i;
48 for (i = 0; i < OBNUM; i++) eo_del(o_images[i]); 48 for (i = 0; i < OBNUM; i++) eo_del(images[i]);
49} 49}
50 50
51/* loop - do things */ 51/* loop - do things */
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
64 y = (win_h / 2) - (h / 2); 64 y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
66 eo_do(o_images[i], evas_obj_position_set(x, y), 66 eo_do(images[i], evas_obj_position_set(x, y),
67 evas_obj_size_set(w, h)); 67 evas_obj_size_set(w, h));
68 } 68 }
69 FPS_STD(NAME); 69 FPS_STD(NAME);
diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc
index 34e3d1f..62511fb 100644
--- a/src/bin/cxx/widgets_file_icons.cc
+++ b/src/bin/cxx/widgets_file_icons.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *icons[] = 22static const char *icons[] =
@@ -47,7 +47,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 images[i] = 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),
@@ -71,7 +71,7 @@ static void _cleanup(void)
71 int i; 71 int i;
72 for (i = 0; i < NUM; i++) 72 for (i = 0; i < NUM; i++)
73 { 73 {
74 eo_del(o_images[i]); 74 eo_del(images[i]);
75 eo_del(o_texts[i]); 75 eo_del(o_texts[i]);
76 } 76 }
77} 77}
@@ -85,7 +85,7 @@ static void _loop(double t, int f)
85 y = 0 - f; 85 y = 0 - f;
86 for (i = 0; i < NUM; i++) 86 for (i = 0; i < NUM; i++)
87 { 87 {
88 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 88 eo_do(images[i], evas_obj_position_set(x + 8, y));
89 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 89 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
90 cent = (ICON_SIZE + 16 - tw) / 2; 90 cent = (ICON_SIZE + 16 - tw) / 2;
91 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 91 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index 82ed0cc..82d0b99 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *icons[] = 22static const char *icons[] =
@@ -47,7 +47,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 images[i] = 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),
@@ -69,7 +69,7 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 eo_del(images[i]);
73 eo_del(o_texts[i]); 73 eo_del(o_texts[i]);
74 } 74 }
75} 75}
@@ -83,7 +83,7 @@ static void _loop(double t, int f)
83 y = 0 - f; 83 y = 0 - f;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 86 eo_do(images[i], evas_obj_position_set(x + 8, y));
87 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 87 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
88 cent = (ICON_SIZE + 16 - tw) / 2; 88 cent = (ICON_SIZE + 16 - tw) / 2;
89 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 89 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc
index 41e53ba..fa42b7a 100644
--- a/src/bin/cxx/widgets_file_icons_2_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *icons[] = 22static const char *icons[] =
@@ -47,7 +47,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 images[i] = 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),
@@ -62,12 +62,12 @@ static void _setup(void)
62 } 62 }
63 for (i = 0; i < NUM; i++) 63 for (i = 0; i < NUM; i++)
64 { 64 {
65 eo_do(o_images[i], evas_obj_raise()); 65 eo_do(images[i], evas_obj_raise());
66 } 66 }
67 for (i = 0; i < NUM; i++) 67 for (i = 0; i < NUM; i++)
68 { 68 {
69 if (i > 13) 69 if (i > 13)
70 eo_do(o_images[i], evas_obj_stack_above(o_images[i - 13])); 70 eo_do(images[i], evas_obj_stack_above(images[i - 13]));
71 } 71 }
72 done = 0; 72 done = 0;
73} 73}
@@ -78,7 +78,7 @@ static void _cleanup(void)
78 int i; 78 int i;
79 for (i = 0; i < NUM; i++) 79 for (i = 0; i < NUM; i++)
80 { 80 {
81 eo_del(o_images[i]); 81 eo_del(images[i]);
82 eo_del(o_texts[i]); 82 eo_del(o_texts[i]);
83 } 83 }
84} 84}
@@ -92,7 +92,7 @@ static void _loop(double t, int f)
92 y = 0 - f; 92 y = 0 - f;
93 for (i = 0; i < NUM; i++) 93 for (i = 0; i < NUM; i++)
94 { 94 {
95 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 95 eo_do(images[i], evas_obj_position_set(x + 8, y));
96 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 96 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
97 cent = (ICON_SIZE + 16 - tw) / 2; 97 cent = (ICON_SIZE + 16 - tw) / 2;
98 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 98 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc
index a4e9756..a7cf08d 100644
--- a/src/bin/cxx/widgets_file_icons_2_same.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *icons[] = 22static const char *icons[] =
@@ -32,7 +32,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 35 images[i] = 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),
@@ -54,7 +54,7 @@ static void _cleanup(void)
54 int i; 54 int i;
55 for (i = 0; i < NUM; i++) 55 for (i = 0; i < NUM; i++)
56 { 56 {
57 eo_del(o_images[i]); 57 eo_del(images[i]);
58 eo_del(o_texts[i]); 58 eo_del(o_texts[i]);
59 } 59 }
60} 60}
@@ -68,7 +68,7 @@ static void _loop(double t, int f)
68 y = 0 - f; 68 y = 0 - f;
69 for (i = 0; i < NUM; i++) 69 for (i = 0; i < NUM; i++)
70 { 70 {
71 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 71 eo_do(images[i], evas_obj_position_set(x + 8, y));
72 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 72 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
73 cent = (ICON_SIZE + 16 - tw) / 2; 73 cent = (ICON_SIZE + 16 - tw) / 2;
74 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 74 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
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 e3a8ffb..7596377 100644
--- a/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same_grouped.cc
@@ -1,22 +1,25 @@
1#undef FNAME
2#undef NAME
3#undef ICON
4 1
5/* metadata */ 2#ifdef HAVE_CONFIG_H
6#define FNAME widgets_file_icons_2_same_grouped_start 3# include <config.h>
7#define NAME "Widgets File Icons 2 Same Grouped" 4#endif
8#define ICON "widgets.png" 5
6#include "Eo.h"
7#include "Evas.h"
8
9#include "Eo.hh"
10#include "Eina.hh"
11#include "Evas.hh"
9 12
10#ifndef PROTO 13#include "main.h"
11# ifndef UI 14
12# include "main.h" 15#define EXPEDITE_CXX_TEST_IMPL
13 16
14/* standard var */ 17/* standard var */
15static int done = 0; 18static int done = 0;
16/* private data */ 19/* private data */
17#define NUM 512 20#define NUM 512
18#define ICON_SIZE 64 21#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 22static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 23static Evas_Object *o_texts[NUM];
21 24
22static const char *icons[] = 25static const char *icons[] =
@@ -32,7 +35,7 @@ static void _setup(void)
32 for (i = 0; i < NUM; i++) 35 for (i = 0; i < NUM; i++)
33 { 36 {
34 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 37 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
35 o_images[i] = o; 38 images[i] = o;
36 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL), 39 eo_do(o, efl_file_set(build_path(icons[i % 1]), NULL),
37 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), 40 evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
38 evas_obj_size_set(ICON_SIZE, ICON_SIZE), 41 evas_obj_size_set(ICON_SIZE, ICON_SIZE),
@@ -47,7 +50,7 @@ static void _setup(void)
47 } 50 }
48 for (i = 0; i < NUM; i++) 51 for (i = 0; i < NUM; i++)
49 { 52 {
50 eo_do(o_images[i], evas_obj_raise()); 53 eo_do(images[i], evas_obj_raise());
51 } 54 }
52 done = 0; 55 done = 0;
53} 56}
@@ -58,7 +61,7 @@ static void _cleanup(void)
58 int i; 61 int i;
59 for (i = 0; i < NUM; i++) 62 for (i = 0; i < NUM; i++)
60 { 63 {
61 eo_del(o_images[i]); 64 eo_del(images[i]);
62 eo_del(o_texts[i]); 65 eo_del(o_texts[i]);
63 } 66 }
64} 67}
@@ -72,7 +75,7 @@ static void _loop(double t, int f)
72 y = 0 - f; 75 y = 0 - f;
73 for (i = 0; i < NUM; i++) 76 for (i = 0; i < NUM; i++)
74 { 77 {
75 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 78 eo_do(images[i], evas_obj_position_set(x + 8, y));
76 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 79 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
77 cent = (ICON_SIZE + 16 - tw) / 2; 80 cent = (ICON_SIZE + 16 - tw) / 2;
78 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 81 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
@@ -92,38 +95,8 @@ static void _key(char *key)
92 KEY_STD; 95 KEY_STD;
93} 96}
94 97
95 98extern "C" void FNAME(void)
96
97
98
99
100
101
102
103
104
105
106/* template stuff - ignore */
107# endif
108#endif
109
110#ifdef UI
111_ui_menu_item_add(ICON, NAME, FNAME);
112#endif
113
114#ifdef PROTO
115void FNAME(void);
116#endif
117
118#ifndef PROTO
119# ifndef UI
120void FNAME(void)
121{ 99{
122 ui_func_set(_key, _loop); 100 ui_func_set(_key, _loop);
123 _setup(); 101 _setup();
124} 102}
125# endif
126#endif
127#undef FNAME
128#undef NAME
129#undef ICON
diff --git a/src/bin/cxx/widgets_file_icons_3.cc b/src/bin/cxx/widgets_file_icons_3.cc
index 2ee74ed..cbc9e65 100644
--- a/src/bin/cxx/widgets_file_icons_3.cc
+++ b/src/bin/cxx/widgets_file_icons_3.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 16 18#define ICON_SIZE 16
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *icons[] = 22static const char *icons[] =
@@ -47,7 +47,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 images[i] = 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),
@@ -69,7 +69,7 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 eo_del(images[i]);
73 eo_del(o_texts[i]); 73 eo_del(o_texts[i]);
74 } 74 }
75} 75}
@@ -83,7 +83,7 @@ static void _loop(double t, int f)
83 y = 0 - f; 83 y = 0 - f;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 86 eo_do(images[i], evas_obj_position_set(x + 8, y));
87 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 87 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
88 cent = (ICON_SIZE + 16 - tw) / 2; 88 cent = (ICON_SIZE + 16 - tw) / 2;
89 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 89 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc
index 7558807..f68a590 100644
--- a/src/bin/cxx/widgets_file_icons_4.cc
+++ b/src/bin/cxx/widgets_file_icons_4.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 96 18#define ICON_SIZE 96
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *icons[] = 22static const char *icons[] =
@@ -47,7 +47,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
50 o_images[i] = o; 50 images[i] = 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),
@@ -69,7 +69,7 @@ static void _cleanup(void)
69 int i; 69 int i;
70 for (i = 0; i < NUM; i++) 70 for (i = 0; i < NUM; i++)
71 { 71 {
72 eo_del(o_images[i]); 72 eo_del(images[i]);
73 eo_del(o_texts[i]); 73 eo_del(o_texts[i]);
74 } 74 }
75} 75}
@@ -83,7 +83,7 @@ static void _loop(double t, int f)
83 y = 0 - f; 83 y = 0 - f;
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
86 eo_do(o_images[i], evas_obj_position_set(x + 8, y)); 86 eo_do(images[i], evas_obj_position_set(x + 8, y));
87 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 87 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
88 cent = (ICON_SIZE + 16 - tw) / 2; 88 cent = (ICON_SIZE + 16 - tw) / 2;
89 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); 89 eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc
index dd7066e..c128d42 100644
--- a/src/bin/cxx/widgets_list_1.cc
+++ b/src/bin/cxx/widgets_list_1.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *labels[] = 22static const char *labels[] =
@@ -63,7 +63,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 images[i] = 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),
@@ -86,7 +86,7 @@ static void _cleanup(void)
86 int i; 86 int i;
87 for (i = 0; i < NUM; i++) 87 for (i = 0; i < NUM; i++)
88 { 88 {
89 eo_del(o_images[i]); 89 eo_del(images[i]);
90 eo_del(o_texts[i]); 90 eo_del(o_texts[i]);
91 } 91 }
92} 92}
@@ -100,7 +100,7 @@ static void _loop(double t, int f)
100 y = 0 - f; 100 y = 0 - f;
101 for (i = 0; i < NUM; i++) 101 for (i = 0; i < NUM; i++)
102 { 102 {
103 eo_do(o_images[i], evas_obj_position_set(x, y)); 103 eo_do(images[i], evas_obj_position_set(x, y));
104 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 104 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
105 cent = (ICON_SIZE - th) / 2; 105 cent = (ICON_SIZE - th) / 2;
106 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); 106 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
diff --git a/src/bin/cxx/widgets_list_1_grouped.cc b/src/bin/cxx/widgets_list_1_grouped.cc
index 93c1d83..034a0c5 100644
--- a/src/bin/cxx/widgets_list_1_grouped.cc
+++ b/src/bin/cxx/widgets_list_1_grouped.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *labels[] = 22static const char *labels[] =
@@ -63,7 +63,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 images[i] = 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),
@@ -79,7 +79,7 @@ static void _setup(void)
79 } 79 }
80 for (i = 0; i < NUM; i++) 80 for (i = 0; i < NUM; i++)
81 { 81 {
82 eo_do(o_images[i], evas_obj_raise()); 82 eo_do(images[i], evas_obj_raise());
83 } 83 }
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
@@ -94,7 +94,7 @@ static void _cleanup(void)
94 int i; 94 int i;
95 for (i = 0; i < NUM; i++) 95 for (i = 0; i < NUM; i++)
96 { 96 {
97 eo_del(o_images[i]); 97 eo_del(images[i]);
98 eo_del(o_texts[i]); 98 eo_del(o_texts[i]);
99 } 99 }
100} 100}
@@ -108,7 +108,7 @@ static void _loop(double t, int f)
108 y = 0 - f; 108 y = 0 - f;
109 for (i = 0; i < NUM; i++) 109 for (i = 0; i < NUM; i++)
110 { 110 {
111 eo_do(o_images[i], evas_obj_position_set(x, y)); 111 eo_do(images[i], evas_obj_position_set(x, y));
112 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 112 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
113 cent = (ICON_SIZE - th) / 2; 113 cent = (ICON_SIZE - th) / 2;
114 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); 114 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc
index 9a93e1c..88c3566 100644
--- a/src/bin/cxx/widgets_list_2.cc
+++ b/src/bin/cxx/widgets_list_2.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 32 18#define ICON_SIZE 32
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *labels[] = 22static const char *labels[] =
@@ -63,7 +63,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 images[i] = 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),
@@ -86,7 +86,7 @@ static void _cleanup(void)
86 int i; 86 int i;
87 for (i = 0; i < NUM; i++) 87 for (i = 0; i < NUM; i++)
88 { 88 {
89 eo_del(o_images[i]); 89 eo_del(images[i]);
90 eo_del(o_texts[i]); 90 eo_del(o_texts[i]);
91 } 91 }
92} 92}
@@ -100,7 +100,7 @@ static void _loop(double t, int f)
100 y = 0 - f; 100 y = 0 - f;
101 for (i = 0; i < NUM; i++) 101 for (i = 0; i < NUM; i++)
102 { 102 {
103 eo_do(o_images[i], evas_obj_position_set(x, y)); 103 eo_do(images[i], evas_obj_position_set(x, y));
104 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 104 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
105 cent = (ICON_SIZE - th) / 2; 105 cent = (ICON_SIZE - th) / 2;
106 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); 106 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc
index b9ea16b..b315af3 100644
--- a/src/bin/cxx/widgets_list_2_grouped.cc
+++ b/src/bin/cxx/widgets_list_2_grouped.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_texts[NUM]; 20static Evas_Object *o_texts[NUM];
21 21
22static const char *labels[] = 22static const char *labels[] =
@@ -63,7 +63,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
66 o_images[i] = o; 66 images[i] = 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),
@@ -79,7 +79,7 @@ static void _setup(void)
79 } 79 }
80 for (i = 0; i < NUM; i++) 80 for (i = 0; i < NUM; i++)
81 { 81 {
82 eo_do(o_images[i], evas_obj_raise()); 82 eo_do(images[i], evas_obj_raise());
83 } 83 }
84 for (i = 0; i < NUM; i++) 84 for (i = 0; i < NUM; i++)
85 { 85 {
@@ -94,7 +94,7 @@ static void _cleanup(void)
94 int i; 94 int i;
95 for (i = 0; i < NUM; i++) 95 for (i = 0; i < NUM; i++)
96 { 96 {
97 eo_del(o_images[i]); 97 eo_del(images[i]);
98 eo_del(o_texts[i]); 98 eo_del(o_texts[i]);
99 } 99 }
100} 100}
@@ -108,7 +108,7 @@ static void _loop(double t, int f)
108 y = 0 - f; 108 y = 0 - f;
109 for (i = 0; i < NUM; i++) 109 for (i = 0; i < NUM; i++)
110 { 110 {
111 eo_do(o_images[i], evas_obj_position_set(x, y)); 111 eo_do(images[i], evas_obj_position_set(x, y));
112 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 112 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
113 cent = (ICON_SIZE - th) / 2; 113 cent = (ICON_SIZE - th) / 2;
114 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); 114 eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
diff --git a/src/bin/cxx/widgets_list_3.cc b/src/bin/cxx/widgets_list_3.cc
index c655b84..677a234 100644
--- a/src/bin/cxx/widgets_list_3.cc
+++ b/src/bin/cxx/widgets_list_3.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_icons[NUM]; 20static Evas_Object *o_icons[NUM];
21static Evas_Object *o_texts[NUM]; 21static Evas_Object *o_texts[NUM];
22 22
@@ -84,7 +84,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 images[i] = 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),
@@ -115,7 +115,7 @@ static void _cleanup(void)
115 int i; 115 int i;
116 for (i = 0; i < NUM; i++) 116 for (i = 0; i < NUM; i++)
117 { 117 {
118 eo_del(o_images[i]); 118 eo_del(images[i]);
119 eo_del(o_icons[i]); 119 eo_del(o_icons[i]);
120 eo_del(o_texts[i]); 120 eo_del(o_texts[i]);
121 } 121 }
@@ -130,7 +130,7 @@ static void _loop(double t, int f)
130 y = 0 - f; 130 y = 0 - f;
131 for (i = 0; i < NUM; i++) 131 for (i = 0; i < NUM; i++)
132 { 132 {
133 eo_do(o_images[i], evas_obj_position_set(x, y)); 133 eo_do(images[i], evas_obj_position_set(x, y));
134 eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); 134 eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
135 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 135 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
136 cent = (ICON_SIZE - th) / 2; 136 cent = (ICON_SIZE - th) / 2;
diff --git a/src/bin/cxx/widgets_list_3_grouped.cc b/src/bin/cxx/widgets_list_3_grouped.cc
index 28b92b7..b1b36ca 100644
--- a/src/bin/cxx/widgets_list_3_grouped.cc
+++ b/src/bin/cxx/widgets_list_3_grouped.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 64 18#define ICON_SIZE 64
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_icons[NUM]; 20static Evas_Object *o_icons[NUM];
21static Evas_Object *o_texts[NUM]; 21static Evas_Object *o_texts[NUM];
22 22
@@ -84,7 +84,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 images[i] = 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),
@@ -108,7 +108,7 @@ static void _setup(void)
108 } 108 }
109 for (i = 0; i < NUM; i++) 109 for (i = 0; i < NUM; i++)
110 { 110 {
111 eo_do(o_images[i], evas_obj_raise()); 111 eo_do(images[i], evas_obj_raise());
112 } 112 }
113 for (i = 0; i < NUM; i++) 113 for (i = 0; i < NUM; i++)
114 { 114 {
@@ -132,7 +132,7 @@ static void _cleanup(void)
132 int i; 132 int i;
133 for (i = 0; i < NUM; i++) 133 for (i = 0; i < NUM; i++)
134 { 134 {
135 eo_del(o_images[i]); 135 eo_del(images[i]);
136 eo_del(o_icons[i]); 136 eo_del(o_icons[i]);
137 eo_del(o_texts[i]); 137 eo_del(o_texts[i]);
138 } 138 }
@@ -147,7 +147,7 @@ static void _loop(double t, int f)
147 y = 0 - f; 147 y = 0 - f;
148 for (i = 0; i < NUM; i++) 148 for (i = 0; i < NUM; i++)
149 { 149 {
150 eo_do(o_images[i], evas_obj_position_set(x, y)); 150 eo_do(images[i], evas_obj_position_set(x, y));
151 eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4)); 151 eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
152 eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); 152 eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
153 cent = (ICON_SIZE - th) / 2; 153 cent = (ICON_SIZE - th) / 2;
diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc
index a624af9..4d146a3 100644
--- a/src/bin/cxx/widgets_list_4.cc
+++ b/src/bin/cxx/widgets_list_4.cc
@@ -16,7 +16,7 @@ static int done = 0;
16/* private data */ 16/* private data */
17#define NUM 512 17#define NUM 512
18#define ICON_SIZE 32 18#define ICON_SIZE 32
19static Evas_Object *o_images[NUM]; 19static efl::eina::list<evas::image> images;
20static Evas_Object *o_icons[NUM]; 20static Evas_Object *o_icons[NUM];
21static Evas_Object *o_texts[NUM]; 21static Evas_Object *o_texts[NUM];
22 22
@@ -84,7 +84,7 @@ static void _setup(void)
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 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
87 o_images[i] = o; 87 images[i] = 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),
@@ -113,7 +113,7 @@ static void _setup(void)
113static void _cleanup(void) 113static void _cleanup(void)
114{ 114{
115 int i; 115 int i;
116 for (i = 0; i < NUM; i++) eo_del(