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

Avoid using a nullptr.

This commit is contained in:
jean-pierre charras 2024-03-20 18:34:18 +01:00
parent 66d8f5cae4
commit 90eed8b4b6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/router/pns_kicad_iface.cpp
View File

@ -1891,8 +1891,11 @@ void PNS_KICAD_IFACE_BASE::AddItem( PNS::ITEM* aItem )
BOARD_CONNECTED_ITEM* PNS_KICAD_IFACE::createBoardItem( PNS::ITEM* aItem )
{
BOARD_CONNECTED_ITEM* newBI = nullptr;
auto net = static_cast<NETINFO_ITEM*>( aItem->Net() );
BOARD_CONNECTED_ITEM* newBoardItem = nullptr;
NETINFO_ITEM* net = static_cast<NETINFO_ITEM*>( aItem->Net() );
if( !net )
net = NETINFO_LIST::OrphanedItem();
switch( aItem->Kind() )
{
@ -1903,7 +1906,7 @@ BOARD_CONNECTED_ITEM* PNS_KICAD_IFACE::createBoardItem( PNS::ITEM* aItem )
new_arc->SetWidth( arc->Width() );
new_arc->SetLayer( ToLAYER_ID( arc->Layers().Start() ) );
new_arc->SetNet( net );
newBI = new_arc;
newBoardItem = new_arc;
break;
}
@ -1917,7 +1920,7 @@ BOARD_CONNECTED_ITEM* PNS_KICAD_IFACE::createBoardItem( PNS::ITEM* aItem )
track->SetWidth( seg->Width() );
track->SetLayer( ToLAYER_ID( seg->Layers().Start() ) );
track->SetNet( net );
newBI = track;
newBoardItem = track;
break;
}
@ -1933,7 +1936,7 @@ BOARD_CONNECTED_ITEM* PNS_KICAD_IFACE::createBoardItem( PNS::ITEM* aItem )
via_board->SetIsFree( via->IsFree() );
via_board->SetLayerPair( ToLAYER_ID( via->Layers().Start() ),
ToLAYER_ID( via->Layers().End() ) );
newBI = via_board;
newBoardItem = via_board;
break;
}
@ -1952,12 +1955,13 @@ BOARD_CONNECTED_ITEM* PNS_KICAD_IFACE::createBoardItem( PNS::ITEM* aItem )
if( net->GetNetCode() <= 0 )
{
NETINFO_ITEM* newNetInfo = newBI->GetNet();
NETINFO_ITEM* newNetInfo = newBoardItem->GetNet();
newNetInfo->SetParent( m_board );
newNetInfo->SetNetClass( m_board->GetDesignSettings().m_NetSettings->m_DefaultNetClass );
}
return newBI;
return newBoardItem;
}