Cleanup includes in board.h and footprint.h

pcbnew/board.cpp

@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <drc/drc_rtree.h>
 #include <pcb_base_frame.h>
 #include <reporter.h>
 #include <board_commit.h>
@@ -186,6 +187,21 @@ void BOARD::ClearProject()
 }
 
 
+void BOARD::IncrementTimeStamp()
+{
+    m_timeStamp++;
+
+    {
+        std::unique_lock<std::mutex> cacheLock( m_CachesMutex );
+        m_InsideAreaCache.clear();
+        m_InsideCourtyardCache.clear();
+        m_InsideFCourtyardCache.clear();
+        m_InsideBCourtyardCache.clear();
+    }
+
+    m_CopperZoneRTrees.clear();
+}
+
 std::vector<PCB_MARKER*> BOARD::ResolveDRCExclusions()
 {
     for( PCB_MARKER* marker : GetBoard()->Markers() )
@@ -813,6 +829,15 @@ void BOARD::DeleteMARKERs( bool aWarningsAndErrors, bool aExclusions )
 }
 
 
+void BOARD::DeleteAllFootprints()
+{
+    for( FOOTPRINT* footprint : m_footprints )
+        delete footprint;
+
+    m_footprints.clear();
+}
+
+
 BOARD_ITEM* BOARD::GetItem( const KIID& aID ) const
 {
     if( aID == niluuid )

pcbnew/board.h

@@ -27,20 +27,22 @@
 
 #include <board_design_settings.h>
 #include <board_item_container.h>
-#include <footprint.h>
 #include <common.h> // Needed for stl hash extensions
+#include <convert_drawsegment_list_to_polygon.h> // for OUTLINE_ERROR_HANDLER
 #include <layers_id_colors_and_visibility.h>
 #include <netinfo.h>
+#include <pcb_item_containers.h>
 #include <pcb_plot_params.h>
 #include <title_block.h>
 #include <tools/pcb_selection.h>
-#include <drc/drc_rtree.h>
 
 class BOARD_COMMIT;
+class DRC_RTREE;
 class PCB_BASE_FRAME;
 class PCB_EDIT_FRAME;
 class PICKED_ITEMS_LIST;
 class BOARD;
+class FOOTPRINT;
 class ZONE;
 class TRACK;
 class PAD;
@@ -168,12 +170,6 @@ public:
 };
 
 
-DECL_VEC_FOR_SWIG( MARKERS, PCB_MARKER* )
-DECL_VEC_FOR_SWIG( ZONES, ZONE* )
-DECL_DEQ_FOR_SWIG( TRACKS, TRACK* )
-// Dequeue rather than Vector just so we can use moveUnflaggedItems in pcbnew_control.cpp
-DECL_DEQ_FOR_SWIG( GROUPS, PCB_GROUP* )
-
 /**
  * Flags to specify how the board is being used.
  */
@@ -268,20 +264,7 @@ public:
      */
     BOARD_USE GetBoardUse() const { return m_boardUse; }
 
-    void IncrementTimeStamp()
-    {
-        m_timeStamp++;
-
-        {
-            std::unique_lock<std::mutex> cacheLock( m_CachesMutex );
-            m_InsideAreaCache.clear();
-            m_InsideCourtyardCache.clear();
-            m_InsideFCourtyardCache.clear();
-            m_InsideBCourtyardCache.clear();
-        }
-
-        m_CopperZoneRTrees.clear();
-    }
+    void IncrementTimeStamp();
 
     int GetTimeStamp() { return m_timeStamp; }
 
@@ -387,13 +370,7 @@ public:
     /**
      * Removes all footprints from the deque and frees the memory associated with them
      */
