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

Fixed compilation warnings

This commit is contained in:
Tomasz Włostowski 2017-06-23 11:36:05 +02:00
parent 5c0edbabab
commit 113163257d
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcbnew/board_netlist_updater.cpp
View File

@ -51,7 +51,6 @@
BOARD_NETLIST_UPDATER::BOARD_NETLIST_UPDATER( PCB_EDIT_FRAME* aFrame, BOARD* aBoard ) : BOARD_NETLIST_UPDATER::BOARD_NETLIST_UPDATER( PCB_EDIT_FRAME* aFrame, BOARD* aBoard ) :
m_commit( aFrame ), m_commit( aFrame ),
m_frame( aFrame ),
m_board( aBoard ) m_board( aBoard )
{ {
m_reporter = &NULL_REPORTER::GetInstance(); m_reporter = &NULL_REPORTER::GetInstance();

1
pcbnew/board_netlist_updater.h
View File

@ -139,7 +139,6 @@ private:
bool testConnectivity( NETLIST& aNetlist ); bool testConnectivity( NETLIST& aNetlist );
BOARD_COMMIT m_commit; BOARD_COMMIT m_commit;
PCB_EDIT_FRAME* m_frame;
BOARD* m_board; BOARD* m_board;
REPORTER* m_reporter; REPORTER* m_reporter;

10
pcbnew/dialogs/dialog_global_deletion.cpp
View File

@ -160,16 +160,16 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete()
masque_layer &= layers_filter; masque_layer &= layers_filter;
for( auto item : pcb->Drawings() ) for( auto dwg : pcb->Drawings() )
{ {
KICAD_T type = item->Type(); KICAD_T type = dwg->Type();
LAYER_NUM layer = item->GetLayer(); LAYER_NUM layer = dwg->GetLayer();
if( delAll if( delAll
|| ( type == PCB_LINE_T && delDrawings && masque_layer[layer] ) || ( type == PCB_LINE_T && delDrawings && masque_layer[layer] )
|| ( type == PCB_TEXT_T && delTexts && del_text_layers[layer] ) ) || ( type == PCB_TEXT_T && delTexts && del_text_layers[layer] ) )
{ {
commit.Remove( item ); commit.Remove( dwg );
} }
} }
} }
@ -238,6 +238,6 @@ void DIALOG_GLOBAL_DELETION::AcceptPcbDelete()
if( gen_rastnest ) if( gen_rastnest )
m_Parent->Compile_Ratsnest( NULL, true ); m_Parent->Compile_Ratsnest( NULL, true );
// There is a chance that some of tracks have changed their nets, so rebuild ratsnest from scratch // There is a chance that some of tracks have changed their nets, so rebuild ratsnest from scratch
m_Parent->GetCanvas()->Refresh(); m_Parent->GetCanvas()->Refresh();
} }

2
pcbnew/tools/drawing_tool.cpp
View File

@ -1413,8 +1413,6 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
} }
} }
printf( "Found zones : %d\n", foundZones.size() );
std::sort( foundZones.begin(), foundZones.end(), std::sort( foundZones.begin(), foundZones.end(),
[] ( const ZONE_CONTAINER* a, const ZONE_CONTAINER* b ) { [] ( const ZONE_CONTAINER* a, const ZONE_CONTAINER* b ) {
return a->GetLayer() < b->GetLayer(); return a->GetLayer() < b->GetLayer();

4
pcbnew/tools/pcb_tool.cpp
View File

@ -149,10 +149,10 @@ void PCB_TOOL::doInteractiveItemPlacement( INTERACTIVE_PLACER_BASE *aPlacer,
if ( aOptions & IPO_SINGLE_CLICK ) if ( aOptions & IPO_SINGLE_CLICK )
{ {
VECTOR2I cursorPos = controls()->GetCursorPosition(); VECTOR2I pos = controls()->GetCursorPosition();
newItem = aPlacer->CreateItem(); newItem = aPlacer->CreateItem();
newItem->SetPosition( wxPoint( cursorPos.x, cursorPos.y ) ); newItem->SetPosition( wxPoint( pos.x, pos.y ) );
preview.Add( newItem.get() ); preview.Add( newItem.get() );
} }