Minor code cleanup.

This commit is contained in:
Jeff Young 2020-09-06 11:28:58 +01:00
parent a25dfb2ac9
commit 133fb5cded
2 changed files with 6 additions and 6 deletions

View File

@ -487,7 +487,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
screen->UpdateLocalLibSymbolLinks(); screen->UpdateLocalLibSymbolLinks();
// Restore all of the loaded symbol instances from the root sheet screen. // Restore all of the loaded symbol instances from the root sheet screen.
sheetList.UpdateSymbolInstances( Schematic().RootScreen()->m_symbolInstances ); sheetList.UpdateSymbolInstances( Schematic().RootScreen()->GetSymbolInstances() );
} }
Schematic().ConnectionGraph()->Reset(); Schematic().ConnectionGraph()->Reset();

View File

@ -257,9 +257,9 @@ void SCH_SHEET_PATH::UpdateAllScreenReferences()
void SCH_SHEET_PATH::GetComponents( SCH_REFERENCE_LIST& aReferences, bool aIncludePowerSymbols, void SCH_SHEET_PATH::GetComponents( SCH_REFERENCE_LIST& aReferences, bool aIncludePowerSymbols,
bool aForceIncludeOrphanComponents ) const bool aForceIncludeOrphanComponents ) const
{ {
for( auto item : LastScreen()->Items().OfType( SCH_COMPONENT_T ) ) for( SCH_ITEM* item : LastScreen()->Items().OfType( SCH_COMPONENT_T ) )
{ {
auto component = static_cast<SCH_COMPONENT*>( item ); SCH_COMPONENT* component = static_cast<SCH_COMPONENT*>( item );
// Skip pseudo components, which have a reference starting with #. This mainly // Skip pseudo components, which have a reference starting with #. This mainly
// affects power symbols. // affects power symbols.
@ -798,7 +798,7 @@ std::vector<KIID_PATH> SCH_SHEET_LIST::GetPaths() const
{ {
std::vector<KIID_PATH> paths; std::vector<KIID_PATH> paths;
for( auto sheetPath : *this ) for( const SCH_SHEET_PATH& sheetPath : *this )
paths.emplace_back( sheetPath.Path() ); paths.emplace_back( sheetPath.Path() );
return paths; return paths;
@ -817,7 +817,7 @@ void SCH_SHEET_LIST::ReplaceLegacySheetPaths( const std::vector<KIID_PATH>& aOld
wxCHECK( screen, /* void */ ); wxCHECK( screen, /* void */ );
for( auto symbol : screen->Items().OfType( SCH_COMPONENT_T ) ) for( SCH_ITEM* symbol : screen->Items().OfType( SCH_COMPONENT_T ) )
{ {
static_cast<SCH_COMPONENT*>( symbol )->ReplaceInstanceSheetPath( oldSheetPath, static_cast<SCH_COMPONENT*>( symbol )->ReplaceInstanceSheetPath( oldSheetPath,
newSheetPath ); newSheetPath );