From 0997205ffb11b5e89937f9df6aa7a0b01b048fdf Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Wed, 25 Jun 2025 21:25:45 -0400 Subject: [PATCH] Minor code style fixes --- pcbnew/api/api_handler_pcb.cpp | 1 + pcbnew/pcb_group.cpp | 12 ++++-------- pcbnew/pcb_group.h | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pcbnew/api/api_handler_pcb.cpp b/pcbnew/api/api_handler_pcb.cpp index 29be3a273a..a74231ccad 100644 --- a/pcbnew/api/api_handler_pcb.cpp +++ b/pcbnew/api/api_handler_pcb.cpp @@ -672,6 +672,7 @@ HANDLER_RESULT API_HANDLER_PCB::handleGetItemsById( GetItemsResponse response; std::vector items; + for( const kiapi::common::types::KIID& id : aCtx.Request.items() ) { if( std::optional item = getItemById( KIID( id.value() ) ) ) diff --git a/pcbnew/pcb_group.cpp b/pcbnew/pcb_group.cpp index b511f3de52..0b4fb7e13c 100644 --- a/pcbnew/pcb_group.cpp +++ b/pcbnew/pcb_group.cpp @@ -79,21 +79,17 @@ bool PCB_GROUP::Deserialize( const google::protobuf::Any &aContainer ) const_cast( m_Uuid ) = KIID( group.id().value() ); SetName( wxString( group.name().c_str(), wxConvUTF8 ) ); - BOARD* board = GetBoard(); + if( !board ) return false; - for ( const kiapi::common::types::KIID& itemId : group.items() ) + for( const kiapi::common::types::KIID& itemId : group.items() ) { + KIID id( itemId.value() ); - KIID id( itemId.value() ); - BOARD_ITEM* item = board->ResolveItem( id, true ); - - if( item ) - { + if( BOARD_ITEM* item = board->ResolveItem( id, true ) ) AddItem( item ); - } } return true; diff --git a/pcbnew/pcb_group.h b/pcbnew/pcb_group.h index 8c8f0247bf..21531a0401 100644 --- a/pcbnew/pcb_group.h +++ b/pcbnew/pcb_group.h @@ -57,7 +57,6 @@ public: void Serialize( google::protobuf::Any &aContainer ) const override; bool Deserialize( const google::protobuf::Any &aContainer ) override; - EDA_ITEM* AsEdaItem() override { return this; } static inline bool ClassOf( const EDA_ITEM* aItem )