From ea077bc34dea56520b59478c84a176fdf22edc34 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Tue, 18 Apr 2023 22:44:04 -0400
Subject: [PATCH] Banish ignore.h to core

---
 common/dialog_shim.cpp                                       | 2 +-
 common/kiway.cpp                                             | 5 +++--
 common/kiway_holder.cpp                                      | 2 +-
 common/plotters/PDF_plotter.cpp                              | 2 +-
 common/richio.cpp                                            | 2 +-
 common/tool/tool_dispatcher.cpp                              | 2 +-
 common/widgets/gal_options_panel.cpp                         | 2 +-
 eeschema/sch_edit_frame.cpp                                  | 2 +-
 gerbview/rs274x.cpp                                          | 2 +-
 {include => libs/core/include/core}/ignore.h                 | 0
 pcbnew/kicad_clipboard.cpp                                   | 2 +-
 pcbnew/load_select_footprint.cpp                             | 2 +-
 pcbnew/pcb_textbox.cpp                                       | 2 +-
 pcbnew/plugins/kicad/pcb_parser.cpp                          | 2 +-
 pcbnew/plugins/legacy/legacy_plugin.cpp                      | 2 +-
 pcbnew/python/scripting/pcbnew_scripting_helpers.cpp         | 2 +-
 plugins/3d/vrml/CMakeLists.txt                               | 2 +-
 .../tools/polygon_triangulation/polygon_triangulation.cpp    | 2 +-
 qa/unittests/eeschema/test_eagle_plugin.cpp                  | 2 +-
 qa/unittests/eeschema/test_sch_rtree.cpp                     | 2 +-
 20 files changed, 21 insertions(+), 20 deletions(-)
 rename {include => libs/core/include/core}/ignore.h (100%)

diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp
index 79b7737aab..d2296735c9 100644
--- a/common/dialog_shim.cpp
+++ b/common/dialog_shim.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <dialog_shim.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <kiway_player.h>
 #include <kiway.h>
 #include <pgm_base.h>
diff --git a/common/kiway.cpp b/common/kiway.cpp
index 05e1bbb2a8..79d6936c2a 100644
--- a/common/kiway.cpp
+++ b/common/kiway.cpp
@@ -24,7 +24,7 @@
 
 #include <cstring>
 
-#include <ignore.h>
+#include <core/ignore.h>
 #include <macros.h>
 #include <kiway.h>
 #include <kiway_player.h>
@@ -445,7 +445,8 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, wxTopLevelWindow
         }
         catch( const std::exception& e )
         {
-            wxLogError( e.what() );
+            const char* ptr = e.what();
+            wxLogError( ptr );
             wxLogError( _( "Error loading editor." ) );
         }
         catch( ... )
diff --git a/common/kiway_holder.cpp b/common/kiway_holder.cpp
index 420d7059d4..c8f9c8e3e6 100644
--- a/common/kiway_holder.cpp
+++ b/common/kiway_holder.cpp
@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <ignore.h>
+#include <core/ignore.h>
 #include <kiway.h>
 #include <kiway_holder.h>
 #include <project.h>
diff --git a/common/plotters/PDF_plotter.cpp b/common/plotters/PDF_plotter.cpp
index 6d8a83685d..a6539e95b9 100644
--- a/common/plotters/PDF_plotter.cpp
+++ b/common/plotters/PDF_plotter.cpp
@@ -37,7 +37,7 @@
 #include <advanced_config.h>
 #include <eda_text.h> // for IsGotoPageHref
 #include <font/font.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <macros.h>
 #include <trigo.h>
 #include <string_utils.h>
diff --git a/common/richio.cpp b/common/richio.cpp
index b90adf90a0..eb1fabe597 100644
--- a/common/richio.cpp
+++ b/common/richio.cpp
@@ -26,7 +26,7 @@
 #include <cstdarg>
 #include <config.h> // HAVE_FGETC_NOLOCK
 
-#include <ignore.h>
+#include <core/ignore.h>
 #include <richio.h>
 #include <errno.h>
 
diff --git a/common/tool/tool_dispatcher.cpp b/common/tool/tool_dispatcher.cpp
index 54851bb0cd..363a4b0725 100644
--- a/common/tool/tool_dispatcher.cpp
+++ b/common/tool/tool_dispatcher.cpp
@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <ignore.h>
+#include <core/ignore.h>
 #include <macros.h>
 #include <trace_helpers.h>
 #include <tool/tool_manager.h>
diff --git a/common/widgets/gal_options_panel.cpp b/common/widgets/gal_options_panel.cpp
index de54d77b72..a5e3e0ceae 100644
--- a/common/widgets/gal_options_panel.cpp
+++ b/common/widgets/gal_options_panel.cpp
@@ -31,7 +31,7 @@
 #include <wx/statbox.h>
 #include <wx/statline.h>
 
-#include <ignore.h>
+#include <core/ignore.h>
 #include <widgets/gal_options_panel.h>
 #include <settings/app_settings.h>
 #include <eda_draw_frame.h>
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 453415f297..f8685dd7e8 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -34,7 +34,7 @@
 #include <executable_names.h>
 #include <gestfich.h>
 #include <dialogs/html_message_box.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <invoke_sch_dialog.h>
 #include <string_utils.h>
 #include <kiface_base.h>
diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index 30688a884b..89654fb2d2 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -31,7 +31,7 @@
 
 #include <gerbview.h>
 #include <gerber_file_image.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <macros.h>
 #include <X2_gerber_attributes.h>
 #include <gbr_metadata.h>
