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

A few minor fixes for compil warnings (shadowed local variables and deprecated auto_ptr)

This commit is contained in:
jean-pierre charras 2016-05-29 17:03:58 +02:00
parent ca0113ab65 1ae9175671
commit 7872f1ec15
9 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/gal/opengl/opengl_gal.cpp
View File

@ -767,9 +767,9 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
* v2 v3 * v2 v3
*/ */
for( unsigned int i = 0; i < aText.length(); ++i ) for( unsigned int ii = 0; ii < aText.length(); ++ii )
{ {
const unsigned int c = aText[i]; const unsigned int c = aText[ii];
wxASSERT_MSG( c < bitmap_chars_count, wxT( "Missing character in bitmap font atlas." ) ); wxASSERT_MSG( c < bitmap_chars_count, wxT( "Missing character in bitmap font atlas." ) );
@ -798,7 +798,7 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
} }
// Draw tilda characters if there are any remaining // Draw tilda characters if there are any remaining
for( int i = 0; i < tildas / 2; ++i ) for( int jj = 0; jj < tildas / 2; ++jj )
overbarLength += drawBitmapChar( '~' ); overbarLength += drawBitmapChar( '~' );
tildas = 0; tildas = 0;

2
cvpcb/dialogs/fp_conflict_assignment_selector.cpp
View File

