From e1ea6a1302e234340d8f8fb020f33a7ea71c5ae4 Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Tue, 15 Jul 2025 22:14:52 -0400 Subject: [PATCH] Shorten class name for legibility --- eeschema/CMakeLists.txt | 2 +- eeschema/cross-probing.cpp | 4 +- .../dialogs/dialog_edit_symbols_libid.cpp | 8 +- eeschema/dialogs/dialog_symbol_remap.cpp | 4 +- eeschema/dialogs/panel_sym_lib_table.cpp | 6 +- eeschema/eeschema.cpp | 4 +- eeschema/erc/erc.cpp | 4 +- eeschema/generate_alias_info.cpp | 8 +- eeschema/generate_alias_info.h | 4 +- ...adapter.cpp => symbol_library_adapter.cpp} | 80 +++++++++---------- ...ger_adapter.h => symbol_library_adapter.h} | 4 +- .../netlist_exporter_xml.cpp | 2 +- eeschema/project_rescue.cpp | 6 +- eeschema/project_sch.cpp | 10 +-- eeschema/project_sch.h | 8 +- eeschema/sch_base_frame.cpp | 10 +-- eeschema/sch_base_frame.h | 4 +- eeschema/sch_io/altium/sch_io_altium.cpp | 4 +- .../sch_io/cadstar/sch_io_cadstar_archive.cpp | 4 +- eeschema/sch_io/database/sch_io_database.cpp | 2 +- eeschema/sch_io/database/sch_io_database.h | 4 +- eeschema/sch_io/eagle/sch_io_eagle.cpp | 6 +- .../sch_io/easyedapro/sch_io_easyedapro.cpp | 4 +- eeschema/sch_io/http_lib/sch_io_http_lib.cpp | 2 +- eeschema/sch_io/http_lib/sch_io_http_lib.h | 4 +- eeschema/sch_io/sch_io.h | 4 +- eeschema/sch_screen.cpp | 4 +- eeschema/sheet.cpp | 8 +- .../lib_symbol_library_manager.cpp | 4 +- eeschema/symbol_editor/symbol_edit_frame.cpp | 22 ++--- eeschema/symbol_editor/symbol_editor.cpp | 8 +- eeschema/symbol_library_manager.cpp | 24 +++--- eeschema/symbol_tree_model_adapter.cpp | 12 +-- eeschema/symbol_tree_model_adapter.h | 8 +- .../symbol_tree_synchronizing_adapter.cpp | 6 +- eeschema/symbol_viewer_frame.cpp | 16 ++-- eeschema/tools/sch_drawing_tools.cpp | 2 +- eeschema/tools/sch_editor_control.cpp | 5 +- eeschema/tools/sch_inspection_tool.cpp | 4 +- eeschema/widgets/panel_symbol_chooser.cpp | 8 +- eeschema/widgets/symbol_preview_widget.cpp | 4 +- qa/tests/eeschema/test_symbol_library.cpp | 6 +- 42 files changed, 170 insertions(+), 173 deletions(-) rename eeschema/libraries/{symbol_library_manager_adapter.cpp => symbol_library_adapter.cpp} (85%) rename eeschema/libraries/{symbol_library_manager_adapter.h => symbol_library_adapter.h} (98%) diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 4a90bc00cf..2cb628ec96 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -433,7 +433,7 @@ set( EESCHEMA_SRCS api/api_sch_utils.cpp libraries/legacy_symbol_library.cpp - libraries/symbol_library_manager_adapter.cpp + libraries/symbol_library_adapter.cpp netlist_exporters/netlist_exporter_allegro.cpp netlist_exporters/netlist_exporter_base.cpp diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp index 6ea3d969b2..4d8bee2288 100644 --- a/eeschema/cross-probing.cpp +++ b/eeschema/cross-probing.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include @@ -886,7 +886,7 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) aError.message ); } ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); adapter->LoadOne( fn.GetName() ); } } diff --git a/eeschema/dialogs/dialog_edit_symbols_libid.cpp b/eeschema/dialogs/dialog_edit_symbols_libid.cpp index 0a7209d49c..1e80c37420 100644 --- a/eeschema/dialogs/dialog_edit_symbols_libid.cpp +++ b/eeschema/dialogs/dialog_edit_symbols_libid.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include @@ -577,7 +577,7 @@ void DIALOG_EDIT_SYMBOLS_LIBID::onCellBrowseLib( wxGridEvent& event ) void DIALOG_EDIT_SYMBOLS_LIBID::onClickOrphansButton( wxCommandEvent& event ) { - std::vector libs = PROJECT_SCH::SymbolLibManager( &Prj() )->GetLibraryNames(); + std::vector libs = PROJECT_SCH::SymbolLibAdapter( &Prj() )->GetLibraryNames(); std::vector aliasNames; wxArrayString candidateSymbNames; @@ -606,7 +606,7 @@ void DIALOG_EDIT_SYMBOLS_LIBID::onClickOrphansButton( wxCommandEvent& event ) try { - aliasNames = PROJECT_SCH::SymbolLibManager( &Prj() )->GetSymbolNames( lib ); + aliasNames = PROJECT_SCH::SymbolLibAdapter( &Prj() )->GetSymbolNames( lib ); } catch( const IO_ERROR& ) {} // ignore, it is handled below @@ -737,7 +737,7 @@ bool DIALOG_EDIT_SYMBOLS_LIBID::TransferDataFromWindow() try { - symbol = PROJECT_SCH::SymbolLibManager( &Prj() )->LoadSymbol( id ); + symbol = PROJECT_SCH::SymbolLibAdapter( &Prj() )->LoadSymbol( id ); } catch( const IO_ERROR& ioe ) { diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp index 2a077e1919..6cd4c6d28c 100644 --- a/eeschema/dialogs/dialog_symbol_remap.cpp +++ b/eeschema/dialogs/dialog_symbol_remap.cpp @@ -33,7 +33,7 @@ #include "widgets/wx_html_report_panel.h" #include -#include +#include #include #include #include @@ -316,7 +316,7 @@ bool DIALOG_SYMBOL_REMAP::remapSymbolToLibTable( SCH_SYMBOL* aSymbol ) wxString libFileName = lib.GetFullFileName(); if( std::optional nickname = - PROJECT_SCH::SymbolLibManager( &Prj() )->FindLibraryByURI( libFileName ) ) + PROJECT_SCH::SymbolLibAdapter( &Prj() )->FindLibraryByURI( libFileName ) ) { LIB_ID id = aSymbol->GetLibId(); diff --git a/eeschema/dialogs/panel_sym_lib_table.cpp b/eeschema/dialogs/panel_sym_lib_table.cpp index 575964d865..9958e453c0 100644 --- a/eeschema/dialogs/panel_sym_lib_table.cpp +++ b/eeschema/dialogs/panel_sym_lib_table.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include @@ -161,7 +161,7 @@ protected: // Errored rows should have the warning button, so we show their error // Configurable libraries will have the options button, so we launch the config // Chained tables will have the open button, so we request the table be opened - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_project ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_project ); auto libTable = static_cast( m_grid->GetTable() ); const LIBRARY_TABLE_ROW& row = libTable->at( aEvent.GetRow() ); @@ -290,7 +290,7 @@ void PANEL_SYM_LIB_TABLE::setupGrid( WX_GRID* aGrid ) aCurrGrid->SetColSize( aCol, std::max( prevWidth, aCurrGrid->GetColSize( aCol ) ) ); }; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( m_project ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( m_project ); for( int ii = 0; ii < aGrid->GetNumberRows(); ++ii ) { diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index a9c665bf76..144d94bc3d 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -496,7 +496,7 @@ void IFACE::PreloadLibraries( PROJECT* aProject ) std::shared_ptr reporter = m_libraryPreloadBackgroundJob->m_reporter; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( aProject ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( aProject ); int elapsed = 0; diff --git a/eeschema/erc/erc.cpp b/eeschema/erc/erc.cpp index 73829c9f0d..330b6ad8b4 100644 --- a/eeschema/erc/erc.cpp +++ b/eeschema/erc/erc.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include /* ERC tests : @@ -1450,7 +1450,7 @@ int ERC_TESTER::TestLibSymbolIssues() wxCHECK( m_schematic, 0 ); LIBRARY_MANAGER& manager = Pgm().GetLibraryManager(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_schematic->Project() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_schematic->Project() ); wxString msg; int err_count = 0; diff --git a/eeschema/generate_alias_info.cpp b/eeschema/generate_alias_info.cpp index 93261622b1..edd1b0d239 100644 --- a/eeschema/generate_alias_info.cpp +++ b/eeschema/generate_alias_info.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include static const wxString DescriptionFormat = wxS( @@ -50,7 +50,7 @@ static const wxString LinkFormat = wxS( "__TEXT__" ); class FOOTPRINT_INFO_GENERATOR { public: - FOOTPRINT_INFO_GENERATOR( SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ) : + FOOTPRINT_INFO_GENERATOR( SYMBOL_LIBRARY_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ) : m_html( DescriptionFormat ), m_libs( aLibs ), m_lib_id( aLibId ), @@ -255,14 +255,14 @@ protected: private: wxString m_html; - SYMBOL_LIBRARY_MANAGER_ADAPTER* m_libs; + SYMBOL_LIBRARY_ADAPTER* m_libs; LIB_ID const m_lib_id; LIB_SYMBOL* m_symbol; int m_unit; }; -wxString GenerateAliasInfo( SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ) +wxString GenerateAliasInfo( SYMBOL_LIBRARY_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ) { FOOTPRINT_INFO_GENERATOR gen( aLibs, aLibId, aUnit ); gen.GenerateHtml(); diff --git a/eeschema/generate_alias_info.h b/eeschema/generate_alias_info.h index b3fd911ea6..0585846efc 100644 --- a/eeschema/generate_alias_info.h +++ b/eeschema/generate_alias_info.h @@ -24,12 +24,12 @@ #include class LIB_ID; -class SYMBOL_LIBRARY_MANAGER_ADAPTER; +class SYMBOL_LIBRARY_ADAPTER; /** * Return an HTML page describing a #LIB_ID in a #SYMBOL_LIB_TABLE. This is suitable for inclusion * in a HTML_WINDOW (wxHtmlWindow). */ -wxString GenerateAliasInfo( SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ); +wxString GenerateAliasInfo( SYMBOL_LIBRARY_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ); #endif // GENERATE_ALIAS_INFO_H diff --git a/eeschema/libraries/symbol_library_manager_adapter.cpp b/eeschema/libraries/symbol_library_adapter.cpp similarity index 85% rename from eeschema/libraries/symbol_library_manager_adapter.cpp rename to eeschema/libraries/symbol_library_adapter.cpp index a6d0c8c5fc..8e5bec11cc 100644 --- a/eeschema/libraries/symbol_library_manager_adapter.cpp +++ b/eeschema/libraries/symbol_library_adapter.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -35,22 +35,22 @@ #include -std::map SYMBOL_LIBRARY_MANAGER_ADAPTER::GlobalLibraries; +std::map SYMBOL_LIBRARY_ADAPTER::GlobalLibraries; -std::mutex SYMBOL_LIBRARY_MANAGER_ADAPTER::GlobalLibraryMutex; +std::mutex SYMBOL_LIBRARY_ADAPTER::GlobalLibraryMutex; -const char* SYMBOL_LIBRARY_MANAGER_ADAPTER::PropPowerSymsOnly = "pwr_sym_only"; -const char* SYMBOL_LIBRARY_MANAGER_ADAPTER::PropNonPowerSymsOnly = "non_pwr_sym_only"; +const char* SYMBOL_LIBRARY_ADAPTER::PropPowerSymsOnly = "pwr_sym_only"; +const char* SYMBOL_LIBRARY_ADAPTER::PropNonPowerSymsOnly = "non_pwr_sym_only"; -SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_LIBRARY_MANAGER_ADAPTER( LIBRARY_MANAGER& aManager ) : +SYMBOL_LIBRARY_ADAPTER::SYMBOL_LIBRARY_ADAPTER( LIBRARY_MANAGER& aManager ) : LIBRARY_MANAGER_ADAPTER( aManager ), m_loadTotal( 0 ) { } -void SYMBOL_LIBRARY_MANAGER_ADAPTER::ProjectChanged() +void SYMBOL_LIBRARY_ADAPTER::ProjectChanged() { abortLoad(); @@ -61,7 +61,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::ProjectChanged() } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadOne( const wxString& aNickname ) +std::optional SYMBOL_LIBRARY_ADAPTER::LoadOne( const wxString& aNickname ) { LOCALE_IO toggle; @@ -94,7 +94,7 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadOne( const wxStrin } -LIBRARY_RESULT SYMBOL_LIBRARY_MANAGER_ADAPTER::loadIfNeeded( const wxString& aNickname ) +LIBRARY_RESULT SYMBOL_LIBRARY_ADAPTER::loadIfNeeded( const wxString& aNickname ) { auto tryLoadFromScope = [&]( LIBRARY_TABLE_SCOPE aScope, std::map& aTarget, @@ -165,7 +165,7 @@ LIBRARY_RESULT SYMBOL_LIBRARY_MANAGER_ADAPTER::loadIfNeeded( const wx } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded( +std::optional SYMBOL_LIBRARY_ADAPTER::fetchIfLoaded( const wxString& aNickname ) const { if( m_libraries.contains( aNickname ) @@ -184,7 +184,7 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded( } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded( +std::optional SYMBOL_LIBRARY_ADAPTER::fetchIfLoaded( const wxString& aNickname ) { if( m_libraries.contains( aNickname ) && m_libraries.at( aNickname ).status.load_status == LOAD_STATUS::LOADED ) @@ -200,13 +200,13 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded( } -wxString SYMBOL_LIBRARY_MANAGER_ADAPTER::getUri( const LIBRARY_TABLE_ROW* aRow ) +wxString SYMBOL_LIBRARY_ADAPTER::getUri( const LIBRARY_TABLE_ROW* aRow ) { return LIBRARY_MANAGER::ExpandURI( aRow->URI(), Pgm().GetSettingsManager().Prj() ); } -std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbols( const wxString& aNickname, +std::vector SYMBOL_LIBRARY_ADAPTER::GetSymbols( const wxString& aNickname, SYMBOL_TYPE aType ) { std::vector symbols; @@ -243,7 +243,7 @@ std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbols( const wxStr } -std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbolNames( const wxString& aNickname, +std::vector SYMBOL_LIBRARY_ADAPTER::GetSymbolNames( const wxString& aNickname, SYMBOL_TYPE aType ) { // TODO(JE) can we kill wxArrayString in internal API? @@ -268,7 +268,7 @@ std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbolNames( const wxSt } -LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadSymbol( const wxString& aNickname, +LIB_SYMBOL* SYMBOL_LIBRARY_ADAPTER::LoadSymbol( const wxString& aNickname, const wxString& aName ) { if( std::optional lib = fetchIfLoaded( aNickname ) ) @@ -290,21 +290,21 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadSymbol( const wxString& aNicknam } -SYMBOL_LIBRARY_MANAGER_ADAPTER::SAVE_T SYMBOL_LIBRARY_MANAGER_ADAPTER::SaveSymbol( +SYMBOL_LIBRARY_ADAPTER::SAVE_T SYMBOL_LIBRARY_ADAPTER::SaveSymbol( const wxString& aNickname, const LIB_SYMBOL* aSymbol, bool aOverwrite ) { wxCHECK_MSG( false, SAVE_SKIPPED, "Unimplemented!" ); } -void SYMBOL_LIBRARY_MANAGER_ADAPTER::DeleteSymbol( const wxString& aNickname, +void SYMBOL_LIBRARY_ADAPTER::DeleteSymbol( const wxString& aNickname, const wxString& aSymbolName ) { wxCHECK_MSG( false, /* void */, "Unimplemented!" ); } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsSymbolLibWritable( const wxString& aLib ) +bool SYMBOL_LIBRARY_ADAPTER::IsSymbolLibWritable( const wxString& aLib ) { if( m_libraries.contains( aLib ) ) return m_libraries[aLib].plugin->IsLibraryWritable( getUri( m_libraries[aLib].row ) ); @@ -316,7 +316,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsSymbolLibWritable( const wxString& aLib ) } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsLibraryLoaded( const wxString& aNickname ) +bool SYMBOL_LIBRARY_ADAPTER::IsLibraryLoaded( const wxString& aNickname ) { // TODO: row->IsOK() doesn't actually tell you if a library is loaded // Once we are preloading libraries we can cache the status of plugin load instead @@ -331,7 +331,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsLibraryLoaded( const wxString& aNickname } -void SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoad() +void SYMBOL_LIBRARY_ADAPTER::AsyncLoad() { // TODO(JE) any reason to clean these up earlier? std::erase_if( m_futures, @@ -459,7 +459,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoad() } -void SYMBOL_LIBRARY_MANAGER_ADAPTER::abortLoad() +void SYMBOL_LIBRARY_ADAPTER::abortLoad() { if( m_futures.empty() ) return; @@ -476,7 +476,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::abortLoad() } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoadProgress() const +std::optional SYMBOL_LIBRARY_ADAPTER::AsyncLoadProgress() const { if( m_loadTotal == 0 ) return std::nullopt; @@ -486,14 +486,14 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoadProgress() const } -void SYMBOL_LIBRARY_MANAGER_ADAPTER::BlockUntilLoaded() +void SYMBOL_LIBRARY_ADAPTER::BlockUntilLoaded() { for( const std::future& future : m_futures ) future.wait(); } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::LibraryError( +std::optional SYMBOL_LIBRARY_ADAPTER::LibraryError( const wxString& aNickname ) const { if( m_libraries.contains( aNickname ) ) @@ -510,7 +510,7 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::LibraryError( } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::FindLibraryByURI( const wxString& aURI ) const +std::optional SYMBOL_LIBRARY_ADAPTER::FindLibraryByURI( const wxString& aURI ) const { for( const LIBRARY_TABLE_ROW* row : m_manager.Rows( LIBRARY_TABLE_TYPE::SYMBOL ) ) { @@ -522,7 +522,7 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::FindLibraryByURI( const } -std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryNames() const +std::vector SYMBOL_LIBRARY_ADAPTER::GetLibraryNames() const { std::vector ret; @@ -536,7 +536,7 @@ std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryNames() const } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryDescription( const wxString& aNickname ) const +std::optional SYMBOL_LIBRARY_ADAPTER::GetLibraryDescription( const wxString& aNickname ) const { if( std::optional optRow = fetchIfLoaded( aNickname ); optRow ) return ( *optRow )->row->Description(); @@ -545,8 +545,8 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryDescription( c } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::HasLibrary( const wxString& aNickname, - bool aCheckEnabled ) const +bool SYMBOL_LIBRARY_ADAPTER::HasLibrary( const wxString& aNickname, + bool aCheckEnabled ) const { if( std::optional r = fetchIfLoaded( aNickname ); r.has_value() ) return !aCheckEnabled || !( *r )->row->Disabled(); @@ -555,7 +555,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::HasLibrary( const wxString& aNickname, } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::DeleteLibrary( const wxString& aNickname ) +bool SYMBOL_LIBRARY_ADAPTER::DeleteLibrary( const wxString& aNickname ) { if( LIBRARY_RESULT result = loadIfNeeded( aNickname ); result.has_value() ) { @@ -576,7 +576,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::DeleteLibrary( const wxString& aNickname ) } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::CreateLibrary( const wxString& aNickname ) +bool SYMBOL_LIBRARY_ADAPTER::CreateLibrary( const wxString& aNickname ) { LOCALE_IO toggle; @@ -600,7 +600,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::CreateLibrary( const wxString& aNickname ) } -std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryStatus( const wxString& aNickname ) const +std::optional SYMBOL_LIBRARY_ADAPTER::GetLibraryStatus( const wxString& aNickname ) const { if( m_libraries.contains( aNickname ) ) return m_libraries.at( aNickname ).status; @@ -612,7 +612,7 @@ std::optional SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryStatus( cons } -std::vector> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryStatuses() const +std::vector> SYMBOL_LIBRARY_ADAPTER::GetLibraryStatuses() const { std::vector> ret; @@ -636,7 +636,7 @@ std::vector> SYMBOL_LIBRARY_MANAGER_ADAPTER::Get } -std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetAvailableExtraFields( +std::vector SYMBOL_LIBRARY_ADAPTER::GetAvailableExtraFields( const wxString& aNickname ) { std::vector fields; @@ -659,7 +659,7 @@ std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetAvailableExtraFields( } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsSubLibraries( const wxString& aNickname ) const +bool SYMBOL_LIBRARY_ADAPTER::SupportsSubLibraries( const wxString& aNickname ) const { if( std::optional result = fetchIfLoaded( aNickname ) ) { @@ -671,7 +671,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsSubLibraries( const wxString& aNick } -std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSubLibraries( +std::vector SYMBOL_LIBRARY_ADAPTER::GetSubLibraries( const wxString& aNickname ) const { std::vector ret; @@ -695,7 +695,7 @@ std::vector SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSubLibraries( } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsConfigurationDialog( const wxString& aNickname ) const +bool SYMBOL_LIBRARY_ADAPTER::SupportsConfigurationDialog( const wxString& aNickname ) const { if( std::optional result = fetchIfLoaded( aNickname ) ) return ( *result )->plugin->SupportsConfigurationDialog(); @@ -704,7 +704,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsConfigurationDialog( const wxString } -void SYMBOL_LIBRARY_MANAGER_ADAPTER::ShowConfigurationDialog( const wxString& aNickname, +void SYMBOL_LIBRARY_ADAPTER::ShowConfigurationDialog( const wxString& aNickname, wxWindow* aParent ) const { std::optional optRow = fetchIfLoaded( aNickname ); @@ -717,7 +717,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::ShowConfigurationDialog( const wxString& aN } -int SYMBOL_LIBRARY_MANAGER_ADAPTER::GetModifyHash() const +int SYMBOL_LIBRARY_ADAPTER::GetModifyHash() const { int hash = 0; @@ -735,7 +735,7 @@ int SYMBOL_LIBRARY_MANAGER_ADAPTER::GetModifyHash() const } -bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsWritable( const wxString& aNickname ) const +bool SYMBOL_LIBRARY_ADAPTER::IsWritable( const wxString& aNickname ) const { if( std::optional result = fetchIfLoaded( aNickname ) ) { diff --git a/eeschema/libraries/symbol_library_manager_adapter.h b/eeschema/libraries/symbol_library_adapter.h similarity index 98% rename from eeschema/libraries/symbol_library_manager_adapter.h rename to eeschema/libraries/symbol_library_adapter.h index a31c910f01..797f775686 100644 --- a/eeschema/libraries/symbol_library_manager_adapter.h +++ b/eeschema/libraries/symbol_library_adapter.h @@ -75,14 +75,14 @@ struct SUB_LIBRARY * and linked to one project in particular. This is what can return actual concrete * schematic library content (symbols). */ -class SYMBOL_LIBRARY_MANAGER_ADAPTER : public LIBRARY_MANAGER_ADAPTER +class SYMBOL_LIBRARY_ADAPTER : public LIBRARY_MANAGER_ADAPTER { public: static const char* PropPowerSymsOnly; static const char* PropNonPowerSymsOnly; public: - SYMBOL_LIBRARY_MANAGER_ADAPTER( LIBRARY_MANAGER& aManager ); + SYMBOL_LIBRARY_ADAPTER( LIBRARY_MANAGER& aManager ); LIBRARY_TABLE_TYPE Type() const override { return LIBRARY_TABLE_TYPE::SYMBOL; } diff --git a/eeschema/netlist_exporters/netlist_exporter_xml.cpp b/eeschema/netlist_exporters/netlist_exporter_xml.cpp index ec8ea1c506..befc85c17a 100644 --- a/eeschema/netlist_exporters/netlist_exporter_xml.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_xml.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include static bool sortPinsByNumber( SCH_PIN* aPin1, SCH_PIN* aPin2 ); diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp index 6bcc4739ad..37f15070f4 100644 --- a/eeschema/project_rescue.cpp +++ b/eeschema/project_rescue.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include // Helper sort function, used in getSymbols, to sort a symbol list by lib_id @@ -383,7 +383,7 @@ void RESCUE_SYMBOL_LIB_TABLE_CANDIDATE::FindRescues( RESCUER& aRescuer, } // Get the library symbol from the symbol library table. - lib_match = SchGetLibSymbol( symbol_id, PROJECT_SCH::SymbolLibManager( aRescuer.GetPrj() ) ); + lib_match = SchGetLibSymbol( symbol_id, PROJECT_SCH::SymbolLibAdapter( aRescuer.GetPrj() ) ); if( !cache_match && !lib_match ) continue; @@ -779,7 +779,7 @@ void SYMBOL_LIB_TABLE_RESCUER::OpenRescueLibrary() wxFileName fn = GetRescueLibraryFileName( m_schematic ); LIBRARY_MANAGER& manager = Pgm().GetLibraryManager(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( m_prj ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( m_prj ); // If a rescue library already exists copy the contents of that library so we do not // lose any previous rescues. diff --git a/eeschema/project_sch.cpp b/eeschema/project_sch.cpp index c647edb003..148cb452e7 100644 --- a/eeschema/project_sch.cpp +++ b/eeschema/project_sch.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include static std::mutex s_symbolTableMutex; @@ -179,7 +179,7 @@ SYMBOL_LIB_TABLE* PROJECT_SCH::SchSymbolLibTable( PROJECT* aProject ) #endif -SYMBOL_LIBRARY_MANAGER_ADAPTER* PROJECT_SCH::SymbolLibManager( PROJECT* aProject ) +SYMBOL_LIBRARY_ADAPTER* PROJECT_SCH::SymbolLibAdapter( PROJECT* aProject ) { LIBRARY_MANAGER& mgr = Pgm().GetLibraryManager(); std::optional adapter = mgr.Adapter( LIBRARY_TABLE_TYPE::SYMBOL ); @@ -187,13 +187,13 @@ SYMBOL_LIBRARY_MANAGER_ADAPTER* PROJECT_SCH::SymbolLibManager( PROJECT* aProject if( !adapter ) { mgr.RegisterAdapter( LIBRARY_TABLE_TYPE::SYMBOL, - std::make_unique( mgr ) ); + std::make_unique( mgr ) ); std::optional created = mgr.Adapter( LIBRARY_TABLE_TYPE::SYMBOL ); wxCHECK( created && ( *created )->Type() == LIBRARY_TABLE_TYPE::SYMBOL, nullptr ); - return static_cast( *created ); + return static_cast( *created ); } wxCHECK( ( *adapter )->Type() == LIBRARY_TABLE_TYPE::SYMBOL, nullptr ); - return static_cast( *adapter ); + return static_cast( *adapter ); } diff --git a/eeschema/project_sch.h b/eeschema/project_sch.h index c58ac1c216..2a4fc79883 100644 --- a/eeschema/project_sch.h +++ b/eeschema/project_sch.h @@ -27,7 +27,7 @@ class SYMBOL_LIB_TABLE; class PROJECT; class SEARCH_STACK; class LEGACY_SYMBOL_LIBS; -class SYMBOL_LIBRARY_MANAGER_ADAPTER; +class SYMBOL_LIBRARY_ADAPTER; class PROJECT_SCH { @@ -41,10 +41,8 @@ public: /// Accessor for Eeschema search stack. static SEARCH_STACK* SchSearchS( PROJECT* aProject ); - /// Accessor for project symbol library table. - //static SYMBOL_LIB_TABLE* SchSymbolLibTable( PROJECT* aProject ); - - static SYMBOL_LIBRARY_MANAGER_ADAPTER* SymbolLibManager( PROJECT* aProject ); + /// Accessor for project symbol library manager adapter. + static SYMBOL_LIBRARY_ADAPTER* SymbolLibAdapter( PROJECT* aProject ); private: PROJECT_SCH() {} diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp index c0cafd3901..fac41ad5c9 100644 --- a/eeschema/sch_base_frame.cpp +++ b/eeschema/sch_base_frame.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -75,7 +75,7 @@ #endif -LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibMgr, +LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_ADAPTER* aLibMgr, LEGACY_SYMBOL_LIB* aCacheLib, wxWindow* aParent, bool aShowErrorMsg ) { wxCHECK_MSG( aLibMgr, nullptr, wxS( "Invalid symbol library manager adapter." ) ); @@ -278,7 +278,7 @@ LIB_SYMBOL* SCH_BASE_FRAME::GetLibSymbol( const LIB_ID& aLibId, bool aUseCacheLi LEGACY_SYMBOL_LIB* cache = ( aUseCacheLib ) ? PROJECT_SCH::LegacySchLibs( &Prj() )->GetCacheLibrary() : nullptr; - return SchGetLibSymbol( aLibId, PROJECT_SCH::SymbolLibManager( &Prj() ), cache, this, + return SchGetLibSymbol( aLibId, PROJECT_SCH::SymbolLibAdapter( &Prj() ), cache, this, aShowErrorMsg ); } @@ -657,7 +657,7 @@ void SCH_BASE_FRAME::GetLibraryItemsForListDialog( wxArrayString& aHeaders, { COMMON_SETTINGS* cfg = Pgm().GetCommonSettings(); PROJECT_FILE& project = Prj().GetProjectFile(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); std::vector libNicknames = adapter->GetLibraryNames(); aHeaders.Add( _( "Library" ) ); @@ -753,7 +753,7 @@ wxString SCH_BASE_FRAME::SelectLibrary( const wxString& aDialogTitle, const wxSt Prj().SetRString( PROJECT::SCH_LIB_PATH, fn.GetPath() ); LIBRARY_TABLE_SCOPE scope = tableChooser.GetUseGlobalTable() ? LIBRARY_TABLE_SCOPE::GLOBAL : LIBRARY_TABLE_SCOPE::PROJECT; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); if( adapter->HasLibrary( libraryName, false ) ) { diff --git a/eeschema/sch_base_frame.h b/eeschema/sch_base_frame.h index 0089b4139d..2d701c7d28 100644 --- a/eeschema/sch_base_frame.h +++ b/eeschema/sch_base_frame.h @@ -54,7 +54,7 @@ class LIB_SYMBOL; class LEGACY_SYMBOL_LIB; class SYMBOL_LIBRARY_FILTER; class LIB_ID; -class SYMBOL_LIBRARY_MANAGER_ADAPTER; +class SYMBOL_LIBRARY_ADAPTER; class EESCHEMA_SETTINGS; class SYMBOL_EDITOR_SETTINGS; struct SCH_SELECTION_FILTER_OPTIONS; @@ -98,7 +98,7 @@ class wxFileSystemWatcherEvent; * * @return The symbol found in the library or NULL if the symbol was not found. */ -LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibMgr, +LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_ADAPTER* aLibMgr, LEGACY_SYMBOL_LIB* aCacheLib = nullptr, wxWindow* aParent = nullptr, bool aShowErrorMsg = false ); diff --git a/eeschema/sch_io/altium/sch_io_altium.cpp b/eeschema/sch_io/altium/sch_io_altium.cpp index d997e2fd9b..34fb230252 100644 --- a/eeschema/sch_io/altium/sch_io_altium.cpp +++ b/eeschema/sch_io/altium/sch_io_altium.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include @@ -4841,7 +4841,7 @@ void SCH_IO_ALTIUM::doEnumerateSymbolLib( const wxString& aLibraryPath, ensureLoadedLibrary( aLibraryPath, aProperties ); bool powerSymbolsOnly = ( aProperties && - aProperties->contains( SYMBOL_LIBRARY_MANAGER_ADAPTER::PropPowerSymsOnly ) ); + aProperties->contains( SYMBOL_LIBRARY_ADAPTER::PropPowerSymsOnly ) ); auto it = m_libCache.find( aLibraryPath ); diff --git a/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp b/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp index adc25122ec..2761d417ac 100644 --- a/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp +++ b/eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -103,7 +103,7 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi csaLoader.Load( aSchematic, rootSheet ); // Save symbols to project library - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &aSchematic->Project() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &aSchematic->Project() ); LIBRARY_TABLE* table = adapter->ProjectTable().value_or( nullptr ); wxCHECK_MSG( table, nullptr, "Could not load symbol lib table." ); diff --git a/eeschema/sch_io/database/sch_io_database.cpp b/eeschema/sch_io/database/sch_io_database.cpp index 8d036d793e..c0b82cf3a8 100644 --- a/eeschema/sch_io/database/sch_io_database.cpp +++ b/eeschema/sch_io/database/sch_io_database.cpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include #include diff --git a/eeschema/sch_io/database/sch_io_database.h b/eeschema/sch_io/database/sch_io_database.h index 6a0d24d3f6..6614c5f49d 100644 --- a/eeschema/sch_io/database/sch_io_database.h +++ b/eeschema/sch_io/database/sch_io_database.h @@ -77,7 +77,7 @@ public: // Database libraries can never be written using the symbol editing API bool IsLibraryWritable( const wxString& aLibraryPath ) override { return false; } - void SetLibraryManagerAdapter( SYMBOL_LIBRARY_MANAGER_ADAPTER* aAdapter ) override + void SetLibraryManagerAdapter( SYMBOL_LIBRARY_ADAPTER* aAdapter ) override { m_adapter = aAdapter; } @@ -105,7 +105,7 @@ private: static std::optional boolFromAny( const std::any& aVal ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* m_adapter; + SYMBOL_LIBRARY_ADAPTER* m_adapter; std::unique_ptr m_settings; diff --git a/eeschema/sch_io/eagle/sch_io_eagle.cpp b/eeschema/sch_io/eagle/sch_io_eagle.cpp index 54efa3c5f8..ff65b6db1e 100644 --- a/eeschema/sch_io/eagle/sch_io_eagle.cpp +++ b/eeschema/sch_io/eagle/sch_io_eagle.cpp @@ -57,7 +57,7 @@ #include #include #include -#include +#include // Eagle schematic axes are aligned with x increasing left to right and Y increasing bottom to top @@ -422,7 +422,7 @@ SCH_SHEET* SCH_IO_EAGLE::LoadSchematicFile( const wxString& aFileName, SCHEMATIC m_sheetPath.SetPageNumber( wxT( "1" ) ); } - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &aSchematic->Project() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &aSchematic->Project() ); LIBRARY_TABLE* table = adapter->ProjectTable().value_or( nullptr ); wxCHECK_MSG( table, nullptr, "Could not load symbol lib table." ); @@ -1982,7 +1982,7 @@ void SCH_IO_EAGLE::loadInstance( const std::unique_ptr& aInstance, // Save the pin positions LIB_SYMBOL* libSymbol = - PROJECT_SCH::SymbolLibManager( &m_schematic->Project() )->LoadSymbol( symbol->GetLibId() ); + PROJECT_SCH::SymbolLibAdapter( &m_schematic->Project() )->LoadSymbol( symbol->GetLibId() ); wxCHECK( libSymbol, /*void*/ ); diff --git a/eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp b/eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp index 85107afad4..ce01a00d1a 100644 --- a/eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp +++ b/eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include struct SCH_IO_EASYEDAPRO::PRJ_DATA @@ -604,7 +604,7 @@ SCH_SHEET* SCH_IO_EASYEDAPRO::LoadSchematicFile( const wxString& aFileName, IO_RELEASER sch_plugin( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_KICAD ) ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &aSchematic->Project() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &aSchematic->Project() ); LIBRARY_TABLE* table = adapter->ProjectTable().value_or( nullptr ); wxCHECK_MSG( table, nullptr, "Could not load symbol lib table." ); diff --git a/eeschema/sch_io/http_lib/sch_io_http_lib.cpp b/eeschema/sch_io/http_lib/sch_io_http_lib.cpp index 3f98a57685..88bcad81f2 100644 --- a/eeschema/sch_io/http_lib/sch_io_http_lib.cpp +++ b/eeschema/sch_io/http_lib/sch_io_http_lib.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "sch_io_http_lib.h" diff --git a/eeschema/sch_io/http_lib/sch_io_http_lib.h b/eeschema/sch_io/http_lib/sch_io_http_lib.h index b0c01a9dad..6f51d696f3 100644 --- a/eeschema/sch_io/http_lib/sch_io_http_lib.h +++ b/eeschema/sch_io/http_lib/sch_io_http_lib.h @@ -70,7 +70,7 @@ public: bool IsLibraryWritable( const wxString& aLibraryPath ) override { return false; } - void SetLibraryManagerAdapter( SYMBOL_LIBRARY_MANAGER_ADAPTER* aAdapter ) override + void SetLibraryManagerAdapter( SYMBOL_LIBRARY_ADAPTER* aAdapter ) override { m_adapter = aAdapter; } @@ -97,7 +97,7 @@ private: const HTTP_LIB_PART& aPart ); private: - SYMBOL_LIBRARY_MANAGER_ADAPTER* m_adapter; + SYMBOL_LIBRARY_ADAPTER* m_adapter; /// Generally will be null if no valid connection is established std::unique_ptr m_conn; diff --git a/eeschema/sch_io/sch_io.h b/eeschema/sch_io/sch_io.h index 18e85722b0..f726f13a4b 100644 --- a/eeschema/sch_io/sch_io.h +++ b/eeschema/sch_io/sch_io.h @@ -32,7 +32,7 @@ #include #include -class SYMBOL_LIBRARY_MANAGER_ADAPTER; +class SYMBOL_LIBRARY_ADAPTER; /** * Base class that schematic file and library loading and saving plugins should derive from. @@ -356,7 +356,7 @@ public: * Some library plugins need to interface with other loaded libraries. * To do this, they receive a reference to the project-specific manager adapter. */ - virtual void SetLibraryManagerAdapter( SYMBOL_LIBRARY_MANAGER_ADAPTER* aAdapter ) {} + virtual void SetLibraryManagerAdapter( SYMBOL_LIBRARY_ADAPTER* aAdapter ) {} //----------------------------------------------------- diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index a577faffa9..d4cf356058 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -66,7 +66,7 @@ // TODO(JE) Debugging only #include -#include +#include #include "sch_bus_entry.h" #include "sch_shape.h" @@ -670,7 +670,7 @@ void SCH_SCREEN::UpdateSymbolLinks( REPORTER* aReporter ) wxString msg; std::vector symbols; - SYMBOL_LIBRARY_MANAGER_ADAPTER* libs = PROJECT_SCH::SymbolLibManager( &Schematic()->Project() ); + SYMBOL_LIBRARY_ADAPTER* libs = PROJECT_SCH::SymbolLibAdapter( &Schematic()->Project() ); // This will be a nullptr if an s-expression schematic is loaded. LEGACY_SYMBOL_LIBS* legacyLibs = PROJECT_SCH::LegacySchLibs( &Schematic()->Project() ); diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp index 5596d95215..0ec88b6785 100644 --- a/eeschema/sheet.cpp +++ b/eeschema/sheet.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include #include "printing/sch_printout.h" @@ -285,7 +285,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr } } - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); std::optional optTable = adapter->ProjectTable(); wxCHECK( optTable, false ); LIBRARY_TABLE* projectTable = *optTable; @@ -345,7 +345,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr // library links are valid but it's better than nothing. for( const wxString& name : names ) { - if( !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( name ) ) + if( !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( name ) ) newLibNames.Add( name ); } @@ -376,7 +376,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr for( const wxString& name : names ) { - if( !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( name ) ) + if( !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( name ) ) newLibNames.Add( name ); else duplicateLibNames.Add( name ); diff --git a/eeschema/symbol_editor/lib_symbol_library_manager.cpp b/eeschema/symbol_editor/lib_symbol_library_manager.cpp index 16e0fe2357..acd2ae911a 100644 --- a/eeschema/symbol_editor/lib_symbol_library_manager.cpp +++ b/eeschema/symbol_editor/lib_symbol_library_manager.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include // TODO(JE) library tables -- this class doesn't need to exist anymore @@ -44,7 +44,7 @@ void LIB_SYMBOL_LIBRARY_MANAGER::Sync( const wxString& aForceRefresh, m_logger->Activate(); { getAdapter()->Sync( aForceRefresh, aProgressCallback ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); m_syncHash = adapter->GetModifyHash(); } m_logger->Deactivate(); diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp index b80c92e677..26925d313f 100644 --- a/eeschema/symbol_editor/symbol_edit_frame.cpp +++ b/eeschema/symbol_editor/symbol_edit_frame.cpp @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include #include #include @@ -836,7 +836,7 @@ bool SYMBOL_EDIT_FRAME::IsSymbolFromLegacyLibrary() const { if( m_symbol ) { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); if( auto row = adapter->GetRow( m_symbol->GetLibNickname() ); row.has_value() ) { @@ -855,7 +855,7 @@ wxString SYMBOL_EDIT_FRAME::GetCurLib() const if( !libNickname.empty() ) { - if( !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( libNickname ) ) + if( !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( libNickname ) ) { Prj().SetRString( PROJECT::SCH_LIBEDIT_CUR_LIB, wxEmptyString ); libNickname = wxEmptyString; @@ -870,7 +870,7 @@ wxString SYMBOL_EDIT_FRAME::SetCurLib( const wxString& aLibNickname ) { wxString old = GetCurLib(); - if( aLibNickname.empty() || !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( aLibNickname ) ) + if( aLibNickname.empty() || !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( aLibNickname ) ) Prj().SetRString( PROJECT::SCH_LIBEDIT_CUR_LIB, wxEmptyString ); else Prj().SetRString( PROJECT::SCH_LIBEDIT_CUR_LIB, aLibNickname ); @@ -1146,7 +1146,7 @@ wxString SYMBOL_EDIT_FRAME::AddLibraryFile( bool aCreateNew ) if( libName.IsEmpty() ) return wxEmptyString; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); if( adapter->HasLibrary( libName ) ) { @@ -1200,7 +1200,7 @@ void SYMBOL_EDIT_FRAME::DdAddLibrary( wxString aLibFile ) if( libName.IsEmpty() ) return; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); if( adapter->HasLibrary( libName ) ) { @@ -1630,7 +1630,7 @@ void SYMBOL_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) wxString libNickname; wxString msg; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); std::optional libTableRow = adapter->FindRowByURI( uri ); if( !libTableRow ) @@ -1674,7 +1674,7 @@ void SYMBOL_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) // Check if the currently selected symbol library been removed or disabled. if( !currentLib.empty() - && !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( currentLib, true ) ) + && !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( currentLib, true ) ) { SetCurLib( wxEmptyString ); emptyScreen(); @@ -1689,7 +1689,7 @@ void SYMBOL_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) case MAIL_REFRESH_SYMBOL: { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); LIB_SYMBOL* symbol = GetCurSymbol(); wxLogTrace( traceLibWatch, "Received refresh symbol request for %s", payload ); @@ -1921,7 +1921,7 @@ bool SYMBOL_EDIT_FRAME::addLibTableEntry( const wxString& aLibFile, LIBRARY_TABL wxFileName libTableFileName( Prj().GetProjectPath(), SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() ); wxString libNickname = fn.GetName(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); const ENV_VAR_MAP& envVars = Pgm().GetLocalEnvVariables(); if( adapter->HasLibrary( libNickname ) ) @@ -1982,7 +1982,7 @@ bool SYMBOL_EDIT_FRAME::addLibTableEntry( const wxString& aLibFile, LIBRARY_TABL bool SYMBOL_EDIT_FRAME::replaceLibTableEntry( const wxString& aLibNickname, const wxString& aLibFile ) { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); LIBRARY_TABLE* table = nullptr; LIBRARY_TABLE_SCOPE scope = LIBRARY_TABLE_SCOPE::GLOBAL; diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp index f50b2f1c53..a79d970e77 100644 --- a/eeschema/symbol_editor/symbol_editor.cpp +++ b/eeschema/symbol_editor/symbol_editor.cpp @@ -50,7 +50,7 @@ #include "symbol_saveas_type.h" #include #include -#include +#include void SYMBOL_EDIT_FRAME::UpdateTitle() @@ -147,7 +147,7 @@ bool SYMBOL_EDIT_FRAME::LoadSymbol( const LIB_ID& aLibId, int aUnit, int aBodySt { LIB_ID libId = aLibId; LIBRARY_MANAGER& manager = Pgm().GetLibraryManager(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); // Some libraries can't be edited, so load the underlying chosen symbol if( auto optRow = manager.GetRow( LIBRARY_TABLE_TYPE::SYMBOL, aLibId.GetLibNickname() ); @@ -231,7 +231,7 @@ bool SYMBOL_EDIT_FRAME::LoadSymbolFromCurrentLib( const wxString& aSymbolName, i try { - symbol = PROJECT_SCH::SymbolLibManager( &Prj() )->LoadSymbol( GetCurLib(), aSymbolName ); + symbol = PROJECT_SCH::SymbolLibAdapter( &Prj() )->LoadSymbol( GetCurLib(), aSymbolName ); } catch( const IO_ERROR& ioe ) { @@ -1507,7 +1507,7 @@ bool SYMBOL_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile ) SCH_IO_MGR::SCH_FILE_T fileType = SCH_IO_MGR::SCH_FILE_T::SCH_KICAD; PROJECT& prj = Prj(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &prj ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &prj ); m_toolManager->RunAction( ACTIONS::cancelInteractive ); diff --git a/eeschema/symbol_library_manager.cpp b/eeschema/symbol_library_manager.cpp index 313469832e..691e37a6e0 100644 --- a/eeschema/symbol_library_manager.cpp +++ b/eeschema/symbol_library_manager.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "lib_logger.h" @@ -74,7 +74,7 @@ bool SYMBOL_LIBRARY_MANAGER::HasModifications() const int SYMBOL_LIBRARY_MANAGER::GetHash() const { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); return adapter->GetModifyHash(); } @@ -301,7 +301,7 @@ bool SYMBOL_LIBRARY_MANAGER::IsLibraryReadOnly( const wxString& aLibrary ) const wxCHECK_MSG( LibraryExists( aLibrary ), true, wxString::Format( "Library missing: %s", aLibrary ) ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); return !adapter->IsSymbolLibWritable( aLibrary ); } @@ -311,7 +311,7 @@ bool SYMBOL_LIBRARY_MANAGER::IsLibraryLoaded( const wxString& aLibrary ) const wxCHECK_MSG( LibraryExists( aLibrary ), false, wxString::Format( "Library missing: %s", aLibrary ) ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); return adapter->IsLibraryLoaded( aLibrary ); } @@ -331,7 +331,7 @@ std::list SYMBOL_LIBRARY_MANAGER::EnumerateSymbols( const wxString& } else { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); std::vector symbols = adapter->GetSymbols( aLibrary ); std::copy( symbols.begin(), symbols.end(), std::back_inserter( ret ) ); @@ -354,7 +354,7 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER::GetBufferedSymbol( const wxString& aSymbolNa if( !bufferedSymbol ) // no buffer symbol found { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); // create a copy of the symbol try @@ -573,7 +573,7 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER::GetSymbol( const wxString& aSymbolName, } // Get the original symbol - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); LIB_SYMBOL* symbol = nullptr; try @@ -603,7 +603,7 @@ bool SYMBOL_LIBRARY_MANAGER::SymbolExists( const wxString& aSymbolName, if( libBufIt != m_libs.end() ) return libBufIt->second.GetBuffer( aSymbolName ) != nullptr; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); try { @@ -645,7 +645,7 @@ bool SYMBOL_LIBRARY_MANAGER::LibraryExists( const wxString& aLibrary, bool aChec if( m_libs.count( aLibrary ) > 0 ) return true; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); return adapter->HasLibrary( aLibrary, aCheckEnabled ); } @@ -701,7 +701,7 @@ size_t SYMBOL_LIBRARY_MANAGER::GetDerivedSymbolNames( const wxString& aSymbolNam size_t SYMBOL_LIBRARY_MANAGER::GetLibraryCount() const { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); return adapter->GetLibraryNames().size(); } @@ -743,7 +743,7 @@ bool SYMBOL_LIBRARY_MANAGER::addLibrary( const wxString& aFilePath, bool aCreate { wxCHECK( schFileType != SCH_IO_MGR::SCH_FILE_T::SCH_LEGACY, false ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); if( !adapter->CreateLibrary( libName ) ) { @@ -763,7 +763,7 @@ std::set SYMBOL_LIBRARY_MANAGER::getOriginalSymbols( const wxString std::set symbols; wxCHECK( LibraryExists( aLibrary ), symbols ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() ); for( LIB_SYMBOL* symbol : adapter->GetSymbols( aLibrary ) ) symbols.insert( symbol ); diff --git a/eeschema/symbol_tree_model_adapter.cpp b/eeschema/symbol_tree_model_adapter.cpp index dfcfa2ef58..113889c96b 100644 --- a/eeschema/symbol_tree_model_adapter.cpp +++ b/eeschema/symbol_tree_model_adapter.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include bool SYMBOL_TREE_MODEL_ADAPTER::m_show_progress = true; @@ -45,7 +45,7 @@ bool SYMBOL_TREE_MODEL_ADAPTER::m_show_progress = true; wxObjectDataPtr SYMBOL_TREE_MODEL_ADAPTER::Create( SCH_BASE_FRAME* aParent, - SYMBOL_LIBRARY_MANAGER_ADAPTER* aManager ) + SYMBOL_LIBRARY_ADAPTER* aManager ) { auto* adapter = new SYMBOL_TREE_MODEL_ADAPTER( aParent, aManager ); return wxObjectDataPtr( adapter ); @@ -53,7 +53,7 @@ SYMBOL_TREE_MODEL_ADAPTER::Create( SCH_BASE_FRAME* aParent, SYMBOL_TREE_MODEL_ADAPTER::SYMBOL_TREE_MODEL_ADAPTER( SCH_BASE_FRAME* aParent, - SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs ) : + SYMBOL_LIBRARY_ADAPTER* aLibs ) : LIB_TREE_MODEL_ADAPTER( aParent, "pinned_symbol_libs", aParent->GetViewerSettingsBase()->m_LibTree ), m_adapter( aLibs ), @@ -202,9 +202,9 @@ void SYMBOL_TREE_MODEL_ADAPTER::AddLibraries( SCH_BASE_FRAME* aFrame ) void SYMBOL_TREE_MODEL_ADAPTER::AddLibrary( wxString const& aLibNickname, bool pinned ) { - SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE type = - ( GetFilter() != nullptr ) ? SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE::POWER_ONLY - : SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE::ALL_SYMBOLS; + SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE type = + ( GetFilter() != nullptr ) ? SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE::POWER_ONLY + : SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE::ALL_SYMBOLS; std::vector symbols = m_adapter->GetSymbols( aLibNickname, type ); std::vector comp_list; diff --git a/eeschema/symbol_tree_model_adapter.h b/eeschema/symbol_tree_model_adapter.h index c015897b8e..85050665ac 100644 --- a/eeschema/symbol_tree_model_adapter.h +++ b/eeschema/symbol_tree_model_adapter.h @@ -24,7 +24,7 @@ #include -class SYMBOL_LIBRARY_MANAGER_ADAPTER; +class SYMBOL_LIBRARY_ADAPTER; class SCH_BASE_FRAME; class SYMBOL_TREE_MODEL_ADAPTER : public LIB_TREE_MODEL_ADAPTER @@ -43,7 +43,7 @@ public: * @param aLibs library set from which parts will be loaded */ static wxObjectDataPtr Create( SCH_BASE_FRAME* aParent, - SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs ); + SYMBOL_LIBRARY_ADAPTER* aLibs ); /** * Add all the libraries in a SYMBOL_LIB_TABLE to the model. @@ -60,7 +60,7 @@ protected: /** * Constructor; takes a set of libraries to be included in the search. */ - SYMBOL_TREE_MODEL_ADAPTER( SCH_BASE_FRAME* aParent, SYMBOL_LIBRARY_MANAGER_ADAPTER* aManager ); + SYMBOL_TREE_MODEL_ADAPTER( SCH_BASE_FRAME* aParent, SYMBOL_LIBRARY_ADAPTER* aManager ); PROJECT::LIB_TYPE_T getLibType() override { return PROJECT::LIB_TYPE_T::SYMBOL_LIB; } @@ -72,7 +72,7 @@ private: */ static bool m_show_progress; - SYMBOL_LIBRARY_MANAGER_ADAPTER* m_adapter; + SYMBOL_LIBRARY_ADAPTER* m_adapter; std::set m_pending_load_libraries; std::unique_ptr m_check_pending_libraries_timer; diff --git a/eeschema/symbol_tree_synchronizing_adapter.cpp b/eeschema/symbol_tree_synchronizing_adapter.cpp index 4f4d2968c1..b960ad3d24 100644 --- a/eeschema/symbol_tree_synchronizing_adapter.cpp +++ b/eeschema/symbol_tree_synchronizing_adapter.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include @@ -82,7 +82,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::Sync( const wxString& aForceRefresh, m_lastSyncHash = m_libMgr->GetHash(); int i = 0, max = GetLibrariesCount(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() ); // Process already stored libraries for( auto it = m_tree.m_Children.begin(); it != m_tree.m_Children.end(); ) @@ -273,7 +273,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie { if( node->m_Type == LIB_TREE_NODE::TYPE::LIBRARY ) { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() ); if( auto optRow = adapter->GetRow( node->m_LibId.GetLibNickname() ) ) diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp index bc7c5aefc5..4e9f282dff 100644 --- a/eeschema/symbol_viewer_frame.cpp +++ b/eeschema/symbol_viewer_frame.cpp @@ -68,7 +68,7 @@ #include #include -#include +#include #include "eda_pattern_match.h" @@ -357,7 +357,7 @@ LIB_SYMBOL* SYMBOL_VIEWER_FRAME::GetSelectedSymbol() const LIB_SYMBOL* symbol = nullptr; if( m_currentSymbol.IsValid() ) - symbol = PROJECT_SCH::SymbolLibManager( &Prj() )->LoadSymbol( m_currentSymbol ); + symbol = PROJECT_SCH::SymbolLibAdapter( &Prj() )->LoadSymbol( m_currentSymbol ); return symbol; } @@ -488,7 +488,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateLibList() COMMON_SETTINGS* cfg = Pgm().GetCommonSettings(); PROJECT_FILE& project = Kiway().Prj().GetProjectFile(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); std::vector libNicknames = adapter->GetLibraryNames(); std::vector pinnedMatches; std::vector otherMatches; @@ -521,7 +521,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateLibList() if( m_listPowerOnly ) { std::vector symbolNames = adapter->GetSymbolNames( - aLib, SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE::POWER_ONLY ); + aLib, SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE::POWER_ONLY ); if( symbolNames.empty() ) return; @@ -621,7 +621,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateSymbolList() if( libName.IsEmpty() ) return false; - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); std::vector symbols = adapter->GetSymbols( libName ); std::set excludes; @@ -703,7 +703,7 @@ void SYMBOL_VIEWER_FRAME::ClickOnLibList( wxCommandEvent& event ) wxString selection = EscapeString( m_libList->GetBaseString( ii ), CTX_LIBID ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); if( !adapter->HasLibrary( selection ) && selection.Find( '-' ) != wxNOT_FOUND ) { @@ -1066,7 +1066,7 @@ void SYMBOL_VIEWER_FRAME::DisplayLibInfos() if( m_libList && !m_libList->IsEmpty() && !libName.IsEmpty() ) { - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); LIBRARY_TABLE_ROW* row = adapter->GetRow( libName ).value_or( nullptr ); wxString title = row @@ -1100,7 +1100,7 @@ void SYMBOL_VIEWER_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail ) LIB_SYMBOL* symbol = GetSelectedSymbol(); wxCHECK2( symbol, break ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() ); LIBRARY_TABLE_ROW* row = adapter->GetRow( symbol->GetLibId().GetLibNickname() ).value_or( nullptr ); diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp index 303d18edba..718c3e1066 100644 --- a/eeschema/tools/sch_drawing_tools.cpp +++ b/eeschema/tools/sch_drawing_tools.cpp @@ -344,7 +344,7 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent ) { m_toolMgr->RunAction( ACTIONS::selectionClear ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* libs = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() ); + SYMBOL_LIBRARY_ADAPTER* libs = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() ); LEGACY_SYMBOL_LIB* cache = PROJECT_SCH::LegacySchLibs( &m_frame->Prj() )->GetCacheLibrary(); std::set unique_libid; diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp index 82279b5785..ec4e523437 100644 --- a/eeschema/tools/sch_editor_control.cpp +++ b/eeschema/tools/sch_editor_control.cpp @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include #ifdef KICAD_IPC_API @@ -383,8 +383,7 @@ int SCH_EDITOR_CONTROL::ExportSymbolsToLibrary( const TOOL_EVENT& aEvent ) bool append = false; SCH_COMMIT commit( m_frame ); - LIBRARY_MANAGER& manager = Pgm().GetLibraryManager(); - SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() ); + SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() ); auto optRow = adapter->GetRow( targetLib ); wxCHECK( optRow, 0 ); diff --git a/eeschema/tools/sch_inspection_tool.cpp b/eeschema/tools/sch_inspection_tool.cpp index a6e5601cad..0fba38e0e8 100644 --- a/eeschema/tools/sch_inspection_tool.cpp +++ b/eeschema/tools/sch_inspection_tool.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include // for KiROUND @@ -368,7 +368,7 @@ void SCH_INSPECTION_TOOL::DiffSymbol( SCH_SYMBOL* symbol ) r->Report( "" ); - SYMBOL_LIBRARY_MANAGER_ADAPTER* libs = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() ); + SYMBOL_LIBRARY_ADAPTER* libs = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() ); if( !libs->HasLibrary( libName, false ) ) { diff --git a/eeschema/widgets/panel_symbol_chooser.cpp b/eeschema/widgets/panel_symbol_chooser.cpp index 1022a9d922..d9d4c04695 100644 --- a/eeschema/widgets/panel_symbol_chooser.cpp +++ b/eeschema/widgets/panel_symbol_chooser.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ PANEL_SYMBOL_CHOOSER::PANEL_SYMBOL_CHOOSER( SCH_BASE_FRAME* aFrame, wxWindow* aP { m_frame = aFrame; - SYMBOL_LIBRARY_MANAGER_ADAPTER* libmgr = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() ); + SYMBOL_LIBRARY_ADAPTER* libmgr = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() ); COMMON_SETTINGS::SESSION& session = Pgm().GetCommonSettings()->m_Session; PROJECT_FILE& project = m_frame->Prj().GetProjectFile(); @@ -547,7 +547,7 @@ void PANEL_SYMBOL_CHOOSER::showFootprintFor( LIB_ID const& aLibId ) try { - symbol = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() )->LoadSymbol( aLibId ); + symbol = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() )->LoadSymbol( aLibId ); } catch( const IO_ERROR& ioe ) { @@ -606,7 +606,7 @@ void PANEL_SYMBOL_CHOOSER::populateFootprintSelector( LIB_ID const& aLibId ) { try { - symbol = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() )->LoadSymbol( aLibId ); + symbol = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() )->LoadSymbol( aLibId ); } catch( const IO_ERROR& ioe ) { diff --git a/eeschema/widgets/symbol_preview_widget.cpp b/eeschema/widgets/symbol_preview_widget.cpp index 169ffd344e..77671e28da 100644 --- a/eeschema/widgets/symbol_preview_widget.cpp +++ b/eeschema/widgets/symbol_preview_widget.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -193,7 +193,7 @@ void SYMBOL_PREVIEW_WIDGET::DisplaySymbol( const LIB_ID& aSymbolID, int aUnit, i try { - LIB_SYMBOL* tmp = PROJECT_SCH::SymbolLibManager( &m_kiway->Prj() )->LoadSymbol( aSymbolID ); + LIB_SYMBOL* tmp = PROJECT_SCH::SymbolLibAdapter( &m_kiway->Prj() )->LoadSymbol( aSymbolID ); if( tmp ) symbol = tmp->Flatten(); diff --git a/qa/tests/eeschema/test_symbol_library.cpp b/qa/tests/eeschema/test_symbol_library.cpp index 920eb30b5d..e10843b43f 100644 --- a/qa/tests/eeschema/test_symbol_library.cpp +++ b/qa/tests/eeschema/test_symbol_library.cpp @@ -23,7 +23,7 @@ #include #include "eeschema_test_utils.h" -#include +#include // NOTE: this is for the new symbol library manager adapter and // library manager system. There is also test_symbol_library_manager.cpp @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE( ProjectLibraryTable ) BOOST_REQUIRE( rows[0]->Nickname() == "Device" ); BOOST_REQUIRE( rows[0]->URI() == "${KIPRJMOD}/Device.kicad_sym" ); - SYMBOL_LIBRARY_MANAGER_ADAPTER adapter( manager ); + SYMBOL_LIBRARY_ADAPTER adapter( manager ); adapter.LoadOne( "Device" ); std::vector symbols = adapter.GetSymbols( "Device" ); @@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE( AsyncLoad ) manager.LoadGlobalTables(); Pgm().GetSettingsManager().LoadProject( "" ); - SYMBOL_LIBRARY_MANAGER_ADAPTER adapter( manager ); + SYMBOL_LIBRARY_ADAPTER adapter( manager ); auto tstart = std::chrono::high_resolution_clock::now(); adapter.AsyncLoad();