AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Use std::array for rstring and elems

Browse Source
This commit is contained in:
Marek Roszko 2024-08-18 22:04:00 -04:00
parent b101c1a0c3
commit 9eae3330ca
2 changed files with 10 additions and 9 deletions

14
common/project.cpp
View File

@ -27,7 +27,6 @@
#include <pgm_base.h>
#include <confirm.h>
#include <core/arraydim.h>
#include <core/kicad_algo.h>
#include <fp_lib_table.h>
#include <string_utils.h>
@ -48,7 +47,7 @@ PROJECT::PROJECT() :
m_projectFile( nullptr ),
m_localSettings( nullptr )
{
memset( m_elems, 0, sizeof( m_elems ) );
m_elems.fill( nullptr );
}
@ -56,7 +55,7 @@ void PROJECT::ElemsClear()
{
// careful here, this should work, but the virtual destructor may not
// be in the same link image as PROJECT.
for( unsigned i = 0; i < arrayDim( m_elems ); ++i )
for( unsigned i = 0; i < m_elems.size(); ++i )
{
SetElem( static_cast<PROJECT::ELEM>( i ), nullptr );
}
@ -270,7 +269,7 @@ void PROJECT::SetRString( RSTRING_T aIndex, const wxString& aString )
{
unsigned ndx = unsigned( aIndex );
if( ndx < arrayDim( m_rstrings ) )
if( ndx < m_rstrings.size() )
m_rstrings[ndx] = aString;
else
wxASSERT( 0 ); // bad index
@ -281,7 +280,7 @@ const wxString& PROJECT::GetRString( RSTRING_T aIndex )
{
unsigned ndx = unsigned( aIndex );
if( ndx < arrayDim( m_rstrings ) )
if( ndx < m_rstrings.size() )
{
return m_rstrings[ndx];
}
@ -299,7 +298,8 @@ const wxString& PROJECT::GetRString( RSTRING_T aIndex )
PROJECT::_ELEM* PROJECT::GetElem( PROJECT::ELEM aIndex )
{
// This is virtual, so implement it out of line
if( static_cast<unsigned>( aIndex ) < arrayDim( m_elems ) )
if( static_cast<unsigned>( aIndex ) < m_elems.size() )
return m_elems[static_cast<unsigned>( aIndex )];
return nullptr;
@ -309,7 +309,7 @@ PROJECT::_ELEM* PROJECT::GetElem( PROJECT::ELEM aIndex )
void PROJECT::SetElem( PROJECT::ELEM aIndex, _ELEM* aElem )
{
// This is virtual, so implement it out of line
if( static_cast<unsigned>( aIndex ) < arrayDim( m_elems ) )
if( static_cast<unsigned>( aIndex ) < m_elems.size() )
{
delete m_elems[static_cast<unsigned>(aIndex)];
m_elems[static_cast<unsigned>( aIndex )] = aElem;

5
include/project.h
View File

@ -27,6 +27,7 @@
/**
* @file project.h
*/
#include <array>
#include <map>
#include <vector>
#include <kiid.h>
@ -335,10 +336,10 @@ private:
std::map<KIID, wxString> m_sheetNames;
/// @see this::SetRString(), GetRString(), and enum RSTRING_T.
wxString m_rstrings[RSTRING_COUNT];
std::array<wxString,RSTRING_COUNT> m_rstrings;
/// @see this::Elem() and enum ELEM_T.
_ELEM* m_elems[static_cast<unsigned int>( PROJECT::ELEM::COUNT )];
std::array<_ELEM*,static_cast<unsigned int>( PROJECT::ELEM::COUNT )> m_elems;
};