immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some more delete checks (#318)

dev-mp
Piotr Dziwinski 2014-08-10 17:51:47 +02:00
parent ac019c263d
commit 9de086390b
4 changed files with 28 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/app.cpp
View File

@ -598,23 +598,14 @@ void CApplication::Destroy()
{
m_joystickEnabled = false;
if (m_robotMain != nullptr)
{
delete m_robotMain;
m_robotMain = nullptr;
}
delete m_robotMain;
m_robotMain = nullptr;
if (m_sound != nullptr)
{
delete m_sound;
m_sound = nullptr;
}
delete m_sound;
m_sound = nullptr;
if (m_modelManager != nullptr)
{
delete m_modelManager;
m_modelManager = nullptr;
}
delete m_modelManager;
m_modelManager = nullptr;
if (m_engine != nullptr)
{

17
src/ui/edit.cpp
View File

@ -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;

6
src/ui/list.cpp
View File

@ -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;
}

53
src/ui/window.cpp
View File

@ -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;