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

SYMBOL_LIBRARY_MANAGER: SaveBuffer doesn't need ownership

Browse Source 
This function just uses the buffer, it doesn't retain
part-ownership, so it doesn't need to get a copy of the
shared_ptr (or even know that the shared_ptr exists).

A reference count of the buffers is safely held by the caller
in SaveLibrary while this function executes.
This commit is contained in:
John Beard 2024-09-17 20:23:07 +01:00
parent a8f4dfd47d
commit 9d4e7e359b
2 changed files with 12 additions and 13 deletions

21
eeschema/symbol_library_manager.cpp
View File

@ -189,7 +189,8 @@ bool SYMBOL_LIBRARY_MANAGER::SaveLibrary( const wxString& aLibrary, const wxStri
for( const std::shared_ptr<SYMBOL_BUFFER>& symbolBuf : symbolBuffers )
{
if( !libBuf.SaveBuffer( symbolBuf, aFileName, &*pi, true ) )
wxCHECK2( symbolBuf, continue );
if( !libBuf.SaveBuffer( *symbolBuf, aFileName, &*pi, true ) )
{
// Something went wrong, but try to save other libraries
res = false;
@ -985,10 +986,9 @@ bool LIB_BUFFER::DeleteBuffer( const SYMBOL_BUFFER& aSymbolBuf )
}
bool LIB_BUFFER::SaveBuffer( std::shared_ptr<SYMBOL_BUFFER> aSymbolBuf,
const wxString& aFileName, SCH_IO* aPlugin, bool aBuffer )
bool LIB_BUFFER::SaveBuffer( SYMBOL_BUFFER& aSymbolBuf, const wxString& aFileName, SCH_IO* aPlugin,
bool aBuffer )
{
wxCHECK( aSymbolBuf, false );
wxCHECK( !aFileName.IsEmpty(), false );
wxString errorMsg = _( "Error saving symbol %s to library '%s'." ) + wxS( "\n%s" );
@ -997,11 +997,10 @@ bool LIB_BUFFER::SaveBuffer( std::shared_ptr<SYMBOL_BUFFER> aSymbolBuf,
std::map<std::string, UTF8> properties;
properties.emplace( SCH_IO_KICAD_LEGACY::PropBuffering, "" );
std::shared_ptr<SYMBOL_BUFFER>& symbolBuf = aSymbolBuf;
LIB_SYMBOL& libSymbol = symbolBuf->GetSymbol();
LIB_SYMBOL& libSymbol = aSymbolBuf.GetSymbol();
{
LIB_SYMBOL& originalSymbol = symbolBuf->GetOriginal();
LIB_SYMBOL& originalSymbol = aSymbolBuf.GetOriginal();
const wxString originalName = originalSymbol.GetName();
// Delete the original symbol if the symbol name has been changed.
@ -1070,11 +1069,11 @@ bool LIB_BUFFER::SaveBuffer( std::shared_ptr<SYMBOL_BUFFER> aSymbolBuf,
auto originalParent = std::make_unique<LIB_SYMBOL>( *bufferedParent.get() );
LIB_SYMBOL& parentRef = *originalParent;
aSymbolBuf->SetOriginal( std::move( originalParent ) );
aSymbolBuf.SetOriginal( std::move( originalParent ) );
auto newSymbol = std::make_unique<LIB_SYMBOL>( libSymbol );
newSymbol->SetParent( &parentRef );
aSymbolBuf->SetOriginal( std::move( newSymbol ) );
aSymbolBuf.SetOriginal( std::move( newSymbol ) );
}
else
{
@ -1096,7 +1095,7 @@ bool LIB_BUFFER::SaveBuffer( std::shared_ptr<SYMBOL_BUFFER> aSymbolBuf,
auto newSymbol = std::make_unique<LIB_SYMBOL>( libSymbol );
newSymbol->SetParent( &originalBufferedParent->GetSymbol() );
aSymbolBuf->SetOriginal( std::move( newSymbol ) );
aSymbolBuf.SetOriginal( std::move( newSymbol ) );
}
}
else
@ -1113,7 +1112,7 @@ bool LIB_BUFFER::SaveBuffer( std::shared_ptr<SYMBOL_BUFFER> aSymbolBuf,
return false;
}
aSymbolBuf->SetOriginal( std::make_unique<LIB_SYMBOL>( libSymbol ) );
aSymbolBuf.SetOriginal( std::make_unique<LIB_SYMBOL>( libSymbol ) );
}
wxArrayString derivedSymbols;

4
eeschema/symbol_library_manager.h
View File

@ -120,8 +120,8 @@ public:
///< Save stored modifications using a plugin. aBuffer decides whether the changes
///< should be cached or stored directly to the disk (for SCH_IO_KICAD_LEGACY).
bool SaveBuffer( std::shared_ptr<SYMBOL_BUFFER> aSymbolBuf, const wxString& aFileName,
SCH_IO* aPlugin, bool aBuffer );
bool SaveBuffer( SYMBOL_BUFFER& aSymbolBuf, const wxString& aFileName, SCH_IO* aPlugin,
bool aBuffer );
///< Return a symbol buffer with LIB_SYMBOL holding a symbolicular alias
std::shared_ptr<SYMBOL_BUFFER> GetBuffer( const wxString& aAlias ) const;