From 26c14271f29e5e6a1d2734470897ce42b50d09ef Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 16 Apr 2023 14:36:34 +0100 Subject: [PATCH] Formatting and warnings cleanup. (No functional changes.) --- pcbnew/pcb_draw_panel_gal.cpp | 6 +++--- pcbnew/pcb_draw_panel_gal.h | 12 +++++------- pcbnew/ratsnest/ratsnest_view_item.cpp | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp index 820b12f743..9f1dadff91 100644 --- a/pcbnew/pcb_draw_panel_gal.cpp +++ b/pcbnew/pcb_draw_panel_gal.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2014-2017 CERN - * Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2021-2023 KiCad Developers, see AUTHORS.txt for contributors. * @author Maciej Suminski * * This program is free software; you can redistribute it and/or @@ -352,7 +352,7 @@ void PCB_DRAW_PANEL_GAL::SetHighContrastLayer( PCB_LAYER_ID aLayer ) LAYER_RATSNEST, LAYER_CURSOR, LAYER_ANCHOR, LAYER_LOCKED_ITEM_SHADOW }; - for( unsigned int i : layers ) + for( int i : layers ) rSettings->SetLayerIsHighContrast( i ); // Pads should be shown too @@ -500,7 +500,7 @@ void PCB_DRAW_PANEL_GAL::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, int viaCount = 0; int trackSegmentCount = 0; std::set netCodes; - int unconnected = board->GetConnectivity()->GetUnconnectedCount( true ); + int unconnected = (int) board->GetConnectivity()->GetUnconnectedCount( true ); for( PCB_TRACK* item : board->Tracks() ) { diff --git a/pcbnew/pcb_draw_panel_gal.h b/pcbnew/pcb_draw_panel_gal.h index 6a879bbed8..6814f3a501 100644 --- a/pcbnew/pcb_draw_panel_gal.h +++ b/pcbnew/pcb_draw_panel_gal.h @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2014 CERN - * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2021-2023 KiCad Developers, see AUTHORS.txt for contributors. * * @author Maciej Suminski * @@ -55,7 +55,7 @@ public: * Sets (or updates) drawing-sheet used by the draw panel. * * @param aDrawingSheet is the drawing-sheet to be used. The object is then owned by - * #PCB_DRAW_PANEL_GAL. + * #PCB_DRAW_PANEL_GAL. */ void SetDrawingSheet( DS_PROXY_VIEW_ITEM* aDrawingSheet ); @@ -115,11 +115,9 @@ protected: ///< Set rendering targets & dependencies for layers. void setDefaultLayerDeps(); - ///< Currently used drawing-sheet. - std::unique_ptr m_drawingSheet; - - ///< Ratsnest view item - std::unique_ptr m_ratsnest; +protected: + std::unique_ptr m_drawingSheet; ///< Currently used drawing-sheet. + std::unique_ptr m_ratsnest; ///< Ratsnest view item }; #endif /* PCB_DRAW_PANEL_GAL_H_ */ diff --git a/pcbnew/ratsnest/ratsnest_view_item.cpp b/pcbnew/ratsnest/ratsnest_view_item.cpp index ee4f5e7238..4472abd901 100644 --- a/pcbnew/ratsnest/ratsnest_view_item.cpp +++ b/pcbnew/ratsnest/ratsnest_view_item.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KICAD, a free EDA CAD application. * * Copyright (C) 2013 CERN - * Copyright (C) 2018-2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2018-2023 KiCad Developers, see AUTHORS.txt for contributors. * * @author Maciej Suminski * @@ -43,7 +43,8 @@ RATSNEST_VIEW_ITEM::RATSNEST_VIEW_ITEM( std::shared_ptr aData ) : - EDA_ITEM( NOT_USED ), m_data( std::move(aData) ) + EDA_ITEM( NOT_USED ), + m_data( std::move( aData ) ) { }