Fix kicad_string.h / string.cpp mismatch.

They don't define a KiCad string class, so the header file name was
somewhat misleading. But the fact that they didn't match definitely
made coding more difficult.

3d-viewer/3d_cache/3d_cache.h

@@ -31,7 +31,7 @@
 
 #include "3d_info.h"
 #include <core/typeinfo.h>
-#include "kicad_string.h"
+#include "string_utils.h"
 #include <list>
 #include <map>
 #include "plugins/3dapi/c3dmodel.h"

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -41,7 +41,7 @@
 #include <pcb_text.h>
 #include <fp_shape.h>
 #include <zone.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <fp_text.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <trigo.h>

common/CMakeLists.txt

@@ -105,7 +105,7 @@ add_library( singletop STATIC EXCLUDE_FROM_ALL
 # Functions and data all need to use the #include <import_export.h> and be declared
 # as APIEXPORT
 set( LIB_KICAD_SRCS
-    string.cpp
+    string_utils.cpp
     )
 
 if( future )

common/base_units.cpp

@@ -36,7 +36,7 @@
 
 #include <base_units.h>
 #include <common.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <math/util.h>      // for KiROUND
 #include <macros.h>
 #include <title_block.h>

common/dialogs/eda_list_dialog.cpp

@@ -25,7 +25,7 @@
 
 #include <dialog_helpers.h>
 #include <eda_draw_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 
 

common/dialogs/html_messagebox.cpp

@@ -24,7 +24,7 @@
 
 #include <wx/clipbrd.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <dialogs/html_messagebox.h>
 
 

common/dialogs/panel_setup_netclasses.cpp

@@ -34,7 +34,7 @@
 #include <dialogs/panel_setup_netclasses.h>
 #include <tool/tool_manager.h>
 #include <widgets/wx_grid.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/grid_color_swatch_helpers.h>
 #include <widgets/grid_icon_text_helpers.h>
 #include <widgets/grid_text_helpers.h>

common/dialogs/wx_html_report_panel.cpp

@@ -26,7 +26,7 @@
 #include <wildcards_and_files_ext.h>
 #include <gal/color4d.h>
 #include <wx/clipbrd.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/ffile.h>
 #include <wx/log.h>
 #include <wx/filedlg.h>

common/drawing_sheet/drawing_sheet_reader.cpp

@@ -25,7 +25,7 @@
 
 #include <eda_item.h>
 #include <locale_io.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <drawing_sheet/ds_data_item.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <drawing_sheet/ds_draw_item.h>

common/drawing_sheet/ds_data_model_io.cpp

@@ -24,7 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <math/vector2d.h>

common/eda_text.cpp

@@ -41,7 +41,7 @@
 #include <gal/color4d.h>      // for COLOR4D, COLOR4D::BLACK
 #include <gal/stroke_font.h>  // for STROKE_FONT
 #include <gr_text.h>          // for GRText
-#include <kicad_string.h>     // for UnescapeString
+#include <string_utils.h>     // for UnescapeString
 #include <math/util.h>        // for KiROUND
 #include <math/vector2d.h>    // for VECTOR2D
 #include <richio.h>

common/footprint_info.cpp

@@ -31,7 +31,7 @@
 #include <footprint_info.h>
 #include <fp_lib_table.h>
 #include <dialogs/html_messagebox.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <lib_id.h>

common/hotkeys_basic.cpp

@@ -26,7 +26,7 @@
 #include <kiface_i.h>
 #include <hotkeys_basic.h>
 #include <id.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <eda_base_frame.h>
 #include <eda_draw_frame.h>
 #include <wildcards_and_files_ext.h>

common/lib_tree_model.cpp

@@ -26,7 +26,7 @@
 #include <lib_tree_item.h>
 #include <utility>
 #include <pgm_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 // Each node gets this lowest score initially, without any matches applied.
 // Matches will then increase this score depending on match quality.  This way,

common/lib_tree_model_adapter.cpp

@@ -29,7 +29,7 @@
 #include <widgets/ui_common.h>
 #include <wx/tokenzr.h>
 #include <wx/wupdlock.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 #define PINNED_ITEMS_KEY      wxT( "PinnedItems" )

common/libeval/numeric_evaluator.cpp

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <libeval/numeric_evaluator.h>
 
 /* The (generated) lemon parser is written in C.

common/libeval_compiler/libeval_compiler.cpp

@@ -23,7 +23,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/log.h>
 
 #ifdef DEBUG

common/plotters/DXF_plotter.cpp

@@ -29,7 +29,7 @@
 #include <fill_type.h>
 #include <plotters_specific.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <render_settings.h>
 #include <trigo.h>

common/plotters/GERBER_plotter.cpp

@@ -25,7 +25,7 @@
 
 #include <eda_base_frame.h>
 #include <fill_type.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <macros.h>
 #include <math/util.h>      // for KiROUND

common/plotters/HPGL_plotter.cpp

@@ -197,7 +197,7 @@
 
 #include <eda_base_frame.h>
 #include <fill_type.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <math/util.h>      // for KiROUND
 #include <trigo.h>

common/plotters/SVG_plotter.cpp

@@ -94,7 +94,7 @@
 #include <base64.h>
 #include <eda_base_frame.h>
 #include <eda_rect.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <trigo.h>
 

common/plugins/altium/altium_parser_utils.cpp

@@ -24,7 +24,7 @@
 
 #include "altium_parser_utils.h"
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_id.h>
 
 

common/plugins/altium/altium_parser_utils.h

@@ -27,7 +27,7 @@
 
 #include <map>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_id.h>
 
 #include <iostream>

common/plugins/eagle/eagle_parser.cpp

@@ -27,7 +27,7 @@
 
 #include <plugins/eagle/eagle_parser.h>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <richio.h>
 #include <wx/log.h>
 

common/project.cpp

@@ -27,7 +27,7 @@
 #include <confirm.h>
 #include <core/arraydim.h>
 #include <fp_lib_table.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <macros.h>

common/project/net_settings.cpp

@@ -26,7 +26,7 @@
 #include <settings/parameters.h>
 #include <settings/json_settings_internals.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <convert_to_biu.h>
 
 

common/refdes_utils.cpp

@@ -23,7 +23,7 @@
 
 #include <refdes_utils.h>
 
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <algorithm>
 #include <cctype>

common/scintilla_tricks.cpp

@@ -22,7 +22,7 @@
  */
 
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <scintilla_tricks.h>
 #include <wx/stc/stc.h>
 #include <gal/color4d.h>

common/string_utils.cpp

@@ -30,7 +30,7 @@
 #include <cmath>
 #include <macros.h>
 #include <richio.h>                        // StrPrintf
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 /**

common/validators.cpp

@@ -28,7 +28,7 @@
  * @brief Custom text control validator implementations.
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <confirm.h>
 #include <validators.h>
 

common/widgets/grid_text_button_helpers.cpp

@@ -30,7 +30,7 @@
 #include <bitmaps.h>
 #include <kiway.h>
 #include <kiway_player.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <dialog_shim.h>
 #include <common.h>
 #include <env_paths.h>

common/widgets/grid_text_helpers.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/grid_text_helpers.h>
 
 

common/widgets/net_selector.cpp

@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiplatform/ui.h>
 
 #include <widgets/ui_common.h>

cvpcb/auto_associate.cpp

@@ -32,7 +32,7 @@
 
 
 #include <kiface_i.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 
 #include <auto_associate.h>

eeschema/connection_graph.cpp

@@ -43,7 +43,7 @@
 #include <schematic.h>
 #include <connection_graph.h>
 #include <widgets/ui_common.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/log.h>
 
 #include <advanced_config.h> // for realtime connectivity switch

eeschema/cross-probing.cpp

@@ -30,7 +30,7 @@
 #include <sch_symbol.h>
 #include <schematic.h>
 #include <reporter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <netlist_exporters/netlist_exporter_kicad.h>
 #include <project/project_file.h>
 #include <project/net_settings.h>

eeschema/dialogs/dialog_change_symbols.cpp

@@ -23,7 +23,7 @@
 #include <algorithm>
 
 #include <bitmaps.h>
-#include <kicad_string.h>   // WildCompareString
+#include <string_utils.h>   // WildCompareString
 #include <kiway.h>
 #include <lib_id.h>
 #include <refdes_utils.h>

eeschema/dialogs/dialog_edit_label.cpp

@@ -35,7 +35,7 @@
 #include <schematic.h>
 #include <dialogs/html_messagebox.h>
 #include <dialog_edit_label.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <tool/actions.h>
 #include <scintilla_tricks.h>
 

eeschema/dialogs/dialog_edit_one_field.cpp

@@ -26,7 +26,7 @@
 #include <bitmaps.h>
 #include <kiway.h>
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_base_frame.h>
 #include <sch_edit_frame.h>
 #include <ee_collectors.h>

eeschema/dialogs/dialog_edit_symbols_libid.cpp

@@ -43,7 +43,7 @@
 #include <wx/dcclient.h>
 #include <grid_tricks.h>
 #include <widgets/grid_text_button_helpers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 #define COL_REFS 0

eeschema/dialogs/dialog_erc.cpp

@@ -49,7 +49,7 @@
 #include <wx/hyperlink.h>
 #include <erc_item.h>
 #include <eeschema_settings.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiplatform/ui.h>
 
 DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :

eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp

@@ -23,7 +23,7 @@
 
 #include <connection_graph.h>
 #include <dialog_global_edit_text_and_graphics_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_symbol.h>
 #include <sch_connection.h>
 #include <sch_edit_frame.h>

eeschema/dialogs/dialog_lib_edit_pin_table.cpp

@@ -32,7 +32,7 @@
 #include <widgets/grid_icon_text_helpers.h>
 #include <widgets/wx_grid.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 class PIN_TABLE_DATA_MODEL : public wxGridTableBase
 {

eeschema/dialogs/dialog_lib_new_symbol.h

@@ -26,7 +26,7 @@
 #define __dialog_lib_new_symbol__
 
 #include <widgets/unit_binder.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <dialog_lib_new_symbol_base.h>
 
 class EDA_DRAW_FRAME;

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -31,7 +31,7 @@
 #include <sch_symbol.h>
 #include <widgets/grid_text_button_helpers.h>
 #include <widgets/wx_grid.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #ifdef KICAD_SPICE
 #include <dialog_spice_model.h>

eeschema/dialogs/dialog_sheet_pin_properties.cpp

@@ -28,7 +28,7 @@
 #include <sch_validators.h>
 #include <dialog_sheet_pin_properties.h>
 #include <dialogs/html_messagebox.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 static wxString sheetPinTypes[] =

eeschema/dialogs/dialog_signal_list.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "dialog_signal_list.h"
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sim/sim_plot_frame.h>
 
 #include <sim/netlist_exporter_pspice_sim.h>

eeschema/dialogs/dialog_symbol_fields_table.cpp

@@ -31,7 +31,7 @@
 #include <eeschema_settings.h>
 #include <general.h>
 #include <grid_tricks.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <refdes_utils.h>
 #include <sch_edit_frame.h>

eeschema/dialogs/dialog_symbol_properties.cpp

@@ -29,7 +29,7 @@
 #include <confirm.h>
 #include <kiface_i.h>
 #include <pin_numbers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <menus_helpers.h>
 #include <widgets/grid_icon_text_helpers.h>
 #include <widgets/grid_combobox.h>

eeschema/dialogs/dialog_update_symbol_fields.cpp

@@ -25,7 +25,7 @@
 #include <lib_symbol.h>
 #include <symbol_edit_frame.h>
 #include <template_fieldnames.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 bool g_removeExtraLibFields      = false;

eeschema/erc.cpp

@@ -26,7 +26,7 @@
 #include "connection_graph.h"
 #include <common.h>     // for ExpandEnvVarSubstitutions
 #include <erc.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_pin.h>
 #include <sch_edit_frame.h>
 #include <sch_marker.h>

eeschema/fields_grid_table.cpp

@@ -36,7 +36,7 @@
 #include <project/project_file.h>
 #include "eda_doc.h"
 #include <wx/settings.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 enum

eeschema/generate_alias_info.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <generate_alias_info.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <template_fieldnames.h>
 #include <lib_symbol.h>
 #include <symbol_lib_table.h>

eeschema/lib_field.cpp

@@ -24,7 +24,7 @@
 
 #include <eda_item.h>
 #include <gr_text.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_draw_panel.h>
 #include <eda_draw_frame.h>
 #include <plotter.h>

eeschema/netlist_exporters/netlist_exporter_cadstar.cpp

@@ -27,7 +27,7 @@
 #include <confirm.h>
 
 #include <connection_graph.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 

eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp

@@ -28,7 +28,7 @@
 
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <symbol_library.h>
 #include <symbol_lib_table.h>
 

eeschema/netlist_exporters/netlist_exporter_pspice.cpp

@@ -31,7 +31,7 @@
 #include <search_stack.h>
 
 #include <connection_graph.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 #include <env_paths.h>

eeschema/netlist_exporters/netlist_exporter_xml.cpp

@@ -29,7 +29,7 @@
 #include <common.h>     // for ExpandTextVars
 #include <sch_base_frame.h>
 #include <symbol_library.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <connection_graph.h>
 #include <refdes_utils.h>
 #include <wx/wfstream.h>

eeschema/netlist_exporters/netlist_generator.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <common.h>     // for ProcessExecute
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <gestfich.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>

eeschema/sch_connection.cpp

@@ -29,7 +29,7 @@
 #include <sch_screen.h>
 #include <project/net_settings.h>
 #include <advanced_config.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 #include <sch_connection.h>
 

eeschema/sch_edit_frame.cpp

@@ -34,7 +34,7 @@
 #include <hierarch.h>
 #include <dialogs/html_messagebox.h>
 #include <invoke_sch_dialog.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <kiplatform/app.h>
 #include <kiway.h>

eeschema/sch_field.cpp

@@ -46,7 +46,7 @@
 #include <sch_field.h>
 #include <schematic.h>
 #include <settings/color_settings.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <trace_helpers.h>
 #include <trigo.h>
 #include <eeschema_id.h>

eeschema/sch_painter.cpp

@@ -63,7 +63,7 @@
 #include <kiface_i.h>
 #include <default_values.h>
 #include <advanced_config.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include "sch_painter.h"
 
 namespace KIGFX

eeschema/sch_plugins/altium/sch_altium_plugin.cpp

@@ -54,7 +54,7 @@
 
 #include <bezier_curves.h>
 #include <compoundfilereader.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_edit_frame.h>
 #include <trigo.h>
 #include <wildcards_and_files_ext.h>

eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp

@@ -32,7 +32,7 @@
 #include <lib_polyline.h>
 #include <lib_text.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_bus_entry.h>
 #include <sch_edit_frame.h> //SYMBOL_ORIENTATION_T
 #include <sch_io_mgr.h>

eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp

@@ -37,7 +37,7 @@
 
 #include <symbol_library.h>
 #include <plugins/eagle/eagle_parser.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <lib_arc.h>
 #include <lib_circle.h>
 #include <lib_id.h>

eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp

@@ -41,7 +41,7 @@
 #include <lib_rectangle.h>
 #include <lib_text.h>
 #include <math/util.h>                           // KiROUND, Clamp
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_bitmap.h>
 #include <sch_bus_entry.h>
 #include <sch_symbol.h>

eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp

@@ -59,7 +59,7 @@
 #include <sch_plugins/kicad/sch_sexpr_parser.h>
 #include <symbol_lib_table.h>  // for PropPowerSymsOnly definition.
 #include <ee_selection.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx_filename.h>       // for ::ResolvePossibleSymlinks()
 #include <widgets/progress_reporter.h>
 

eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp

@@ -34,7 +34,7 @@
 #include <wx_filename.h>       // For ::ResolvePossibleSymlinks()
 
 #include <kiway.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <richio.h>
 #include <trace_helpers.h>

eeschema/sch_screen.cpp

@@ -34,7 +34,7 @@
 #include <eda_item.h>
 #include <eda_rect.h>
 #include <id.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiway.h>
 #include <plotter.h>
 #include <project.h>

eeschema/sch_sheet.cpp

@@ -29,7 +29,7 @@
 #include <trigo.h>
 #include <sch_edit_frame.h>
 #include <plotter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <widgets/msgpanel.h>
 #include <math/util.h>      // for KiROUND
 #include <sch_sheet.h>

eeschema/sch_sheet_pin.cpp

@@ -28,7 +28,7 @@
 #include <general.h>
 #include <geometry/shape_line_chain.h>
 #include <gr_text.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <plotter.h>
 #include <sch_draw_panel.h>
 #include <sch_edit_frame.h>

eeschema/sch_symbol.cpp

@@ -36,7 +36,7 @@
 #include <trigo.h>
 #include <refdes_utils.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 /**
  * Convert a wxString to UTF8 and replace any control characters with a ~,

eeschema/sch_text.cpp

@@ -34,7 +34,7 @@
 #include <widgets/msgpanel.h>
 #include <gal/stroke_font.h>
 #include <bitmaps.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_text.h>
 #include <schematic.h>
 #include <settings/color_settings.h>

eeschema/sim/netlist_exporter_pspice_sim.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "netlist_exporter_pspice_sim.h"
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>     // for TO_UTF8 def
 #include <wx/regex.h>
 #include <wx/tokenzr.h>

eeschema/sim/sim_plot_frame.cpp

@@ -36,7 +36,7 @@
 #include <wildcards_and_files_ext.h>
 #include <widgets/tuner_slider.h>
 #include <dialogs/dialog_signal_list.h>
-#include "kicad_string.h"
+#include "string_utils.h"
 #include "netlist_exporter_pspice_sim.h"
 #include <pgm_base.h>
 #include "ngspice.h"

eeschema/symbol_editor/symbol_edit_frame.cpp

@@ -72,7 +72,7 @@
 #include <wildcards_and_files_ext.h>
 #include <panel_sym_lib_table.h>
 #include <wx/choicdlg.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 bool SYMBOL_EDIT_FRAME::m_showDeMorgan = false;

eeschema/symbol_editor/symbol_editor.cpp

@@ -43,7 +43,7 @@
 #include <wx/clipbrd.h>
 #include <wx/filedlg.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 /**

eeschema/symbol_editor/symbol_editor_import_export.cpp

@@ -31,7 +31,7 @@
 #include <symbol_library_manager.h>
 #include <wx/filename.h>
 #include <wx/filedlg.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 void SYMBOL_EDIT_FRAME::ImportSymbol()

eeschema/symbol_editor/symbol_library_manager.cpp

@@ -39,7 +39,7 @@
 #include <list>
 #include <locale_io.h>
 #include <wx/log.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include "lib_logger.h"
 
 

eeschema/symbol_library.cpp

@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <kiface_i.h>
 #include <eda_base_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <macros.h>
 #include <richio.h>
 #include <config_params.h>

eeschema/symbol_tree_synchronizing_adapter.cpp

@@ -27,7 +27,7 @@
 #include <symbol_library_manager.h>
 #include <symbol_lib_table.h>
 #include <tools/symbol_editor_control.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 
 wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER>

eeschema/symbol_viewer_frame.cpp

@@ -55,7 +55,7 @@
 #include <wx/listbox.h>
 
 #include <default_values.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 // Save previous symbol library viewer state.
 wxString SYMBOL_VIEWER_FRAME::m_libraryName;

eeschema/tools/assign_footprints.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <sch_edit_frame.h>
 #include <wildcards_and_files_ext.h>

eeschema/tools/backannotate.cpp

@@ -32,7 +32,7 @@
 #include <sch_edit_frame.h>
 #include <sch_sheet_path.h>
 #include <schematic.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiface_i.h>
 #include <wildcards_and_files_ext.h>
 #include <connection_graph.h>

eeschema/tools/sch_drawing_tools.cpp

@@ -50,7 +50,7 @@
 #include <dialogs/dialog_line_wire_bus_properties.h>
 #include <dialogs/dialog_junction_props.h>
 #include <dialogs/dialog_sheet_pin_properties.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/filedlg.h>
 

eeschema/tools/sch_edit_tool.cpp

@@ -34,7 +34,7 @@
 #include <confirm.h>
 #include <eda_item.h>
 #include <reporter.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <sch_item.h>
 #include <sch_symbol.h>
 #include <sch_sheet.h>

eeschema/tools/sch_editor_control.cpp

@@ -34,7 +34,7 @@
 #include <project_rescue.h>
 #include <erc.h>
 #include <invoke_sch_dialog.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <kiway.h>
 #include <kiway_player.h>
 #include <netlist_exporters/netlist_exporter_pspice.h>

eeschema/tools/symbol_editor_drawing_tools.cpp

@@ -36,7 +36,7 @@
 #include <pgm_base.h>
 #include <symbol_editor/symbol_editor_settings.h>
 #include <settings/settings_manager.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 
 static void* g_lastPinWeakPtr;
 

eeschema/tools/symbol_editor_edit_tool.cpp

@@ -29,7 +29,7 @@
 #include <tools/symbol_editor_move_tool.h>
 #include <ee_actions.h>
 #include <bitmaps.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <symbol_edit_frame.h>
 #include <dialogs/dialog_lib_edit_draw_item.h>
 #include <dialogs/dialog_lib_edit_text.h>

gerbview/excellon_read_drill_file.cpp

@@ -70,7 +70,7 @@
 #include <gerber_file_image_list.h>
 #include <excellon_image.h>
 #include <macros.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <X2_gerber_attributes.h>
 #include <view/view.h>

gerbview/export_to_pcbnew.cpp

@@ -27,7 +27,7 @@
 #include <export_to_pcbnew.h>
 
 #include <confirm.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <trigo.h>

gerbview/gerber_draw_item.cpp

@@ -30,7 +30,7 @@
 #include <gerber_draw_item.h>
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <geometry/shape_arc.h>
 #include <math/util.h>      // for KiROUND
 #include <widgets/msgpanel.h>

gerbview/readgerb.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>

gerbview/toolbars_gerber.cpp

@@ -26,7 +26,7 @@
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
 #include <dialog_helpers.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/wupdlock.h>
 #include <tool/actions.h>
 #include <tool/action_toolbar.h>

gerbview/tools/gerbview_control.cpp

@@ -25,7 +25,7 @@
 #include <gerber_file_image_list.h>
 #include <gerbview_painter.h>
 #include <gerbview_frame.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <excellon_image.h>
 #include <menus_helpers.h>
 #include <tool/tool_manager.h>

gerbview/tools/gerbview_selection_tool.cpp

@@ -26,7 +26,7 @@ using namespace std::placeholders;
 #include <eda_item.h>
 #include <gerber_collectors.h>
 #include <class_draw_panel_gal.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <view/view.h>
 #include <view/view_group.h>
 #include <painter.h>

include/lib_table_grid.h

@@ -21,7 +21,7 @@
 #define __LIB_TABLE_GRID_H__
 
 #include <lib_table_base.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <wx/grid.h>
 
 const wxColour COLOUR_ROW_ENABLED( 0, 0, 0 );

include/string_utils.h

@@ -21,14 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file  kicad_string.h
- * @see   common.h, string.cpp
- */
-
-
-#ifndef KICAD_STRING_H_
-#define KICAD_STRING_H_
+#ifndef STRING_UTILS_H
+#define STRING_UTILS_H
 
 #include "config.h"
 
@@ -354,4 +348,4 @@ std::string Double2Str( double aValue );
  */
 wxString AngleToStringDegrees( double aAngle );
 
-#endif  // KICAD_STRING_H_
+#endif  // STRING_UTILS_H

pcb_calculator/datafile_read_write.cpp

@@ -29,7 +29,7 @@
 #include <class_regulator_data.h>
 #include <common.h>
 #include <datafile_read_write.h>
-#include <kicad_string.h>
+#include <string_utils.h>
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_calculator_datafile_lexer.h>