@ -127,7 +127,7 @@ void DIALOG_FP_CONFLICT_ASSIGNMENT_SELECTOR::OnItemClicked( wxMouseEvent& event
else else
{ {
minpx = maxpx; minpx = maxpx;
int maxpx = minpx + m_listFp->GetColumnWidth( 3 ); maxpx = minpx + m_listFp->GetColumnWidth( 3 );
if( pos.x > minpx && pos.x < maxpx ) if( pos.x > minpx && pos.x < maxpx )
{ {

14
pcbnew/board_items_to_polygon_shape_transform.cpp
View File

@ -758,9 +758,6 @@ void CreateThermalReliefPadPolygon( SHAPE_POLY_SET& aCornerBuffer,
// the pad position is NOT the shape position // the pad position is NOT the shape position
wxSize copper_thickness; wxSize copper_thickness;
int dx = aPad.GetSize().x / 2;
int dy = aPad.GetSize().y / 2;
double delta = 3600.0 / aCircleToSegmentsCount; // rot angle in 0.1 degree double delta = 3600.0 / aCircleToSegmentsCount; // rot angle in 0.1 degree
/* Keep in account the polygon outline thickness /* Keep in account the polygon outline thickness
@ -778,6 +775,9 @@ void CreateThermalReliefPadPolygon( SHAPE_POLY_SET& aCornerBuffer,
if( aCopperThickness < 0 ) if( aCopperThickness < 0 )
aCopperThickness = 0; aCopperThickness = 0;
int dx = aPad.GetSize().x / 2;
int dy = aPad.GetSize().y / 2;
copper_thickness.x = std::min( dx, aCopperThickness ); copper_thickness.x = std::min( dx, aCopperThickness );
copper_thickness.y = std::min( dy, aCopperThickness ); copper_thickness.y = std::min( dy, aCopperThickness );
@ -870,8 +870,8 @@ void CreateThermalReliefPadPolygon( SHAPE_POLY_SET& aCornerBuffer,
// Oval pad support along the lines of round and rectangular pads // Oval pad support along the lines of round and rectangular pads
std::vector <wxPoint> corners_buffer; // Polygon buffer as vector std::vector <wxPoint> corners_buffer; // Polygon buffer as vector
int dx = (aPad.GetSize().x / 2) + aThermalGap; // Cutout radius x dx = (aPad.GetSize().x / 2) + aThermalGap; // Cutout radius x
int dy = (aPad.GetSize().y / 2) + aThermalGap; // Cutout radius y dy = (aPad.GetSize().y / 2) + aThermalGap; // Cutout radius y
wxPoint shape_offset; wxPoint shape_offset;
@ -1023,8 +1023,8 @@ void CreateThermalReliefPadPolygon( SHAPE_POLY_SET& aCornerBuffer,
std::vector <wxPoint> corners_buffer; // Polygon buffer as vector std::vector <wxPoint> corners_buffer; // Polygon buffer as vector
int dx = (aPad.GetSize().x / 2) + aThermalGap; // Cutout radius x dx = (aPad.GetSize().x / 2) + aThermalGap; // Cutout radius x
int dy = (aPad.GetSize().y / 2) + aThermalGap; // Cutout radius y dy = (aPad.GetSize().y / 2) + aThermalGap; // Cutout radius y
// The first point of polygon buffer is left lower corner, second the crosspoint of // The first point of polygon buffer is left lower corner, second the crosspoint of
// thermal spoke sides, the third is upper right corner and the rest are rounding // thermal spoke sides, the third is upper right corner and the rest are rounding

4
pcbnew/dialogs/wizard_add_fplib.cpp
View File

@ -658,9 +658,9 @@ bool WIZARD_FPLIB_TABLE::downloadGithubLibsFromList( wxArrayString& aUrlList,
for( unsigned i = 0; i < footprints.size(); ++i ) for( unsigned i = 0; i < footprints.size(); ++i )
{ {
std::auto_ptr<MODULE> m( src->FootprintLoad( libsrc_name, footprints[i] ) ); std::unique_ptr<MODULE> m( src->FootprintLoad( libsrc_name, footprints[i] ) );
dst->FootprintSave( libdst_name, m.get() ); dst->FootprintSave( libdst_name, m.get() );
// m is deleted here by auto_ptr. // m is deleted here by unique_ptr.
} }
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )

18
pcbnew/eagle_plugin.cpp
View File

@ -149,11 +149,11 @@ public:
/// return the contents of the XPATH as a single string /// return the contents of the XPATH as a single string
string Contents() string Contents()
{ {
typedef std::vector<TRIPLET>::const_iterator CITER; typedef std::vector<TRIPLET>::const_iterator CITER_TRIPLET;
string ret; string ret;
for( CITER it = p.begin(); it != p.end(); ++it ) for( CITER_TRIPLET it = p.begin(); it != p.end(); ++it )
{ {
if( it != p.begin() ) if( it != p.begin() )
ret += '.'; ret += '.';
@ -1191,8 +1191,8 @@ BOARD* EAGLE_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, const
if( !aAppendToMe ) if( !aAppendToMe )
m_board->SetFileName( aFileName ); m_board->SetFileName( aFileName );
// delete on exception, iff I own m_board, according to aAppendToMe // delete on exception, if I own m_board, according to aAppendToMe
auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board ); unique_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board );
try try
{ {
@ -1806,9 +1806,9 @@ void EAGLE_PLUGIN::loadElements( CPTREE& aElements )
m_xpath->Value( e.name.c_str() ); m_xpath->Value( e.name.c_str() );
string key = makeKey( e.library, e.package ); string pkg_key = makeKey( e.library, e.package );
MODULE_CITER mi = m_templates.find( key ); MODULE_CITER mi = m_templates.find( pkg_key );
if( mi == m_templates.end() ) if( mi == m_templates.end() )
{ {
@ -1832,9 +1832,9 @@ void EAGLE_PLUGIN::loadElements( CPTREE& aElements )
// update the nets within the pads of the clone // update the nets within the pads of the clone
for( D_PAD* pad = m->Pads(); pad; pad = pad->Next() ) for( D_PAD* pad = m->Pads(); pad; pad = pad->Next() )
{ {
string key = makeKey( e.name, TO_UTF8( pad->GetPadName() ) ); string pn_key = makeKey( e.name, TO_UTF8( pad->GetPadName() ) );
NET_MAP_CITER ni = m_pads_to_nets.find( key ); NET_MAP_CITER ni = m_pads_to_nets.find( pn_key );
if( ni != m_pads_to_nets.end() ) if( ni != m_pads_to_nets.end() )
{ {
const ENET* enet = &ni->second; const ENET* enet = &ni->second;
@ -2124,7 +2124,7 @@ void EAGLE_PLUGIN::orientModuleText( MODULE* m, const EELEMENT& e,
MODULE* EAGLE_PLUGIN::makeModule( CPTREE& aPackage, const string& aPkgName ) const MODULE* EAGLE_PLUGIN::makeModule( CPTREE& aPackage, const string& aPkgName ) const
{ {
std::auto_ptr<MODULE> m( new MODULE( m_board ) ); std::unique_ptr<MODULE> m( new MODULE( m_board ) );
m->SetFPID( FPID( aPkgName ) ); m->SetFPID( FPID( aPkgName ) );

4
pcbnew/gpcb_plugin.cpp
View File

@ -140,7 +140,7 @@ class GPCB_FPL_CACHE_ITEM
wxFileName m_file_name; ///< The the full file name and path of the footprint to cache. wxFileName m_file_name; ///< The the full file name and path of the footprint to cache.
bool m_writable; ///< Writability status of the footprint file. bool m_writable; ///< Writability status of the footprint file.
wxDateTime m_mod_time; ///< The last file modified time stamp. wxDateTime m_mod_time; ///< The last file modified time stamp.
std::auto_ptr<MODULE> m_module; std::unique_ptr<MODULE> m_module;
public: public:
GPCB_FPL_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName ); GPCB_FPL_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName );
@ -412,7 +412,7 @@ MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR,
wxPoint textPos; wxPoint textPos;
wxString msg; wxString msg;
wxArrayString parameters; wxArrayString parameters;
std::auto_ptr<MODULE> module( new MODULE( NULL ) ); std::unique_ptr<MODULE> module( new MODULE( NULL ) );
if( aLineReader->ReadLine() == NULL ) if( aLineReader->ReadLine() == NULL )

6
pcbnew/loadcmp.cpp
View File

@ -252,8 +252,6 @@ MODULE* PCB_BASE_FRAME::LoadModuleFromLibrary( const wxString& aLibrary,
} }
else else
{ {
FPID fpid;
wxCHECK_MSG( fpid.Parse( moduleName ) < 0, NULL, wxCHECK_MSG( fpid.Parse( moduleName ) < 0, NULL,
wxString::Format( wxT( "Could not parse FPID string '%s'." ), wxString::Format( wxT( "Could not parse FPID string '%s'." ),
GetChars( moduleName ) ) ); GetChars( moduleName ) ) );
@ -553,14 +551,14 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
for( unsigned i = 0; i < mods.size(); ++i ) for( unsigned i = 0; i < mods.size(); ++i )
{ {
std::auto_ptr<MODULE> m( cur->FootprintLoad( curLibPath, mods[i] ) ); std::unique_ptr<MODULE> m( cur->FootprintLoad( curLibPath, mods[i] ) );
dst->FootprintSave( dstLibPath, m.get() ); dst->FootprintSave( dstLibPath, m.get() );
msg = wxString::Format( _( "Footprint '%s' saved" ), msg = wxString::Format( _( "Footprint '%s' saved" ),
GetChars( mods[i] ) ); GetChars( mods[i] ) );
SetStatusText( msg ); SetStatusText( msg );
// m is deleted here by auto_ptr. // m is deleted here by unique_ptr.
} }
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )

2
pcbnew/netlist.cpp
View File

@ -75,7 +75,7 @@ void PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFileName,
try try
{ {
std::auto_ptr<NETLIST_READER> netlistReader( NETLIST_READER::GetNetlistReader( std::unique_ptr<NETLIST_READER> netlistReader( NETLIST_READER::GetNetlistReader(
&netlist, aNetlistFileName, aCmpFileName ) ); &netlist, aNetlistFileName, aCmpFileName ) );
if( !netlistReader.get() ) if( !netlistReader.get() )

4
pcbnew/netlist_reader.cpp
View File

@ -83,13 +83,13 @@ NETLIST_READER* NETLIST_READER::GetNetlistReader( NETLIST* aNetlist,
{ {
wxASSERT( aNetlist != NULL ); wxASSERT( aNetlist != NULL );
std::auto_ptr< FILE_LINE_READER > file_rdr(new FILE_LINE_READER( aNetlistFileName ) ); std::unique_ptr< FILE_LINE_READER > file_rdr(new FILE_LINE_READER( aNetlistFileName ) );
NETLIST_FILE_T type = GuessNetlistFileType( file_rdr.get() ); NETLIST_FILE_T type = GuessNetlistFileType( file_rdr.get() );
file_rdr->Rewind(); file_rdr->Rewind();
// The component footprint link reader is NULL if no file name was specified. // The component footprint link reader is NULL if no file name was specified.
std::auto_ptr<CMP_READER> cmp_rdr( aCompFootprintFileName.IsEmpty() ? std::unique_ptr<CMP_READER> cmp_rdr( aCompFootprintFileName.IsEmpty() ?
NULL : NULL :
new CMP_READER( new FILE_LINE_READER( aCompFootprintFileName ) ) ); new CMP_READER( new FILE_LINE_READER( aCompFootprintFileName ) ) );