Commit 612e2ddb authored by jean-pierre charras's avatar jean-pierre charras
Browse files

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

parent a455ab4a

common/basicframe.cpp

+2 −1
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ 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.

    if( config )

        config->Read( m_FrameName + entryPerspective, &m_perspective );

}

common/fp_lib_table.cpp

+8 −4
Original line number Diff line number Diff line
@@ -827,11 +827,15 @@ bool FP_LIB_TABLE::ConvertFromLegacy( NETLIST& aNetList, const wxArrayString& aL 
                newFPID.SetLibNickname( libNickname );



                if( !newFPID.IsValid() )

                {

                    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

eeschema/schematic_undo_redo.cpp

+2 −6
Original line number Diff line number Diff line
@@ -269,8 +269,8 @@ 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();



        SCH_ITEM* image = (SCH_ITEM*) aList->GetPickedItemLink( ii );
@@ -278,10 +278,6 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed 
        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;

pcbnew/drc.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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 )