From 96dc27d9e63eb157fa1b706ec64defdede6f926e Mon Sep 17 00:00:00 2001 From: Lorenzo Marcantonio Date: Sun, 28 Apr 2013 16:28:13 +0200 Subject: [PATCH] Removed the SAFE_DELETE macro. In most case the assignment to null was not necessary since it was easily provable that the (local) variable wouldn't have referenced after that anyway. --- common/drawframe.cpp | 3 ++- eeschema/class_libentry.cpp | 6 +++--- eeschema/dialogs/dialog_erc.cpp | 2 +- eeschema/edit_label.cpp | 2 +- eeschema/files-io.cpp | 3 ++- eeschema/libedit.cpp | 10 ++++++---- eeschema/load_one_schematic_file.cpp | 2 +- eeschema/schframe.cpp | 12 ++++++++---- eeschema/sheet.cpp | 2 +- include/wxstruct.h | 5 ----- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/common/drawframe.cpp b/common/drawframe.cpp index 33e9e038a5..361230ff1a 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -168,7 +168,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent, EDA_DRAW_FRAME::~EDA_DRAW_FRAME() { - SAFE_DELETE( m_currentScreen ); + delete m_currentScreen; + m_currentScreen = NULL; m_auimgr.UnInit(); } diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp index a525245cfe..45dc86465e 100644 --- a/eeschema/class_libentry.cpp +++ b/eeschema/class_libentry.cpp @@ -868,7 +868,7 @@ bool LIB_COMPONENT::LoadDrawEntries( LINE_READER& aLineReader, wxString& aErrorM { aErrorMsg.Printf( wxT( "error <%s> in DRAW command %c" ), GetChars( aErrorMsg ), line[0] ); - SAFE_DELETE( newEntry ); + delete newEntry; // Flush till end of draw section do @@ -913,7 +913,7 @@ bool LIB_COMPONENT::LoadField( LINE_READER& aLineReader, wxString& aErrorMsg ) if( !field->Load( aLineReader, aErrorMsg ) ) { - SAFE_DELETE( field ); + delete field; return false; } @@ -931,7 +931,7 @@ bool LIB_COMPONENT::LoadField( LINE_READER& aLineReader, wxString& aErrorMsg ) if( field->GetId() == VALUE ) m_name = field->GetText(); - SAFE_DELETE( field ); + delete field; } else { diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index d0714e75e7..0b2306b0f5 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -247,7 +247,7 @@ void DIALOG_ERC::ReBuildMatrixPanel() wxStaticText* text = new wxStaticText( m_matrixPanel, -1, wxT( "W" ), pos ); int text_height = text->GetRect().GetHeight(); bitmap_size.y = std::max( bitmap_size.y, text_height ); - SAFE_DELETE( text ); + delete text; // compute the Y pos interval: pos.y = text_height; diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp index 4d0b354def..b29ccaef2c 100644 --- a/eeschema/edit_label.cpp +++ b/eeschema/edit_label.cpp @@ -110,7 +110,7 @@ SCH_TEXT* SCH_EDIT_FRAME::CreateNewText( wxDC* aDC, int aType ) if( textItem->GetText().IsEmpty() ) { - SAFE_DELETE( textItem ); + delete textItem; return NULL; } diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 46263035c2..187637bb9f 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -293,7 +293,8 @@ bool SCH_EDIT_FRAME::LoadOneEEProject( const wxString& aFileName, bool aIsNew ) // Clear the screen before open a new file if( g_RootSheet ) { - SAFE_DELETE( g_RootSheet ); + delete g_RootSheet; + g_RootSheet = NULL; } CreateScreens(); diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp index 8f761b5104..036e07d260 100644 --- a/eeschema/libedit.cpp +++ b/eeschema/libedit.cpp @@ -143,7 +143,8 @@ void LIB_EDIT_FRAME::LoadOneLibraryPart( wxCommandEvent& event ) // Delete previous library component, if any if( m_component ) { - SAFE_DELETE( m_component ); + delete m_component; + m_component = NULL; m_aliasName.Empty(); } @@ -212,7 +213,7 @@ bool LIB_EDIT_FRAME::LoadOneLibraryPartAux( LIB_ALIAS* aEntry, CMP_LIBRARY* aLib if( m_component ) { - SAFE_DELETE( m_component ); + delete m_component; m_aliasName.Empty(); } @@ -574,7 +575,8 @@ All changes will be lost. Discard changes?" ) ) ) } else { - SAFE_DELETE( m_component ); + delete m_component; + m_component = NULL; m_aliasName.Empty(); } @@ -660,7 +662,7 @@ lost!\n\nClear the current component from the screen?" ) ) ) if( m_component ) { - SAFE_DELETE( m_component ); + delete m_component; m_aliasName.Empty(); } diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp index f75c81ab7b..9ca2183bba 100644 --- a/eeschema/load_one_schematic_file.cpp +++ b/eeschema/load_one_schematic_file.cpp @@ -232,7 +232,7 @@ again." ); if( !itemLoaded ) { - SAFE_DELETE( item ); + delete item; } else { diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 18b52d2f03..8aa50de101 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -274,10 +274,14 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( wxWindow* aParent, const wxString& aTitle, SCH_EDIT_FRAME::~SCH_EDIT_FRAME() { SetScreen( NULL ); - SAFE_DELETE( m_CurrentSheet ); // a SCH_SHEET_PATH, on the heap. - SAFE_DELETE( m_undoItem ); - SAFE_DELETE( g_RootSheet ); - SAFE_DELETE( m_findReplaceData ); + delete m_CurrentSheet; // a SCH_SHEET_PATH, on the heap. + delete m_undoItem; + delete g_RootSheet; + delete m_findReplaceData; + m_CurrentSheet = NULL; + m_undoItem = NULL; + g_RootSheet = NULL; + m_findReplaceData = NULL; CMP_LIBRARY::RemoveAllLibraries(); } diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp index 896d2d1d52..a3805ddbc2 100644 --- a/eeschema/sheet.cpp +++ b/eeschema/sheet.cpp @@ -292,7 +292,7 @@ static void ExitSheet( EDA_DRAW_PANEL* aPanel, wxDC* aDC ) if( item->IsNew() ) { - SAFE_DELETE( item ); + delete item; } else if( item->IsMoving() || item->IsResized() ) { diff --git a/include/wxstruct.h b/include/wxstruct.h index c381445daf..ed936281d6 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -51,11 +51,6 @@ #include #endif -// C++ guarantees that operator delete checks its argument for null-ness -#ifndef SAFE_DELETE -#define SAFE_DELETE( p ) delete (p); (p) = NULL; -#endif - // Option for dialog boxes #define DIALOG_STYLE wxDEFAULT_DIALOG_STYLE | wxFRAME_FLOAT_ON_PARENT | MAYBE_RESIZE_BORDER