Remove cover types.

This commit is contained in:
Jeff Young 2024-06-03 11:11:04 +01:00
parent 63d828d5ff
commit 40854cec0e
4 changed files with 8 additions and 11 deletions

View File

@ -620,7 +620,7 @@ findItemsFromSyncSelection( const SCHEMATIC& aSchematic, const std::string aSync
const SCH_SHEET_LIST allSheetsList = aSchematic.GetSheets();
// In orderedSheets, the current sheet comes first.
SCH_SHEET_PATHS orderedSheets;
std::vector<SCH_SHEET_PATH> orderedSheets;
orderedSheets.reserve( allSheetsList.size() );
orderedSheets.push_back( aSchematic.CurrentSheet() );

View File

@ -1809,7 +1809,7 @@ void SCH_EDIT_FRAME::RecalculateConnections( SCH_COMMIT* aCommit, SCH_CLEANUP_FL
// Lambda to add an item to the connectivity update sets
auto addItemToChangeSet = [&changed_items, &pts, &item_paths]( CHANGED_ITEM itemData )
{
SCH_SHEET_PATHS& paths = itemData.screen->GetClientSheetPaths();
std::vector<SCH_SHEET_PATH>& paths = itemData.screen->GetClientSheetPaths();
std::vector<VECTOR2I> tmp_pts = itemData.item->GetConnectionPoints();
pts.insert( tmp_pts.begin(), tmp_pts.end() );

View File

@ -142,7 +142,7 @@ void SCH_SHEET_PATH::initFromOther( const SCH_SHEET_PATH& aOther )
m_virtualPageNumber = aOther.m_virtualPageNumber;
m_current_hash = aOther.m_current_hash;
// Note: don't copy m_recursion_test_cache as it is slow and we want SCH_SHEET_PATHS to be
// Note: don't copy m_recursion_test_cache as it is slow and we want std::vector<SCH_SHEET_PATH> to be
// very fast to construct for use in the connectivity algorithm.
}
@ -1018,7 +1018,7 @@ void SCH_SHEET_LIST::GetSymbolsWithinPath( SCH_REFERENCE_LIST& aReferences,
}
void SCH_SHEET_LIST::GetSheetsWithinPath( SCH_SHEET_PATHS& aSheets,
void SCH_SHEET_LIST::GetSheetsWithinPath( std::vector<SCH_SHEET_PATH>& aSheets,
const SCH_SHEET_PATH& aSheetPath ) const
{
for( const SCH_SHEET_PATH& sheet : *this )
@ -1050,7 +1050,7 @@ std::optional<SCH_SHEET_PATH> SCH_SHEET_LIST::GetSheetPathByKIIDPath( const KIID
void SCH_SHEET_LIST::GetMultiUnitSymbols( SCH_MULTI_UNIT_REFERENCE_MAP &aRefList,
bool aIncludePowerSymbols ) const
{
for( SCH_SHEET_PATHS::const_iterator it = begin(); it != end(); ++it )
for( auto it = begin(); it != end(); ++it )
{
SCH_MULTI_UNIT_REFERENCE_MAP tempMap;
( *it ).GetMultiUnitSymbols( tempMap, aIncludePowerSymbols );

View File

@ -451,10 +451,6 @@ struct SHEET_PATH_CMP
};
typedef std::vector< SCH_SHEET_PATH > SCH_SHEET_PATHS;
typedef SCH_SHEET_PATHS::iterator SCH_SHEET_PATHS_ITER;
/**
* A container for handling #SCH_SHEET_PATH objects in a flattened hierarchy.
*
@ -463,7 +459,7 @@ typedef SCH_SHEET_PATHS::iterator SCH_SHEET_PATHS_ITER;
* be shared between these sheets and symbol references are specific to a sheet path.
* When a sheet is entered, symbol references and sheet page number are updated.
*/
class SCH_SHEET_LIST : public SCH_SHEET_PATHS
class SCH_SHEET_LIST : public std::vector<SCH_SHEET_PATH>
{
public:
/**
@ -538,7 +534,8 @@ public:
* @param aReferences List of sheets to populate.
* @param aSheetPath Path to return sheets from
*/
void GetSheetsWithinPath( SCH_SHEET_PATHS& aSheets, const SCH_SHEET_PATH& aSheetPath ) const;
void GetSheetsWithinPath( std::vector<SCH_SHEET_PATH>& aSheets,
const SCH_SHEET_PATH& aSheetPath ) const;
/**