Remove unused vars
This commit is contained in:
parent
1e1aedbe30
commit
63295cfb9e
|
@ -273,7 +273,7 @@ bool DATABASE_CONNECTION::getQuoteChar()
|
||||||
|
|
||||||
wxLogTrace( traceDatabase, wxT( "Quote char retrieved: %c" ), m_quoteChar );
|
wxLogTrace( traceDatabase, wxT( "Quote char retrieved: %c" ), m_quoteChar );
|
||||||
}
|
}
|
||||||
catch( nanodbc::database_error& e )
|
catch( nanodbc::database_error& )
|
||||||
{
|
{
|
||||||
wxLogTrace( traceDatabase, wxT( "Exception while querying quote char: %s" ), m_lastError );
|
wxLogTrace( traceDatabase, wxT( "Exception while querying quote char: %s" ), m_lastError );
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -138,7 +138,6 @@ std::string EDA_UNIT_UTILS::FormatInternalUnits( const EDA_IU_SCALE& aIuScale, i
|
||||||
{
|
{
|
||||||
std::string buf;
|
std::string buf;
|
||||||
double engUnits = aValue;
|
double engUnits = aValue;
|
||||||
int len;
|
|
||||||
|
|
||||||
engUnits /= aIuScale.IU_PER_MM;
|
engUnits /= aIuScale.IU_PER_MM;
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ std::unique_ptr<NODE> MARKUP_PARSER::Parse()
|
||||||
auto root = parse_tree::parse<MARKUP::grammar, MARKUP::NODE, MARKUP::selector>( in );
|
auto root = parse_tree::parse<MARKUP::grammar, MARKUP::NODE, MARKUP::selector>( in );
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
catch ( tao::pegtl::parse_error& parseError )
|
catch ( tao::pegtl::parse_error& )
|
||||||
{
|
{
|
||||||
// couldn't parse text item
|
// couldn't parse text item
|
||||||
// TODO message to user?
|
// TODO message to user?
|
||||||
|
|
|
@ -26,6 +26,7 @@ class WX_GRID;
|
||||||
#include <wx/button.h>
|
#include <wx/button.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
|
#include <wx/treebook.h>
|
||||||
#include <wx/simplebook.h>
|
#include <wx/simplebook.h>
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -208,7 +208,7 @@ void NETLIST_EXPORTER_SPICE::ReadDirectives( unsigned aNetlistOptions )
|
||||||
NETLIST_EXPORTER_SPICE_PARSER::control>
|
NETLIST_EXPORTER_SPICE_PARSER::control>
|
||||||
( in );
|
( in );
|
||||||
}
|
}
|
||||||
catch( const tao::pegtl::parse_error& e )
|
catch( const tao::pegtl::parse_error& )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -547,7 +547,7 @@ bool SCH_FIELD::Matches( const EDA_SEARCH_DATA& aSearchData, void* aAuxData ) co
|
||||||
searchAndReplace = schSearchData.searchAndReplace;
|
searchAndReplace = schSearchData.searchAndReplace;
|
||||||
replaceReferences = schSearchData.replaceReferences;
|
replaceReferences = schSearchData.replaceReferences;
|
||||||
}
|
}
|
||||||
catch( const std::bad_cast& e )
|
catch( const std::bad_cast& )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -622,7 +622,7 @@ bool SCH_FIELD::Replace( const EDA_SEARCH_DATA& aSearchData, void* aAuxData )
|
||||||
const SCH_SEARCH_DATA& schSearchData = dynamic_cast<const SCH_SEARCH_DATA&>( aSearchData );
|
const SCH_SEARCH_DATA& schSearchData = dynamic_cast<const SCH_SEARCH_DATA&>( aSearchData );
|
||||||
replaceReferences = schSearchData.replaceReferences;
|
replaceReferences = schSearchData.replaceReferences;
|
||||||
}
|
}
|
||||||
catch( const std::bad_cast& e )
|
catch( const std::bad_cast& )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ SIM_MODEL::DEVICE_INFO SIM_MODEL::DeviceTypeInfo( DEVICE_TYPE_ aDeviceType )
|
||||||
SIM_MODEL::INFO SIM_MODEL::TypeInfo( TYPE aType )
|
SIM_MODEL::INFO SIM_MODEL::TypeInfo( TYPE aType )
|
||||||
{
|
{
|
||||||
switch( aType )
|
switch( aType )
|
||||||
{
|
{
|
||||||
case TYPE::NONE: return { DEVICE_TYPE_::NONE, "", "" };
|
case TYPE::NONE: return { DEVICE_TYPE_::NONE, "", "" };
|
||||||
|
|
||||||
case TYPE::R: return { DEVICE_TYPE_::R, "", "Ideal" };
|
case TYPE::R: return { DEVICE_TYPE_::R, "", "Ideal" };
|
||||||
|
@ -132,7 +132,7 @@ SIM_MODEL::INFO SIM_MODEL::TypeInfo( TYPE aType )
|
||||||
case TYPE::C_BEHAVIORAL: return { DEVICE_TYPE_::C, "=", "Behavioral" };
|
case TYPE::C_BEHAVIORAL: return { DEVICE_TYPE_::C, "=", "Behavioral" };
|
||||||
|
|
||||||
case TYPE::L: return { DEVICE_TYPE_::L, "", "Ideal" };
|
case TYPE::L: return { DEVICE_TYPE_::L, "", "Ideal" };
|
||||||
case TYPE::L_MUTUAL: return { DEVICE_TYPE_::L, "MUTUAL", "Mutual" };
|
case TYPE::L_MUTUAL: return { DEVICE_TYPE_::L, "MUTUAL", "Mutual" };
|
||||||
case TYPE::L_BEHAVIORAL: return { DEVICE_TYPE_::L, "=", "Behavioral" };
|
case TYPE::L_BEHAVIORAL: return { DEVICE_TYPE_::L, "=", "Behavioral" };
|
||||||
|
|
||||||
case TYPE::TLINE_Z0: return { DEVICE_TYPE_::TLINE, "Z0", "Characteristic impedance" };
|
case TYPE::TLINE_Z0: return { DEVICE_TYPE_::TLINE, "Z0", "Characteristic impedance" };
|
||||||
|
@ -142,7 +142,7 @@ SIM_MODEL::INFO SIM_MODEL::TypeInfo( TYPE aType )
|
||||||
case TYPE::SW_I: return { DEVICE_TYPE_::SW, "I", "Current-controlled" };
|
case TYPE::SW_I: return { DEVICE_TYPE_::SW, "I", "Current-controlled" };
|
||||||
|
|
||||||
case TYPE::D: return { DEVICE_TYPE_::D, "", "" };
|
case TYPE::D: return { DEVICE_TYPE_::D, "", "" };
|
||||||
|
|
||||||
case TYPE::NPN_GUMMELPOON: return { DEVICE_TYPE_::NPN, "GUMMELPOON", "Gummel-Poon" };
|
case TYPE::NPN_GUMMELPOON: return { DEVICE_TYPE_::NPN, "GUMMELPOON", "Gummel-Poon" };
|
||||||
case TYPE::PNP_GUMMELPOON: return { DEVICE_TYPE_::PNP, "GUMMELPOON", "Gummel-Poon" };
|
case TYPE::PNP_GUMMELPOON: return { DEVICE_TYPE_::PNP, "GUMMELPOON", "Gummel-Poon" };
|
||||||
case TYPE::NPN_VBIC: return { DEVICE_TYPE_::NPN, "VBIC", "VBIC" };
|
case TYPE::NPN_VBIC: return { DEVICE_TYPE_::NPN, "VBIC", "VBIC" };
|
||||||
|
@ -262,7 +262,7 @@ SIM_MODEL::SPICE_INFO SIM_MODEL::SpiceInfo( TYPE aType )
|
||||||
case TYPE::L: return { "L", "" };
|
case TYPE::L: return { "L", "" };
|
||||||
case TYPE::L_MUTUAL: return { "K", "" };
|
case TYPE::L_MUTUAL: return { "K", "" };
|
||||||
case TYPE::L_BEHAVIORAL: return { "L", "", "", "0", false, true };
|
case TYPE::L_BEHAVIORAL: return { "L", "", "", "0", false, true };
|
||||||
|
|
||||||
//case TYPE::TLINE_Z0: return { "T" };
|
//case TYPE::TLINE_Z0: return { "T" };
|
||||||
case TYPE::TLINE_Z0: return { "O", "LTRA" };
|
case TYPE::TLINE_Z0: return { "O", "LTRA" };
|
||||||
case TYPE::TLINE_RLGC: return { "O", "LTRA" };
|
case TYPE::TLINE_RLGC: return { "O", "LTRA" };
|
||||||
|
@ -606,7 +606,7 @@ TYPE SIM_MODEL::InferTypeFromRefAndValue( const wxString& aRef, const wxString&
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch( const tao::pegtl::parse_error& e )
|
catch( const tao::pegtl::parse_error& )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1021,7 +1021,7 @@ bool SIM_MODEL::SetParamValue( const wxString& aParamName, const wxString& aValu
|
||||||
{
|
{
|
||||||
return param.info.name == aParamName.Lower();
|
return param.info.name == aParamName.Lower();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
if( it == params.end() )
|
if( it == params.end() )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -1071,7 +1071,7 @@ SIM_MODEL::SIM_MODEL( TYPE aType ) :
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SIM_MODEL::SIM_MODEL( TYPE aType, std::unique_ptr<SPICE_GENERATOR> aSpiceGenerator ) :
|
SIM_MODEL::SIM_MODEL( TYPE aType, std::unique_ptr<SPICE_GENERATOR> aSpiceGenerator ) :
|
||||||
m_spiceGenerator( std::move( aSpiceGenerator ) ),
|
m_spiceGenerator( std::move( aSpiceGenerator ) ),
|
||||||
m_baseModel( nullptr ),
|
m_baseModel( nullptr ),
|
||||||
m_type( aType ),
|
m_type( aType ),
|
||||||
|
@ -1174,7 +1174,7 @@ void SIM_MODEL::ParseParamsField( const wxString& aParamsField )
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Using parse tree instead of actions because we don't care about performance that much,
|
// Using parse tree instead of actions because we don't care about performance that much,
|
||||||
// and having a tree greatly simplifies some things.
|
// and having a tree greatly simplifies some things.
|
||||||
root = tao::pegtl::parse_tree::parse<
|
root = tao::pegtl::parse_tree::parse<
|
||||||
SIM_MODEL_PARSER::fieldParamValuePairsGrammar,
|
SIM_MODEL_PARSER::fieldParamValuePairsGrammar,
|
||||||
SIM_MODEL_PARSER::fieldParamValuePairsSelector>
|
SIM_MODEL_PARSER::fieldParamValuePairsSelector>
|
||||||
|
@ -1193,7 +1193,7 @@ void SIM_MODEL::ParseParamsField( const wxString& aParamsField )
|
||||||
paramName = node->string();
|
paramName = node->string();
|
||||||
// TODO: Do something with number<SIM_VALUE::TYPE_INT, ...>.
|
// TODO: Do something with number<SIM_VALUE::TYPE_INT, ...>.
|
||||||
// It doesn't seem too useful?
|
// It doesn't seem too useful?
|
||||||
else if( node->is_type<SIM_MODEL_PARSER::quotedStringContent>()
|
else if( node->is_type<SIM_MODEL_PARSER::quotedStringContent>()
|
||||||
|| node->is_type<SIM_MODEL_PARSER::unquotedString>() )
|
|| node->is_type<SIM_MODEL_PARSER::unquotedString>() )
|
||||||
{
|
{
|
||||||
wxASSERT( paramName != "" );
|
wxASSERT( paramName != "" );
|
||||||
|
@ -1295,7 +1295,7 @@ std::unique_ptr<SIM_MODEL> SIM_MODEL::create( TYPE aType )
|
||||||
case TYPE::V_BEHAVIORAL:
|
case TYPE::V_BEHAVIORAL:
|
||||||
case TYPE::I_BEHAVIORAL:
|
case TYPE::I_BEHAVIORAL:
|
||||||
return std::make_unique<SIM_MODEL_BEHAVIORAL>( aType );
|
return std::make_unique<SIM_MODEL_BEHAVIORAL>( aType );
|
||||||
|
|
||||||
case TYPE::TLINE_Z0:
|
case TYPE::TLINE_Z0:
|
||||||
case TYPE::TLINE_RLGC:
|
case TYPE::TLINE_RLGC:
|
||||||
return std::make_unique<SIM_MODEL_TLINE>( aType );
|
return std::make_unique<SIM_MODEL_TLINE>( aType );
|
||||||
|
|
|
@ -469,7 +469,7 @@ int SCH_EDITOR_CONTROL::FindNext( const TOOL_EVENT& aEvent )
|
||||||
const SCH_SEARCH_DATA& schSearchData = dynamic_cast<const SCH_SEARCH_DATA&>( data );
|
const SCH_SEARCH_DATA& schSearchData = dynamic_cast<const SCH_SEARCH_DATA&>( data );
|
||||||
searchAllSheets = !( schSearchData.searchCurrentSheetOnly );
|
searchAllSheets = !( schSearchData.searchCurrentSheetOnly );
|
||||||
}
|
}
|
||||||
catch( const std::bad_cast& e )
|
catch( const std::bad_cast& )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -624,7 +624,7 @@ int SCH_EDITOR_CONTROL::ReplaceAll( const TOOL_EVENT& aEvent )
|
||||||
const SCH_SEARCH_DATA& schSearchData = dynamic_cast<const SCH_SEARCH_DATA&>( data );
|
const SCH_SEARCH_DATA& schSearchData = dynamic_cast<const SCH_SEARCH_DATA&>( data );
|
||||||
currentSheetOnly = schSearchData.searchCurrentSheetOnly;
|
currentSheetOnly = schSearchData.searchCurrentSheetOnly;
|
||||||
}
|
}
|
||||||
catch( const std::bad_cast& e )
|
catch( const std::bad_cast& )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -781,7 +781,7 @@ int SCH_EDITOR_CONTROL::SimProbe( const TOOL_EVENT& aEvent )
|
||||||
|
|
||||||
// TODO: We need to unify this library-model inheritance stuff into one
|
// TODO: We need to unify this library-model inheritance stuff into one
|
||||||
// abstraction.
|
// abstraction.
|
||||||
|
|
||||||
// It might not be the best idea to have to load a file every time current is
|
// It might not be the best idea to have to load a file every time current is
|
||||||
// probed either.
|
// probed either.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue