summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-10-02 13:24:54 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-10-02 13:24:54 -0300
commit08f95c4bfe269305dcf31f7b2a03c3d405fb2510 (patch)
tree60af7412f2fb5bd32468312e5e4e603602d4d3aa
parent9dccf530847a3562cfdd593b6bbe25532fcf26b2 (diff)
expedite-cxx: Add parent_set(nullptr) to all _cleanups.
-rw-r--r--src/bin/cxx/image_blend_border.cc6
-rw-r--r--src/bin/cxx/image_blend_border_recolor.cc4
-rw-r--r--src/bin/cxx/image_blend_fade_pow2_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_fade_unscaled.cc4
-rw-r--r--src/bin/cxx/image_blend_many_smooth_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_nearest_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_nearest_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_scaled.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_occlude1_many.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude1_very_many.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude2.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude2_few.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude2_many.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude2_very_many.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude3.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude3_few.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude3_many.cc2
-rw-r--r--src/bin/cxx/image_blend_occlude3_very_many.cc2
-rw-r--r--src/bin/cxx/image_blend_smooth_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_smooth_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_border.cc4
-rw-r--r--src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc4
-rw-r--r--src/bin/cxx/image_blend_solid_middle_border.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_middle_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_unscaled.cc4
-rw-r--r--src/bin/cxx/image_blend_unscaled.cc2
-rw-r--r--src/bin/cxx/image_crossfade.cc2
-rw-r--r--src/bin/cxx/image_data_argb_alpha.cc2
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl.cc2
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc2
-rw-r--r--src/bin/cxx/image_map_3d_flow.cc4
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_nearest_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_nearest_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_quality_scale.cc2
-rw-r--r--src/bin/cxx/proxy_image.cc2
-rw-r--r--src/bin/cxx/proxy_image_offscreen.cc2
-rw-r--r--src/bin/cxx/rect_blend_pow2_few.cc2
-rw-r--r--src/bin/cxx/rect_solid.cc2
-rw-r--r--src/bin/cxx/rect_solid_few.cc2
-rw-r--r--src/bin/cxx/widgets_file_icons.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_2_grouped.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_2_same.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_3.cc4
-rw-r--r--src/bin/cxx/widgets_file_icons_4.cc4
-rw-r--r--src/bin/cxx/widgets_list_1.cc4
-rw-r--r--src/bin/cxx/widgets_list_1_grouped.cc4
-rw-r--r--src/bin/cxx/widgets_list_2.cc5
-rw-r--r--src/bin/cxx/widgets_list_2_grouped.cc4
-rw-r--r--src/bin/cxx/widgets_list_3.cc6
-rw-r--r--src/bin/cxx/widgets_list_3_grouped.cc8
-rw-r--r--src/bin/cxx/widgets_list_4.cc8
-rw-r--r--src/bin/cxx/widgets_list_4_grouped.cc2
70 files changed, 181 insertions, 12 deletions
diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index f4d24f2..de4bde6 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -26,9 +26,9 @@ 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); 29 evas::image o(efl::eo::parent = canvas); // XXX
30 images.push_back(o); 30 images.push_back(o);
31 o.file_set(::build_path("bar.png"), ""); 31 o.file_set(::build_path("bar.png"), ""); // XXX
32 o.border_set(6, 6, 6, 6); 32 o.border_set(6, 6, 6, 6);
33 o.visibility_set(true); 33 o.visibility_set(true);
34 } 34 }
@@ -38,6 +38,8 @@ static void _setup()
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
diff --git a/src/bin/cxx/image_blend_border_recolor.cc b/src/bin/cxx/image_blend_border_recolor.cc
index d7560cd..bf2b81d 100644
--- a/src/bin/cxx/image_blend_border_recolor.cc
+++ b/src/bin/cxx/image_blend_border_recolor.cc
@@ -39,8 +39,8 @@ static void _setup(void)
39/* cleanup */ 39/* cleanup */
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 for (evas::image o : images) 42 for (evas::image& i : images)
43 o.visibility_set(false); // XXX 43 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 44 images.clear();
45} 45}
46 46
diff --git a/src/bin/cxx/image_blend_fade_pow2_unscaled.cc b/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
index 9b14e7b..ef82f70 100644
--- a/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
+++ b/src/bin/cxx/image_blend_fade_pow2_unscaled.cc
@@ -45,6 +45,8 @@ static void _setup(void)
45/* cleanup */ 45/* cleanup */
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 for (evas::image& i : images)
49 i.parent_set(efl::eo::base(nullptr));
48 images.clear(); 50 images.clear();
49} 51}
50 52
diff --git a/src/bin/cxx/image_blend_fade_unscaled.cc b/src/bin/cxx/image_blend_fade_unscaled.cc
index 242e2cb..3a9405e 100644
--- a/src/bin/cxx/image_blend_fade_unscaled.cc
+++ b/src/bin/cxx/image_blend_fade_unscaled.cc
@@ -42,8 +42,8 @@ static void _setup(void)
42/* cleanup */ 42/* cleanup */
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 for (evas::image o : images) 45 for (evas::image& i : images)
46 o.visibility_set(false); // XXX 46 i.parent_set(efl::eo::base(nullptr));
47 images.clear(); 47 images.clear();
48} 48}
49 49
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 c041825..96a3d25 100644
--- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
@@ -45,6 +45,8 @@ static void _setup(void)
45/* cleanup */ 45/* cleanup */
46static void _cleanup() 46static void _cleanup()
47{ 47{
48 for (evas::image& i : images)
49 i.parent_set(efl::eo::base(nullptr));
48 images.clear(); 50 images.clear();
49} 51}
50 52
diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc
index be6533c..b74d2d0 100644
--- a/src/bin/cxx/image_blend_nearest_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc
index 9bee4e2..191c2dd 100644
--- a/src/bin/cxx/image_blend_nearest_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
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 afcd872..76d466f 100644
--- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
index edb49e2..e745cf3 100644
--- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc
index 623c713..6fca663 100644
--- a/src/bin/cxx/image_blend_occlude1.cc
+++ b/src/bin/cxx/image_blend_occlude1.cc
@@ -52,6 +52,8 @@ static void _setup(void)
52/* cleanup */ 52/* cleanup */
53static void _cleanup() 53static void _cleanup()
54{ 54{
55 for (evas::image& i : images)
56 i.parent_set(efl::eo::base(nullptr));
55 images.clear(); 57 images.clear();
56} 58}
57 59
diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc
index 3edd0cc..4c5eae5 100644
--- a/src/bin/cxx/image_blend_occlude1_few.cc
+++ b/src/bin/cxx/image_blend_occlude1_few.cc
@@ -55,6 +55,8 @@ static void _setup(void)
55/* cleanup */ 55/* cleanup */
56static void _cleanup() 56static void _cleanup()
57{ 57{
58 for (evas::image& i : images)
59 i.parent_set(efl::eo::base(nullptr));
58 images.clear(); 60 images.clear();
59} 61}
60 62
diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc
index 1c939bd..6c1c673 100644
--- a/src/bin/cxx/image_blend_occlude1_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_many.cc
@@ -54,6 +54,8 @@ static void _setup(void)
54/* cleanup */ 54/* cleanup */
55static void _cleanup() 55static void _cleanup()
56{ 56{
57 for (evas::image& i : images)
58 i.parent_set(efl::eo::base(nullptr));
57 images.clear(); 59 images.clear();
58} 60}
59 61
diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc
index 0768ab9..72ba4eb 100644
--- a/src/bin/cxx/image_blend_occlude1_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_very_many.cc
@@ -55,6 +55,8 @@ static void _setup(void)
55/* cleanup */ 55/* cleanup */
56static void _cleanup() 56static void _cleanup()
57{ 57{
58 for (evas::image& i : images)
59 i.parent_set(efl::eo::base(nullptr));
58 images.clear(); 60 images.clear();
59} 61}
60 62
diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc
index d5305ca..0d5fe22 100644
--- a/src/bin/cxx/image_blend_occlude2.cc
+++ b/src/bin/cxx/image_blend_occlude2.cc
@@ -54,6 +54,8 @@ static void _setup(void)
54/* cleanup */ 54/* cleanup */
55static void _cleanup() 55static void _cleanup()
56{ 56{
57 for (evas::image& i : images)
58 i.parent_set(efl::eo::base(nullptr));
57 images.clear(); 59 images.clear();
58} 60}
59 61
diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc
index 61e328c..03e2664 100644
--- a/src/bin/cxx/image_blend_occlude2_few.cc
+++ b/src/bin/cxx/image_blend_occlude2_few.cc
@@ -55,6 +55,8 @@ static void _setup(void)
55/* cleanup */ 55/* cleanup */
56static void _cleanup() 56static void _cleanup()
57{ 57{
58 for (evas::image& i : images)
59 i.parent_set(efl::eo::base(nullptr));
58 images.clear(); 60 images.clear();
59} 61}
60 62
diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc
index 6a462b6..1bbfc1a 100644
--- a/src/bin/cxx/image_blend_occlude2_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_many.cc
@@ -57,6 +57,8 @@ static void _setup(void)
57/* cleanup */ 57/* cleanup */
58static void _cleanup() 58static void _cleanup()
59{ 59{
60 for (evas::image& i : images)
61 i.parent_set(efl::eo::base(nullptr));
60 images.clear(); 62 images.clear();
61} 63}
62 64
diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc
index 4ad8dee..ad10aef 100644
--- a/src/bin/cxx/image_blend_occlude2_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_very_many.cc
@@ -55,6 +55,8 @@ static void _setup(void)
55/* cleanup */ 55/* cleanup */
56static void _cleanup() 56static void _cleanup()
57{ 57{
58 for (evas::image& i : images)
59 i.parent_set(efl::eo::base(nullptr));
58 images.clear(); 60 images.clear();
59} 61}
60 62
diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc
index 832758c..392e8f2 100644
--- a/src/bin/cxx/image_blend_occlude3.cc
+++ b/src/bin/cxx/image_blend_occlude3.cc
@@ -54,6 +54,8 @@ static void _setup(void)
54/* cleanup */ 54/* cleanup */
55static void _cleanup() 55static void _cleanup()
56{ 56{
57 for (evas::image& i : images)
58 i.parent_set(efl::eo::base(nullptr));
57 images.clear(); 59 images.clear();
58} 60}
59 61
diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc
index 327621b..2099276 100644
--- a/src/bin/cxx/image_blend_occlude3_few.cc
+++ b/src/bin/cxx/image_blend_occlude3_few.cc
@@ -57,6 +57,8 @@ static void _setup(void)
57/* cleanup */ 57/* cleanup */
58static void _cleanup() 58static void _cleanup()
59{ 59{
60 for (evas::image& i : images)
61 i.parent_set(efl::eo::base(nullptr));
60 images.clear(); 62 images.clear();
61} 63}
62 64
diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc
index 1e61262..0c22848 100644
--- a/src/bin/cxx/image_blend_occlude3_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_many.cc
@@ -53,6 +53,8 @@ static void _setup(void)
53/* cleanup */ 53/* cleanup */
54static void _cleanup() 54static void _cleanup()
55{ 55{
56 for (evas::image& i : images)
57 i.parent_set(efl::eo::base(nullptr));
56 images.clear(); 58 images.clear();
57} 59}
58 60
diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc
index ab22528..8ee8f05 100644
--- a/src/bin/cxx/image_blend_occlude3_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_very_many.cc
@@ -54,6 +54,8 @@ static void _setup(void)
54/* cleanup */ 54/* cleanup */
55static void _cleanup() 55static void _cleanup()
56{ 56{
57 for (evas::image& i : images)
58 i.parent_set(efl::eo::base(nullptr));
57 images.clear(); 59 images.clear();
58} 60}
59 61
diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc
index 1957cf2..010151a 100644
--- a/src/bin/cxx/image_blend_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc
@@ -39,6 +39,8 @@ static void _setup(void)
39/* cleanup */ 39/* cleanup */
40static void _cleanup() 40static void _cleanup()
41{ 41{
42 for (evas::image& i : images)
43 i.parent_set(efl::eo::base(nullptr));
42 images.clear(); 44 images.clear();
43} 45}
44 46
diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc
index 744e668..7f2d9d9 100644
--- a/src/bin/cxx/image_blend_smooth_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
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 c521789..f74d689 100644
--- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
index 5e61a5c..01decdf 100644
--- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
@@ -38,6 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup() 39static void _cleanup()
40{ 40{
41 for (evas::image& i : images)
42 i.parent_set(efl::eo::base(nullptr));
41 images.clear(); 43 images.clear();
42} 44}
43 45
diff --git a/src/bin/cxx/image_blend_solid_border.cc b/src/bin/cxx/image_blend_solid_border.cc
index 5391376..b4abefe 100644
--- a/src/bin/cxx/image_blend_solid_border.cc
+++ b/src/bin/cxx/image_blend_solid_border.cc
@@ -38,8 +38,8 @@ static void _setup(void)
38/* cleanup */ 38/* cleanup */
39static void _cleanup(void) 39static void _cleanup(void)
40{ 40{
41 for (evas::image o : images) 41 for (evas::image& i : images)
42 o.visibility_set(false); // XXX 42 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 43 images.clear();
44} 44}
45 45
diff --git a/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
index 526a372..6830d65 100644
--- a/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
@@ -42,8 +42,8 @@ static void _setup(void)
42/* cleanup */ 42/* cleanup */
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 for (evas::image o : images) 45 for (evas::image& i : images)
46 o.visibility_set(false); 46 i.parent_set(efl::eo::base(nullptr));
47 images.clear(); 47 images.clear();
48} 48}
49 49
diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc
index df53c36..04610c4 100644
--- a/src/bin/cxx/image_blend_solid_middle_border.cc
+++ b/src/bin/cxx/image_blend_solid_middle_border.cc
@@ -39,6 +39,8 @@ static void _setup(void)
39/* cleanup */ 39/* cleanup */
40static void _cleanup() 40static void _cleanup()
41{ 41{
42 for (evas::image& i : images)
43 i.parent_set(efl::eo::base(nullptr));
42 images.clear(); 44 images.clear();
43} 45}
44 46
diff --git a/src/bin/cxx/image_blend_solid_middle_unscaled.cc b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
index 974bebc..9d1f3ad 100644
--- a/src/bin/cxx/image_blend_solid_middle_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup() 42static void _cleanup()
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
diff --git a/src/bin/cxx/image_blend_solid_unscaled.cc b/src/bin/cxx/image_blend_solid_unscaled.cc
index 1b59b04..163ae85 100644
--- a/src/bin/cxx/image_blend_solid_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_unscaled.cc
@@ -39,8 +39,8 @@ static void _setup(void)
39/* cleanup */ 39/* cleanup */
40static void _cleanup(void) 40static void _cleanup(void)
41{ 41{
42 for (evas::image o : images) 42 for (evas::image& i : images)
43 o.visibility_set(false); // XXX 43 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 44 images.clear();
45} 45}
46 46
diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc
index f5f57b3..d9c3be7 100644
--- a/src/bin/cxx/image_blend_unscaled.cc
+++ b/src/bin/cxx/image_blend_unscaled.cc
@@ -39,6 +39,8 @@ static void _setup(void)
39/* cleanup */ 39/* cleanup */
40static void _cleanup() 40static void _cleanup()
41{ 41{
42 for (evas::image& i : images)
43 i.parent_set(efl::eo::base(nullptr));
42 images.clear(); 44 images.clear();
43} 45}
44 46
diff --git a/src/bin/cxx/image_crossfade.cc b/src/bin/cxx/image_crossfade.cc
index 2334e32..a268880 100644
--- a/src/bin/cxx/image_crossfade.cc
+++ b/src/bin/cxx/image_crossfade.cc
@@ -46,6 +46,8 @@ static void _setup(void)
46/* cleanup */ 46/* cleanup */
47static void _cleanup(void) 47static void _cleanup(void)
48{ 48{
49 for (evas::image& i : images)
50 i.parent_set(efl::eo::base(nullptr));
49 images.clear(); 51 images.clear();
50} 52}
51 53
diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc
index 8ac24ab..af4e5fc 100644
--- a/src/bin/cxx/image_data_argb_alpha.cc
+++ b/src/bin/cxx/image_data_argb_alpha.cc
@@ -43,6 +43,8 @@ static void _setup(void)
43/* cleanup */ 43/* cleanup */
44static void _cleanup(void) 44static void _cleanup(void)
45{ 45{
46 for (evas::image& i : images)
47 i.parent_set(efl::eo::base(nullptr));
46 images.clear(); 48 images.clear();
47} 49}
48 50
diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc
index 79353b9..58c1ab6 100644
--- a/src/bin/cxx/image_data_ycbcr601pl.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl.cc
@@ -73,6 +73,8 @@ static void _setup(void)
73/* cleanup */ 73/* cleanup */
74static void _cleanup(void) 74static void _cleanup(void)
75{ 75{
76 for (evas::image& i : images)
77 i.parent_set(efl::eo::base(nullptr));
76 images.clear(); 78 images.clear();
77 free(yp); 79 free(yp);
78 free(up); 80 free(up);
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 ffd96b9..f3b6c75 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
@@ -74,6 +74,8 @@ static void _setup(void)
74/* cleanup */ 74/* cleanup */
75static void _cleanup(void) 75static void _cleanup(void)
76{ 76{
77 for (evas::image& i : images)
78 i.parent_set(efl::eo::base(nullptr));
77 images.clear(); 79 images.clear();
78 free(yp); 80 free(yp);
79 free(up); 81 free(up);
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 23befa8..8e9b2c5 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
@@ -73,6 +73,8 @@ static void _setup(void)
73/* cleanup */ 73/* cleanup */
74static void _cleanup(void) 74static void _cleanup(void)
75{ 75{
76 for (evas::image& i : images)
77 i.parent_set(efl::eo::base(nullptr));
76 images.clear(); 78 images.clear();
77 free(yp); 79 free(yp);
78 free(up); 80 free(up);
diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
index 831bf53..8e5c737 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
@@ -77,6 +77,8 @@ static void _setup(void)
77/* cleanup */ 77/* cleanup */
78static void _cleanup(void) 78static void _cleanup(void)
79{ 79{
80 for (evas::image& i : images)
81 i.parent_set(efl::eo::base(nullptr));
80 images.clear(); 82 images.clear();
81 free(yp); 83 free(yp);
82 free(up); 84 free(up);
diff --git a/src/bin/cxx/image_map_3d_flow.cc b/src/bin/cxx/image_map_3d_flow.cc
index 10b49ab..f5675d0 100644
--- a/src/bin/cxx/image_map_3d_flow.cc
+++ b/src/bin/cxx/image_map_3d_flow.cc
@@ -56,7 +56,11 @@ static void _setup(void)
56/* cleanup */ 56/* cleanup */
57static void _cleanup(void) 57static void _cleanup(void)
58{ 58{
59 for (evas::image& i : images)
60 i.parent_set(efl::eo::base(nullptr));
59 images.clear(); 61 images.clear();
62 for (evas::image& i : reflec)
63 i.parent_set(efl::eo::base(nullptr));
60 reflec.clear(); 64 reflec.clear();
61} 65}
62 66
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 048ace9..267ffab 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
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 b2be1a6..0d21c41 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
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc
index e445361..1251179 100644
--- a/src/bin/cxx/image_map_color_alpha_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_rotate.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
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 6158fab..71fedf4 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc
index ec12efe..ba72f9e 100644
--- a/src/bin/cxx/image_map_color_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_rotate.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
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 ac17087..6b99176 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc
index c497f24..8673d0d 100644
--- a/src/bin/cxx/image_map_color_rotate.cc
+++ b/src/bin/cxx/image_map_color_rotate.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index 7f2f0e6..dbf86fd 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc
index 962d401..6aa2887 100644
--- a/src/bin/cxx/image_map_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_rotate.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index b82c1aa..e4d6452 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -41,6 +41,8 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (evas::image& i : images)
45 i.parent_set(efl::eo::base(nullptr));
44 images.clear(); 46 images.clear();
45} 47}
46 48
diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc
index a31612a..64c6569 100644
--- a/src/bin/cxx/image_map_rotate.cc
+++ b/src/bin/cxx/image_map_rotate.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc
index 03761ba..3d2fdab 100644
--- a/src/bin/cxx/image_map_solid_rotate.cc
+++ b/src/bin/cxx/image_map_solid_rotate.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index e93f52c..ee523aa 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -40,6 +40,8 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (evas::image& i : images)
44 i.parent_set(efl::eo::base(nullptr));
43 images.clear(); 45 images.clear();
44} 46}
45 47
diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc
index 6bff11f..b16f513 100644
--- a/src/bin/cxx/proxy_image.cc
+++ b/src/bin/cxx/proxy_image.cc
@@ -45,6 +45,8 @@ static void _setup(void)
45/* cleanup */ 45/* cleanup */
46static void _cleanup() 46static void _cleanup()
47{ 47{
48 for (evas::image& i : images)
49 i.parent_set(efl::eo::base(nullptr));
48 images.clear(); 50 images.clear();
49} 51}
50 52
diff --git a/src/bin/cxx/proxy_image_offscreen.cc b/src/bin/cxx/proxy_image_offscreen.cc
index 8b455a0..0a492d5 100644
--- a/src/bin/cxx/proxy_image_offscreen.cc
+++ b/src/bin/cxx/proxy_image_offscreen.cc
@@ -47,6 +47,8 @@ static void _setup(void)
47/* cleanup */ 47/* cleanup */
48static void _cleanup() 48static void _cleanup()
49{ 49{
50 for (evas::image& i : images)
51 i.parent_set(efl::eo::base(nullptr));
50 images.clear(); 52 images.clear();
51} 53}
52 54
diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc
index 1a5370e..f514347 100644
--- a/src/bin/cxx/rect_blend_pow2_few.cc
+++ b/src/bin/cxx/rect_blend_pow2_few.cc
@@ -47,6 +47,8 @@ static void _setup(void)
47/* cleanup */ 47/* cleanup */
48static void _cleanup(void) 48static void _cleanup(void)
49{ 49{
50 for (evas::image& i : images)
51 i.parent_set(efl::eo::base(nullptr));
50 images.clear(); 52 images.clear();
51} 53}
52 54
diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc
index 60d5b42..7f65d3f 100644
--- a/src/bin/cxx/rect_solid.cc
+++ b/src/bin/cxx/rect_solid.cc
@@ -42,6 +42,8 @@ static void _setup(void)
42/* cleanup */ 42/* cleanup */
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 for (evas::image& i : images)
46 i.parent_set(efl::eo::base(nullptr));
45 images.clear(); 47 images.clear();
46} 48}
47 49
diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc
index 8e2f874..3e03e5d 100644
--- a/src/bin/cxx/rect_solid_few.cc
+++ b/src/bin/cxx/rect_solid_few.cc
@@ -45,6 +45,8 @@ static void _setup(void)
45/* cleanup */ 45/* cleanup */
46static void _cleanup(void) 46static void _cleanup(void)
47{ 47{
48 for (evas::image& i : images)
49 i.parent_set(efl::eo::base(nullptr));
48 images.clear(); 50 images.clear();
49} 51}
50 52
diff --git a/src/bin/cxx/widgets_file_icons.cc b/src/bin/cxx/widgets_file_icons.cc
index 5fe4559..2c373f7 100644
--- a/src/bin/cxx/widgets_file_icons.cc
+++ b/src/bin/cxx/widgets_file_icons.cc
@@ -74,7 +74,11 @@ static void _setup(void)
74/* cleanup */ 74/* cleanup */
75static void _cleanup(void) 75static void _cleanup(void)
76{ 76{
77 for (evas::image& i : images)
78 i.parent_set(efl::eo::base(nullptr));
77 images.clear(); 79 images.clear();
80 for (evas::text& t : texts)
81 t.parent_set(efl::eo::base(nullptr));
78 texts.clear(); 82 texts.clear();
79} 83}
80 84
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index 45e8d4f..b6766fd 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -72,7 +72,11 @@ static void _setup(void)
72/* cleanup */ 72/* cleanup */
73static void _cleanup(void) 73static void _cleanup(void)
74{ 74{
75 for (evas::image& i : images)
76 i.parent_set(efl::eo::base(nullptr));
75 images.clear(); 77 images.clear();
78 for (evas::text& t : texts)
79 t.parent_set(efl::eo::base(nullptr));
76 texts.clear(); 80 texts.clear();
77} 81}
78 82
diff --git a/src/bin/cxx/widgets_file_icons_2_grouped.cc b/src/bin/cxx/widgets_file_icons_2_grouped.cc
index 04ac413..212b9e8 100644
--- a/src/bin/cxx/widgets_file_icons_2_grouped.cc
+++ b/src/bin/cxx/widgets_file_icons_2_grouped.cc
@@ -82,7 +82,11 @@ static void _setup(void)
82/* cleanup */ 82/* cleanup */
83static void _cleanup(void) 83static void _cleanup(void)
84{ 84{
85 for (evas::image& i : images)
86 i.parent_set(efl::eo::base(nullptr));
85 images.clear(); 87 images.clear();
88 for (evas::text& t : texts)
89 t.parent_set(efl::eo::base(nullptr));
86 texts.clear(); 90 texts.clear();
87} 91}
88 92
diff --git a/src/bin/cxx/widgets_file_icons_2_same.cc b/src/bin/cxx/widgets_file_icons_2_same.cc
index d180ee4..373e938 100644
--- a/src/bin/cxx/widgets_file_icons_2_same.cc
+++ b/src/bin/cxx/widgets_file_icons_2_same.cc
@@ -58,7 +58,11 @@ static void _setup(void)
58/* cleanup */ 58/* cleanup */
59static void _cleanup(void) 59static void _cleanup(void)
60{ 60{
61 for (evas::image& i : images)
62 i.parent_set(efl::eo::base(nullptr));
61 images.clear(); 63 images.clear();
64 for (evas::text& t : texts)
65 t.parent_set(efl::eo::base(nullptr));
62 texts.clear(); 66 texts.clear();
63} 67}
64 68
diff --git a/src/bin/cxx/widgets_file_icons_3.cc b/src/bin/cxx/widgets_file_icons_3.cc
index 3a5524c..9d7b73f 100644
--- a/src/bin/cxx/widgets_file_icons_3.cc
+++ b/src/bin/cxx/widgets_file_icons_3.cc
@@ -72,7 +72,11 @@ static void _setup(void)
72/* cleanup */ 72/* cleanup */
73static void _cleanup(void) 73static void _cleanup(void)
74{ 74{
75 for (evas::image& i : images)
76 i.parent_set(efl::eo::base(nullptr));
75 images.clear(); 77 images.clear();
78 for (evas::text& t : texts)
79 t.parent_set(efl::eo::base(nullptr));
76 texts.clear(); 80 texts.clear();
77} 81}
78 82
diff --git a/src/bin/cxx/widgets_file_icons_4.cc b/src/bin/cxx/widgets_file_icons_4.cc
index 4ba708b..d186c73 100644
--- a/src/bin/cxx/widgets_file_icons_4.cc
+++ b/src/bin/cxx/widgets_file_icons_4.cc
@@ -72,7 +72,11 @@ static void _setup(void)
72/* cleanup */ 72/* cleanup */
73static void _cleanup(void) 73static void _cleanup(void)
74{ 74{
75 for (evas::image& i : images)
76 i.parent_set(efl::eo::base(nullptr));
75 images.clear(); 77 images.clear();
78 for (evas::text& t : texts)
79 t.parent_set(efl::eo::base(nullptr));
76 texts.clear(); 80 texts.clear();
77} 81}
78 82
diff --git a/src/bin/cxx/widgets_list_1.cc b/src/bin/cxx/widgets_list_1.cc
index 4884b8f..15ce04c 100644
--- a/src/bin/cxx/widgets_list_1.cc
+++ b/src/bin/cxx/widgets_list_1.cc
@@ -90,7 +90,11 @@ static void _setup(void)
90/* cleanup */ 90/* cleanup */
91static void _cleanup(void) 91static void _cleanup(void)
92{ 92{
93 for (evas::image& i : images)
94 i.parent_set(efl::eo::base(nullptr));
93 images.clear(); 95 images.clear();
96 for (evas::text& t : texts)
97 t.parent_set(efl::eo::base(nullptr));
94 texts.clear(); 98 texts.clear();
95} 99}
96 100
diff --git a/src/bin/cxx/widgets_list_1_grouped.cc b/src/bin/cxx/widgets_list_1_grouped.cc
index 91ef32d..29db00d 100644
--- a/src/bin/cxx/widgets_list_1_grouped.cc
+++ b/src/bin/cxx/widgets_list_1_grouped.cc
@@ -97,7 +97,11 @@ static void _setup(void)
97/* cleanup */ 97/* cleanup */
98static void _cleanup(void) 98static void _cleanup(void)
99{ 99{
100 for (evas::image& i : images)
101 i.parent_set(efl::eo::base(nullptr));
100 images.clear(); 102 images.clear();
103 for (evas::text& t : texts)
104 t.parent_set(efl::eo::base(nullptr));
101 texts.clear(); 105 texts.clear();
102} 106}
103 107
diff --git a/src/bin/cxx/widgets_list_2.cc b/src/bin/cxx/widgets_list_2.cc
index 40f3be8..20b7a80 100644
--- a/src/bin/cxx/widgets_list_2.cc
+++ b/src/bin/cxx/widgets_list_2.cc
@@ -90,7 +90,12 @@ static void _setup(void)
90/* cleanup */ 90/* cleanup */
91static void _cleanup(void) 91static void _cleanup(void)
92{ 92{
93 for (evas::image& i : images)
94 i.parent_set(efl::eo::base(nullptr));
93 images.clear(); 95 images.clear();
96
97 for (evas::text& t : texts)
98 t.parent_set(efl::eo::base(nullptr));
94 texts.clear(); 99 texts.clear();
95} 100}
96 101
diff --git a/src/bin/cxx/widgets_list_2_grouped.cc b/src/bin/cxx/widgets_list_2_grouped.cc
index 4705668..ff3769c 100644
--- a/src/bin/cxx/widgets_list_2_grouped.cc
+++ b/src/bin/cxx/widgets_list_2_grouped.cc
@@ -98,7 +98,11 @@ static void _setup(void)
98/* cleanup */ 98/* cleanup */
99static void _cleanup(void) 99static void _cleanup(void)
100{ 100{
101 for (evas::image& i : images)
102 i.parent_set(efl::eo::base(nullptr));
101 images.clear(); 103 images.clear();
104 for (evas::text& t : texts)
105 t.parent_set(efl::eo::base(nullptr));
102 texts.clear(); 106 texts.clear();
103} 107}
104 108
diff --git a/src/bin/cxx/widgets_list_3.cc b/src/bin/cxx/widgets_list_3.cc
index 660d9f4..cd6a44e 100644
--- a/src/bin/cxx/widgets_list_3.cc
+++ b/src/bin/cxx/widgets_list_3.cc
@@ -117,8 +117,14 @@ static void _setup(void)
117/* cleanup */ 117/* cleanup */
118static void _cleanup(void) 118static void _cleanup(void)
119{ 119{
120 for (evas::image& i : images)
121 i.parent_set(efl::eo::base(nullptr));
120 images.clear(); 122 images.clear();
123 for (evas::image& i : icons)
124 i.parent_set(efl::eo::base(nullptr));
121 icons.clear(); 125 icons.clear();
126 for (evas::text& t : texts)
127 t.parent_set(efl::eo::base(nullptr));
122 texts.clear(); 128 texts.clear();
123} 129}
124 130
diff --git a/src/bin/cxx/widgets_list_3_grouped.cc b/src/bin/cxx/widgets_list_3_grouped.cc
index 874f530..08322f6 100644
--- a/src/bin/cxx/widgets_list_3_grouped.cc
+++ b/src/bin/cxx/widgets_list_3_grouped.cc
@@ -136,8 +136,16 @@ static void _setup(void)
136/* cleanup */ 136/* cleanup */
137static void _cleanup(void) 137static void _cleanup(void)
138{ 138{
139 for (evas::image& i : images)
140 i.parent_set(efl::eo::base(nullptr));
139 images.clear(); 141 images.clear();
142
143 for (evas::image& i : icons)
144 i.parent_set(efl::eo::base(nullptr));
140 icons.clear(); 145 icons.clear();
146
147 for (evas::text& t : texts)
148 t.parent_set(efl::eo::base(nullptr));
141 texts.clear(); 149 texts.clear();
142} 150}
143 151
diff --git a/src/bin/cxx/widgets_list_4.cc b/src/bin/cxx/widgets_list_4.cc
index 72fdc9c..7ae358f 100644
--- a/src/bin/cxx/widgets_list_4.cc
+++ b/src/bin/cxx/widgets_list_4.cc
@@ -119,8 +119,16 @@ static void _setup(void)
119/* cleanup */ 119/* cleanup */
120static void _cleanup(void) 120static void _cleanup(void)
121{ 121{
122 for (evas::image& i : images)
123 i.parent_set(efl::eo::base(nullptr));
122 images.clear(); 124 images.clear();
125
126 for (evas::image& i : icons)
127 i.parent_set(efl::eo::base(nullptr));
123 icons.clear(); 128 icons.clear();
129
130 for (evas::text& t : texts)
131 t.parent_set(efl::eo::base(nullptr));
124 texts.clear(); 132 texts.clear();
125} 133}
126 134
diff --git a/src/bin/cxx/widgets_list_4_grouped.cc b/src/bin/cxx/widgets_list_4_grouped.cc
index 3f1ae15..485a8cc 100644
--- a/src/bin/cxx/widgets_list_4_grouped.cc
+++ b/src/bin/cxx/widgets_list_4_grouped.cc
@@ -132,6 +132,8 @@ static void _setup(void)
132 132
133static void _cleanup() 133static void _cleanup()
134{ 134{
135 for (evas::image& i : images)
136 i.parent_set(efl::eo::base(nullptr));
135 images.clear(); 137 images.clear();
136} 138}
137 139