diff --git a/common/asset_archive.cpp b/common/asset_archive.cpp
index f0691f43a1..8bec371c93 100644
--- a/common/asset_archive.cpp
+++ b/common/asset_archive.cpp
@@ -52,7 +52,7 @@ bool ASSET_ARCHIVE::Load()
size_t offset = 0;
- while( ( entry = tarStream.GetNextEntry() ) )
+ while( ( entry = tarStream.GetNextEntry() ) != nullptr )
{
if( entry->IsDir() )
{
diff --git a/common/eda_pattern_match.cpp b/common/eda_pattern_match.cpp
index 39507f54f0..22514bc73b 100644
--- a/common/eda_pattern_match.cpp
+++ b/common/eda_pattern_match.cpp
@@ -321,7 +321,7 @@ int EDA_PATTERN_MATCH_RELATIONAL::FindOne( const wxString& aCandidate ) const
wxString val = m_regex_description.GetMatch( aCandidate, 2 );
wxString unit = m_regex_description.GetMatch( aCandidate, 3 );
- int istart = ( start > std::numeric_limits<int>::max() ) ? std::numeric_limits<int>::max() : start;
+ int istart = static_cast<int>( CLAMPED_VAL_INT_MAX( start ) );
if( key.Lower() != m_key )
return EDA_PATTERN_NOT_FOUND;
diff --git a/common/eseries.cpp b/common/eseries.cpp
index 4f24c2c3ba..20abc5b840 100644
--- a/common/eseries.cpp
+++ b/common/eseries.cpp
@@ -53,7 +53,7 @@ static std::string strValue( double aValue )
else
{
double div = 1e3;
- int unit = 'K';
+ char unit = 'K';
if( aValue >= 1e6 )
{
diff --git a/common/gal/opengl/shader.cpp b/common/gal/opengl/shader.cpp
index 51ef423349..44366bc736 100644
--- a/common/gal/opengl/shader.cpp
+++ b/common/gal/opengl/shader.cpp
@@ -136,7 +136,7 @@ int SHADER::AddParameter( const std::string& aParameterName )
else
throw std::runtime_error( "Could not find shader uniform: " + aParameterName );
- return parameterLocation.size() - 1;
+ return static_cast<int>( parameterLocation.size() ) - 1;
}
@@ -254,7 +254,7 @@ bool SHADER::loadShaderFromStringArray( SHADER_TYPE aShaderType, const char** aA
programInfo( programNumber );
// Attach the sources
- glShaderSource( shaderNumber, aSize, (const GLchar**) aArray, nullptr );
+ glShaderSource( shaderNumber, static_cast<GLsizei>( aSize ), (const GLchar**) aArray, nullptr );
programInfo( programNumber );
// Compile and attach shader to the program
diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index 7ad46c0a2f..901b299d41 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -75,7 +75,7 @@ wxString FindKicadFile( const wxString& shortname )
// kicad can be installed highly portably on Windows, anywhere and concurrently
// either the "kicad file" is immediately adjacent to the exe or it's not a valid install
return shortname;
-#endif
+#else
// Path list for KiCad binary files
const static wxChar* possibilities[] = {
@@ -109,6 +109,8 @@ wxString FindKicadFile( const wxString& shortname )
}
return shortname;
+
+#endif
}
diff --git a/common/plugins/cadstar/cadstar_parts_lib_parser.cpp b/common/plugins/cadstar/cadstar_parts_lib_parser.cpp
index 62daef2ad4..5928b24960 100644
--- a/common/plugins/cadstar/cadstar_parts_lib_parser.cpp
+++ b/common/plugins/cadstar/cadstar_parts_lib_parser.cpp
@@ -526,7 +526,7 @@ bool checkHeaderHelper( INPUT_TYPE& aInput )
if( !parse<VALID_HEADER>( aInput ) )
return false;
}
- catch( const parse_error& e )
+ catch( const parse_error& )
{
return false;
}
diff --git a/common/preview_items/arc_geom_manager.cpp b/common/preview_items/arc_geom_manager.cpp
index 2ab785b912..1c27c17c3b 100644
--- a/common/preview_items/arc_geom_manager.cpp
+++ b/common/preview_items/arc_geom_manager.cpp
@@ -75,7 +75,7 @@ VECTOR2I ARC_GEOM_MANAGER::GetOrigin() const
VECTOR2I ARC_GEOM_MANAGER::GetStartRadiusEnd() const
{
- VECTOR2I vec( m_radius, 0 );
+ VECTOR2I vec( static_cast<int>( m_radius ), 0 );
RotatePoint( vec, -m_startAngle );
return m_origin +vec;
}
@@ -83,7 +83,7 @@ VECTOR2I ARC_GEOM_MANAGER::GetStartRadiusEnd() const
VECTOR2I ARC_GEOM_MANAGER::GetEndRadiusEnd() const
{
- VECTOR2I vec( m_radius, 0 );
+ VECTOR2I vec( static_cast<int>( m_radius ), 0 );
RotatePoint( vec, -m_endAngle );
return m_origin + vec;
}
diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index c139d6df7e..4622c7239b 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -2696,19 +2696,16 @@ bool mpWindow::SaveScreenshot( const wxString& filename, wxBitmapType type, wxSi
bool fit )
{
int sizeX, sizeY;
- int bk_scrX, bk_scrY;
if( imageSize == wxDefaultSize )
{
- sizeX = m_scrX;
- sizeY = m_scrY;
+ sizeX = m_scrX;
+ sizeY = m_scrY;
}
else
{
- sizeX = imageSize.x;
- sizeY = imageSize.y;
- bk_scrX = m_scrX;
- bk_scrY = m_scrY;
+ sizeX = imageSize.x;
+ sizeY = imageSize.y;
SetScr( sizeX, sizeY );
}
@@ -2733,6 +2730,8 @@ bool mpWindow::SaveScreenshot( const wxString& filename, wxBitmapType type, wxSi
if( imageSize != wxDefaultSize )
{
// Restore dimensions
+ int bk_scrX = m_scrX;
+ int bk_scrY = m_scrY;
SetScr( bk_scrX, bk_scrY );
Fit( m_desiredXmin, m_desiredXmax, m_desiredYmin, m_desiredYmax, &bk_scrX, &bk_scrY );
UpdateAll();
diff --git a/common/widgets/wx_grid.cpp b/common/widgets/wx_grid.cpp
index e584267d49..81ccf8f2a0 100644
--- a/common/widgets/wx_grid.cpp
+++ b/common/widgets/wx_grid.cpp
@@ -439,7 +439,7 @@ bool WX_GRID::CancelPendingChanges()
wxGridCellAttr* attr = GetCellAttr( row, col );
wxGridCellEditor* editor = attr->GetEditor( this, row, col );
- bool changed = editor->EndEdit( row, col, this, oldval, &newval );
+ editor->EndEdit( row, col, this, oldval, &newval );
editor->DecRef();
attr->DecRef();
diff --git a/cvpcb/dialogs/fp_conflict_assignment_selector.cpp b/cvpcb/dialogs/fp_conflict_assignment_selector.cpp
index 10a56320e7..0a622f4319 100644
--- a/cvpcb/dialogs/fp_conflict_assignment_selector.cpp
+++ b/cvpcb/dialogs/fp_conflict_assignment_selector.cpp
@@ -112,7 +112,7 @@ void DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR::OnItemClicked( wxMouseEvent& event
long idx = m_listFp->HitTest( pos, flgs );
// Try to find the column clicked (must be COL_SELCMP or COL_SELSCH)
- int colclr = -1, colset;
+ int colclr = -1, colset = -1;
int minpx = m_listFp->GetColumnWidth( 0 ) + m_listFp->GetColumnWidth( 1 );
int maxpx = minpx + m_listFp->GetColumnWidth( 2 );
diff --git a/eeschema/sch_io_mgr.cpp b/eeschema/sch_io_mgr.cpp
index 191803379e..97c548d573 100644
--- a/eeschema/sch_io_mgr.cpp
+++ b/eeschema/sch_io_mgr.cpp
@@ -209,6 +209,3 @@ SCH_IO_MGR::SCH_FILE_T SCH_IO_MGR::GuessPluginTypeFromSchPath( const wxString& a
return ret;
}
-
-
-DECLARE_ENUM_VECTOR( SCH_IO_MGR, SCH_FILE_T )
diff --git a/eeschema/sch_plugin.cpp b/eeschema/sch_plugin.cpp
index 22b34631f0..a8d4004cfa 100644
--- a/eeschema/sch_plugin.cpp
+++ b/eeschema/sch_plugin.cpp
@@ -25,34 +25,23 @@
#include <sch_io_mgr.h>
#include <wx/translation.h>
-#define FMT_UNIMPLEMENTED "Plugin \"%s\" does not implement the \"%s\" function."
-
-/**
- * Function not_implemented
- * throws an IO_ERROR and complains of an API function not being implemented.
- *
- * @param aPlugin is a SCH_PLUGIN instance
- * @param aCaller is the name of the unimplemented API function.
- */
-static void not_implemented( const SCH_PLUGIN* aPlugin, const char* aCaller )
-{
- THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED,
- aPlugin->GetName().GetData(),
+#define FMT_UNIMPLEMENTED wxT( "Plugin \"%s\" does not implement the \"%s\" function." )
+#define NOT_IMPLEMENTED( aCaller ) \
+ THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED, \
+ GetName().GetData(), \
wxString::FromUTF8( aCaller ).GetData() ) );
-}
void SCH_PLUGIN::SaveLibrary( const wxString& aFileName, const STRING_UTF8_MAP* aProperties )
{
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
SCH_SHEET* SCH_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchematic,
SCH_SHEET* aAppendToMe, const STRING_UTF8_MAP* aProperties )
{
- not_implemented( this, __FUNCTION__ );
- return nullptr;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -60,7 +49,7 @@ void SCH_PLUGIN::Save( const wxString& aFileName, SCH_SHEET* aSheet, SCHEMATIC*
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -69,7 +58,7 @@ void SCH_PLUGIN::EnumerateSymbolLib( wxArrayString& aAliasNameList,
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -78,7 +67,7 @@ void SCH_PLUGIN::EnumerateSymbolLib( std::vector<LIB_SYMBOL*>& aSymbolList,
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -86,8 +75,7 @@ LIB_SYMBOL* SCH_PLUGIN::LoadSymbol( const wxString& aLibraryPath, const wxString
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return nullptr;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -95,7 +83,7 @@ void SCH_PLUGIN::SaveSymbol( const wxString& aLibraryPath, const LIB_SYMBOL* aSy
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -103,30 +91,28 @@ void SCH_PLUGIN::DeleteSymbol( const wxString& aLibraryPath, const wxString& aSy
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
void SCH_PLUGIN::CreateSymbolLib( const wxString& aLibraryPath, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
bool SCH_PLUGIN::DeleteSymbolLib( const wxString& aLibraryPath, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return false;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
bool SCH_PLUGIN::IsSymbolLibWritable( const wxString& aLibraryPath )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return false;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -169,15 +155,12 @@ void SCH_PLUGIN::SymbolLibOptions( STRING_UTF8_MAP* aListToAppendTo ) const
bool SCH_PLUGIN::CheckHeader( const wxString& aFileName )
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return false;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
const wxString& SCH_PLUGIN::GetError() const
{
// not pure virtual so that plugins only have to implement subset of the SCH_PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- static wxString error;
- return error;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
diff --git a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
index b1ceed3cbc..79564ed74c 100644
--- a/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
+++ b/eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
@@ -2658,7 +2658,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadItemOntoKiCadSheet( LAYER_ID aCadstarSheetI
if( aCadstarSheetID == "ALL_SHEETS" )
{
- SCH_ITEM* duplicateItem;
+ SCH_ITEM* duplicateItem = nullptr;
for( std::pair<LAYER_ID, SHEET_NAME> sheetPair : Sheets.SheetNames )
{
diff --git a/eeschema/sim/kibis/kibis.cpp b/eeschema/sim/kibis/kibis.cpp
index b209d7d8cc..d54802ec0a 100644
--- a/eeschema/sim/kibis/kibis.cpp
+++ b/eeschema/sim/kibis/kibis.cpp
@@ -1498,7 +1498,7 @@ std::vector<std::pair<int, double>> KIBIS_WAVEFORM_PRBS::GenerateBitSequence()
do
{
uint8_t lsb = lfsr & 0x01;
- bitSequence.emplace_back( ( inverted ^ lsb ? 1 : 0 ), t );
+ bitSequence.emplace_back( ( static_cast<uint8_t>( inverted ) ^ lsb ? 1 : 0 ), t );
lfsr = lfsr >> 1;
if ( lsb )
diff --git a/eeschema/sim/sim_model.cpp b/eeschema/sim/sim_model.cpp
index 09368d622d..0e7e22a7ac 100644
--- a/eeschema/sim/sim_model.cpp
+++ b/eeschema/sim/sim_model.cpp
@@ -447,7 +447,7 @@ std::unique_ptr<SIM_MODEL> SIM_MODEL::Create( TYPE aType, const std::vector<LIB_
// Passing nullptr to ReadDataFields will make it act as if all fields were empty.
model->ReadDataFields( static_cast<const std::vector<SCH_FIELD>*>( nullptr ), aPins );
}
- catch( IO_ERROR& err )
+ catch( IO_ERROR& )
{
wxFAIL_MSG( "Shouldn't throw reading empty fields!" );
}
@@ -484,7 +484,7 @@ std::unique_ptr<SIM_MODEL> SIM_MODEL::Create( const SIM_MODEL* aBaseModel,
{
model->ReadDataFields( static_cast<const std::vector<SCH_FIELD>*>( nullptr ), aPins );
}
- catch( IO_ERROR& err )
+ catch( IO_ERROR& )
{
wxFAIL_MSG( "Shouldn't throw reading empty fields!" );
}
diff --git a/eeschema/sim/sim_plot_panel.cpp b/eeschema/sim/sim_plot_panel.cpp
index a15cb198d9..21a43c2d1a 100644
--- a/eeschema/sim/sim_plot_panel.cpp
+++ b/eeschema/sim/sim_plot_panel.cpp
@@ -557,7 +557,7 @@ void SIM_PLOT_PANEL::prepareDCAxes( int aNewTraceType )
if( sim_cmd.StartsWith( ".dc", &rem ) )
{
- wxChar ch;
+ wxChar ch = 0;
rem.Trim( false );
diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp
index 24e177387e..20a8c6c951 100644
--- a/eeschema/tools/sch_drawing_tools.cpp
+++ b/eeschema/tools/sch_drawing_tools.cpp
@@ -1364,7 +1364,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
}
else if( isSheetPin )
{
- EDA_ITEM* i;
+ EDA_ITEM* i = nullptr;
// If we didn't have a sheet selected, try to find one under the cursor
if( !sheet && m_selectionTool->SelectPoint( cursorPos, { SCH_SHEET_T }, &i ) )
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 3e3e3a7ca0..c720bcc3ab 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -461,7 +461,7 @@ bool GERBVIEW_FRAME::unarchiveFiles( const wxString& aFullFileName, REPORTER* aR
bool reported_no_more_layer = false;
KIGFX::VIEW* view = GetCanvas()->GetView();
- while( ( entry = zipArchive.GetNextEntry() ) )
+ while( ( entry = zipArchive.GetNextEntry() ) != nullptr )
{
if( entry->IsDir() )
continue;
diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp
index 37d441e66c..7dda9006fa 100644
--- a/gerbview/gerbview.cpp
+++ b/gerbview/gerbview.cpp
@@ -195,7 +195,7 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
char* line;
wxString data;
- while( ( line = jobfileReader.ReadLine() ) )
+ while( ( line = jobfileReader.ReadLine() ) != nullptr )
data << line << '\n';
// detect the file format: old (deprecated) gerber format or official JSON format
diff --git a/gerbview/job_file_reader.cpp b/gerbview/job_file_reader.cpp
index d40083b79b..478cd74658 100644
--- a/gerbview/job_file_reader.cpp
+++ b/gerbview/job_file_reader.cpp
@@ -132,7 +132,7 @@ bool GERBER_JOBFILE_READER::ReadGerberJobFile()
if( json_format )
{
- while( ( line = jobfileReader.ReadLine() ) )
+ while( ( line = jobfileReader.ReadLine() ) != nullptr )
data << '\n' << line;
try
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index e7a1336e80..30688a884b 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -967,7 +967,6 @@ char* GERBER_FILE_IMAGE::GetNextLine( char *aBuff, unsigned int aBuffSize, char*
return aText;
}
}
- return aText;
}
diff --git a/libs/kimath/src/bezier_curves.cpp b/libs/kimath/src/bezier_curves.cpp
index d64725f7be..e37f428b29 100644
--- a/libs/kimath/src/bezier_curves.cpp
+++ b/libs/kimath/src/bezier_curves.cpp
@@ -128,8 +128,8 @@ void TransformEllipseToBeziers( const ELLIPSE<T>& aEllipse, std::vector<BEZIER<T
const int minBeziersPerCircle = 4;
/// The number of Beziers needed for the given arc
- const int numBeziers = std::ceil( std::abs( arcAngle.AsRadians() /
- ( 2 * M_PI / minBeziersPerCircle ) ) );
+ const int numBeziers = static_cast<int>(
+ std::ceil( std::abs( arcAngle.AsRadians() / ( 2 * M_PI / minBeziersPerCircle ) ) ) );
/// Angle occupied by each Bezier
const double angleIncrement = arcAngle.AsRadians() / numBeziers;
diff --git a/libs/kimath/src/geometry/eda_angle.cpp b/libs/kimath/src/geometry/eda_angle.cpp
index 3387b5b135..13e5a02602 100644
--- a/libs/kimath/src/geometry/eda_angle.cpp
+++ b/libs/kimath/src/geometry/eda_angle.cpp
@@ -34,8 +34,8 @@ EDA_ANGLE EDA_ANGLE::KeepUpright() const
EDA_ANGLE inAngle( *this );
inAngle.Normalize();
- int inDegrees = inAngle.AsDegrees();
- int outDegrees;
+ double inDegrees = inAngle.AsDegrees();
+ double outDegrees;
if( inDegrees <= 45 || inDegrees >= 315 || ( inDegrees > 135 && inDegrees <= 225 ) )
outDegrees = 0;
diff --git a/libs/kimath/src/geometry/seg.cpp b/libs/kimath/src/geometry/seg.cpp
index 041cd6b87c..ee02eb4fd3 100644
--- a/libs/kimath/src/geometry/seg.cpp
+++ b/libs/kimath/src/geometry/seg.cpp
@@ -354,7 +354,7 @@ int SEG::LineDistance( const VECTOR2I& aP, bool aDetermineSide ) const
ecoord dist = isqrt( dist_sq );
- return aDetermineSide ? dist : std::abs( dist );
+ return static_cast<int>( aDetermineSide ? dist : std::abs( dist ) );
}
diff --git a/libs/kimath/src/geometry/shape_line_chain.cpp b/libs/kimath/src/geometry/shape_line_chain.cpp
index f4e60b2833..499d5def04 100644
--- a/libs/kimath/src/geometry/shape_line_chain.cpp
+++ b/libs/kimath/src/geometry/shape_line_chain.cpp
@@ -1478,8 +1478,6 @@ static inline void addIntersection( SHAPE_LINE_CHAIN::INTERSECTIONS& aIps, int a
return;
}
- const auto& last = aIps.back();
-
aIps.push_back( aP );
}
diff --git a/pcbnew/drc/drc_test_provider_connection_width.cpp b/pcbnew/drc/drc_test_provider_connection_width.cpp
index abfd7c1b28..c9db1d9983 100644
--- a/pcbnew/drc/drc_test_provider_connection_width.cpp
+++ b/pcbnew/drc/drc_test_provider_connection_width.cpp
@@ -137,7 +137,7 @@ public:
Vertex* match = nullptr;
// Only run the expensive search if we don't already have a match for the point
- if( ( all_hits.empty() || all_hits.count( p ) == 0 ) && ( match = getKink( p ) ) )
+ if( ( all_hits.empty() || all_hits.count( p ) == 0 ) && ( match = getKink( p ) ) != nullptr )
{
if( !all_hits.count( match ) && m_hits.emplace( p->i, match->i ).second )
{
diff --git a/pcbnew/drc/drc_test_provider_copper_clearance.cpp b/pcbnew/drc/drc_test_provider_copper_clearance.cpp
index 61a535c35a..6881056194 100644
--- a/pcbnew/drc/drc_test_provider_copper_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_copper_clearance.cpp
@@ -641,8 +641,8 @@ bool DRC_TEST_PROVIDER_COPPER_CLEARANCE::testPadAgainstItem( PAD* pad, SHAPE* pa
std::shared_ptr<SHAPE> otherShape = other->GetEffectiveShape( aLayer );
DRC_CONSTRAINT constraint;
- int clearance;
- int actual;
+ int clearance = 0;
+ int actual = 0;
VECTOR2I pos;
if( otherPad && pad->SameLogicalPadAs( otherPad ) )
diff --git a/pcbnew/drc/drc_test_provider_hole_size.cpp b/pcbnew/drc/drc_test_provider_hole_size.cpp
index 007846efdc..895e1bbf79 100644
--- a/pcbnew/drc/drc_test_provider_hole_size.cpp
+++ b/pcbnew/drc/drc_test_provider_hole_size.cpp
@@ -131,7 +131,7 @@ void DRC_TEST_PROVIDER_HOLE_SIZE::checkPadHole( PAD* aPad )
UNDEFINED_LAYER /* holes are not layer-specific */ );
bool fail_min = false;
bool fail_max = false;
- int constraintValue;
+ int constraintValue = 0;
if( constraint.GetSeverity() == RPT_SEVERITY_IGNORE )
return;
@@ -200,7 +200,7 @@ void DRC_TEST_PROVIDER_HOLE_SIZE::checkViaHole( PCB_VIA* via, bool aExceedMicro,
UNDEFINED_LAYER /* holes are not layer-specific */ );
bool fail_min = false;
bool fail_max = false;
- int constraintValue;
+ int constraintValue = 0;
if( constraint.GetSeverity() == RPT_SEVERITY_IGNORE )
return;
diff --git a/pcbnew/drc/drc_test_provider_track_width.cpp b/pcbnew/drc/drc_test_provider_track_width.cpp
index 487bfed5c9..7e5ddaebcd 100644
--- a/pcbnew/drc/drc_test_provider_track_width.cpp
+++ b/pcbnew/drc/drc_test_provider_track_width.cpp
@@ -104,7 +104,7 @@ bool DRC_TEST_PROVIDER_TRACK_WIDTH::Run()
item->GetLayer() );
bool fail_min = false;
bool fail_max = false;
- int constraintWidth;
+ int constraintWidth = 0;
if( constraint.GetSeverity() != RPT_SEVERITY_IGNORE )
{
diff --git a/pcbnew/footprint_editor_settings.cpp b/pcbnew/footprint_editor_settings.cpp
index c7d15a70d4..e2529d9b7c 100644
--- a/pcbnew/footprint_editor_settings.cpp
+++ b/pcbnew/footprint_editor_settings.cpp
@@ -407,7 +407,7 @@ bool FOOTPRINT_EDITOR_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
( *m_internals )[m_internals->PointerFromString( "appearance.color_theme" )] = "user_footprints";
- double x, y;
+ double x = 0, y = 0;
f = "ModEditFrame";
if( aCfg->Read( f + "PcbUserGrid_X", &x ) && aCfg->Read( f + "PcbUserGrid_Y", &y ) )
diff --git a/pcbnew/netlist_reader/netlist.cpp b/pcbnew/netlist_reader/netlist.cpp
index 8682b1e005..72d183ba2e 100644
--- a/pcbnew/netlist_reader/netlist.cpp
+++ b/pcbnew/netlist_reader/netlist.cpp
@@ -175,7 +175,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER& aReporter )
KIID_PATH path = component->GetPath();
path.push_back( uuid );
- if( ( fpOnBoard = m_pcb->FindFootprintByPath( path ) ) )
+ if( ( fpOnBoard = m_pcb->FindFootprintByPath( path ) ) != nullptr )
break;
}
}
diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp
index b2a6a595b3..42215b19d6 100644
--- a/pcbnew/pcbnew_settings.cpp
+++ b/pcbnew/pcbnew_settings.cpp
@@ -889,7 +889,7 @@ bool PCBNEW_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
Set( "appearance.color_theme", cs->GetFilename() );
- double x, y;
+ double x = 0, y = 0;
if( aCfg->Read( f + "PcbUserGrid_X", &x ) && aCfg->Read( f + "PcbUserGrid_Y", &y ) )
{
diff --git a/pcbnew/plugin.cpp b/pcbnew/plugin.cpp
index ceac3def9f..1a983ea656 100644
--- a/pcbnew/plugin.cpp
+++ b/pcbnew/plugin.cpp
@@ -27,40 +27,30 @@
#include <wx/translation.h>
-#define FMT_UNIMPLEMENTED wxT( "Plugin \"%s\" does not implement the \"%s\" function." )
-
-/**
- * Throw an #IO_ERROR and complains of an API function not being implemented.
- *
- * @param aPlugin is a #PLUGIN instance.
- * @param aCaller is the name of the unimplemented API function.
- */
-static void not_implemented( PLUGIN* aPlugin, const char* aCaller )
-{
- THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED,
- aPlugin->PluginName(),
+#define FMT_UNIMPLEMENTED wxT( "Plugin \"%s\" does not implement the \"%s\" function." )
+#define NOT_IMPLEMENTED( aCaller ) \
+ THROW_IO_ERROR( wxString::Format( FMT_UNIMPLEMENTED, \
+ PluginName(), \
wxString::FromUTF8( aCaller ) ) );
-}
+
BOARD* PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties,
PROJECT* aProject, PROGRESS_REPORTER* aProgressReporter )
{
- not_implemented( this, __FUNCTION__ );
- return nullptr;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
std::vector<FOOTPRINT*> PLUGIN::GetImportedCachedLibraryFootprints()
{
- not_implemented( this, __FUNCTION__ );
- return std::vector<FOOTPRINT*>();
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
void PLUGIN::Save( const wxString& aFileName, BOARD* aBoard, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -68,7 +58,7 @@ void PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString&
bool aBestEfforts, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -98,8 +88,7 @@ FOOTPRINT* PLUGIN::FootprintLoad( const wxString& aLibraryPath, const wxString&
bool aKeepUUID, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return nullptr;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -107,7 +96,7 @@ void PLUGIN::FootprintSave( const wxString& aLibraryPath, const FOOTPRINT* aFoot
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
@@ -115,30 +104,28 @@ void PLUGIN::FootprintDelete( const wxString& aLibraryPath, const wxString& aFoo
const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
void PLUGIN::FootprintLibCreate( const wxString& aLibraryPath, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
bool PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, const STRING_UTF8_MAP* aProperties )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return false;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
bool PLUGIN::IsFootprintLibWritable( const wxString& aLibraryPath )
{
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
- not_implemented( this, __FUNCTION__ );
- return false;
+ NOT_IMPLEMENTED( __FUNCTION__ );
}
diff --git a/plugins/3d/vrml/v2/vrml2_inline.cpp b/plugins/3d/vrml/v2/vrml2_inline.cpp
index 9ca008b6c5..920ff418e7 100644
--- a/plugins/3d/vrml/v2/vrml2_inline.cpp
+++ b/plugins/3d/vrml/v2/vrml2_inline.cpp
@@ -93,7 +93,7 @@ bool WRL2INLINE::Read( WRLPROC& proc, WRL2BASE* aTopNode )
proc.Pop();
- while( ( tok = proc.Peek() ) )
+ while( ( tok = proc.Peek() ) != 0 )
{
std::string glob;
diff --git a/utils/idftools/dxf2idfmain.cpp b/utils/idftools/dxf2idfmain.cpp
index 90f02327d2..eced607f18 100644
--- a/utils/idftools/dxf2idfmain.cpp
+++ b/utils/idftools/dxf2idfmain.cpp
@@ -40,7 +40,7 @@ int main( int argc, char **argv )
string dname; // DXF filename
string gname; // Geometry Name
string pname; // Part Name
- double height; // extrusion height
+ double height = 0; // extrusion height
bool inch = false; // true = inches, false = mm
bool ok;
diff --git a/utils/idftools/idf2vrml.cpp b/utils/idftools/idf2vrml.cpp
index 79f7d905d3..4ec88ed9c4 100644
--- a/utils/idftools/idf2vrml.cpp
+++ b/utils/idftools/idf2vrml.cpp
@@ -759,7 +759,7 @@ bool MakeComponents( IDF3_BOARD& board, std::ostream& file, bool compact )
tY += vY;
tA += vA;
- if( ( pout = (IDF3_COMP_OUTLINE*)((*so)->GetOutline()) ) )
+ if( ( pout = (IDF3_COMP_OUTLINE*)((*so)->GetOutline()) ) != nullptr )
{
vcp = GetColor( cmap, cidx, pout->GetUID() );
}