-    void DeleteAllFootprints()
-    {
-        for( FOOTPRINT* footprint : m_footprints )
-            delete footprint;
-
-        m_footprints.clear();
-    }
+    void DeleteAllFootprints();
 
     /**
      * @return null if aID is null. Returns an object of Type() == NOT_USED if

pcbnew/cross-probing.cpp

@@ -34,6 +34,7 @@
 #include <board.h>
 #include <footprint.h>
 #include <track.h>
+#include <zone.h>
 #include <collectors.h>
 #include <eda_dde.h>
 #include <kiface_i.h>

pcbnew/dialogs/dialog_board_statistics.h

@@ -29,6 +29,7 @@
 
 #include <base_units.h>
 #include <board.h>
+#include <footprint.h>
 #include <track.h>
 #include <confirm.h>
 #include <dialog_board_statistics_base.h>

pcbnew/dialogs/dialog_cleanup_graphics.cpp

@@ -23,6 +23,7 @@
 
 #include <dialog_cleanup_graphics.h>
 #include <board_commit.h>
+#include <footprint.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <graphics_cleaner.h>

pcbnew/dialogs/dialog_find.cpp

@@ -28,6 +28,7 @@
 #include <footprint.h>
 #include <pcb_text.h>
 #include <fp_text.h>
+#include <zone.h>
 #include <dialog_find.h>
 #include <kicad_string.h>
 #include <pcb_edit_frame.h>

pcbnew/dialogs/dialog_footprint_checker.cpp

@@ -25,6 +25,7 @@
 #include <widgets/appearance_controls.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
+#include <footprint.h>
 #include <pcb_marker.h>
 #include <drc/drc_results_provider.h>
 #include <footprint_edit_frame.h>

pcbnew/dialogs/dialog_track_via_properties.cpp

@@ -27,6 +27,7 @@
 #include <dialogs/dialog_track_via_properties.h>
 #include <pcb_layer_box_selector.h>
 #include <tools/pcb_selection_tool.h>
+#include <footprint.h>
 #include <track.h>
 #include <pcb_edit_frame.h>
 #include <confirm.h>

pcbnew/dialogs/dialog_unused_pad_layers.cpp

@@ -26,6 +26,7 @@
 
 #include <bitmaps.h>
 #include <board_commit.h>
+#include <footprint.h>
 #include <track.h>
 #include <pad.h>
 #include <pcb_edit_frame.h>

pcbnew/drc/drc_engine.cpp

@@ -27,12 +27,14 @@
 #include <widgets/progress_reporter.h>
 #include <kicad_string.h>
 #include <drc/drc_engine.h>
+#include <drc/drc_rtree.h>
 #include <drc/drc_rule_parser.h>
 #include <drc/drc_rule.h>
 #include <drc/drc_rule_condition.h>
 #include <drc/drc_test_provider.h>
-#include <track.h>
 #include <footprint.h>
+#include <track.h>
+#include <zone.h>
 #include <geometry/shape.h>
 #include <geometry/shape_segment.h>
 #include <geometry/shape_null.h>

pcbnew/drc/drc_rtree.h

@@ -27,7 +27,9 @@
 
 #include <eda_rect.h>
 #include <board_item.h>
+#include <fp_text.h>
 #include <track.h>
+#include <memory>
 #include <unordered_set>
 #include <set>
 #include <vector>

pcbnew/drc/drc_test_provider_copper_clearance.cpp

@@ -23,9 +23,11 @@
 
 #include <common.h>
 #include <board.h>
+#include <footprint.h>
 #include <pcb_shape.h>
 #include <pad.h>
 #include <track.h>
+#include <zone.h>
 
 #include <geometry/seg.h>
 #include <geometry/shape_poly_set.h>

pcbnew/drc/drc_test_provider_courtyard_clearance.cpp

@@ -25,6 +25,7 @@
 #include <drc/drc_item.h>
 #include <drc/drc_rule.h>
 #include <drc/drc_test_provider_clearance_base.h>
+#include <footprint.h>
 
 /*
     Couartyard clearance. Tests for malformed component courtyards and overlapping footprints.
@@ -277,4 +278,4 @@ std::set<DRC_CONSTRAINT_T> DRC_TEST_PROVIDER_COURTYARD_CLEARANCE::GetConstraintT
 namespace detail
 {
     static DRC_REGISTER_TEST_PROVIDER<DRC_TEST_PROVIDER_COURTYARD_CLEARANCE> dummy;
-}
+}

pcbnew/drc/drc_test_provider_diff_pair_coupling.cpp

@@ -34,6 +34,7 @@
 #include <connectivity/connectivity_data.h>
 #include <connectivity/from_to_cache.h>
 
+#include <view/view_overlay.h>
 
 /*
     Differential pair gap/coupling test.

pcbnew/drc/drc_test_provider_disallow.cpp

@@ -26,6 +26,7 @@
 #include <drc/drc_item.h>
 #include <drc/drc_rule.h>
 #include <drc/drc_test_provider.h>
+#include <zone.h>
 
 /*
     "Disallow" test. Goes through all items, matching types/conditions drop errors.

pcbnew/drc/drc_test_provider_hole_size.cpp

@@ -21,6 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <footprint.h>
 #include <pad.h>
 #include <track.h>
 #include <drc/drc_item.h>

pcbnew/drc/drc_test_provider_hole_to_hole.cpp

@@ -22,6 +22,7 @@
  */
 
 #include <common.h>
