haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coverty fixes.

This commit is contained in:
Jeff Young 2023-02-03 15:08:12 +00:00
parent 8ecf64b6c5
commit 71b8a2112c
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -511,11 +511,9 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( const std::map<SCH_SYMBOL*,
{ {
wxCHECK( !aSymbols.empty() && aNewId.IsValid(), 0 ); wxCHECK( !aSymbols.empty() && aNewId.IsValid(), 0 );
std::vector<SCH_SHEET_PATH> instances;
int matchesProcessed = 0; int matchesProcessed = 0;
SCH_EDIT_FRAME* frame = dynamic_cast<SCH_EDIT_FRAME*>( GetParent() ); SCH_EDIT_FRAME* frame = dynamic_cast<SCH_EDIT_FRAME*>( GetParent() );
SCH_SCREEN* screen = nullptr; SCH_SCREEN* screen = nullptr;
SCH_SYMBOL* symbol = nullptr;
LIB_SYMBOL* libSymbol = nullptr; LIB_SYMBOL* libSymbol = nullptr;
std::map<SCH_SYMBOL*, std::vector<SCH_SHEET_PATH>> symbols = aSymbols; std::map<SCH_SYMBOL*, std::vector<SCH_SHEET_PATH>> symbols = aSymbols;
@ -529,7 +527,7 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( const std::map<SCH_SYMBOL*,
// satify the library symbol update. // satify the library symbol update.
while( it != symbols.end() ) while( it != symbols.end() )
{ {
symbol = it->first; SCH_SYMBOL* symbol = it->first;
wxCHECK2( symbol, continue ); wxCHECK2( symbol, continue );
@ -561,11 +559,8 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( const std::map<SCH_SYMBOL*,
// Removing the symbol needs to be done before the LIB_SYMBOL is changed to prevent stale // Removing the symbol needs to be done before the LIB_SYMBOL is changed to prevent stale
// library symbols in the schematic file. // library symbols in the schematic file.
for( auto& pair : symbols ) for( const auto& [ symbol, instances ] : symbols )
{ {
symbol = pair.first;
instances = pair.second;
wxCHECK( symbol && !instances.empty(), 0 ); wxCHECK( symbol && !instances.empty(), 0 );
screen = instances[0].LastScreen(); screen = instances[0].LastScreen();
@ -576,10 +571,8 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( const std::map<SCH_SYMBOL*,
frame->SaveCopyInUndoList( screen, symbol, UNDO_REDO::CHANGED, true ); frame->SaveCopyInUndoList( screen, symbol, UNDO_REDO::CHANGED, true );
} }
for( auto& pair : symbols ) for( const auto& [ symbol, instances ] : symbols )
{ {
symbol = pair.first;
if( aNewId != symbol->GetLibId() ) if( aNewId != symbol->GetLibId() )
symbol->SetLibId( aNewId ); symbol->SetLibId( aNewId );
@ -623,7 +616,7 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( const std::map<SCH_SYMBOL*,
{ {
if( i == REFERENCE_FIELD ) if( i == REFERENCE_FIELD )
{ {
for( const SCH_SHEET_PATH& instance : pair.second ) for( const SCH_SHEET_PATH& instance : instances )
{ {
symbol->SetRef( &instance, symbol->SetRef( &instance,
UTIL::GetRefDesUnannotated( libField->GetText() ) ); UTIL::GetRefDesUnannotated( libField->GetText() ) );
@ -698,7 +691,6 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( const std::map<SCH_SYMBOL*,
} }
symbol->SetSchSymbolLibraryName( wxEmptyString ); symbol->SetSchSymbolLibraryName( wxEmptyString );
instances = pair.second;
screen = instances[0].LastScreen(); screen = instances[0].LastScreen();
screen->Append( symbol ); screen->Append( symbol );
frame->GetCanvas()->GetView()->Update( symbol ); frame->GetCanvas()->GetView()->Update( symbol );