Pcbnew: regroup drc files to the already existing drc folder.

common/CMakeLists.txt

@@ -443,7 +443,7 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/connectivity/connectivity_items.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/connectivity/connectivity_data.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/convert_drawsegment_list_to_polygon.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/drc_item.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_item.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/eagle_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/gpcb_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/io_mgr.cpp

pcbnew/CMakeLists.txt

@@ -226,6 +226,8 @@ set( PCBNEW_MICROWAVE_SRCS
 
 set( PCBNEW_DRC_SRCS
     drc/courtyard_overlap.cpp
+    drc/drc.cpp
+    drc/drc_clearance_test_functions.cpp
     drc/drc_marker_factory.cpp
     drc/drc_provider.cpp
     )
@@ -254,8 +256,6 @@ set( PCBNEW_CLASS_SRCS
     array_pad_name_provider.cpp
     build_BOM_from_board.cpp
     cross-probing.cpp
-    tools/drc.cpp
-    tools/drc_clearance_test_functions.cpp
     edit.cpp
     edit_track_width.cpp
     files.cpp

pcbnew/dialogs/dialog_cleanup_tracks_and_vias.h

@@ -27,7 +27,7 @@
 
 #include <dialog_cleanup_tracks_and_vias_base.h>
 
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <wx/config.h>
 
 

pcbnew/dialogs/dialog_drc.h

@@ -30,7 +30,7 @@
 #include <wx/htmllbox.h>
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
 #include <dialog_drc_base.h>

pcbnew/dialogs/dialog_drclistbox.h

@@ -29,7 +29,7 @@
 #include <wx/htmllbox.h>
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <class_marker_pcb.h>
 #include <class_board.h>
 #include <dialog_drc_base.h>

pcbnew/dialogs/dialog_netlist.cpp

@@ -30,14 +30,15 @@
 #include <pcb_edit_frame.h>
 #include <reporter.h>
 #include <bitmaps.h>
+#include <drc/drc.h>
 #include <tool/tool_manager.h>
-#include <tools/drc.h>
 #include <tools/pcb_actions.h>
 #include <class_board.h>
 #include <connectivity/connectivity_data.h>
 #include <wildcards_and_files_ext.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <netlist_reader/board_netlist_updater.h>
+
 #include <dialog_netlist.h>
 
 #include <wx_html_report_panel.h>

pcbnew/dialogs/dialog_plot.cpp

@@ -36,8 +36,8 @@
 #include <dialog_plot.h>
 #include <dialog_gendrill.h>
 #include <wx_html_report_panel.h>
+#include <drc/drc.h>
 #include <tool/tool_manager.h>
-#include <tools/drc.h>
 #include <tools/zone_filler_tool.h>
 #include <math/util.h>      // for KiROUND
 

pcbnew/drc/courtyard_overlap.cpp

@@ -31,7 +31,7 @@
 #include <drc/courtyard_overlap.h>
 
 #include <class_module.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 
 #include <drc/drc_marker_factory.h>
 

pcbnew/drc/drc.cpp

@@ -47,7 +47,7 @@
 #include <tools/pcb_tool_base.h>
 #include <kiface_i.h>
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <math/util.h>      // for KiROUND
 
@@ -58,7 +58,7 @@
 #include <geometry/shape_arc.h>
 
 #include <drc/courtyard_overlap.h>
-#include "zone_filler_tool.h"
+#include <tools/zone_filler_tool.h>
 
 DRC::DRC() :
         PCB_TOOL_BASE( "pcbnew.DRCTool" ),

pcbnew/drc/drc_clearance_test_functions.cpp

@@ -27,7 +27,7 @@
 #include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_track.h>

pcbnew/drc/drc_item.cpp

@@ -27,7 +27,7 @@
 #include <common.h>
 
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <drc_item.h>
 #include <class_board.h>
 #include <base_units.h>

pcbnew/drc/drc_marker_factory.cpp

@@ -35,7 +35,7 @@
 #include <class_track.h>
 #include <class_zone.h>
 #include <common.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <fctsys.h>
 #include <geometry/geometry_utils.h>
 #include <pcb_edit_frame.h>

pcbnew/edit_track_width.cpp

@@ -27,7 +27,7 @@
 #include <pcbnew_id.h>
 #include <class_track.h>
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 
 
 int PCB_EDIT_FRAME::SetTrackSegmentWidth( TRACK*             aTrackItem,

pcbnew/pcb_edit_frame.cpp

@@ -31,7 +31,7 @@
 #include <trace_helpers.h>
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <layer_widget.h>
 #include <pcb_layer_widget.h>
 #include <config_params.h>

pcbnew/zones_by_polygon.cpp

@@ -35,7 +35,7 @@
 #include <pcbnew.h>
 #include <zones.h>
 #include <zones_functions_for_undo_redo.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <connectivity/connectivity_data.h>
 #include <widgets/progress_reporter.h>
 #include <zone_filler.h>

pcbnew/zones_test_and_combine_areas.cpp

@@ -40,7 +40,7 @@
 #include <class_marker_pcb.h>
 
 #include <pcbnew.h>
-#include <tools/drc.h>
+#include <drc/drc.h>
 #include <math_for_graphics.h>
 
 #define STRAIGHT 0      // To be remove after math_for_graphics code cleanup

qa/pcbnew/drc/test_drc_courtyard_invalid.cpp

@@ -27,7 +27,7 @@
 #include <pcbnew_utils/board_file_utils.h>
 
 #include <class_module.h>
-#include <drc.h>
+#include <drc/drc.h>
 
 #include <drc/courtyard_overlap.h>
 

qa/pcbnew/drc/test_drc_courtyard_overlap.cpp

@@ -27,7 +27,7 @@
 #include <pcbnew_utils/board_file_utils.h>
 
 #include <class_module.h>
-#include <drc.h>
+#include <drc/drc.h>
 
 #include <drc/courtyard_overlap.h>
 

qa/pcbnew_utils/board_construction_utils.cpp

@@ -25,7 +25,7 @@
 
 #include <class_edge_mod.h>
 #include <class_module.h>
-#include <drc.h>
+#include <drc/drc.h>
 
 #include <geometry/seg.h>
 #include <math/vector2d.h>