From 94a23971cc105ec10e1fa0448fc5bbd0d47c0355 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 21 Jun 2023 16:51:24 +0100 Subject: [PATCH] Performance improvements. --- pcbnew/pcb_expr_functions.cpp | 14 +++++++------- pcbnew/zone.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pcbnew/pcb_expr_functions.cpp b/pcbnew/pcb_expr_functions.cpp index 4f2fb29b9c..1053835360 100644 --- a/pcbnew/pcb_expr_functions.cpp +++ b/pcbnew/pcb_expr_functions.cpp @@ -208,32 +208,32 @@ bool collidesWithCourtyard( BOARD_ITEM* aItem, std::shared_ptr& aItemShap static bool searchFootprints( BOARD* aBoard, const wxString& aArg, PCB_EXPR_CONTEXT* aCtx, - std::function aFunc ) + const std::function& aFunc ) { if( aArg == wxT( "A" ) ) { FOOTPRINT* fp = dynamic_cast( aCtx->GetItem( 0 ) ); if( fp && aFunc( fp ) ) - return 1.0; + return true; } else if( aArg == wxT( "B" ) ) { FOOTPRINT* fp = dynamic_cast( aCtx->GetItem( 1 ) ); if( fp && aFunc( fp ) ) - return 1.0; + return true; } else for( FOOTPRINT* fp : aBoard->Footprints() ) { if( fp->GetReference().Matches( aArg ) ) { if( aFunc( fp ) ) - return 1.0; + return true; } } - return 0.0; + return false; } @@ -522,7 +522,7 @@ bool collidesWithArea( BOARD_ITEM* aItem, PCB_EXPR_CONTEXT* aCtx, ZONE* aArea ) bool searchAreas( BOARD* aBoard, const wxString& aArg, PCB_EXPR_CONTEXT* aCtx, - std::function aFunc ) + const std::function& aFunc ) { if( aArg == wxT( "A" ) ) { @@ -555,7 +555,7 @@ bool searchAreas( BOARD* aBoard, const wxString& aArg, PCB_EXPR_CONTEXT* aCtx, } } - return 0.0; + return false; } else // Match on zone name { diff --git a/pcbnew/zone.h b/pcbnew/zone.h index b8ec71f8cd..6f9a5618ed 100644 --- a/pcbnew/zone.h +++ b/pcbnew/zone.h @@ -128,7 +128,7 @@ public: void SetLayerSet( LSET aLayerSet ) override; virtual LSET GetLayerSet() const override { return m_layerSet; } - wxString GetZoneName() const { return m_zoneName; } + const wxString& GetZoneName() const { return m_zoneName; } void SetZoneName( const wxString& aName ) { m_zoneName = aName; } bool Matches( const EDA_SEARCH_DATA& aSearchData, void* aAuxData ) const override