diff --git a/include/ignore.h b/libs/core/include/core/ignore.h
similarity index 100%
rename from include/ignore.h
rename to libs/core/include/core/ignore.h
diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp
index 1b611fe8f6..3b9d8c03f4 100644
--- a/pcbnew/kicad_clipboard.cpp
+++ b/pcbnew/kicad_clipboard.cpp
@@ -27,7 +27,7 @@
 #include <wx/log.h>
 
 #include <board.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <pad.h>
 #include <pcb_group.h>
 #include <pcb_shape.h>
diff --git a/pcbnew/load_select_footprint.cpp b/pcbnew/load_select_footprint.cpp
index 4f2ef57546..89cb77e0d9 100644
--- a/pcbnew/load_select_footprint.cpp
+++ b/pcbnew/load_select_footprint.cpp
@@ -38,7 +38,7 @@ using namespace std::placeholders;
 #include <footprint_tree_pane.h>
 #include <footprint_viewer_frame.h>
 #include <fp_lib_table.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <io_mgr.h>
 #include <string_utils.h>
 #include <kiway.h>
diff --git a/pcbnew/pcb_textbox.cpp b/pcbnew/pcb_textbox.cpp
index 71c75bd7b7..dd89c56ae9 100644
--- a/pcbnew/pcb_textbox.cpp
+++ b/pcbnew/pcb_textbox.cpp
@@ -35,7 +35,7 @@
 #include <callback_gal.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <macros.h>
-#include <ignore.h>
+#include <core/ignore.h>
 
 
 PCB_TEXTBOX::PCB_TEXTBOX( BOARD_ITEM* parent ) :
diff --git a/pcbnew/plugins/kicad/pcb_parser.cpp b/pcbnew/plugins/kicad/pcb_parser.cpp
index 83896f8df2..85ceb9dbef 100644
--- a/pcbnew/plugins/kicad/pcb_parser.cpp
+++ b/pcbnew/plugins/kicad/pcb_parser.cpp
@@ -48,7 +48,7 @@
 #include <footprint.h>
 #include <geometry/shape_line_chain.h>
 #include <font/font.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <netclass.h>
 #include <plugins/kicad/pcb_plugin.h>
 #include <pcb_plot_params_parser.h>
diff --git a/pcbnew/plugins/legacy/legacy_plugin.cpp b/pcbnew/plugins/legacy/legacy_plugin.cpp
index 555a247aa0..e200fc04a1 100644
--- a/pcbnew/plugins/legacy/legacy_plugin.cpp
+++ b/pcbnew/plugins/legacy/legacy_plugin.cpp
@@ -75,7 +75,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <footprint.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <pad.h>
 #include <pcb_track.h>
 #include <pcb_text.h>
diff --git a/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp b/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
index 3ac97ceccd..279981ebfc 100644
--- a/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
+++ b/pcbnew/python/scripting/pcbnew_scripting_helpers.cpp
@@ -40,7 +40,7 @@
 #include <drc/drc_engine.h>
 #include <drc/drc_item.h>
 #include <fp_lib_table.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <io_mgr.h>
 #include <string_utils.h>
 #include <macros.h>
diff --git a/plugins/3d/vrml/CMakeLists.txt b/plugins/3d/vrml/CMakeLists.txt
index ecf01ed31c..dd766e792d 100644
--- a/plugins/3d/vrml/CMakeLists.txt
+++ b/plugins/3d/vrml/CMakeLists.txt
@@ -65,7 +65,7 @@ add_library( s3d_plugin_vrml MODULE
         x3d/x3d_transform.cpp
         )
 
-target_link_libraries( s3d_plugin_vrml kicad_3dsg ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES} ZLIB::ZLIB )
+target_link_libraries( s3d_plugin_vrml kicad_3dsg core ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES} ZLIB::ZLIB )
 
 target_include_directories( s3d_plugin_vrml PRIVATE
     $<TARGET_PROPERTY:gzip-hpp,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp b/qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp
index 52c759fde1..7c2a9cdc39 100644
--- a/qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp
+++ b/qa/tools/pcbnew_tools/tools/polygon_triangulation/polygon_triangulation.cpp
@@ -32,7 +32,7 @@
 #include <qa_utils/utility_registry.h>
 
 #include <board.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <zone.h>
 #include <profile.h>
 
diff --git a/qa/unittests/eeschema/test_eagle_plugin.cpp b/qa/unittests/eeschema/test_eagle_plugin.cpp
index b00126f307..027f324f9d 100644
--- a/qa/unittests/eeschema/test_eagle_plugin.cpp
+++ b/qa/unittests/eeschema/test_eagle_plugin.cpp
@@ -24,7 +24,7 @@
 
 #include <qa_utils/wx_utils/unit_test_utils.h>
 
-#include <ignore.h>
+#include <core/ignore.h>
 #include <kiway.h>
 #include <sch_io_mgr.h>
 
diff --git a/qa/unittests/eeschema/test_sch_rtree.cpp b/qa/unittests/eeschema/test_sch_rtree.cpp
index afbd7ddf85..e2d1018f04 100644
--- a/qa/unittests/eeschema/test_sch_rtree.cpp
+++ b/qa/unittests/eeschema/test_sch_rtree.cpp
@@ -27,7 +27,7 @@
  */
 
 #include <base_units.h>
-#include <ignore.h>
+#include <core/ignore.h>
 #include <sch_junction.h>
 #include <sch_no_connect.h>
 #include <qa_utils/uuid_test_utils.h>