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

Remove some unused variables.

Browse Source
This commit is contained in:
Alex Shvartzkop 2025-07-02 16:48:26 +03:00
parent 5ab735eb93
commit 4a5039c2cf
43 changed files with 29 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/array_axis.cpp
View File

@ -134,7 +134,6 @@ void ARRAY_AXIS::SetStep( int aStep )
wxString ARRAY_AXIS::GetItemNumber( int n ) const wxString ARRAY_AXIS::GetItemNumber( int n ) const
{ {
wxString itemNum;
const wxString& alphabet = GetAlphabet(); const wxString& alphabet = GetAlphabet();
const bool nonUnitColsStartAt0 = schemeNonUnitColsStartAt0( m_type ); const bool nonUnitColsStartAt0 = schemeNonUnitColsStartAt0( m_type );

3
common/project/project_archiver.cpp
View File

@ -254,8 +254,7 @@ bool PROJECT_ARCHIVER::Archive( const wxString& aSrcDir, const wxString& aDestFi
wxZipOutputStream zipstream( ostream, -1, wxConvUTF8 ); wxZipOutputStream zipstream( ostream, -1, wxConvUTF8 );
wxDir projectDir( aSrcDir ); wxDir projectDir( aSrcDir );
wxString currFilename;
if( !projectDir.IsOpened() ) if( !projectDir.IsOpened() )
{ {

2
common/settings/settings_manager.cpp
View File

@ -1273,8 +1273,6 @@ bool SETTINGS_MANAGER::BackupProject( REPORTER& aReporter, wxFileName& aTarget )
aTarget.SetExt( FILEEXT::ArchiveFileExtension ); aTarget.SetExt( FILEEXT::ArchiveFileExtension );
} }
wxString test = aTarget.GetPath();
if( !aTarget.DirExists() && !wxMkdir( aTarget.GetPath() ) ) if( !aTarget.DirExists() && !wxMkdir( aTarget.GetPath() ) )
{ {
wxLogTrace( traceSettings, wxT( "Could not create project backup path %s" ), wxLogTrace( traceSettings, wxT( "Could not create project backup path %s" ),

3
common/widgets/lib_tree.cpp
View File

@ -151,8 +151,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
m_query_ctrl->Bind( wxEVT_MENU, m_query_ctrl->Bind( wxEVT_MENU,
[this]( wxCommandEvent& aEvent ) [this]( wxCommandEvent& aEvent )
{ {
wxString search; size_t idx = aEvent.GetId() - 1;
size_t idx = aEvent.GetId() - 1;
if( idx < g_recentSearches[ m_recentSearchesKey ].size() ) if( idx < g_recentSearches[ m_recentSearchesKey ].size() )
m_query_ctrl->SetValue( g_recentSearches[ m_recentSearchesKey ][idx] ); m_query_ctrl->SetValue( g_recentSearches[ m_recentSearchesKey ][idx] );

4
cvpcb/cvpcb_mainframe.cpp
View File

@ -1030,9 +1030,7 @@ void CVPCB_MAINFRAME::BuildLibrariesList()
if( tbl ) if( tbl )
{ {
wxArrayString libNames; std::vector<wxString> libNickNames = tbl->GetLogicalLibs();
std::vector< wxString > libNickNames = tbl->GetLogicalLibs();
for( const wxString& libNickName : libNickNames ) for( const wxString& libNickName : libNickNames )
process( libNickName ); process( libNickName );

1
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -525,7 +525,6 @@ int DIALOG_CHANGE_SYMBOLS::processMatchingSymbols( SCH_COMMIT* aCommit )
wxCHECK( frame, false ); wxCHECK( frame, false );
LIB_ID newId; LIB_ID newId;
wxString msg;
int matchesProcessed = 0; int matchesProcessed = 0;
SCH_SYMBOL* symbol = nullptr; SCH_SYMBOL* symbol = nullptr;

3
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View File

@ -101,9 +101,6 @@ static COL_ORDER GetColTypeForString( const wxString& aStr )
{ {
for( int i = 0; i < COL_COUNT; i++ ) for( int i = 0; i < COL_COUNT; i++ )
{ {
const wxString nativeLabel = GetPinTableColLabel( i );
const wxString translatedLabel = wxGetTranslation( nativeLabel );
if( MatchTranslationOrNative( aStr, GetPinTableColLabel( i ), false ) ) if( MatchTranslationOrNative( aStr, GetPinTableColLabel( i ), false ) )
return (COL_ORDER) i; return (COL_ORDER) i;
} }

2
eeschema/dialogs/dialog_table_properties.cpp
View File

@ -63,8 +63,6 @@ DIALOG_TABLE_PROPERTIES::DIALOG_TABLE_PROPERTIES( SCH_EDIT_FRAME* aFrame, SCH_TA
m_gridSizer->Add( m_grid, 1, wxEXPAND, 5 ); m_gridSizer->Add( m_grid, 1, wxEXPAND, 5 );
m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) ); m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
wxColor coveredColor = wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT );
for( int row = 0; row < m_table->GetRowCount(); ++row ) for( int row = 0; row < m_table->GetRowCount(); ++row )
{ {
for( int col = 0; col < m_table->GetColCount(); ++col ) for( int col = 0; col < m_table->GetColCount(); ++col )

1
eeschema/net_navigator.cpp
View File

@ -207,7 +207,6 @@ void SCH_EDIT_FRAME::MakeNetNavigatorNode( const wxString& aNetName, wxTreeItemI
wxCHECK( connectionGraph, /* void */ ); wxCHECK( connectionGraph, /* void */ );
wxString sheetPathPrefix;
std::set<CONNECTION_SUBGRAPH*> subgraphs; std::set<CONNECTION_SUBGRAPH*> subgraphs;
{ {

10
eeschema/netlist_exporters/netlist_exporter_allegro.cpp
View File

@ -41,10 +41,7 @@ bool NETLIST_EXPORTER_ALLEGRO::WriteNetlist( const wxString& aOutFileName,
REPORTER& aReporter ) REPORTER& aReporter )
{ {
m_f = nullptr; m_f = nullptr;
wxString field; int ret = 0; // zero now, OR in the sign bit on error
wxString footprint;
int ret = 0; // zero now, OR in the sign bit on error
wxString netName;
// Create the devices directory // Create the devices directory
m_exportPath = wxFileName( aOutFileName ).GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR ) m_exportPath = wxFileName( aOutFileName ).GetPath( wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR )
@ -188,10 +185,6 @@ void NETLIST_EXPORTER_ALLEGRO::extractComponentsInfo()
} }
} }
wxString netCodeTxt;
wxString netName;
wxString ref;
struct NET_RECORD struct NET_RECORD
{ {
NET_RECORD( const wxString& aName ) : NET_RECORD( const wxString& aName ) :
@ -275,7 +268,6 @@ void NETLIST_EXPORTER_ALLEGRO::extractComponentsInfo()
for( const NET_NODE& netNode : net_record->m_Nodes ) for( const NET_NODE& netNode : net_record->m_Nodes )
{ {
wxString refText = netNode.m_Pin->GetParentSymbol()->GetRef( &netNode.m_Sheet ); wxString refText = netNode.m_Pin->GetParentSymbol()->GetRef( &netNode.m_Sheet );
wxString pinText = netNode.m_Pin->GetShownNumber();
// Skip power symbols and virtual symbols // Skip power symbols and virtual symbols
if( refText[0] == wxChar( '#' ) ) if( refText[0] == wxChar( '#' ) )

4
eeschema/netlist_exporters/netlist_exporter_pads.cpp
View File

@ -100,9 +100,7 @@ bool NETLIST_EXPORTER_PADS::WriteNetlist( const wxString& aOutFileName,
bool NETLIST_EXPORTER_PADS::writeListOfNets( FILE* f ) bool NETLIST_EXPORTER_PADS::writeListOfNets( FILE* f )
{ {
int ret = 0; int ret = 0;
wxString initialSignalLine;
wxString netName; wxString netName;
ret |= fputs( "*NET*\n", f ); ret |= fputs( "*NET*\n", f );

2
eeschema/netlist_exporters/netlist_exporter_spice.cpp
View File

@ -121,7 +121,6 @@ void NETLIST_EXPORTER_SPICE::WriteTail( OUTPUTFORMATTER& aFormatter, unsigned aN
bool NETLIST_EXPORTER_SPICE::ReadSchematicAndLibraries( unsigned aNetlistOptions, bool NETLIST_EXPORTER_SPICE::ReadSchematicAndLibraries( unsigned aNetlistOptions,
REPORTER& aReporter ) REPORTER& aReporter )
{ {
wxString msg;
std::set<std::string> refNames; // Set of reference names to check for duplication. std::set<std::string> refNames; // Set of reference names to check for duplication.
int ncCounter = 1; int ncCounter = 1;
@ -297,7 +296,6 @@ const SPICE_ITEM* NETLIST_EXPORTER_SPICE::FindItem( const wxString& aRefName ) c
void NETLIST_EXPORTER_SPICE::ReadDirectives( unsigned aNetlistOptions ) void NETLIST_EXPORTER_SPICE::ReadDirectives( unsigned aNetlistOptions )
{ {
wxString msg;
wxString text; wxString text;
m_directives.clear(); m_directives.clear();

9
eeschema/netlist_exporters/netlist_exporter_xml.cpp
View File

@ -806,12 +806,9 @@ XNODE* NETLIST_EXPORTER_XML::makeLibParts()
XNODE* NETLIST_EXPORTER_XML::makeListOfNets( unsigned aCtl ) XNODE* NETLIST_EXPORTER_XML::makeListOfNets( unsigned aCtl )
{ {
XNODE* xnets = node( wxT( "nets" ) ); // auto_ptr if exceptions ever get used. wxString netCodeTxt;
wxString netCodeTxt; XNODE* xnets = node( wxT( "nets" ) ); // auto_ptr if exceptions ever get used.
wxString netName; XNODE* xnet = nullptr;
wxString ref;
XNODE* xnet = nullptr;
/* output: /* output:
<net code="123" name="/cfcard.sch/WAIT#" class="signal"> <net code="123" name="/cfcard.sch/WAIT#" class="signal">

2
eeschema/sch_connection.cpp
View File

@ -445,7 +445,7 @@ void SCH_CONNECTION::SetSuffix( const wxString& aSuffix )
void SCH_CONNECTION::AppendInfoToMsgPanel( std::vector<MSG_PANEL_ITEM>& aList ) const void SCH_CONNECTION::AppendInfoToMsgPanel( std::vector<MSG_PANEL_ITEM>& aList ) const
{ {
wxString msg, group_name, members; wxString msg, group_name;
std::vector<wxString> group_members; std::vector<wxString> group_members;
aList.emplace_back( _( "Connection Name" ), UnescapeString( Name() ) ); aList.emplace_back( _( "Connection Name" ), UnescapeString( Name() ) );

4
eeschema/sch_io/altium/sch_io_altium.cpp
View File

@ -956,8 +956,8 @@ void SCH_IO_ALTIUM::ParseStorage( const ALTIUM_COMPOUND_FILE& aAltiumSchFile )
ALTIUM_BINARY_PARSER reader( aAltiumSchFile, file ); ALTIUM_BINARY_PARSER reader( aAltiumSchFile, file );
std::map<wxString, wxString> properties = reader.ReadProperties(); std::map<wxString, wxString> properties = reader.ReadProperties();
wxString header = ALTIUM_PROPS_UTILS::ReadString( properties, "HEADER", "" ); ALTIUM_PROPS_UTILS::ReadString( properties, "HEADER", "" );
int weight = ALTIUM_PROPS_UTILS::ReadInt( properties, "WEIGHT", 0 ); int weight = ALTIUM_PROPS_UTILS::ReadInt( properties, "WEIGHT", 0 );
if( weight < 0 ) if( weight < 0 )
THROW_IO_ERROR( "Storage weight is negative!" ); THROW_IO_ERROR( "Storage weight is negative!" );

1
eeschema/sch_io/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -1719,7 +1719,6 @@ const LIB_SYMBOL* CADSTAR_SCH_ARCHIVE_LOADER::loadSymdef( const SYMDEF_ID& aSymd
{ {
wxArrayString strings; wxArrayString strings;
wxStringSplit( csText.Text, strings, '\n' ); wxStringSplit( csText.Text, strings, '\n' );
wxPoint firstLinePos;
for( size_t ii = 0; ii < strings.size(); ++ii ) for( size_t ii = 0; ii < strings.size(); ++ii )
{ {

1
eeschema/sch_io/eagle/sch_io_eagle.cpp
View File

@ -2159,7 +2159,6 @@ bool SCH_IO_EAGLE::loadSymbol( const std::unique_ptr<ESYMBOL>& aEsymbol,
{ {
wxCHECK( aEsymbol && aSymbol && aDevice, false ); wxCHECK( aEsymbol && aSymbol && aDevice, false );
wxString symbolName = aEsymbol->name;
std::vector<SCH_ITEM*> items; std::vector<SCH_ITEM*> items;
bool showRefDes = false; bool showRefDes = false;

18
eeschema/sch_io/easyeda/sch_easyeda_parser.cpp
View File

@ -717,7 +717,7 @@ void SCH_EASYEDA_PARSER::ParseSymbolShapes( LIB_SYMBOL* aSymbol
wxString pinName = pinNameParts[4]; wxString pinName = pinNameParts[4];
bool numVisible = pinNumParts[0] != wxS( "0" ); bool numVisible = pinNumParts[0] != wxS( "0" );
wxString ptSize = pinNumParts[4]; // wxString ptSize = pinNumParts[4];
VECTOR2D startPoint; VECTOR2D startPoint;
bool vertical = false; bool vertical = false;
@ -846,7 +846,7 @@ void SCH_EASYEDA_PARSER::ParseSymbolShapes( LIB_SYMBOL* aSymbol
wxString textType = arr[1]; wxString textType = arr[1];
VECTOR2D pos( Convert( arr[2] ), Convert( arr[3] ) ); VECTOR2D pos( Convert( arr[2] ), Convert( arr[3] ) );
int angle = Convert( arr[4] ); int angle = Convert( arr[4] );
wxString color = arr[5]; // wxString color = arr[5];
wxString fontname = arr[6]; wxString fontname = arr[6];
wxString fontSize = arr[7]; wxString fontSize = arr[7];
wxString baselineAlign = arr[10]; wxString baselineAlign = arr[10];
@ -1145,8 +1145,8 @@ void SCH_EASYEDA_PARSER::ParseSchematic( SCHEMATIC* aSchematic, SCH_SHEET* aRoot
sepShapeStr.Replace( wxS( "^^" ), wxS( "\n" ) ); sepShapeStr.Replace( wxS( "^^" ), wxS( "\n" ) );
wxArrayString segments = wxSplit( sepShapeStr, '\n', '\0' ); wxArrayString segments = wxSplit( sepShapeStr, '\n', '\0' );
wxArrayString mainParts = wxSplit( segments[0], '~', '\0' ); // wxArrayString mainParts = wxSplit( segments[0], '~', '\0' );
wxArrayString uselessParts = wxSplit( segments[1], '~', '\0' ); // wxArrayString uselessParts = wxSplit( segments[1], '~', '\0' );
wxArrayString valueParts = wxSplit( segments[2], '~', '\0' ); wxArrayString valueParts = wxSplit( segments[2], '~', '\0' );
wxString flagTypename = arr[1]; wxString flagTypename = arr[1];
@ -1305,10 +1305,10 @@ void SCH_EASYEDA_PARSER::ParseSchematic( SCHEMATIC* aSchematic, SCH_SHEET* aRoot
else if( rootType == wxS( "W" ) ) else if( rootType == wxS( "W" ) )
{ {
wxArrayString ptArr = wxSplit( arr[1], ' ', '\0' ); wxArrayString ptArr = wxSplit( arr[1], ' ', '\0' );
wxString strokeColor = arr[2]; //wxString strokeColor = arr[2];
//double lineWidth = Convert( arr[3] ); //double lineWidth = Convert( arr[3] );
//LINE_STYLE strokeStyle = ConvertStrokeStyle( arr[4] ); //LINE_STYLE strokeStyle = ConvertStrokeStyle( arr[4] );
wxString fillColor = arr[5].Lower(); //wxString fillColor = arr[5].Lower();
//bool locked = arr[7] != wxS( "0" ); //bool locked = arr[7] != wxS( "0" );
SHAPE_LINE_CHAIN chain; SHAPE_LINE_CHAIN chain;
@ -1335,8 +1335,8 @@ void SCH_EASYEDA_PARSER::ParseSchematic( SCHEMATIC* aSchematic, SCH_SHEET* aRoot
VECTOR2D text_pos( Convert( arr[8] ), VECTOR2D text_pos( Convert( arr[8] ),
Convert( arr[9] ) ); // TODO: detect top/bottom align Convert( arr[9] ) ); // TODO: detect top/bottom align
wxString fontname = arr[10]; // wxString fontname = arr[10];
wxString fontSize = arr[11]; // wxString fontSize = arr[11];
std::unique_ptr<SCH_LABEL> label = std::unique_ptr<SCH_LABEL> label =
std::make_unique<SCH_LABEL>( RelPos( pos ), netname ); std::make_unique<SCH_LABEL>( RelPos( pos ), netname );
@ -1376,7 +1376,7 @@ void SCH_EASYEDA_PARSER::ParseSchematic( SCHEMATIC* aSchematic, SCH_SHEET* aRoot
{ {
VECTOR2D pos( Convert( arr[2] ), Convert( arr[3] ) ); VECTOR2D pos( Convert( arr[2] ), Convert( arr[3] ) );
int angle = Convert( arr[4] ); int angle = Convert( arr[4] );
wxString color = arr[5]; // wxString color = arr[5];
wxString fontname = arr[6]; wxString fontname = arr[6];
wxString fontSize = arr[7]; wxString fontSize = arr[7];
wxString baselineAlign = arr[10]; wxString baselineAlign = arr[10];

6
eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp
View File

@ -1665,10 +1665,8 @@ void SCH_IO_KICAD_LEGACY::Format( SELECTION* aSelection, OUTPUTFORMATTER* aForma
void SCH_IO_KICAD_LEGACY::saveSymbol( SCH_SYMBOL* aSymbol ) void SCH_IO_KICAD_LEGACY::saveSymbol( SCH_SYMBOL* aSymbol )
{ {
std::string name1; std::string name1;
std::string name2; std::string name2;
static wxString delimiters( wxT( " " ) );
// This is redundant with the AR entries below, but it makes the files backwards-compatible. // This is redundant with the AR entries below, but it makes the files backwards-compatible.
if( aSymbol->GetInstances().size() > 0 ) if( aSymbol->GetInstances().size() > 0 )

2
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp
View File

@ -1589,8 +1589,6 @@ SCH_PIN* SCH_IO_KICAD_SEXPR_PARSER::parseSymbolPin()
wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a pin token." ) ); wxT( "Cannot parse " ) + GetTokenString( CurTok() ) + wxT( " as a pin token." ) );
T token; T token;
wxString tmp;
wxString error;
std::unique_ptr<SCH_PIN> pin = std::make_unique<SCH_PIN>( nullptr ); std::unique_ptr<SCH_PIN> pin = std::make_unique<SCH_PIN>( nullptr );
pin->SetUnit( m_unit ); pin->SetUnit( m_unit );

2
eeschema/sch_io/ltspice/ltspice_schematic.cpp
View File

@ -1004,7 +1004,7 @@ std::vector<LTSPICE_SCHEMATIC::LT_ASC> LTSPICE_SCHEMATIC::StructureBuilder()
{ {
tokensSizeRangeCheck( tokens.size(), 6, 7, lineNumber, fileName ); tokensSizeRangeCheck( tokens.size(), 6, 7, lineNumber, fileName );
wxString lineWidth = tokens[1]; // wxString lineWidth = tokens[1];
wxString botRightX = tokens[2]; wxString botRightX = tokens[2];
wxString botRightY = tokens[3]; wxString botRightY = tokens[3];
wxString topLeftX = tokens[4]; wxString topLeftX = tokens[4];

2
eeschema/sch_item.cpp
View File

@ -625,8 +625,6 @@ bool SCH_ITEM::RenderAsBitmap( double aWorldScale ) const
void SCH_ITEM::getSymbolEditorMsgPanelInfo( EDA_DRAW_FRAME* aFrame, void SCH_ITEM::getSymbolEditorMsgPanelInfo( EDA_DRAW_FRAME* aFrame,
std::vector<MSG_PANEL_ITEM>& aList ) std::vector<MSG_PANEL_ITEM>& aList )
{ {
wxString msg;
aList.emplace_back( _( "Type" ), GetFriendlyName() ); aList.emplace_back( _( "Type" ), GetFriendlyName() );
if( const SYMBOL* parent = GetParentSymbol() ) if( const SYMBOL* parent = GetParentSymbol() )

2
eeschema/sch_symbol.cpp
View File

@ -1311,8 +1311,6 @@ bool SCH_SYMBOL::ResolveTextVar( const SCH_SHEET_PATH* aPath, wxString* token, i
return true; return true;
} }
wxString upperToken = token->Upper();
for( const SCH_FIELD& field : m_fields ) for( const SCH_FIELD& field : m_fields )
{ {
wxString fieldName = field.IsMandatory() ? field.GetCanonicalName() wxString fieldName = field.IsMandatory() ? field.GetCanonicalName()

9
eeschema/sim/simulator_frame_ui.cpp
View File

@ -1219,7 +1219,6 @@ wxString SIMULATOR_FRAME_UI::vectorNameFromSignalName( SIM_PLOT_TAB* aPlotTab,
} }
} }
wxString suffix;
wxString name = aSignalName; wxString name = aSignalName;
for( const auto& [ candidate, type ] : suffixes ) for( const auto& [ candidate, type ] : suffixes )
@ -1429,9 +1428,8 @@ void SIMULATOR_FRAME_UI::onMeasurementsGridCellChanged( wxGridEvent& aEvent )
if( !plotTab ) if( !plotTab )
return; return;
int row = aEvent.GetRow(); int row = aEvent.GetRow();
int col = aEvent.GetCol(); int col = aEvent.GetCol();
wxString text = m_measurementsGrid->GetCellValue( row, col );
if( col == COL_MEASUREMENT ) if( col == COL_MEASUREMENT )
{ {
@ -1711,8 +1709,7 @@ void SIMULATOR_FRAME_UI::AddMeasurement( const wxString& aCmd )
if( !plotTab ) if( !plotTab )
return; return;
wxString simType = simulator()->TypeToName( plotTab->GetSimType(), true ); int row;
int row;
for( row = 0; row < m_measurementsGrid->GetNumberRows(); ++row ) for( row = 0; row < m_measurementsGrid->GetNumberRows(); ++row )
{ {

1
eeschema/symbol_editor/symbol_editor.cpp
View File

@ -344,7 +344,6 @@ void SYMBOL_EDIT_FRAME::CreateNewSymbol( const wxString& aInheritFrom )
{ {
m_toolManager->RunAction( ACTIONS::cancelInteractive ); m_toolManager->RunAction( ACTIONS::cancelInteractive );
wxArrayString symbolNames;
wxString lib = getTargetLib(); wxString lib = getTargetLib();
if( !m_libMgr->LibraryExists( lib ) ) if( !m_libMgr->LibraryExists( lib ) )

1
eeschema/tools/sch_editor_control.cpp
View File

@ -1824,7 +1824,6 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent )
{ {
SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item ); SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
SCH_FIELD* nameField = sheet->GetField( FIELD_T::SHEET_NAME ); SCH_FIELD* nameField = sheet->GetField( FIELD_T::SHEET_NAME );
wxString baseName = nameField->GetText();
wxFileName srcFn = sheet->GetFileName(); wxFileName srcFn = sheet->GetFileName();
if( srcFn.IsRelative() ) if( srcFn.IsRelative() )

3
eeschema/tools/symbol_editor_edit_tool.cpp
View File

@ -700,9 +700,6 @@ void SYMBOL_EDITOR_EDIT_TOOL::editFieldProperties( SCH_FIELD* aField )
if( dlg.ShowQuasiModal() != wxID_OK ) if( dlg.ShowQuasiModal() != wxID_OK )
return; return;
wxString newFieldValue = EscapeString( dlg.GetText(), CTX_LIBID );
wxString oldFieldValue = aField->GetFullText( m_frame->GetUnit() );
SCH_COMMIT commit( m_toolMgr ); SCH_COMMIT commit( m_toolMgr );
commit.Modify( aField, m_frame->GetScreen() ); commit.Modify( aField, m_frame->GetScreen() );

1
eeschema/widgets/hierarchy_pane.cpp
View File

@ -134,7 +134,6 @@ void HIERARCHY_PANE::buildHierarchyTree( SCH_SHEET_PATH* aList, const wxTreeItem
wxString sheetNameBase = sheet->GetField( FIELD_T::SHEET_NAME )->GetShownText( false ); wxString sheetNameBase = sheet->GetField( FIELD_T::SHEET_NAME )->GetShownText( false );
wxString sheetName = formatPageString( sheetNameBase, aList->GetPageNumber() ); wxString sheetName = formatPageString( sheetNameBase, aList->GetPageNumber() );
wxString sheetNumber = aList->GetPageNumber();
wxTreeItemId child = m_tree->AppendItem( aParent, sheetName, 0, 1 ); wxTreeItemId child = m_tree->AppendItem( aParent, sheetName, 0, 1 );
m_tree->SetItemData( child, new TREE_ITEM_DATA( *aList ) ); m_tree->SetItemData( child, new TREE_ITEM_DATA( *aList ) );

4
pcbnew/convert_shape_list_to_polygon.cpp
View File

@ -195,9 +195,7 @@ bool doConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aShapeList, SHAPE_POLY_
if( aShapeList.size() == 0 ) if( aShapeList.size() == 0 )
return true; return true;
bool selfIntersecting = false; bool selfIntersecting = false;
wxString msg;
PCB_SHAPE* graphic = nullptr; PCB_SHAPE* graphic = nullptr;
std::set<PCB_SHAPE*> startCandidates( aShapeList.begin(), aShapeList.end() ); std::set<PCB_SHAPE*> startCandidates( aShapeList.begin(), aShapeList.end() );

2
pcbnew/cross-probing.cpp
View File

@ -72,8 +72,6 @@
void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline ) void PCB_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
{ {
char line[1024]; char line[1024];
wxString msg;
wxString modName;
char* idcmd; char* idcmd;
char* text; char* text;
int netcode = -1; int netcode = -1;

1
pcbnew/dialogs/dialog_export_2581.cpp
View File

@ -367,7 +367,6 @@ bool DIALOG_EXPORT_2581::TransferDataFromWindow()
} }
PROJECT_FILE& prj = Prj().GetProjectFile(); PROJECT_FILE& prj = Prj().GetProjectFile();
wxString empty;
prj.m_IP2581Bom.id = GetOEM(); prj.m_IP2581Bom.id = GetOEM();
prj.m_IP2581Bom.mfg = GetMfg(); prj.m_IP2581Bom.mfg = GetMfg();

2
pcbnew/dialogs/dialog_export_odbpp.cpp
View File

@ -437,8 +437,6 @@ void DIALOG_EXPORT_ODBPP::GenerateODBPPFiles( const JOB_EXPORT_PCB_ODB& aJob, BO
} }
} }
wxString upperTxt;
wxString lowerTxt;
std::map<std::string, UTF8> props; std::map<std::string, UTF8> props;
props["units"] = aJob.m_units == JOB_EXPORT_PCB_ODB::ODB_UNITS::MM ? "mm" : "inch"; props["units"] = aJob.m_units == JOB_EXPORT_PCB_ODB::ODB_UNITS::MM ? "mm" : "inch";

2
pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -403,8 +403,6 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( BOARD_COMMIT& aCommit, B
else if(( m_italic->Get3StateValue() != wxCHK_UNDETERMINED else if(( m_italic->Get3StateValue() != wxCHK_UNDETERMINED
|| m_bold->Get3StateValue() != wxCHK_UNDETERMINED ) ) || m_bold->Get3StateValue() != wxCHK_UNDETERMINED ) )
{ {
wxString fontName = text->GetFontName();
if( !text->GetFontName().IsEmpty() ) if( !text->GetFontName().IsEmpty() )
{ {
text->SetFont( KIFONT::FONT::GetFont( text->GetFontName(), text->IsBold(), text->SetFont( KIFONT::FONT::GetFont( text->GetFontName(), text->IsBold(),

1
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -776,7 +776,6 @@ void PANEL_FP_LIB_TABLE::onMigrateLibraries( wxCommandEvent& event )
for( int row : rowsToMigrate ) for( int row : rowsToMigrate )
{ {
wxString libName = m_cur_grid->GetCellValue( row, COL_NICKNAME );
wxString relPath = m_cur_grid->GetCellValue( row, COL_URI ); wxString relPath = m_cur_grid->GetCellValue( row, COL_URI );
wxString resolvedPath = ExpandEnvVarSubstitutions( relPath, m_project ); wxString resolvedPath = ExpandEnvVarSubstitutions( relPath, m_project );
wxFileName legacyLib( resolvedPath ); wxFileName legacyLib( resolvedPath );

1
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -198,7 +198,6 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
m_textEditor->SearchAnchor(); m_textEditor->SearchAnchor();
wxString rules = m_textEditor->GetText();
int currentPos = m_textEditor->GetCurrentPos(); int currentPos = m_textEditor->GetCurrentPos();
int startPos = 0; int startPos = 0;

1
pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
View File

@ -290,7 +290,6 @@ bool PANEL_SETUP_TRACKS_AND_VIAS::TransferDataFromWindow()
return false; return false;
} }
wxString msg;
std::vector<int> trackWidths; std::vector<int> trackWidths;
std::vector<VIA_DIMENSION> vias; std::vector<VIA_DIMENSION> vias;
std::vector<DIFF_PAIR_DIMENSION> diffPairs; std::vector<DIFF_PAIR_DIMENSION> diffPairs;

2
pcbnew/exporters/export_d356.cpp
View File

@ -384,7 +384,7 @@ bool IPC356D_WRITER::Write( const wxString& aFilename )
int BOARD_EDITOR_CONTROL::GenD356File( const TOOL_EVENT& aEvent ) int BOARD_EDITOR_CONTROL::GenD356File( const TOOL_EVENT& aEvent )
{ {
wxFileName fn = m_frame->GetBoard()->GetFileName(); wxFileName fn = m_frame->GetBoard()->GetFileName();
wxString ext, wildcard, msg; wxString ext, wildcard;
ext = FILEEXT::IpcD356FileExtension; ext = FILEEXT::IpcD356FileExtension;
wildcard = FILEEXT::IpcD356FileWildcard(); wildcard = FILEEXT::IpcD356FileWildcard();

4
pcbnew/files.cpp
View File

@ -391,8 +391,6 @@ int BOARD_EDITOR_CONTROL::New( const TOOL_EVENT& aEvent )
bool PCB_EDIT_FRAME::SaveBoard( bool aSaveAs, bool aSaveCopy ) bool PCB_EDIT_FRAME::SaveBoard( bool aSaveAs, bool aSaveCopy )
{ {
wxString msg;
if( !aSaveAs ) if( !aSaveAs )
{ {
if( !GetBoard()->GetFileName().IsEmpty() ) if( !GetBoard()->GetFileName().IsEmpty() )
@ -599,8 +597,6 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
else else
setProject = Prj().GetProjectFullName().IsEmpty(); setProject = Prj().GetProjectFullName().IsEmpty();
wxString path = wxPathOnly( Prj().GetProjectFullName() );
if( setProject ) if( setProject )
{ {
// calls SaveProject // calls SaveProject

4
pcbnew/footprint_libraries_utils.cpp
View File

@ -599,9 +599,7 @@ void PCB_EDIT_FRAME::ExportFootprintsToLibrary( bool aStoreInNewLib, const wxStr
DisplayInfoMessage( this, _( "No footprints to export!" ) ); DisplayInfoMessage( this, _( "No footprints to export!" ) );
return; return;
} }
wxString footprintName;
auto resetReference = auto resetReference =
[]( FOOTPRINT* aFootprint ) []( FOOTPRINT* aFootprint )
{ {

2
pcbnew/netinfo_item.cpp
View File

@ -83,8 +83,6 @@ void NETINFO_ITEM::SetNetClass( const std::shared_ptr<NETCLASS>& aNetClass )
void NETINFO_ITEM::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) void NETINFO_ITEM::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList )
{ {
wxString msg;
aList.emplace_back( _( "Net Name" ), UnescapeString( GetNetname() ) ); aList.emplace_back( _( "Net Name" ), UnescapeString( GetNetname() ) );
aList.emplace_back( _( "Net Code" ), fmt::format( "{}", GetNetCode() ) ); aList.emplace_back( _( "Net Code" ), fmt::format( "{}", GetNetCode() ) );

1
pcbnew/pcb_base_frame.cpp
View File

@ -1230,7 +1230,6 @@ void PCB_BASE_FRAME::OnFpChangeDebounceTimer( wxTimerEvent& aEvent )
for( const EDA_ITEM* item : GetCurrentSelection() ) for( const EDA_ITEM* item : GetCurrentSelection() )
{ {
wxString uuidStr = item->m_Uuid.AsString();
selectedItems.emplace_back( item->m_Uuid ); selectedItems.emplace_back( item->m_Uuid );
} }

2
pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp
View File

@ -1499,8 +1499,6 @@ void PCB_IO_KICAD_SEXPR::formatLayers( LSET aLayerMask, bool aEnumerateLayers )
} }
// output any individual layers not handled in wildcard combos above // output any individual layers not handled in wildcard combos above
wxString layerName;
for( int layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer ) for( int layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
{ {
if( aLayerMask[layer] ) if( aLayerMask[layer] )

4
pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
View File

@ -1324,8 +1324,6 @@ void PCB_IO_KICAD_SEXPR_PARSER::resolveGroups( BOARD_ITEM* aParent )
static_cast<BOARD*>( groupInfo->parent )->Add( group, ADD_MODE::INSERT, true ); static_cast<BOARD*>( groupInfo->parent )->Add( group, ADD_MODE::INSERT, true );
} }
wxString error;
for( const GROUP_INFO* groupInfo : groupTypeObjects ) for( const GROUP_INFO* groupInfo : groupTypeObjects )
{ {
if( PCB_GROUP* group = dynamic_cast<PCB_GROUP*>( getItem( groupInfo->uuid ) ) ) if( PCB_GROUP* group = dynamic_cast<PCB_GROUP*>( getItem( groupInfo->uuid ) ) )
@ -4623,8 +4621,6 @@ FOOTPRINT* PCB_IO_KICAD_SEXPR_PARSER::parseFOOTPRINT_unchecked( wxArrayString* a
case T_property: case T_property:
{ {
wxString value;
NeedSYMBOL(); NeedSYMBOL();
wxString pName = FromUTF8(); wxString pName = FromUTF8();
NeedSYMBOL(); NeedSYMBOL();