Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxDELETE() and wxDELETEA() when possible.

Browse Source 
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-06-20 18:18:23 +00:00
parent 9ac34ac915
commit 5276b0a53c
162 changed files with 259 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/ipc/baseclient.cpp
View File

@@ -184,8 +184,7 @@ void MyClient::Disconnect()
if (m_connection)
{
m_connection->Disconnect();
delete m_connection;
m_connection = NULL;
wxDELETE(m_connection);
wxLogMessage("Client disconnected from server");
}
wxGetApp().ExitMainLoop();

3
samples/ipc/baseserver.cpp
View File

@@ -211,8 +211,7 @@ void MyServer::Disconnect()
if ( m_connection )
{
m_connection->Disconnect();
delete m_connection;
m_connection = NULL;
wxDELETE(m_connection);
wxLogMessage("Disconnected client");
}
}

12
samples/ipc/client.cpp
View File

@@ -234,8 +234,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
{
if (m_client)
{
delete m_client;
m_client = NULL;
wxDELETE(m_client);
}
event.Skip();
}
@@ -261,8 +260,7 @@ void MyFrame::OnStart(wxCommandEvent& WXUNUSED(event))
if (!retval)
{
delete m_client;
m_client = NULL;
wxDELETE(m_client);
}
EnableControls();
}
@@ -316,8 +314,7 @@ void MyFrame::OnDisconnect(wxCommandEvent& WXUNUSED(event))
void MyFrame::Disconnect()
{
delete m_client;
m_client = NULL;
wxDELETE(m_client);
EnableControls();
}
@@ -399,8 +396,7 @@ void MyClient::Disconnect()
if (m_connection)
{
m_connection->Disconnect();
delete m_connection;
m_connection = NULL;
wxDELETE(m_connection);
wxGetApp().GetFrame()->EnableControls();
wxLogMessage(wxT("Client disconnected from server"));
}

12
samples/ipc/server.cpp
View File

@@ -160,11 +160,7 @@ void MyFrame::UpdateUI()
void MyFrame::OnClose(wxCloseEvent& event)
{
if (m_server)
{
delete m_server;
m_server = NULL;
}
wxDELETE(m_server);
event.Skip();
}
@@ -185,8 +181,7 @@ void MyFrame::OnStart(wxCommandEvent& WXUNUSED(event))
else
{
wxLogMessage("Server %s failed to start", servername);
delete m_server;
m_server = NULL;
wxDELETE(m_server);
}
UpdateUI();
}
@@ -262,8 +257,7 @@ void MyServer::Disconnect()
{
if ( m_connection )
{
delete m_connection;
m_connection = NULL;
wxDELETE(m_connection);
wxGetApp().GetFrame()->UpdateUI();
wxLogMessage("Disconnected client");
}