expedite-cxx: Add parent_set(nullptr) to all _cleanups.

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()
    evas::canvas canvas(::eo_ref(G_evas));
    for (int i = 0; i < OBNUM; i++)
      {
-        evas::image o(efl::eo::parent = canvas);
+        evas::image o(efl::eo::parent = canvas); // XXX
         images.push_back(o);
-        o.file_set(::build_path("bar.png"), "");
+        o.file_set(::build_path("bar.png"), ""); // XXX
         o.border_set(6, 6, 6, 6);
         o.visibility_set(true);
      }
@@ -38,6 +38,8 @@ static void _setup()
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
-   for (evas::image o : images)
-     o.visibility_set(false); // XXX
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
-   for (evas::image o : images)
-     o.visibility_set(false); // XXX
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
-   for (evas::image o : images)
-     o.visibility_set(false); // XXX
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
-   for (evas::image o : images)
-     o.visibility_set(false);
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
-   for (evas::image o : images)
-     o.visibility_set(false); // XXX
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
    free(yp);
    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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
    free(yp);
    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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
    free(yp);
    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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
    free(yp);
    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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::image& i : reflec)
+     i.parent_set(efl::eo::base(nullptr));
    reflec.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+   for (evas::image& i : icons)
+     i.parent_set(efl::eo::base(nullptr));
    icons.clear();
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+
+   for (evas::image& i : icons)
+     i.parent_set(efl::eo::base(nullptr));
    icons.clear();
+
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 /* cleanup */
 static void _cleanup(void)
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
+
+   for (evas::image& i : icons)
+     i.parent_set(efl::eo::base(nullptr));
    icons.clear();
+
+   for (evas::text& t : texts)
+     t.parent_set(efl::eo::base(nullptr));
    texts.clear();
 }
 
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)
 
 static void _cleanup()
 {
+   for (evas::image& i : images)
+     i.parent_set(efl::eo::base(nullptr));
    images.clear();
 }