MULTICHANNEL_TOOL: post-rebase fixes

pcbnew/connectivity/topo_match.cpp

@@ -32,6 +32,7 @@
 #include <set>
 #include <cctype>
 
+#include <pad.h>
 #include <footprint.h>
 #include <wx/string.h>
 #include <wx/log.h>

pcbnew/tools/multichannel_tool.cpp

@@ -356,11 +356,8 @@ int MULTICHANNEL_TOOL::RepeatLayout( const TOOL_EVENT& aEvent, ZONE* aRefZone )
             return -1;
         }
 
-
-        printf("rep-l grp %d affected %d\n", groupableItems.size(), affectedItems.size() );
         commit.Push( _( "Repeat layout" ) );
 
-
         if( m_areas.m_groupItems )
         {
             // fixme: sth gets weird when creating new zones & grouping them within a single COMMIT
@@ -625,7 +622,7 @@ bool MULTICHANNEL_TOOL::pruneExistingGroups( COMMIT& aCommit, const std::unorder
     for( PCB_GROUP* grp : board()->Groups() )
     {
         std::unordered_set<BOARD_ITEM*>& grpItems = grp->GetItems();
-        int n_erased = 0;
+        size_t n_erased = 0;
 
         for(  auto refItem : grpItems )
         {
@@ -646,7 +643,7 @@ bool MULTICHANNEL_TOOL::pruneExistingGroups( COMMIT& aCommit, const std::unorder
             aCommit.Stage( grp, CHT_REMOVE );
         }
 
-        printf("Grp %p items %d pruned %d air %d\n", grp,grpItems.size(), (int) n_erased, (int) aItemsToRemove.size() );
+        //printf("Grp %p items %d pruned %d air %d\n", grp,grpItems.size(), (int) n_erased, (int) aItemsToRemove.size() );
     }
 
     return false;

pcbnew/tools/multichannel_tool.h

@@ -134,6 +134,8 @@ private:
                                       const SHAPE_POLY_SET& aRAPoly, RULE_AREA* aRA, FOOTPRINT* aFp,
                                       const REPEAT_LAYOUT_OPTIONS& aOpts ) const;
 
+    bool pruneExistingGroups( COMMIT& aCommit, const std::unordered_set<BOARD_ITEM*>& aItemsToCheck );
+
     std::unique_ptr<REPORTER> m_reporter;
     RULE_AREAS_DATA           m_areas;
 };