summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio S. Machado <savio.sena@acm.org>2014-10-13 12:35:40 -0300
committerSavio S. Machado <savio.sena@acm.org>2014-10-13 12:35:40 -0300
commitbc5d56877ed33bffffa238be01026f0fae5ca451 (patch)
treeb13392170d28b8e2cc68af9859634ce61db72881
parent3434b132b843c7625d750234d62b4fa99ec6dfdf (diff)
expedite-cxx: Remove XXX and made some minor improvements.
-rw-r--r--src/bin/cxx/font_effect_blur_alpha.cc2
-rw-r--r--src/bin/cxx/image_blend_border.cc4
-rw-r--r--src/bin/cxx/image_blend_border_recolor.cc2
-rw-r--r--src/bin/cxx/image_blend_fade_pow2_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_fade_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude1.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude1_few.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude3.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_fade_unscaled.cc4
-rw-r--r--src/bin/cxx/image_crossfade.cc12
-rw-r--r--src/bin/cxx/image_data_argb.cc2
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_3d_flow.cc4
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc18
-rw-r--r--src/bin/cxx/text_change.cc2
-rw-r--r--src/bin/cxx/textblock_basic.cc30
-rw-r--r--src/bin/cxx/textblock_intl.cc27
-rw-r--r--src/bin/cxx/textblock_text_append.cc35
-rw-r--r--src/bin/cxx/widgets_file_icons.cc2
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc2
-rw-r--r--src/bin/cxx/widgets_file_icons_2_grouped.cc5
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same.cc2
-rw-r--r--src/bin/cxx/widgets_list_2.cc2
-rw-r--r--src/bin/cxx/widgets_list_2_grouped.cc2
-rw-r--r--src/bin/cxx/widgets_list_4.cc2
25 files changed, 86 insertions, 85 deletions
diff --git a/src/bin/cxx/font_effect_blur_alpha.cc b/src/bin/cxx/font_effect_blur_alpha.cc
index 0dfb5a7..543cad1 100644
--- a/src/bin/cxx/font_effect_blur_alpha.cc
+++ b/src/bin/cxx/font_effect_blur_alpha.cc
@@ -51,7 +51,7 @@ static void _cleanup(void)
51static void _loop(double t, int f) 51static void _loop(double t, int f)
52{ 52{
53 char buf[256]; 53 char buf[256];
54 char *str = "padding_set(%d);blur(%d,color=black);"; // XXX remove warning 54 char *str = "padding_set(%d);blur(%d,color=black);";
55 sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1)); 55 sprintf(buf, str, MAX_BLUR, ((f % MAX_BLUR) + 1));
56 eo_do(text, evas_obj_text_filter_program_set(buf)); 56 eo_do(text, evas_obj_text_filter_program_set(buf));
57 57
diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index 9f859fa..549f603 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -1,4 +1,4 @@
1// XXX DONE 1
2#ifdef HAVE_CONFIG_H 2#ifdef HAVE_CONFIG_H
3# include <config.h> 3# include <config.h>
4#endif 4#endif
@@ -26,7 +26,7 @@ static void _setup()
26 evas::canvas canvas(::eo_ref(G_evas)); 26 evas::canvas canvas(::eo_ref(G_evas));
27 for (int i = 0; i < OBNUM; i++) 27 for (int i = 0; i < OBNUM; i++)
28 { 28 {
29 evas::image o(efl::eo::parent = canvas); // XXX: 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 eo_do(o._eo_ptr(), efl_file_set(build_path("bar.png"), NULL)); // XXX 31 eo_do(o._eo_ptr(), efl_file_set(build_path("bar.png"), NULL)); // XXX
32 o.border_set(6, 6, 6, 6); 32 o.border_set(6, 6, 6, 6);
diff --git a/src/bin/cxx/image_blend_border_recolor.cc b/src/bin/cxx/image_blend_border_recolor.cc
index e1435da..a9217f2 100644
--- a/src/bin/cxx/image_blend_border_recolor.cc
+++ b/src/bin/cxx/image_blend_border_recolor.cc
@@ -1,4 +1,4 @@
1// XXX DONE 1
2#ifdef HAVE_CONFIG_H 2#ifdef HAVE_CONFIG_H
3# include <config.h> 3# include <config.h>
4#endif 4#endif
diff --git a/src/bin/cxx/image_blend_fade_pow2_unscaled.cc b/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
index 82c6ce5..249dd55 100644
--- a/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
+++ b/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
@@ -1,4 +1,4 @@
1// XXX DONE 1
2#ifdef HAVE_CONFIG_H 2#ifdef HAVE_CONFIG_H
3# include <config.h> 3# include <config.h>
4#endif 4#endif
diff --git a/src/bin/cxx/image_blend_fade_unscaled.cc b/src/bin/cxx/image_blend_fade_unscaled.cc
index 634f0dd..27d067e 100644
--- a/src/bin/cxx/image_blend_fade_unscaled.cc
+++ b/src/bin/cxx/image_blend_fade_unscaled.cc
@@ -1,4 +1,4 @@
1// XXX DONE 1
2#ifdef HAVE_CONFIG_H 2#ifdef HAVE_CONFIG_H
3# include <config.h> 3# include <config.h>
4#endif 4#endif
diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc
index bf2db13..c5d2ec6 100644
--- a/src/bin/cxx/image_blend_occlude1.cc
+++ b/src/bin/cxx/image_blend_occlude1.cc
@@ -60,7 +60,7 @@ static void _cleanup()
60/* loop - do things */ 60/* loop - do things */
61static void _loop(double t, int f) 61static void _loop(double t, int f)
62{ 62{
63 int i = 0; // XXX 63 int i = 0;
64 for (evas::image& img : images) 64 for (evas::image& img : images)
65 { 65 {
66 if (i < (OBNUM / 2)) 66 if (i < (OBNUM / 2))
diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc
index 6be38fa..dced7ac 100644
--- a/src/bin/cxx/image_blend_occlude1_few.cc
+++ b/src/bin/cxx/image_blend_occlude1_few.cc
@@ -63,7 +63,7 @@ static void _cleanup()
63/* loop - do things */ 63/* loop - do things */
64static void _loop(double t, int f) 64static void _loop(double t, int f)
65{ 65{
66 int i = 0; // XXX 66 int i = 0;
67 for (evas::image& img : images) 67 for (evas::image& img : images)
68 { 68 {
69 if (i < (OBNUM / 2)) 69 if (i < (OBNUM / 2))
diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc
index 86b6381..064ccb8 100644
--- a/src/bin/cxx/image_blend_occlude3.cc
+++ b/src/bin/cxx/image_blend_occlude3.cc
@@ -62,7 +62,7 @@ static void _cleanup()
62/* loop - do things */ 62/* loop - do things */
63static void _loop(double t, int f) 63static void _loop(double t, int f)
64{ 64{
65 int i = 0; // XXX 65 int i = 0;
66 for (evas::image& img : images) 66 for (evas::image& img : images)
67 { 67 {
68 if (i > (OBNUM / 2)) 68 if (i > (OBNUM / 2))
diff --git a/src/bin/cxx/image_blend_solid_fade_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
index 5d63007..bfe5259 100644
--- a/src/bin/cxx/image_blend_solid_fade_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
@@ -41,8 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image o : images) 44 for (evas::image& img : images)
45 o.visibility_set(false); // XXX 45 img.visibility_set(false); // XXX
46 images.clear(); 46 images.clear();
47} 47}
48 48
diff --git a/src/bin/cxx/image_crossfade.cc b/src/bin/cxx/image_crossfade.cc
index f7036ed..dc05ae3 100644
--- a/src/bin/cxx/image_crossfade.cc
+++ b/src/bin/cxx/image_crossfade.cc
@@ -54,11 +54,13 @@ static void _cleanup(void)
54/* loop - do things */ 54/* loop - do things */
55static void _loop(double t, int f) 55static void _loop(double t, int f)
56{ 56{
57 if (images.empty()) return; // XXX 57 if (!images.empty())
58 int a = f & 0x1f; 58 {
59 a = ((a << 3) | (a >> 2)) & 0xff; 59 int a = f & 0x1f;
60 evas::image img = images.back(); 60 a = ((a << 3) | (a >> 2)) & 0xff;
61 img.evas::object::color_set(a, a, a, a); 61 evas::image img = images.back();
62 img.evas::object::color_set(a, a, a, a);
63 }
62 FPS_STD(NAME); 64 FPS_STD(NAME);
63} 65}
64 66
diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc
index 2eecb82..f5deceb 100644
--- a/src/bin/cxx/image_data_argb.cc
+++ b/src/bin/cxx/image_data_argb.cc
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
63 img.evas::object::size_set(w, h); 63 img.evas::object::size_set(w, h);
64 img.fill_set(0, 0, w, h); 64 img.fill_set(0, 0, w, h);
65 data = static_cast<unsigned int*>(img.data_get(1)); 65 data = static_cast<unsigned int*>(img.data_get(1));
66 st = img.stride_get(); // XXX 66 st = img.stride_get();
67 st = st >> 2; 67 st = st >> 2;
68 p = data; 68 p = data;
69 for (y = 0; y < h; y++) 69 for (y = 0; y < h; y++)
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 2651bcf..3366b72 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
@@ -49,7 +49,7 @@ static void _setup(void)
49 fread(vp, 320 * 240, 1, f); 49 fread(vp, 320 * 240, 1, f);
50 fclose(f); 50 fclose(f);
51 } 51 }
52 unsigned char **data = static_cast<unsigned char**>(o.data_get(1)); // XXX 52 unsigned char **data = static_cast<unsigned char**>(o.data_get(1));
53 unsigned char **lp = data; 53 unsigned char **lp = data;
54 for (int y = 0; y < 480; y++) 54 for (int y = 0; y < 480; y++)
55 { 55 {
diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc
index c8b22c0..ec69365 100644
--- a/src/bin/cxx/image_map_3d_flow.cc
+++ b/src/bin/cxx/image_map_3d_flow.cc
@@ -33,7 +33,7 @@ static void _setup(void)
33 char buf[256]; 33 char buf[256];
34 34
35 evas::image o1(efl::eo::parent = canvas); 35 evas::image o1(efl::eo::parent = canvas);
36 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); // XXX 36 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
37 eo_do(o1._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX 37 eo_do(o1._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
38 o1.fill_set(0, 0, 256, 256); 38 o1.fill_set(0, 0, 256, 256);
39 o1.evas::object::size_set(256, 256); 39 o1.evas::object::size_set(256, 256);
@@ -42,7 +42,7 @@ static void _setup(void)
42 images.push_back(o1); 42 images.push_back(o1);
43 43
44 evas::image o2(efl::eo::parent = canvas); 44 evas::image o2(efl::eo::parent = canvas);
45 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); // XXX 45 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
46 eo_do(o2._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX 46 eo_do(o2._eo_ptr(), efl_file_set(build_path(buf), NULL)); // XXX
47 o2.fill_set(0, 0, 256, 256); 47 o2.fill_set(0, 0, 256, 256);
48 o2.size_set(256, 256); 48 o2.size_set(256, 256);
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 b600dbf..34f7ca4 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -50,24 +50,24 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 int i = 0; // XXX 53 int i = 0;
54 for (evas::image& img : images) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
58 Evas_Coord x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
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 Evas_Coord y = (win_h / 2) - (h / 2); 60 Evas_Coord 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 62
63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 ::evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
64 64
65 evas_map_point_color_set(m, 0, 255, 255, 255, 255); 65 ::evas_map_point_color_set(m, 0, 255, 255, 255, 255);
66 evas_map_point_color_set(m, 1, 255, 0, 0, 255); 66 ::evas_map_point_color_set(m, 1, 255, 0, 0, 255);
67 evas_map_point_color_set(m, 2, 0, 0, 255, 255); 67 ::evas_map_point_color_set(m, 2, 0, 0, 255, 255);
68 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 68 ::evas_map_point_color_set(m, 3, 0, 0, 0, 0);
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 ::evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 img.map_enable_set(1); 71 img.map_enable_set(1);
72 img.map_set(m); 72 img.map_set(m);
73 ++i; 73 ++i;
diff --git a/src/bin/cxx/text_change.cc b/src/bin/cxx/text_change.cc
index da9bc12..f337bd6 100644
--- a/src/bin/cxx/text_change.cc
+++ b/src/bin/cxx/text_change.cc
@@ -37,7 +37,7 @@ static void _setup(void)
37 evas::text o(efl::eo::parent = canvas); 37 evas::text o(efl::eo::parent = canvas);
38 texts.push_back(o); 38 texts.push_back(o);
39 o.font_set("Vera-Bold", 20); 39 o.font_set("Vera-Bold", 20);
40 snprintf(buf, sizeof(buf), "%s %s %s %s.", // XXX 40 snprintf(buf, sizeof(buf), "%s %s %s %s.",
41 strs[rnd() % (sizeof(strs) / sizeof(char *))], 41 strs[rnd() % (sizeof(strs) / sizeof(char *))],
42 strs[rnd() % (sizeof(strs) / sizeof(char *))], 42 strs[rnd() % (sizeof(strs) / sizeof(char *))],
43 strs[rnd() % (sizeof(strs) / sizeof(char *))], 43 strs[rnd() % (sizeof(strs) / sizeof(char *))],
diff --git a/src/bin/cxx/textblock_basic.cc b/src/bin/cxx/textblock_basic.cc
index 567568d..84cedc7 100644
--- a/src/bin/cxx/textblock_basic.cc
+++ b/src/bin/cxx/textblock_basic.cc
@@ -129,21 +129,21 @@ static void _cleanup(void)
129/* loop - do things */ 129/* loop - do things */
130static void _loop(double t, int f) 130static void _loop(double t, int f)
131{ 131{
132 Evas_Coord x, y, w, h, w0, h0; 132 if (text_block)
133 int i = 0; 133 {
134 134 Evas_Coord x, y, w, h, w0, h0;
135 if (!text_block) goto fps; // XXX 135 int i = 0;
136 w0 = 160; 136 w0 = 160;
137 h0 = 120; 137 h0 = 120;
138 w = 150 + ((1.0 + cos((double)(f + (i * 10)) / (37.4 * SLOW) )) * w0 * 2); 138 w = 150 + ((1.0 + cos((double)(f + (i * 10)) / (37.4 * SLOW) )) * w0 * 2);
139 h = 50 + ((1.0 + sin((double)(f + (i * 19)) / (52.6 * SLOW) )) * h0 * 2); 139 h = 50 + ((1.0 + sin((double)(f + (i * 19)) / (52.6 * SLOW) )) * h0 * 2);
140 x = (win_w / 2) - (w / 2); 140 x = (win_w / 2) - (w / 2);
141 x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2); 141 x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2);
142 y = (win_h / 2) - (h / 2); 142 y = (win_h / 2) - (h / 2);
143 y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2); 143 y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
144 text_block->evas::object::position_set(x, y); 144 text_block->evas::object::position_set(x, y);
145 text_block->evas::object::size_set(w, 5000); 145 text_block->evas::object::size_set(w, 5000);
146 fps: 146 }
147 FPS_STD(NAME); 147 FPS_STD(NAME);
148} 148}
149 149
diff --git a/src/bin/cxx/textblock_intl.cc b/src/bin/cxx/textblock_intl.cc
index afef9ad..54fffb7 100644
--- a/src/bin/cxx/textblock_intl.cc
+++ b/src/bin/cxx/textblock_intl.cc
@@ -99,19 +99,20 @@ static void _cleanup(void)
99/* loop - do things */ 99/* loop - do things */
100static void _loop(double t, int f) 100static void _loop(double t, int f)
101{ 101{
102 Evas_Coord x, y, w, h, w0, h0; 102 if (text_block)
103 int i = 0; 103 {
104 if (!text_block) goto fps; // XXX 104 Evas_Coord x, y, w, h, w0, h0;
105 text_block->size_native_get(&w0, &h0); 105 int i = 0;
106 w = w0; 106 text_block->size_native_get(&w0, &h0);
107 h = h0; 107 w = w0;
108 x = (win_w / 2) - (w / 2); 108 h = h0;
109 x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2)); 109 x = (win_w / 2) - (w / 2);
110 y = (win_h / 2) - (h / 2); 110 x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2));
111 y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2)); 111 y = (win_h / 2) - (h / 2);
112 text_block->evas::object::position_set(x, y); 112 y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2));
113 text_block->evas::object::size_set(w, h); 113 text_block->evas::object::position_set(x, y);
114fps: 114 text_block->evas::object::size_set(w, h);
115 }
115 FPS_STD(NAME); 116 FPS_STD(NAME);
116} 117}
117 118
diff --git a/src/bin/cxx/textblock_text_append.cc b/src/bin/cxx/textblock_text_append.cc
index 4cfa7b5..736e4e1 100644
--- a/src/bin/cxx/textblock_text_append.cc
+++ b/src/bin/cxx/textblock_text_append.cc
@@ -111,26 +111,27 @@ static void _cleanup(void)
111/* loop - do things */ 111/* loop - do things */
112static void _loop(double t, int f) 112static void _loop(double t, int f)
113{ 113{
114 Evas_Textblock_Cursor *cur; 114 if (text_block)
115 static Evas_Textblock_Cursor *cur2; 115 {
116 if (!text_block) goto fps; // XXX 116 Evas_Textblock_Cursor *cur;
117 static Evas_Textblock_Cursor *cur2;
117 118
118 cur = text_block->cursor_get(); 119 cur = text_block->cursor_get();
119 evas_textblock_cursor_text_append(cur, "*"); 120 evas_textblock_cursor_text_append(cur, "*");
120 evas_textblock_cursor_char_delete(cur); 121 evas_textblock_cursor_char_delete(cur);
121 122
122 evas_textblock_cursor_paragraph_char_first(cur); 123 evas_textblock_cursor_paragraph_char_first(cur);
123 if (!cur2) 124 if (!cur2)
124 { 125 {
125 cur2 = text_block->cursor_new(); 126 cur2 = text_block->cursor_new();
126 evas_textblock_cursor_paragraph_last(cur2); 127 evas_textblock_cursor_paragraph_last(cur2);
127 evas_textblock_cursor_paragraph_char_first(cur2); 128 evas_textblock_cursor_paragraph_char_first(cur2);
129 }
130 if (!evas_textblock_cursor_compare(cur, cur2))
131 evas_textblock_cursor_paragraph_first(cur);
132 else
133 evas_textblock_cursor_paragraph_next(cur);
128 } 134 }
129 if (!evas_textblock_cursor_compare(cur, cur2))
130 evas_textblock_cursor_paragraph_first(cur);
131 else
132 evas_textblock_cursor_paragraph_next(cur);
133fps:
134 FPS_STD(NAME); 135 FPS_STD(NAME);
135} 136}
136 137
diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc
index ecaa977..9378fae 100644
--- a/src/bin/cxx/widgets_file_icons.cc
+++ b/src/bin/cxx/widgets_file_icons.cc
@@ -24,7 +24,7 @@ static int done = 0;
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::text> texts; 25static efl::eina::list<evas::text> texts;
26 26
27static const char *icons[] = // XXX 27static const char *icons[] =
28{ 28{
29 "bug.png", 29 "bug.png",
30 "bulb.png", 30 "bulb.png",
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index 1303681..32327ae 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -23,7 +23,7 @@ static int done = 0;
23static efl::eina::list<evas::image> images; 23static efl::eina::list<evas::image> images;
24static efl::eina::list<evas::text> texts; 24static efl::eina::list<evas::text> texts;
25 25
26static const char *icons[] = // XXX 26static const char *icons[] =
27{ 27{
28 "bug.png", 28 "bug.png",
29 "bulb.png", 29 "bulb.png",
diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc
index 02ef0e4..767d9ae 100644
--- a/src/bin/cxx/widgets_file_icons_2_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc
@@ -87,10 +87,7 @@ static void _cleanup(void)
87 images.clear(); 87 images.clear();
88 88
89 for (evas::text& t : texts) 89 for (evas::text& t : texts)
90 { 90 t.parent_set(efl::eo::base(nullptr));
91 //t.visibility_set(false); // XXX
92 t.parent_set(efl::eo::base(nullptr));
93 }
94 texts.clear(); 91 texts.clear();
95} 92}
96 93
diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc
index 861cf6e..847ed50 100644
--- a/src/bin/cxx/widgets_file_icons_2_same.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same.cc
@@ -24,7 +24,7 @@ static int done = 0;
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::text> texts; 25static efl::eina::list<evas::text> texts;
26 26
27static const char *icons[] = // XXX 27static const char *icons[] =
28{ 28{
29 "e.png", 29 "e.png",
30}; 30};
diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc
index d8debb5..3f1cfe0 100644
--- a/src/bin/cxx/widgets_list_2.cc
+++ b/src/bin/cxx/widgets_list_2.cc
@@ -24,7 +24,7 @@ static int done = 0;
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::text> texts; 25static efl::eina::list<evas::text> texts;
26 26
27static const char *labels[] = // XXX 27static const char *labels[] =
28{ 28{
29 "Andrew", 29 "Andrew",
30 "Alex", 30 "Alex",
diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc
index facf8af..3ac9f32 100644
--- a/src/bin/cxx/widgets_list_2_grouped.cc
+++ b/src/bin/cxx/widgets_list_2_grouped.cc
@@ -24,7 +24,7 @@ static int done = 0;
24static efl::eina::list<evas::image> images; 24static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::text> texts; 25static efl::eina::list<evas::text> texts;
26 26
27static const char *labels[] = // XXX 27static const char *labels[] =
28{ 28{
29 "Andrew", 29 "Andrew",
30 "Alex", 30 "Alex",
diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc
index 61fe485..bec8116 100644
--- a/src/bin/cxx/widgets_list_4.cc
+++ b/src/bin/cxx/widgets_list_4.cc
@@ -25,7 +25,7 @@ static efl::eina::list<evas::image> images;
25static efl::eina::list<evas::image> icons; 25static efl::eina::list<evas::image> icons;
26static efl::eina::list<evas::text> texts; 26static efl::eina::list<evas::text> texts;
27 27
28static const char *_icons[] = // XXX 28static const char *_icons[] =
29{ 29{
30 "bug.png", 30 "bug.png",
31 "bulb.png", 31 "bulb.png",