Pcbnew: housekeeping: move netlist code to netlist_reader sub directory.

common/CMakeLists.txt

@@ -462,17 +462,17 @@ set( PCB_COMMON_SRCS
     ../pcbnew/gpcb_plugin.cpp
     ../pcbnew/io_mgr.cpp
     ../pcbnew/kicad_clipboard.cpp
-    ../pcbnew/kicad_netlist_reader.cpp
+    ../pcbnew/netlist_reader/kicad_netlist_reader.cpp
     ../pcbnew/kicad_plugin.cpp
-    ../pcbnew/legacy_netlist_reader.cpp
+    ../pcbnew/netlist_reader/legacy_netlist_reader.cpp
     ../pcbnew/legacy_plugin.cpp
-    ../pcbnew/netlist_reader.cpp
+    ../pcbnew//netlist_reader/netlist_reader.cpp
     ../pcbnew/pad_custom_shape_functions.cpp
     ../pcbnew/pad_print_functions.cpp
     ../pcbnew/pcb_display_options.cpp
     ../pcbnew/pcb_draw_panel_gal.cpp
     ../pcbnew/pcb_general_settings.cpp
-    ../pcbnew/pcb_netlist.cpp
+    ../pcbnew/netlist_reader/pcb_netlist.cpp
     ../pcbnew/pcb_painter.cpp
     ../pcbnew/pcb_parser.cpp
     ../pcbnew/pcb_plot_params.cpp

cvpcb/cvpcb_mainframe.cpp

@@ -30,7 +30,7 @@
 #include <kiface_i.h>
 #include <kiway_express.h>
 #include <macros.h>
-#include <netlist_reader.h>
+#include <netlist_reader/netlist_reader.h>
 #include <numeric>
 #include <tool/action_toolbar.h>
 #include <tool/common_control.h>

cvpcb/cvpcb_mainframe.h

@@ -27,7 +27,7 @@
 
 #include <config_params.h>
 #include <kiway_player.h>
-#include <pcb_netlist.h>
+#include <netlist_reader/pcb_netlist.h>
 
 #include <auto_associate.h>
 #include <cvpcb_association.h>

pcbnew/CMakeLists.txt

@@ -232,11 +232,17 @@ set( PCBNEW_DRC_SRCS
     drc/drc_provider.cpp
     )
 
+set( PCBNEW_NETLIST_SRCS
+    netlist_reader/board_netlist_updater.cpp
+    netlist_reader/netlist.cpp
+    )
+
 set( PCBNEW_CLASS_SRCS
     ${PCBNEW_DIALOGS}
     ${PCBNEW_EXPORTERS}
-    ${PCBNEW_IMPORT_GFX}
     ${PCBNEW_DRC_SRCS}
+    ${PCBNEW_IMPORT_GFX}
+    ${PCBNEW_NETLIST_SRCS}
     ${PCBNEW_BRDSTACKUP_MGR}
 
     autorouter/rect_placement/rect_placement.cpp
@@ -248,7 +254,6 @@ set( PCBNEW_CLASS_SRCS
     action_plugin.cpp
     array_creator.cpp
     array_pad_name_provider.cpp
-    board_netlist_updater.cpp
     build_BOM_from_board.cpp
     cross-probing.cpp
     tools/drc.cpp
@@ -274,7 +279,6 @@ set( PCBNEW_CLASS_SRCS
     menubar_footprint_editor.cpp
     menubar_pcb_editor.cpp
     microwave.cpp
-    netlist.cpp
     pad_naming.cpp
     pcb_base_edit_frame.cpp
     pcb_layer_box_selector.cpp

pcbnew/cross-probing.cpp

@@ -45,7 +45,7 @@
 #include <class_zone.h>
 #include <collectors.h>
 #include <pcbnew.h>
-#include <pcb_netlist.h>
+#include <netlist_reader/pcb_netlist.h>
 #include <tools/pcb_actions.h>
 #include <tool/tool_manager.h>
 #include <tools/selection_tool.h>

pcbnew/dialogs/dialog_netlist.cpp

@@ -28,7 +28,6 @@
 #include <macros.h>
 #include <html_messagebox.h>
 #include <pcb_edit_frame.h>
-#include <pcb_netlist.h>
 #include <reporter.h>
 #include <bitmaps.h>
 #include <tool/tool_manager.h>
@@ -37,9 +36,10 @@
 #include <class_board.h>
 #include <connectivity/connectivity_data.h>
 #include <wildcards_and_files_ext.h>
-#include <board_netlist_updater.h>
-
+#include <netlist_reader/pcb_netlist.h>
+#include <netlist_reader/board_netlist_updater.h>
 #include <dialog_netlist.h>
+
 #include <wx_html_report_panel.h>
 
 #define NETLIST_FILTER_MESSAGES_KEY wxT("NetlistReportFilterMsg")

pcbnew/dialogs/dialog_update_pcb.cpp

@@ -27,10 +27,10 @@
 
 #include <common.h>
 #include <pcb_edit_frame.h>
-#include <pcb_netlist.h>
 #include <dialog_update_pcb.h>
 #include <wx_html_report_panel.h>
-#include <board_netlist_updater.h>
+#include <netlist_reader/pcb_netlist.h>
+#include <netlist_reader/board_netlist_updater.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>

pcbnew/files.cpp

@@ -40,7 +40,7 @@
 #include <kiway_player.h>
 #include <trace_helpers.h>
 #include <lockfile.cpp>
-#include <pcb_netlist.h>
+#include <netlist_reader/pcb_netlist.h>
 #include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <io_mgr.h>

pcbnew/netlist_reader/board_netlist_updater.cpp

@@ -40,11 +40,11 @@
 #include <class_pad.h>
 #include <class_zone.h>
 
-#include <pcb_netlist.h>
+#include "pcb_netlist.h"
 #include <connectivity/connectivity_data.h>
 #include <reporter.h>
 
-#include <board_netlist_updater.h>
+#include "board_netlist_updater.h"
 
 #include <pcb_edit_frame.h>
 

pcbnew/netlist_reader/kicad_netlist_reader.cpp

@@ -29,8 +29,8 @@
 #include <netlist_lexer.h>  // netlist_lexer is common to Eeschema and Pcbnew
 #include <macros.h>
 
-#include <pcb_netlist.h>
-#include <netlist_reader.h>
+#include "pcb_netlist.h"
+#include "netlist_reader.h"
 
 using namespace NL_T;
 

pcbnew/netlist_reader/legacy_netlist_reader.cpp

@@ -31,8 +31,8 @@
 #include <richio.h>
 #include <kicad_string.h>
 
-#include <pcb_netlist.h>
-#include <netlist_reader.h>
+#include "pcb_netlist.h"
+#include "netlist_reader.h"
 
 void LEGACY_NETLIST_READER::LoadNetlist()
 {

pcbnew/netlist_reader/netlist.cpp

@@ -36,8 +36,8 @@ using namespace std::placeholders;
 #include <confirm.h>
 #include <dialog_helpers.h>
 #include <pcb_edit_frame.h>
-#include <pcb_netlist.h>
-#include <netlist_reader.h>
+#include "pcb_netlist.h"
+#include "netlist_reader.h"
 #include <reporter.h>
 #include <wildcards_and_files_ext.h>
 #include <lib_id.h>
@@ -47,7 +47,7 @@ using namespace std::placeholders;
 #include <ratsnest_data.h>
 #include <pcbnew.h>
 #include <io_mgr.h>
-#include <board_netlist_updater.h>
+#include "board_netlist_updater.h"
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>

pcbnew/netlist_reader/netlist_reader.cpp

@@ -31,8 +31,8 @@
 #include <kicad_string.h>
 #include <reporter.h>
 
-#include <pcb_netlist.h>
-#include <netlist_reader.h>
+#include "pcb_netlist.h"
+#include "netlist_reader.h"
 #include <class_module.h>
 
 #include <wx/regex.h>

pcbnew/netlist_reader/pcb_netlist.cpp

@@ -31,7 +31,7 @@
 #include <refdes_utils.h>
 #include <reporter.h>
 
-#include <pcb_netlist.h>
+#include "pcb_netlist.h"
 #include <class_module.h>
 #include <eda_pattern_match.h>
 

pcbnew/pcb_edit_frame.cpp

@@ -81,9 +81,9 @@
 #include <autorouter/autoplacer_tool.h>
 #include <gestfich.h>
 #include <executable_names.h>
-#include <board_netlist_updater.h>
-#include <netlist_reader.h>
-#include <pcb_netlist.h>
+#include <netlist_reader/board_netlist_updater.h>
+#include <netlist_reader/netlist_reader.h>
+#include <netlist_reader/pcb_netlist.h>
 #include <wx/wupdlock.h>
 #include <dialog_drc.h>     // for DIALOG_DRC_WINDOW_NAME definition
 

pcbnew/tools/drc.cpp

@@ -48,7 +48,7 @@
 #include <kiface_i.h>
 #include <pcbnew.h>
 #include <tools/drc.h>
-#include <pcb_netlist.h>
+#include <netlist_reader/pcb_netlist.h>
 
 #include <dialog_drc.h>
 #include <wx/progdlg.h>
@@ -882,11 +882,11 @@ void DRC::testZones()
 
 void DRC::testKeepoutAreas()
 {
-    // Get a list of all zones to inspect, from both board and footprints
-    std::list<ZONE_CONTAINER*> areasToInspect = m_pcb->GetZoneList( true );
-
+    // Get a list of all zones to inspect, from both board and footprints
+    std::list<ZONE_CONTAINER*> areasToInspect = m_pcb->GetZoneList( true );
+
     // Test keepout areas for vias, tracks and pads inside keepout areas
-    for( ZONE_CONTAINER* area : areasToInspect )
+    for( ZONE_CONTAINER* area : areasToInspect )
     {
 
         if( !area->GetIsKeepout() )

pcbnew/tools/pcb_editor_control.cpp

@@ -47,7 +47,7 @@
 #include <view/view_controls.h>
 #include <origin_viewitem.h>
 #include <dialogs/dialog_page_settings.h>
-#include <pcb_netlist.h>
+#include <netlist_reader/pcb_netlist.h>
 #include <dialogs/dialog_update_pcb.h>
 #include <gestfich.h>
 #include <wildcards_and_files_ext.h>