Remove some more delete checks (#318)

1 files changed, 15 insertions, 38 deletions

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;