Remove some more delete checks (#318)

3 files changed, 22 insertions, 54 deletions

diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index 24d02e9..4132896 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -115,21 +115,16 @@ CEdit::CEdit () : CControl ()
 
 CEdit::~CEdit()
 {
-    int     i;
-
     FreeImage();
 
-    for ( i=0 ; i<EDITUNDOMAX ; i++ )
+    for (int i = 0; i < EDITUNDOMAX; i++)
     {
         delete m_undo[i].text;
         m_undo[i].text = nullptr;
     }
 
-    if (m_text != nullptr)
-    {
-        delete[] m_text;
-        m_text = nullptr;
-    }
+    delete[] m_text;
+    m_text = nullptr;
 
     delete m_scroll;
     m_scroll = nullptr;
@@ -1479,8 +1474,7 @@ bool CEdit::ReadText(std::string filename, int addSize)
 
     FreeImage();
 
-    if (m_text != nullptr)
-        delete[] m_text;
+    delete[] m_text;
 
     m_text = new char[m_maxChar+1];
     memset(m_text, 0, m_maxChar+1);
@@ -1958,8 +1952,7 @@ void CEdit::SetMaxChar(int max)
 {
     FreeImage();
 
-    if (m_text != nullptr)
-        delete[] m_text;
+    delete[] m_text;
 
     m_maxChar = max;
 
diff --git a/src/ui/list.cpp b/src/ui/list.cpp
index f6c3ed9..b3e55e1 100644
--- a/src/ui/list.cpp
+++ b/src/ui/list.cpp
@@ -61,12 +61,10 @@ CList::~CList()
 {
     for (int i = 0; i < LISTMAXDISPLAY; i++)
     {
-        if (m_button[i] != nullptr)
-            delete m_button[i];
+        delete m_button[i];
     }
 
-    if (m_scroll != nullptr)
-        delete m_scroll;
+    delete m_scroll;
 }
 
 
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 98e1e6c..21e2b30 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -64,34 +64,20 @@ CWindow::~CWindow()
 
 void CWindow::Flush()
 {
-    int     i;
-
-    for ( i=0 ; i<MAXWINDOW ; i++ )
+    for (int i = 0 ; i < MAXWINDOW; i++)
     {
-        if ( m_table[i] != 0 )
-        {
-            delete m_table[i];
-            m_table[i] = 0;
-        }
+        delete m_table[i];
+        m_table[i] = nullptr;
     }
 
-    if ( m_buttonReduce != 0 )
-    {
-        delete m_buttonReduce;
-        m_buttonReduce = 0;
-    }
+    delete m_buttonReduce;
+    m_buttonReduce = nullptr;
 
-    if ( m_buttonFull != 0 )
-    {
-        delete m_buttonFull;
-        m_buttonFull = 0;
-    }
+    delete m_buttonFull;
+    m_buttonFull = nullptr;
 
-    if ( m_buttonClose != 0 )
-    {
-        delete m_buttonClose;
-        m_buttonClose = 0;
-    }
+    delete m_buttonClose;
+    m_buttonClose = nullptr;
 }
 
 
@@ -583,23 +569,14 @@ void CWindow::SetName(std::string name, bool tooltip)
 
     CControl::SetName(name, tooltip);
 
-    if ( m_buttonReduce != 0 )
-    {
-        delete m_buttonReduce;
-        m_buttonReduce = 0;
-    }
+    delete m_buttonReduce;
+    m_buttonReduce = nullptr;
 
-    if ( m_buttonFull != 0 )
-    {
-        delete m_buttonFull;
-        m_buttonFull = 0;
-    }
+    delete m_buttonFull;
+    m_buttonFull = nullptr;
 
-    if ( m_buttonClose != 0 )
-    {
-        delete m_buttonClose;
-        m_buttonClose = 0;
-    }
+    delete m_buttonClose;
+    m_buttonClose = nullptr;
 
     bAdjust = false;