From 8c57821e9b9e60b467b6980bc66a202e2d4bbd47 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Tue, 16 Jun 2020 11:15:14 -0700
Subject: [PATCH] pcbnew: Move ratsnest items to separate folder

---
 common/CMakeLists.txt                       | 4 ++--
 pcbnew/CMakeLists.txt                       | 3 ++-
 pcbnew/autorouter/ar_autoplacer.cpp         | 2 +-
 pcbnew/class_board.cpp                      | 4 ++--
 pcbnew/connectivity/connectivity_data.cpp   | 2 +-
 pcbnew/dialogs/dialog_global_deletion.cpp   | 2 +-
 pcbnew/dialogs/dialog_update_pcb.cpp        | 3 ++-
 pcbnew/files.cpp                            | 3 ++-
 pcbnew/footprint_editor_utils.cpp           | 3 ++-
 pcbnew/netlist_reader/netlist.cpp           | 2 +-
 pcbnew/pcb_draw_panel_gal.cpp               | 5 +++--
 pcbnew/pcb_edit_frame.cpp                   | 3 ++-
 pcbnew/{ => ratsnest}/ratsnest.cpp          | 2 +-
 pcbnew/{ => ratsnest}/ratsnest_data.cpp     | 2 +-
 pcbnew/{ => ratsnest}/ratsnest_data.h       | 0
 pcbnew/{ => ratsnest}/ratsnest_viewitem.cpp | 6 ++++--
 pcbnew/{ => ratsnest}/ratsnest_viewitem.h   | 0
 pcbnew/tools/drawing_tool.cpp               | 2 +-
 pcbnew/tools/placement_tool.cpp             | 3 ++-
 19 files changed, 30 insertions(+), 21 deletions(-)
 rename pcbnew/{ => ratsnest}/ratsnest.cpp (98%)
 rename pcbnew/{ => ratsnest}/ratsnest_data.cpp (99%)
 rename pcbnew/{ => ratsnest}/ratsnest_data.h (100%)
 rename pcbnew/{ => ratsnest}/ratsnest_viewitem.cpp (98%)
 rename pcbnew/{ => ratsnest}/ratsnest_viewitem.h (100%)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 8ae63df59c..3ea1a8beab 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -493,8 +493,8 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_view.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcbnew_settings.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/plugin.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/ratsnest_data.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/ratsnest_viewitem.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/ratsnest/ratsnest_data.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/ratsnest/ratsnest_viewitem.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/sel_layer.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/zone_settings.cpp
 
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 403c611b9a..85089a94c8 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -296,7 +296,6 @@ set( PCBNEW_CLASS_SRCS
     pcbplot.cpp
     plot_board_layers.cpp
     plot_brditems_plotter.cpp
-    ratsnest.cpp
     specctra_import_export/specctra.cpp
     specctra_import_export/specctra_export.cpp
     specctra_import_export/specctra_import.cpp
@@ -311,6 +310,8 @@ set( PCBNEW_CLASS_SRCS
     zones_functions_for_undo_redo.cpp
     zones_test_and_combine_areas.cpp
 
+    ratsnest/ratsnest.cpp
+    
     tools/drawing_tool.cpp
     tools/edit_tool.cpp
     tools/global_edit_tool.cpp
diff --git a/pcbnew/autorouter/ar_autoplacer.cpp b/pcbnew/autorouter/ar_autoplacer.cpp
index 610f71d854..ae1107461a 100644
--- a/pcbnew/autorouter/ar_autoplacer.cpp
+++ b/pcbnew/autorouter/ar_autoplacer.cpp
@@ -38,12 +38,12 @@
 #include <class_pad.h>
 #include <board_commit.h>
 #include <connectivity/connectivity_data.h>
-#include <ratsnest_data.h>
 #include <widgets/progress_reporter.h>
 
 #include "ar_autoplacer.h"
 #include "ar_matrix.h"
 #include <memory>
+#include <ratsnest/ratsnest_data.h>
 
 #define AR_GAIN            16
 #define AR_KEEPOUT_MARGIN  500
diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 2aea2d3ec2..edfa6a699d 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -38,8 +38,6 @@
 #include <pcb_base_frame.h>
 #include <msgpanel.h>
 #include <reporter.h>
-#include <ratsnest_data.h>
-#include <ratsnest_viewitem.h>
 #include <ws_proxy_view_item.h>
 #include <pcbnew.h>
 #include <collectors.h>
@@ -53,6 +51,8 @@
 #include <connectivity/connectivity_data.h>
 #include <pgm_base.h>
 #include <pcbnew_settings.h>
+#include <ratsnest/ratsnest_data.h>
+#include <ratsnest/ratsnest_viewitem.h>
 
 /**
  * A singleton item of this class is returned for a weak reference that no longer exists.
diff --git a/pcbnew/connectivity/connectivity_data.cpp b/pcbnew/connectivity/connectivity_data.cpp
index 8c0ac91eb0..2682a21631 100644
--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/pcbnew/connectivity/connectivity_data.cpp
@@ -33,7 +33,7 @@
 
 #include <connectivity/connectivity_data.h>
 #include <connectivity/connectivity_algo.h>
-#include <ratsnest_data.h>
+#include <ratsnest/ratsnest_data.h>
 
 CONNECTIVITY_DATA::CONNECTIVITY_DATA()
 {
diff --git a/pcbnew/dialogs/dialog_global_deletion.cpp b/pcbnew/dialogs/dialog_global_deletion.cpp
index a938eda90e..3096b9b80f 100644
--- a/pcbnew/dialogs/dialog_global_deletion.cpp
+++ b/pcbnew/dialogs/dialog_global_deletion.cpp
@@ -28,7 +28,7 @@ using namespace std::placeholders;
 #include <confirm.h>
 #include <pcbnew.h>
 #include <pcb_edit_frame.h>
-#include <ratsnest_data.h>
+#include <ratsnest/ratsnest_data.h>
 #include <board_commit.h>
 #include <class_board.h>
 #include <class_module.h>
diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp
index 60e3e03d9b..808732832f 100644
--- a/pcbnew/dialogs/dialog_update_pcb.cpp
+++ b/pcbnew/dialogs/dialog_update_pcb.cpp
@@ -28,6 +28,8 @@
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <dialog_update_pcb.h>
+
+#include <ratsnest/ratsnest_data.h>
 #include <wx_html_report_panel.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <netlist_reader/board_netlist_updater.h>
@@ -35,7 +37,6 @@
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>
 #include <class_board.h>
-#include <ratsnest_data.h>
 #include <kiface_i.h>
 
 using namespace std::placeholders;
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 5c33b362ff..2b019b0dbc 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -34,7 +34,6 @@
 #include <pgm_base.h>
 #include <msgpanel.h>
 #include <fp_lib_table.h>
-#include <ratsnest_data.h>
 #include <kiway.h>
 #include <kiway_player.h>
 #include <trace_helpers.h>
@@ -49,6 +48,8 @@
 #include <class_board.h>
 #include <wx/stdpaths.h>
 #include <pcb_layer_widget.h>
+#include <ratsnest/ratsnest_data.h>
+
 #include <wx/wupdlock.h>
 
 
diff --git a/pcbnew/footprint_editor_utils.cpp b/pcbnew/footprint_editor_utils.cpp
index 86a2b6a405..d3cb45d223 100644
--- a/pcbnew/footprint_editor_utils.cpp
+++ b/pcbnew/footprint_editor_utils.cpp
@@ -52,8 +52,9 @@
 #include <pcbnew.h>
 #include <pcbnew_id.h>
 #include <pcbnew_settings.h>
+#include <ratsnest/ratsnest_data.h>
+
 #include <pgm_base.h>
-#include <ratsnest_data.h>
 #include <settings/color_settings.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
diff --git a/pcbnew/netlist_reader/netlist.cpp b/pcbnew/netlist_reader/netlist.cpp
index e65acaba41..b1b471e915 100644
--- a/pcbnew/netlist_reader/netlist.cpp
+++ b/pcbnew/netlist_reader/netlist.cpp
@@ -41,7 +41,7 @@ using namespace std::placeholders;
 #include <fp_lib_table.h>
 #include <class_board.h>
 #include <class_module.h>
-#include <ratsnest_data.h>
+#include <ratsnest/ratsnest_data.h>
 #include <pcbnew.h>
 #include <io_mgr.h>
 #include "board_netlist_updater.h"
diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index d62837835f..077373c719 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -27,8 +27,6 @@
 #include <view/wx_view_controls.h>
 #include <pcb_painter.h>
 #include <ws_proxy_view_item.h>
-#include <ratsnest_viewitem.h>
-#include <ratsnest_data.h>
 #include <connectivity/connectivity_data.h>
 
 #include <class_board.h>
@@ -37,6 +35,9 @@
 #include <class_marker_pcb.h>
 #include <pcb_base_frame.h>
 #include <pcbnew_settings.h>
+#include <ratsnest/ratsnest_data.h>
+#include <ratsnest/ratsnest_viewitem.h>
+
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <confirm.h>
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 453162f97b..4e51b7a50d 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -48,7 +48,6 @@
 #include <class_module.h>
 #include <ws_proxy_view_item.h>
 #include <connectivity/connectivity_data.h>
-#include <ratsnest_viewitem.h>
 #include <wildcards_and_files_ext.h>
 #include <kicad_string.h>
 #include <pcb_draw_panel_gal.h>
@@ -86,6 +85,8 @@
 #include <netlist_reader/pcb_netlist.h>
 #include <wx/wupdlock.h>
 #include <dialog_drc.h>     // for DIALOG_DRC_WINDOW_NAME definition
+#include <ratsnest/ratsnest_viewitem.h>
+
 #include <widgets/infobar.h>
 
 #if defined(KICAD_SCRIPTING) || defined(KICAD_SCRIPTING_WXPYTHON)
diff --git a/pcbnew/ratsnest.cpp b/pcbnew/ratsnest/ratsnest.cpp
similarity index 98%
rename from pcbnew/ratsnest.cpp
rename to pcbnew/ratsnest/ratsnest.cpp
index 2ae188affc..826f5ed046 100644
--- a/pcbnew/ratsnest.cpp
+++ b/pcbnew/ratsnest/ratsnest.cpp
@@ -31,7 +31,7 @@
 #include <class_module.h>
 #include <class_track.h>
 #include <pcbnew.h>
-#include <ratsnest_data.h>
+#include <ratsnest/ratsnest_data.h>
 
 /**
  * Function Compile_Ratsnest
diff --git a/pcbnew/ratsnest_data.cpp b/pcbnew/ratsnest/ratsnest_data.cpp
similarity index 99%
rename from pcbnew/ratsnest_data.cpp
rename to pcbnew/ratsnest/ratsnest_data.cpp
index 4b3c78f295..389acf4886 100644
--- a/pcbnew/ratsnest_data.cpp
+++ b/pcbnew/ratsnest/ratsnest_data.cpp
@@ -32,7 +32,7 @@
 #include <profile.h>
 #endif
 
-#include <ratsnest_data.h>
+#include <ratsnest/ratsnest_data.h>
 #include <functional>
 using namespace std::placeholders;
 
diff --git a/pcbnew/ratsnest_data.h b/pcbnew/ratsnest/ratsnest_data.h
similarity index 100%
rename from pcbnew/ratsnest_data.h
rename to pcbnew/ratsnest/ratsnest_data.h
diff --git a/pcbnew/ratsnest_viewitem.cpp b/pcbnew/ratsnest/ratsnest_viewitem.cpp
similarity index 98%
rename from pcbnew/ratsnest_viewitem.cpp
rename to pcbnew/ratsnest/ratsnest_viewitem.cpp
index 3b78796494..d282567754 100644
--- a/pcbnew/ratsnest_viewitem.cpp
+++ b/pcbnew/ratsnest/ratsnest_viewitem.cpp
@@ -29,10 +29,12 @@
  * @brief Class that draws missing connections on a PCB.
  */
 
-#include <ratsnest_viewitem.h>
-#include <ratsnest_data.h>
+#include <ratsnest/ratsnest_viewitem.h>
+
 #include <gal/graphics_abstraction_layer.h>
 #include <pcb_painter.h>
+#include <ratsnest/ratsnest_data.h>
+
 #include <layers_id_colors_and_visibility.h>
 #include <pcb_base_frame.h>
 
diff --git a/pcbnew/ratsnest_viewitem.h b/pcbnew/ratsnest/ratsnest_viewitem.h
similarity index 100%
rename from pcbnew/ratsnest_viewitem.h
rename to pcbnew/ratsnest/ratsnest_viewitem.h
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index 23c851234a..537c235cf6 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -37,7 +37,6 @@
 #include <gal/graphics_abstraction_layer.h>
 #include <tool/tool_manager.h>
 #include <geometry/geometry_utils.h>
-#include <ratsnest_data.h>
 #include <board_commit.h>
 #include <scoped_set_reset.h>
 #include <bitmaps.h>
@@ -59,6 +58,7 @@
 #include <tools/selection_tool.h>
 #include <tools/tool_event_utils.h>
 #include <tools/zone_create_helper.h>
+#include <ratsnest/ratsnest_data.h>
 
 using SCOPED_DRAW_MODE = SCOPED_SET_RESET<DRAWING_TOOL::MODE>;
 
diff --git a/pcbnew/tools/placement_tool.cpp b/pcbnew/tools/placement_tool.cpp
index e64c4669f7..a2aedc2442 100644
--- a/pcbnew/tools/placement_tool.cpp
+++ b/pcbnew/tools/placement_tool.cpp
@@ -26,11 +26,12 @@
 #include "pcb_actions.h"
 #include "selection_tool.h"
 #include "edit_tool.h"
+
+#include <ratsnest/ratsnest_data.h>
 #include <tool/tool_manager.h>
 
 #include <pcb_edit_frame.h>
 #include <class_board.h>
-#include <ratsnest_data.h>
 #include <board_commit.h>
 #include <bitmaps.h>