haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly create wxStrings for assignment to make MSVC builds happy.

This commit is contained in:
Wayne Stambaugh 2024-02-09 17:37:36 -05:00
parent 9e9ee96181
commit 04ccf7e885
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/sch_pin.cpp
View File

@ -101,7 +101,7 @@ wxString SCH_PIN::GetName() const
wxString SCH_PIN::GetShownName() const wxString SCH_PIN::GetShownName() const
{ {
wxString name = m_libPin ? m_libPin->GetName() : wxS( "??" ); wxString name = m_libPin ? m_libPin->GetName() : wxString( "??" );
if( !m_alt.IsEmpty() ) if( !m_alt.IsEmpty() )
name = m_alt; name = m_alt;
@ -239,14 +239,14 @@ void SCH_PIN::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITE
if( libSymbol->GetUnitCount() ) if( libSymbol->GetUnitCount() )
{ {
msg = m_libPin ? LIB_ITEM::GetUnitDescription( m_libPin->GetUnit() ) : msg = m_libPin ? LIB_ITEM::GetUnitDescription( m_libPin->GetUnit() ) :
wxS( "Undefined library pin." ); wxString( "Undefined library pin." );
aList.emplace_back( _( "Unit" ), msg ); aList.emplace_back( _( "Unit" ), msg );
} }
if( libSymbol->HasAlternateBodyStyle() ) if( libSymbol->HasAlternateBodyStyle() )
{ {
msg = m_libPin ? LIB_ITEM::GetBodyStyleDescription( m_libPin->GetBodyStyle() ) : msg = m_libPin ? LIB_ITEM::GetBodyStyleDescription( m_libPin->GetBodyStyle() ) :
wxS( "Undefined library pin." ); wxString( "Undefined library pin." );
aList.emplace_back( _( "Body Style" ), msg ); aList.emplace_back( _( "Body Style" ), msg );
} }
} }
@ -323,7 +323,7 @@ wxString SCH_PIN::GetDefaultNetName( const SCH_SHEET_PATH& aPath, bool aForceNoC
} }
else else
{ {
wxString tmp = m_libPin ? m_libPin->GetName() : wxS( "??" ); wxString tmp = m_libPin ? m_libPin->GetName() : wxString( "??" );
return EscapeString( tmp, CTX_NETNAME ); return EscapeString( tmp, CTX_NETNAME );
} }
@ -364,15 +364,15 @@ wxString SCH_PIN::GetDefaultNetName( const SCH_SHEET_PATH& aPath, bool aForceNoC
} }
} }
wxString libPinShownName = m_libPin ? m_libPin->GetShownName() : wxS( "??" ); wxString libPinShownName = m_libPin ? m_libPin->GetShownName() : wxString( "??" );
wxString libPinShownNumber = m_libPin ? m_libPin->GetShownNumber() : wxS( "??" ); wxString libPinShownNumber = m_libPin ? m_libPin->GetShownNumber() : wxString( "??" );
// Use timestamp for unannotated symbols // Use timestamp for unannotated symbols
if( GetParentSymbol()->GetRef( &aPath, false ).Last() == '?' ) if( GetParentSymbol()->GetRef( &aPath, false ).Last() == '?' )
{ {
name << GetParentSymbol()->m_Uuid.AsString(); name << GetParentSymbol()->m_Uuid.AsString();
wxString libPinNumber = m_libPin ? m_libPin->GetNumber() : wxS( "??" ); wxString libPinNumber = m_libPin ? m_libPin->GetNumber() : wxString( "??" );
name << "-Pad" << libPinNumber << ")"; name << "-Pad" << libPinNumber << ")";
annotated = false; annotated = false;
} }