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

Minor cleanup.

This commit is contained in:
Jeff Young 2021-06-07 13:02:29 +01:00
parent 08e8b17029
commit e91721cb62
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/sheet.cpp
View File

@ -123,7 +123,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
if( !fileName.IsAbsolute() && !fileName.MakeAbsolute() ) if( !fileName.IsAbsolute() && !fileName.MakeAbsolute() )
{ {
wxFAIL_MSG( wxString::Format( "Cannot make file name \"%s\" path absolute.", aFileName ) ); wxFAIL_MSG( wxString::Format( "Cannot make file name '%s' path absolute.", aFileName ) );
return false; return false;
} }
@ -212,7 +212,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
// It's possible the user copied this schematic from another project so the library // It's possible the user copied this schematic from another project so the library
// links may not be available. Even this is check is no guarantee that all symbol // links may not be available. Even this is check is no guarantee that all symbol
// library links are valid but it's better than nothing. // library links are valid but it's better than nothing.
for( const auto& name : names ) for( const wxString& name : names )
{ {
if( !Prj().SchSymbolLibTable()->HasLibrary( name ) ) if( !Prj().SchSymbolLibTable()->HasLibrary( name ) )
newLibNames.Add( name ); newLibNames.Add( name );
@ -242,7 +242,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
// library table. // library table.
wxArrayString duplicateLibNames; wxArrayString duplicateLibNames;
for( const auto& name : names ) for( const wxString& name : names )
{ {
if( !Prj().SchSymbolLibTable()->HasLibrary( name ) ) if( !Prj().SchSymbolLibTable()->HasLibrary( name ) )
newLibNames.Add( name ); newLibNames.Add( name );
@ -297,7 +297,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
if( !missingLibNames ) if( !missingLibNames )
{ {
for( const auto& newLibName : newLibNames ) for( const wxString& newLibName : newLibNames )
{ {
if( !table.HasLibrary( newLibName ) ) if( !table.HasLibrary( newLibName ) )
{ {
@ -330,7 +330,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier
{ {
bool libNameConflict = false; bool libNameConflict = false;
for( const auto& duplicateLibName : duplicateLibNames ) for( const wxString& duplicateLibName : duplicateLibNames )
{ {
const SYMBOL_LIB_TABLE_ROW* thisRow = nullptr; const SYMBOL_LIB_TABLE_ROW* thisRow = nullptr;
const SYMBOL_LIB_TABLE_ROW* otherRow = nullptr; const SYMBOL_LIB_TABLE_ROW* otherRow = nullptr;