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

fix bugs 1264240, 1264247, 1264239, 1264233 (clang report errors)

This commit is contained in:
jean-pierre charras 2013-12-29 16:12:27 +01:00
parent a455ab4a90
commit 612e2ddb4a
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/basicframe.cpp
View File

@ -221,7 +221,8 @@ void EDA_BASE_FRAME::LoadSettings()
// Once this is fully implemented, wxAuiManager will be used to maintain the persistance of
// the main frame and all it's managed windows and all of the legacy frame persistence
// position code can be removed.
config->Read( m_FrameName + entryPerspective, &m_perspective );
if( config )
config->Read( m_FrameName + entryPerspective, &m_perspective );
}

12
common/fp_lib_table.cpp
View File

@ -828,10 +828,14 @@ bool FP_LIB_TABLE::ConvertFromLegacy( NETLIST& aNetList, const wxArrayString& aL
if( !newFPID.IsValid() )
{
msg.Printf( _( "Component `%s` FPID <%s> is not valid.\n" ),
GetChars( component->GetReference() ),
GetChars( FROM_UTF8( newFPID.Format().c_str() ) ) );
aReporter->Report( msg );
if( aReporter )
{
msg.Printf( _( "Component `%s` FPID <%s> is not valid.\n" ),
GetChars( component->GetReference() ),
GetChars( FROM_UTF8( newFPID.Format().c_str() ) ) );
aReporter->Report( msg );
}
retv = false;
}
else

8
eeschema/schematic_undo_redo.cpp
View File

@ -269,19 +269,15 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
for( int ii = aList->GetCount() - 1; ii >= 0; ii-- )
{
item = (SCH_ITEM*) aList->GetPickedItem( ii );
wxAssert( item );
if( item )
item->ClearFlags();
item->ClearFlags();
SCH_ITEM* image = (SCH_ITEM*) aList->GetPickedItemLink( ii );
switch( aList->GetPickedItemStatus( ii ) )
{
case UR_CHANGED: /* Exchange old and new data for each item */
// tmp = item->Clone();
// *item = *image;
// *image = *tmp;
// delete tmp;
item->SwapData( image );
break;

3
pcbnew/drc.cpp
View File

@ -224,7 +224,8 @@ void DRC::RunTests( wxTextCtrl* aMessages )
wxSafeYield();
}
m_mainWindow->Fill_All_Zones( aMessages->GetParent(), false );
m_mainWindow->Fill_All_Zones( aMessages ? aMessages->GetParent() : m_mainWindow,
false );
// test zone clearances to other zones
if( aMessages )