From deef13e80c91dd4348f3caa1ad88762e5338929b Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 19 Oct 2019 19:26:14 +0200
Subject: [PATCH] Window::~Window() is now in charge of calling deleteLater for
 all children

---
 radio/src/thirdparty/libopenui/src/coloredit.cpp | 5 -----
 radio/src/thirdparty/libopenui/src/coloredit.h   | 2 --
 radio/src/thirdparty/libopenui/src/form.h        | 5 -----
 radio/src/thirdparty/libopenui/src/menu.h        | 4 ++--
 radio/src/thirdparty/libopenui/src/menutoolbar.h | 5 -----
 radio/src/thirdparty/libopenui/src/window.cpp    | 2 +-
 6 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/coloredit.cpp b/radio/src/thirdparty/libopenui/src/coloredit.cpp
index 6ea5936c0..0de6d9386 100644
--- a/radio/src/thirdparty/libopenui/src/coloredit.cpp
+++ b/radio/src/thirdparty/libopenui/src/coloredit.cpp
@@ -78,8 +78,3 @@ ColorEdit::ColorEdit(FormGroup * parent, const rect_t & rect, std::function<uint
                    });
   }
 }
-
-ColorEdit::~ColorEdit()
-{
-  deleteChildren();
-}
diff --git a/radio/src/thirdparty/libopenui/src/coloredit.h b/radio/src/thirdparty/libopenui/src/coloredit.h
index 4568a7dc5..28f57ae4e 100644
--- a/radio/src/thirdparty/libopenui/src/coloredit.h
+++ b/radio/src/thirdparty/libopenui/src/coloredit.h
@@ -32,8 +32,6 @@ class ColorEdit : public FormGroup {
       return "ColorEdit";
     }
 #endif
-
-    ~ColorEdit() override;
 };
 
 #endif // _COLOREDIT_H_
diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h
index cd612ff0b..73c57b804 100644
--- a/radio/src/thirdparty/libopenui/src/form.h
+++ b/radio/src/thirdparty/libopenui/src/form.h
@@ -85,11 +85,6 @@ class FormGroup: public FormField {
     {
     }
 
-    ~FormGroup() override
-    {
-      deleteChildren(); // TODO move it to ~Window()
-    }
-
 #if defined(DEBUG_WINDOWS)
     std::string getName() override
     {
diff --git a/radio/src/thirdparty/libopenui/src/menu.h b/radio/src/thirdparty/libopenui/src/menu.h
index b76d1f477..c58ef6b6c 100644
--- a/radio/src/thirdparty/libopenui/src/menu.h
+++ b/radio/src/thirdparty/libopenui/src/menu.h
@@ -57,7 +57,7 @@ class MenuWindow: public Window {
   };
 
   public:
-    MenuWindow(Menu * parent);
+    explicit MenuWindow(Menu * parent);
 
 #if defined(DEBUG_WINDOWS)
     std::string getName() override
@@ -126,7 +126,7 @@ class Menu : public Window {
 
     ~Menu() override
     {
-      delete toolbar;
+      menuWindow.detach();
     }
 
     void setCancelHandler(std::function<void()> handler)
diff --git a/radio/src/thirdparty/libopenui/src/menutoolbar.h b/radio/src/thirdparty/libopenui/src/menutoolbar.h
index 81720d339..725bad6f9 100644
--- a/radio/src/thirdparty/libopenui/src/menutoolbar.h
+++ b/radio/src/thirdparty/libopenui/src/menutoolbar.h
@@ -77,11 +77,6 @@ class MenuToolbar: public FormGroup {
     {
     }
 
-    ~MenuToolbar() override
-    {
-      deleteChildren();
-    }
-
     void paint(BitmapBuffer * dc) override
     {
       dc->clear(DISABLE_COLOR);
diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index 8c371e2ce..64360c71d 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -46,7 +46,7 @@ Window::~Window()
     focusWindow = nullptr;
   }
 
-  //  TODO deleteChildren(); (remove from FormGroup)
+  deleteChildren();
 }
 
 void Window::attach(Window * window)