From 58e3c5bb6b78f8bb6e945f82ff0aa1341bc9869c Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sun, 18 Aug 2024 20:30:34 -0400
Subject: [PATCH] Rename Type() to ProjectElementType() for _ELEM children

---
 3d-viewer/3d_cache/3d_cache.h      | 2 +-
 common/project.cpp                 | 2 +-
 eeschema/project_sch.cpp           | 4 ++--
 eeschema/symbol_lib_table.h        | 2 +-
 eeschema/symbol_library.h          | 2 +-
 include/fp_lib_table.h             | 2 +-
 include/project.h                  | 3 ++-
 include/search_stack.h             | 2 +-
 pcbnew/project_pcb.cpp             | 2 +-
 qa/tests/common/test_lib_table.cpp | 2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/3d-viewer/3d_cache/3d_cache.h b/3d-viewer/3d_cache/3d_cache.h
index 16268ab9a5..f1a7a5c964 100644
--- a/3d-viewer/3d_cache/3d_cache.h
+++ b/3d-viewer/3d_cache/3d_cache.h
@@ -56,7 +56,7 @@ public:
     S3D_CACHE();
     virtual ~S3D_CACHE();
 
-    KICAD_T Type() noexcept override
+    KICAD_T ProjectElementType() noexcept override
     {
         return S3D_CACHE_T;
     }
diff --git a/common/project.cpp b/common/project.cpp
index b27a1941db..8245db501a 100644
--- a/common/project.cpp
+++ b/common/project.cpp
@@ -345,7 +345,7 @@ FP_LIB_TABLE* PROJECT::PcbFootprintLibs( KIWAY& aKiway )
 
     if( tbl )
     {
-        wxASSERT( tbl->Type() == FP_LIB_TABLE_T );
+        wxASSERT( tbl->ProjectElementType() == FP_LIB_TABLE_T );
     }
     else
     {
diff --git a/eeschema/project_sch.cpp b/eeschema/project_sch.cpp
index 993956f226..010c5357fd 100644
--- a/eeschema/project_sch.cpp
+++ b/eeschema/project_sch.cpp
@@ -91,7 +91,7 @@ SYMBOL_LIBS* PROJECT_SCH::SchLibs( PROJECT* aProject )
 {
     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 )
     {
@@ -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 );
 
     // 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 )
     {
diff --git a/eeschema/symbol_lib_table.h b/eeschema/symbol_lib_table.h
index f6e4191b18..8574ded02b 100644
--- a/eeschema/symbol_lib_table.h
+++ b/eeschema/symbol_lib_table.h
@@ -146,7 +146,7 @@ private:
 class SYMBOL_LIB_TABLE : public LIB_TABLE
 {
 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* PropNonPowerSymsOnly;
diff --git a/eeschema/symbol_library.h b/eeschema/symbol_library.h
index b9f4a85a91..7fa3dbabfc 100644
--- a/eeschema/symbol_library.h
+++ b/eeschema/symbol_library.h
@@ -62,7 +62,7 @@ typedef boost::ptr_vector< SYMBOL_LIB >                     SYMBOL_LIBS_BASE;
 class SYMBOL_LIBS : public SYMBOL_LIBS_BASE, public PROJECT::_ELEM
 {
 public:
-    KICAD_T Type() override { return SYMBOL_LIBS_T; }
+    KICAD_T ProjectElementType() override { return SYMBOL_LIBS_T; }
 
     SYMBOL_LIBS() {}
 
diff --git a/include/fp_lib_table.h b/include/fp_lib_table.h
index 2676a38c8d..5980d2b93b 100644
--- a/include/fp_lib_table.h
+++ b/include/fp_lib_table.h
@@ -98,7 +98,7 @@ private:
 class FP_LIB_TABLE : public LIB_TABLE
 {
 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;
 
diff --git a/include/project.h b/include/project.h
index ebc20adae4..2825a6caf3 100644
--- a/include/project.h
+++ b/include/project.h
@@ -74,7 +74,7 @@ public:
     public:
         virtual ~_ELEM() {}
 
-        virtual KICAD_T Type() = 0;     // Sanity-checking for returned values.
+        virtual KICAD_T ProjectElementType() = 0;     // Sanity-checking for returned values.
     };
 
     PROJECT();
@@ -226,6 +226,7 @@ public:
         ELEM_SCH_SEARCH_STACK,
         ELEM_3DCACHE,
         ELEM_SYMBOL_LIB_TABLE,
+        ELEM_PCB,
 
         ELEM_COUNT
     };
diff --git a/include/search_stack.h b/include/search_stack.h
index d237739956..a1315d3938 100644
--- a/include/search_stack.h
+++ b/include/search_stack.h
@@ -42,7 +42,7 @@
 class KICOMMON_API SEARCH_STACK : public wxPathList, public PROJECT::_ELEM
 {
 public:
-    KICAD_T Type() override { return SEARCH_STACK_T; }
+    KICAD_T ProjectElementType() override { return SEARCH_STACK_T; }
 
 #if defined(DEBUG)
     void Show( const wxString& aPrefix ) const;
diff --git a/pcbnew/project_pcb.cpp b/pcbnew/project_pcb.cpp
index 7ff31ae59c..bcfbf36485 100644
--- a/pcbnew/project_pcb.cpp
+++ b/pcbnew/project_pcb.cpp
@@ -42,7 +42,7 @@ FP_LIB_TABLE* PROJECT_PCB::PcbFootprintLibs( PROJECT* aProject )
     FP_LIB_TABLE* tbl = (FP_LIB_TABLE*) aProject->GetElem( PROJECT::ELEM_FPTBL );
 
     // 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 )
     {
diff --git a/qa/tests/common/test_lib_table.cpp b/qa/tests/common/test_lib_table.cpp
index 672c497004..2bf34a9679 100644
--- a/qa/tests/common/test_lib_table.cpp
+++ b/qa/tests/common/test_lib_table.cpp
@@ -83,7 +83,7 @@ public:
     {
     }
 
-    KICAD_T Type() override // from _ELEM
+    KICAD_T ProjectElementType() override // from _ELEM
     {
         // Doesn't really matter what this is
         return FP_LIB_TABLE_T;