realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Type() to ProjectElementType() for _ELEM children

Browse Source
This commit is contained in:
Marek Roszko 2024-08-18 20:30:34 -04:00
parent 7b076482c9
commit 58e3c5bb6b
10 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_cache/3d_cache.h
View File

@ -56,7 +56,7 @@ public:
S3D_CACHE(); S3D_CACHE();
virtual ~S3D_CACHE(); virtual ~S3D_CACHE();
KICAD_T Type() noexcept override KICAD_T ProjectElementType() noexcept override
{ {
return S3D_CACHE_T; return S3D_CACHE_T;
} }

2
common/project.cpp
View File

@ -345,7 +345,7 @@ FP_LIB_TABLE* PROJECT::PcbFootprintLibs( KIWAY& aKiway )
if( tbl ) if( tbl )
{ {
wxASSERT( tbl->Type() == FP_LIB_TABLE_T ); wxASSERT( tbl->ProjectElementType() == FP_LIB_TABLE_T );
} }
else else
{ {

4
eeschema/project_sch.cpp
View File

@ -91,7 +91,7 @@ SYMBOL_LIBS* PROJECT_SCH::SchLibs( PROJECT* aProject )
{ {
SYMBOL_LIBS* libs = (SYMBOL_LIBS*) aProject->GetElem( PROJECT::ELEM_SCH_SYMBOL_LIBS ); SYMBOL_LIBS* libs = (SYMBOL_LIBS*) aProject->GetElem( PROJECT::ELEM_SCH_SYMBOL_LIBS );
wxASSERT( !libs || libs->Type() == SYMBOL_LIBS_T ); wxASSERT( !libs || libs->ProjectElementType() == SYMBOL_LIBS_T );
if( !libs ) if( !libs )
{ {
@ -139,7 +139,7 @@ SYMBOL_LIB_TABLE* PROJECT_SCH::SchSymbolLibTable( PROJECT* aProject )
SYMBOL_LIB_TABLE* tbl = (SYMBOL_LIB_TABLE*) aProject->GetElem( PROJECT::ELEM_SYMBOL_LIB_TABLE ); SYMBOL_LIB_TABLE* tbl = (SYMBOL_LIB_TABLE*) aProject->GetElem( PROJECT::ELEM_SYMBOL_LIB_TABLE );
// its gotta be NULL or a SYMBOL_LIB_TABLE, or a bug. // its gotta be NULL or a SYMBOL_LIB_TABLE, or a bug.
wxASSERT( !tbl || tbl->Type() == SYMBOL_LIB_TABLE_T ); wxASSERT( !tbl || tbl->ProjectElementType() == SYMBOL_LIB_TABLE_T );
if( !tbl ) if( !tbl )
{ {

2
eeschema/symbol_lib_table.h
View File

@ -146,7 +146,7 @@ private:
class SYMBOL_LIB_TABLE : public LIB_TABLE class SYMBOL_LIB_TABLE : public LIB_TABLE
{ {
public: public:
KICAD_T Type() override { return SYMBOL_LIB_TABLE_T; } KICAD_T ProjectElementType() override { return SYMBOL_LIB_TABLE_T; }
static const char* PropPowerSymsOnly; static const char* PropPowerSymsOnly;
static const char* PropNonPowerSymsOnly; static const char* PropNonPowerSymsOnly;

2
eeschema/symbol_library.h
View File

@ -62,7 +62,7 @@ typedef boost::ptr_vector< SYMBOL_LIB > SYMBOL_LIBS_BASE;
class SYMBOL_LIBS : public SYMBOL_LIBS_BASE, public PROJECT::_ELEM class SYMBOL_LIBS : public SYMBOL_LIBS_BASE, public PROJECT::_ELEM
{ {
public: public:
KICAD_T Type() override { return SYMBOL_LIBS_T; } KICAD_T ProjectElementType() override { return SYMBOL_LIBS_T; }
SYMBOL_LIBS() {} SYMBOL_LIBS() {}

2
include/fp_lib_table.h
View File

@ -98,7 +98,7 @@ private:
class FP_LIB_TABLE : public LIB_TABLE class FP_LIB_TABLE : public LIB_TABLE
{ {
public: public:
KICAD_T Type() override { return FP_LIB_TABLE_T; } KICAD_T ProjectElementType() override { return FP_LIB_TABLE_T; }
virtual void Parse( LIB_TABLE_LEXER* aLexer ) override; virtual void Parse( LIB_TABLE_LEXER* aLexer ) override;

3
include/project.h
View File

@ -74,7 +74,7 @@ public:
public: public:
virtual ~_ELEM() {} virtual ~_ELEM() {}
virtual KICAD_T Type() = 0; // Sanity-checking for returned values. virtual KICAD_T ProjectElementType() = 0; // Sanity-checking for returned values.
}; };
PROJECT(); PROJECT();
@ -226,6 +226,7 @@ public:
ELEM_SCH_SEARCH_STACK, ELEM_SCH_SEARCH_STACK,
ELEM_3DCACHE, ELEM_3DCACHE,
ELEM_SYMBOL_LIB_TABLE, ELEM_SYMBOL_LIB_TABLE,
ELEM_PCB,
ELEM_COUNT ELEM_COUNT
}; };

2
include/search_stack.h
View File

@ -42,7 +42,7 @@
class KICOMMON_API SEARCH_STACK : public wxPathList, public PROJECT::_ELEM class KICOMMON_API SEARCH_STACK : public wxPathList, public PROJECT::_ELEM
{ {
public: public:
KICAD_T Type() override { return SEARCH_STACK_T; } KICAD_T ProjectElementType() override { return SEARCH_STACK_T; }
#if defined(DEBUG) #if defined(DEBUG)
void Show( const wxString& aPrefix ) const; void Show( const wxString& aPrefix ) const;

2
pcbnew/project_pcb.cpp
View File

@ -42,7 +42,7 @@ FP_LIB_TABLE* PROJECT_PCB::PcbFootprintLibs( PROJECT* aProject )
FP_LIB_TABLE* tbl = (FP_LIB_TABLE*) aProject->GetElem( PROJECT::ELEM_FPTBL ); FP_LIB_TABLE* tbl = (FP_LIB_TABLE*) aProject->GetElem( PROJECT::ELEM_FPTBL );
// its gotta be NULL or a FP_LIB_TABLE, or a bug. // its gotta be NULL or a FP_LIB_TABLE, or a bug.
wxASSERT( !tbl || tbl->Type() == FP_LIB_TABLE_T ); wxASSERT( !tbl || tbl->ProjectElementType() == FP_LIB_TABLE_T );
if( !tbl ) if( !tbl )
{ {

2
qa/tests/common/test_lib_table.cpp
View File

@ -83,7 +83,7 @@ public:
{ {
} }
KICAD_T Type() override // from _ELEM KICAD_T ProjectElementType() override // from _ELEM
{ {
// Doesn't really matter what this is // Doesn't really matter what this is
return FP_LIB_TABLE_T; return FP_LIB_TABLE_T;