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

Eeschema: internal tidying of field editor ApplyData 

Make a few things const (specficially the reference into
m_fieldStore - we should commit to not modifying that in this
function.

Also avoid a couple of needless string copies.

Also explicitly dereference the into a (non-const) reference at the outset.
For the whole if this function, comp is the same object and may not
be null (as it is used unchecked).

(cherry picked from commit edd94ce2d6)
This commit is contained in:
John Beard 2019-03-27 09:39:25 +00:00
parent b93382831c
commit 473c41ddbf
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -590,26 +590,29 @@ public:
{ {
for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i ) for( unsigned i = 0; i < m_componentRefs.GetCount(); ++i )
{ {
SCH_COMPONENT* comp = m_componentRefs[ i ].GetComp(); SCH_COMPONENT& comp = *m_componentRefs[i].GetComp();
m_frame->SetCurrentSheet( m_componentRefs[ i ].GetSheetPath() ); m_frame->SetCurrentSheet( m_componentRefs[i].GetSheetPath() );
m_frame->SaveCopyInUndoList( comp, UR_CHANGED, true ); m_frame->SaveCopyInUndoList( &comp, UR_CHANGED, true );
std::map<wxString, wxString>& fieldStore = m_dataStore[ comp->GetTimeStamp() ]; const std::map<wxString, wxString>& fieldStore = m_dataStore[comp.GetTimeStamp()];
for( std::pair<wxString, wxString> srcData : fieldStore ) for( const std::pair<wxString, wxString> srcData : fieldStore )
{ {
wxString srcName = srcData.first; const wxString& srcName = srcData.first;
wxString srcValue = srcData.second; const wxString& srcValue = srcData.second;
SCH_FIELD* destField = comp->FindField( srcName ); SCH_FIELD* destField = comp.FindField( srcName );
if( !destField && !srcValue.IsEmpty() ) if( !destField && !srcValue.IsEmpty() )
destField = comp->AddField( SCH_FIELD( comp->GetPosition(), -1, comp, srcName ) ); {
const auto compOrigin = comp.GetPosition();
destField = comp.AddField( SCH_FIELD( compOrigin, -1, &comp, srcName ) );
}
if( destField && !srcValue.IsEmpty() ) if( destField && !srcValue.IsEmpty() )
destField->SetText( srcValue ); destField->SetText( srcValue );
else else
comp->RemoveField( srcName ); comp.RemoveField( srcName );
} }
} }