+#include <footprint.h>
 #include <pad.h>
 #include <track.h>
 #include <geometry/shape_segment.h>

pcbnew/drc/drc_test_provider_silk_clearance.cpp

@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <board.h>
+#include <footprint.h>
 #include <pcb_shape.h>
 
 #include <geometry/seg.h>

pcbnew/exporters/gendrill_gerber_writer.cpp

@@ -36,6 +36,7 @@
 #include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <board.h>
+#include <footprint.h>
 #include <track.h>
 #include <pcbplot.h>
 #include <gendrill_gerber_writer.h>

pcbnew/footprint.cpp

@@ -37,7 +37,9 @@
 #include <pcb_text.h>
 #include <pcb_marker.h>
 #include <pcb_group.h>
+#include <track.h>
 #include <footprint.h>
+#include <zone.h>
 #include <view/view.h>
 #include <geometry/shape_null.h>
 #include <i18n_utility.h>

pcbnew/footprint.h

@@ -37,8 +37,8 @@
 
 #include <zones.h>
 #include <convert_drawsegment_list_to_polygon.h>
+#include <pcb_item_containers.h>
 #include <fp_text.h>
-#include <zone.h>
 #include <functional>
 
 class LINE_READER;
@@ -98,11 +98,6 @@ public:
     bool     m_Show;        ///< Include model in rendering
 };
 
-DECL_DEQ_FOR_SWIG( PADS, PAD* )
-DECL_DEQ_FOR_SWIG( DRAWINGS, BOARD_ITEM* )
-DECL_VEC_FOR_SWIG( FP_ZONES, FP_ZONE* )
-DECL_VEC_FOR_SWIG( FP_GROUPS, PCB_GROUP* )
-DECL_DEQ_FOR_SWIG( FOOTPRINTS, FOOTPRINT* )
 
 class FOOTPRINT : public BOARD_ITEM_CONTAINER
 {

pcbnew/kicad_clipboard.cpp

@@ -32,6 +32,7 @@
 #include <pcb_shape.h>
 #include <pcb_text.h>
 #include <fp_text.h>
+#include <zone.h>
 #include <locale_io.h>
 #include <netinfo.h>
 #include <plugins/kicad/pcb_parser.h>

pcbnew/netinfo_item.cpp

@@ -32,7 +32,9 @@
 #include <widgets/msgpanel.h>
 #include <base_units.h>
 #include <board.h>
+#include <footprint.h>
 #include <track.h>
+#include <pad.h>
 
 
 /*********************************************************/

pcbnew/pcb_base_edit_frame.cpp

@@ -40,6 +40,7 @@
 #include <dialogs/dialog_grid_settings.h>
 #include <dialogs/eda_view_switcher.h>
 #include <wildcards_and_files_ext.h>
+#include <collectors.h>
 
 
 PCB_BASE_EDIT_FRAME::PCB_BASE_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,

pcbnew/pcb_expr_evaluator.cpp

@@ -25,6 +25,7 @@
 #include <cstdio>
 #include <memory>
 #include <board.h>
+#include <drc/drc_rtree.h>
 #include <track.h>
 #include <pcb_group.h>
 #include <geometry/shape_segment.h>