realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Netinfo: avoid transitive string_utils.h include

Browse Source 
Put the string manipuuation utils in the cpp, and
remove string_utils.h from the includes of netinfo.h.

This spams that header into about 350 files, not all of which
need it. Then go round and tidy up the places (most exporters
and dialogs) where CPP files weren't including string_utils.h
when they used it, as well as some other order-sensitive
include issues that turned up.
This commit is contained in:
John Beard 2025-08-08 20:04:19 +08:00
parent 10ca84470c
commit 299a6c6c7b
39 changed files with 219 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/dialogs/dialog_board_statistics.cpp
View File

@ -24,15 +24,19 @@
#include "dialog_board_statistics.h"
#include <wx/filedlg.h>
#include <kiplatform/ui.h>
#include <confirm.h>
#include <pad.h>
#include <macros.h>
#include <string_utils.h>
#include <wildcards_and_files_ext.h>
#include <widgets/wx_grid.h>
#include <wx/filedlg.h>
#include <convert_basic_shapes_to_polygon.h>
#define COL_LABEL 0
#define COL_AMOUNT 1

11
pcbnew/dialogs/dialog_export_2581.cpp
View File

@ -17,7 +17,12 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <dialogs/dialog_export_2581.h>
#include "dialogs/dialog_export_2581.h"
#include <set>
#include <vector>
#include <wx/filedlg.h>
#include <board.h>
#include <footprint.h>
@ -28,12 +33,10 @@
#include <project.h>
#include <project/project_file.h>
#include <settings/settings_manager.h>
#include <string_utils.h>
#include <widgets/std_bitmap_button.h>
#include <jobs/job_export_pcb_ipc2581.h>
#include <set>
#include <vector>
#include <wx/filedlg.h>
DIALOG_EXPORT_2581::DIALOG_EXPORT_2581( PCB_EDIT_FRAME* aParent ) :

26
pcbnew/dialogs/dialog_export_odbpp.cpp
View File

@ -17,7 +17,18 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <dialogs/dialog_export_odbpp.h>
#include "dialogs/dialog_export_odbpp.h"
#include <set>
#include <vector>
#include <thread_pool.h>
#include <wx/dir.h>
#include <wx/filedlg.h>
#include <wx/wfstream.h>
#include <wx/zipstrm.h>
#include <wx/tarstrm.h>
#include <wx/zstream.h>
#include <board.h>
#include <confirm.h>
@ -32,21 +43,12 @@
#include <project.h>
#include <project/project_file.h>
#include <settings/settings_manager.h>
#include <string_utils.h>
#include <widgets/std_bitmap_button.h>
#include <jobs/job_export_pcb_odb.h>
#include <set>
#include <vector>
#include <thread_pool.h>
#include <io/io_mgr.h>
#include <jobs/job_export_pcb_odb.h>
#include <pcb_io/pcb_io_mgr.h>
#include <wx/dir.h>
#include <wx/filedlg.h>
#include <wx/wfstream.h>
#include <wx/zipstrm.h>
#include <wx/tarstrm.h>
#include <wx/zstream.h>
DIALOG_EXPORT_ODBPP::DIALOG_EXPORT_ODBPP( PCB_EDIT_FRAME* aParent ) :

6
pcbnew/dialogs/dialog_export_step.cpp
View File

@ -22,6 +22,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dialog_export_step.h"
#include "dialog_export_step_process.h"
#include <wx/log.h>
#include <wx/stdpaths.h>
#include <wx/process.h>
@ -33,8 +36,6 @@
#include <confirm.h>
#include <kidialog.h>
#include <widgets/std_bitmap_button.h>
#include "dialog_export_step.h"
#include "dialog_export_step_process.h"
#include <footprint.h>
#include <kiface_base.h>
#include <locale_io.h>
@ -43,6 +44,7 @@
#include <tools/board_editor_control.h>
#include <project/project_file.h> // LAST_PATH_TYPE
#include <reporter.h>
#include <string_utils.h>
#include <trace_helpers.h>
#include <widgets/text_ctrl_eval.h>
#include <wildcards_and_files_ext.h>

12
pcbnew/dialogs/dialog_gen_footprint_position.cpp
View File

@ -26,7 +26,11 @@
* 2 - create a footprint report (pos and footprint descr) (ascii file)
*/
#include <dialog_gen_footprint_position.h>
#include "dialog_gen_footprint_position.h"
#include <wx/dirdlg.h>
#include <wx/msgdlg.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
#include <project/project_file.h>
@ -35,15 +39,13 @@
#include <tools/board_editor_control.h>
#include <wildcards_and_files_ext.h>
#include <kiface_base.h>
#include <string_utils.h>
#include <widgets/wx_html_report_panel.h>
#include <widgets/std_bitmap_button.h>
#include <exporters/place_file_exporter.h>
#include "gerber_placefile_writer.h"
#include <jobs/job_export_pcb_pos.h>
#include <wx/dirdlg.h>
#include <wx/msgdlg.h>
DIALOG_GEN_FOOTPRINT_POSITION::DIALOG_GEN_FOOTPRINT_POSITION( PCB_EDIT_FRAME* aEditFrame ) :
DIALOG_GEN_FOOTPRINT_POSITION_BASE( aEditFrame ),
@ -556,5 +558,3 @@ int BOARD_EDITOR_CONTROL::GenFootprintsReport( const TOOL_EVENT& aEvent )
return 0;
}

15
pcbnew/dialogs/dialog_gencad_export_options.cpp
View File

@ -26,11 +26,6 @@
#include "dialog_gencad_export_options.h"
#include <jobs/job_export_pcb_gencad.h>
#include <pcb_edit_frame.h>
#include <kidialog.h>
#include <wildcards_and_files_ext.h>
#include <wx/anybutton.h>
#include <wx/filedlg.h>
#include <wx/checkbox.h>
@ -38,7 +33,14 @@
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include "widgets/std_bitmap_button.h"
#include <jobs/job_export_pcb_gencad.h>
#include <pcb_edit_frame.h>
#include <kidialog.h>
#include <wildcards_and_files_ext.h>
#include <widgets/std_bitmap_button.h>
#include <string_utils.h>
#include <board.h>
@ -222,4 +224,3 @@ void DIALOG_GENCAD_EXPORT_OPTIONS::createOptCheckboxes()
m_optsSizer->Add( chkbox );
}
}

11
pcbnew/dialogs/dialog_gendrill.cpp
View File

@ -22,6 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dialog_gendrill.h"
#include <wx/msgdlg.h>
#include <wx/dirdlg.h>
#include <wx/filedlg.h>
#include <confirm.h>
#include <core/arraydim.h>
#include <widgets/std_bitmap_button.h>
@ -35,12 +41,9 @@
#include <pad.h>
#include <pcb_track.h>
#include <paths.h>
#include <dialog_gendrill.h>
#include <string_utils.h>
#include <wildcards_and_files_ext.h>
#include <reporter.h>
#include <wx/msgdlg.h>
#include <wx/dirdlg.h>
#include <wx/filedlg.h>
#include <jobs/job_export_pcb_drill.h>
// List of allowed precision for EXCELLON files, for integer format. Due to difference between inches and mm,

6
pcbnew/dialogs/dialog_gendrill.h
View File

@ -24,10 +24,16 @@
#pragma once
#include <math/vector2d.h>
#include <gendrill_file_writer_base.h> // for DRILL_PRECISION definition
#include <dialog_gendrill_base.h>
#include <pcb_plot_params.h>
class JOB_EXPORT_PCB_DRILL;
class PCB_EDIT_FRAME;
class DIALOG_GENDRILL : public DIALOG_GENDRILL_BASE
{

11
pcbnew/dialogs/dialog_plot.cpp
View File

@ -21,8 +21,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dialog_plot.h"
#include <wx/bmpbuttn.h>
#include <wx/clntdata.h>
#include <wx/dirdlg.h>
#include <wx/msgdlg.h>
#include <wx/rearrangectrl.h>
#include <plotters/plotter.h>
@ -37,8 +41,8 @@
#include <layer_ids.h>
#include <locale_io.h>
#include <bitmaps.h>
#include <dialog_plot.h>
#include <dialog_gendrill.h>
#include <string_utils.h>
#include <widgets/wx_html_report_panel.h>
#include <widgets/std_bitmap_button.h>
#include <widgets/color_swatch.h>
@ -56,9 +60,6 @@
#include <plotters/plotters_pslike.h>
#include <pcb_plotter.h>
#include <wx/dirdlg.h>
#include <wx/msgdlg.h>
LSEQ DIALOG_PLOT::s_lastAllLayersOrder;
@ -1372,4 +1373,4 @@ void DIALOG_PLOT::updatePdfColorOptions()
void DIALOG_PLOT::onPDFColorChoice( wxCommandEvent& aEvent )
{
updatePdfColorOptions();
}
}

6
pcbnew/dialogs/dialog_shape_properties.cpp
View File

@ -25,22 +25,24 @@
/*
* Edit properties of Lines, Circles, Arcs and Polygons for PCBNew and Footprint Editor
*/
#include "dialog_shape_properties_base.h"
#include <wx/valnum.h>
#include <pcb_base_edit_frame.h>
#include <pcb_edit_frame.h>
#include <wx/valnum.h>
#include <board_commit.h>
#include <board_design_settings.h>
#include <pcb_layer_box_selector.h>
#include <dialogs/html_message_box.h>
#include <length_delay_calculation/length_delay_calculation.h>
#include <string_utils.h>
#include <tool/tool_manager.h>
#include <tool/actions.h>
#include <pcb_shape.h>
#include <macros.h>
#include <widgets/unit_binder.h>
#include <dialog_shape_properties_base.h>
#include <tools/drawing_tool.h>

6
pcbnew/dialogs/dialog_table_properties.cpp
View File

@ -21,6 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dialog_table_properties.h"
#include <kiplatform/ui.h>
#include <widgets/font_choice.h>
#include <widgets/color_swatch.h>
@ -29,6 +31,7 @@
#include <widgets/grid_color_swatch_helpers.h>
#include <grid_tricks.h>
#include <scintilla_tricks.h>
#include <string_utils.h>
#include <confirm.h>
#include <board.h>
#include <board_commit.h>
@ -42,7 +45,6 @@
#include <pcb_layer_box_selector.h>
#include <tool/tool_manager.h>
#include <tools/pcb_actions.h>
#include <dialog_table_properties.h>
DIALOG_TABLE_PROPERTIES::DIALOG_TABLE_PROPERTIES( PCB_BASE_EDIT_FRAME* aFrame, PCB_TABLE* aTable ) :
@ -441,5 +443,3 @@ void DIALOG_TABLE_PROPERTIES::onSize( wxSizeEvent& aEvent )
aEvent.Skip();
}

7
pcbnew/dialogs/dialog_text_properties.cpp
View File

@ -22,9 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dialog_text_properties.h"
#include <wx/valnum.h>
#include <widgets/bitmap_button.h>
#include <widgets/font_choice.h>
#include <dialog_text_properties.h>
#include <confirm.h>
#include <board_commit.h>
#include <board.h>
@ -33,8 +36,8 @@
#include <project.h>
#include <pcb_edit_frame.h>
#include <pcb_layer_box_selector.h>
#include <wx/valnum.h>
#include <scintilla_tricks.h>
#include <string_utils.h>
DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, PCB_TEXT* aText ) :

5
pcbnew/dialogs/dialog_textbox_properties.cpp
View File

@ -21,9 +21,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "dialog_textbox_properties.h"
#include <widgets/bitmap_button.h>
#include <widgets/font_choice.h>
#include <dialog_textbox_properties.h>
#include <confirm.h>
#include <board_commit.h>
#include <board_design_settings.h>
@ -34,6 +35,8 @@
#include <pcb_edit_frame.h>
#include <pcb_layer_box_selector.h>
#include <scintilla_tricks.h>
#include <string_utils.h>
DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
PCB_TEXTBOX* aTextBox ) :

9
pcbnew/drc/drc_report.cpp
View File

@ -17,19 +17,22 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "drc_report.h"
#include <fstream>
#include <wx/string.h>
#include <board.h>
#include <board_design_settings.h>
#include <build_version.h>
#include "drc_report.h"
#include <drc/drc_item.h>
#include <locale_io.h>
#include <macros.h>
#include <json_common.h>
#include <rc_json_schema.h>
#include <string_utils.h>
#include <fstream>
DRC_REPORT::DRC_REPORT( BOARD* aBoard, EDA_UNITS aReportUnits,
std::shared_ptr<RC_ITEMS_PROVIDER> aMarkersProvider,
@ -180,4 +183,4 @@ bool DRC_REPORT::WriteJsonReport( const wxString& aFullFileName )
jsonFileStream.close();
return true;
}
}

2
pcbnew/drc/drc_test_provider_library_parity.cpp
View File

@ -35,6 +35,8 @@
#include <drc/drc_item.h>
#include <drc/drc_test_provider.h>
#include <project_pcb.h>
#include <string_utils.h>
/*
Library parity test.

21
pcbnew/exporters/export_d356.cpp
View File

@ -26,6 +26,15 @@
* @file export_d356.cpp
* @brief Export IPC-D-356 test format
*/
#include "export_d356.h"
#include <vector>
#include <cctype>
#include <wx/checkbox.h>
#include <wx/filedlg.h>
#include <wx/filedlgcustomize.h>
#include <wx/msgdlg.h>
#include <confirm.h>
#include <gestfich.h>
@ -42,16 +51,10 @@
#include <layer_range.h>
#include <pad.h>
#include <pcb_track.h>
#include <vector>
#include <cctype>
#include <math/util.h> // for KiROUND
#include <export_d356.h>
#include <tools/board_editor_control.h>
#include <string_utils.h>
#include <wx/checkbox.h>
#include <wx/filedlg.h>
#include <wx/filedlgcustomize.h>
#include <wx/msgdlg.h>
#include <math/util.h> // for KiROUND
#include <tools/board_editor_control.h>
// Compute the access code for a pad. Returns -1 if there is no copper

4
pcbnew/exporters/export_gencad_writer.cpp
View File

@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "export_gencad_writer.h"
#include <build_version.h>
#include <board.h>
@ -26,12 +27,11 @@
#include <pad.h>
#include <pcb_track.h>
#include <richio.h>
#include <string_utils.h>
#include <locale_io.h>
#include <macros.h>
#include <hash_eda.h>
#include <export_gencad_writer.h>
/// Layer names for GenCAD export.
static std::string genCADLayerName( int aCuCount, PCB_LAYER_ID aId )

9
pcbnew/exporters/export_gencad_writer.h
View File

@ -17,9 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h> // for FILE
#include <wx/string.h>
#include <math/vector2d.h>
class BOARD;
class wxString;
struct aFile;
class FOOTPRINT;
/**
* Export board to GenCAD file format.

13
pcbnew/exporters/export_hyperlynx.cpp
View File

@ -22,6 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <cstdio>
#include <vector>
#include <wx/log.h>
#include <wx/filedlg.h>
#include <kiface_base.h>
#include <macros.h>
#include <pcb_edit_frame.h>
@ -32,16 +38,14 @@
#include <pad.h>
#include <pcb_track.h>
#include <zone.h>
#include <cstdio>
#include <vector>
#include <ki_exception.h>
#include <locale_io.h>
#include <reporter.h>
#include <richio.h>
#include <string_utils.h>
#include <tools/board_editor_control.h>
#include <exporters/board_exporter_base.h>
#include <wx/log.h>
#include <wx/filedlg.h>
static double iu2hyp( double iu )
{
@ -688,4 +692,3 @@ int BOARD_EDITOR_CONTROL::ExportHyperlynx( const TOOL_EVENT& aEvent )
return 0;
}

9
pcbnew/exporters/gendrill_file_writer_base.h
View File

@ -36,8 +36,17 @@
#define USE_ATTRIB_FOR_HOLES 1
#include <vector>
#include <string>
#include <layer_ids.h>
#include <plotters/plotter.h>
class BOARD;
class BOARD_ITEM;
class OUTPUTFORMATTER;
class PAGE_INFO;
class REPORTER;
// hole attribute, mainly to identify vias and pads and add this info as comment
// in NC drill files

5
pcbnew/generators/pcb_tuning_pattern.cpp
View File

@ -29,6 +29,8 @@
#include <magic_enum.hpp>
#include <wx/debug.h>
#include <wx/log.h>
#include <gal/graphics_abstraction_layer.h>
#include <geometry/shape_circle.h>
#include <geometry/geometry_utils.h>
@ -37,6 +39,7 @@
#include <collectors.h>
#include <scoped_set_reset.h>
#include <core/mirror.h>
#include <string_utils.h>
#include <board_design_settings.h>
#include <drc/drc_engine.h>
@ -69,8 +72,6 @@
#include <dialogs/dialog_tuning_pattern_properties.h>
#include <wx/log.h>
enum LENGTH_TUNING_MODE
{

20
pcbnew/netinfo.h
View File

@ -30,10 +30,8 @@
#define CLASS_NETINFO_
#include <macros_swig.h>
#include <gr_basic.h>
#include <netclass.h>
#include <board_item.h>
#include <string_utils.h>
class EDA_DRAW_FRAME;
@ -126,27 +124,13 @@ public:
/**
* @return true if the net was not labelled by the user.
*/
bool HasAutoGeneratedNetname()
{
return m_shortNetname.StartsWith( wxT( "Net-(" ) )
|| m_shortNetname.StartsWith( wxT( "unconnected-(" ) );
}
bool HasAutoGeneratedNetname();
/**
* Set the long netname to \a aNetName, the short netname to the last token in
* the long netname's path, and the unescaped short netname.
*/
void SetNetname( const wxString& aNewName )
{
m_netname = aNewName;
if( aNewName.Contains( wxT( "/" ) ) )
m_shortNetname = aNewName.AfterLast( '/' );
else
m_shortNetname = aNewName;
m_displayNetname = UnescapeString( m_shortNetname );
}
void SetNetname( const wxString& aNewName );
bool IsCurrent() const { return m_isCurrent; }
void SetIsCurrent( bool isCurrent ) { m_isCurrent = isCurrent; }

23
pcbnew/netinfo_item.cpp
View File

@ -27,7 +27,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "netinfo.h"
#include <fmt/format.h>
#include <pcb_base_frame.h>
#include <string_utils.h>
#include <widgets/msgpanel.h>
@ -184,3 +187,23 @@ const BOX2I NETINFO_ITEM::GetBoundingBox() const
return bbox;
}
bool NETINFO_ITEM::HasAutoGeneratedNetname()
{
return m_shortNetname.StartsWith( wxT( "Net-(" ) )
|| m_shortNetname.StartsWith( wxT( "unconnected-(" ) );
}
void NETINFO_ITEM::SetNetname( const wxString& aNewName )
{
m_netname = aNewName;
if( aNewName.Contains( wxT( "/" ) ) )
m_shortNetname = aNewName.AfterLast( '/' );
else
m_shortNetname = aNewName;
m_displayNetname = UnescapeString( m_shortNetname );
}

8
pcbnew/netinfo_list.cpp
View File

@ -21,6 +21,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "netinfo.h"
#include <wx/log.h>
#include <board.h>
#include <board_commit.h>
#include <footprint.h>
@ -28,9 +32,8 @@
#include <pad.h>
#include <pcb_shape.h>
#include <pcb_track.h>
#include <string_utils.h>
#include <zone.h>
#include <netinfo.h>
#include <wx/log.h>
// Constructor and destructor
@ -344,4 +347,3 @@ NETINFO_ITEM* NETINFO_MAPPING::iterator::operator->() const
const int NETINFO_LIST::UNCONNECTED = 0;
const int NETINFO_LIST::ORPHANED = -1;

1
pcbnew/pcb_draw_panel_gal.cpp
View File

@ -46,6 +46,7 @@
#include <settings/settings_manager.h>
#include <confirm.h>
#include <progress_reporter.h>
#include <string_utils.h>
#include <gal/graphics_abstraction_layer.h>
#include <zoom_defines.h>

6
pcbnew/pcb_group.cpp
View File

@ -21,15 +21,17 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "pcb_group.h"
#include <bitmaps.h>
#include <eda_draw_frame.h>
#include <geometry/shape_compound.h>
#include <board.h>
#include <board_item.h>
#include <confirm.h>
#include <footprint.h>
#include <pcb_generator.h>
#include <pcb_group.h>
#include <confirm.h>
#include <string_utils.h>
#include <widgets/msgpanel.h>
#include <view/view.h>
#include <api/api_enums.h>

3
pcbnew/pcb_io/geda/pcb_io_geda.cpp
View File

@ -26,8 +26,10 @@
* @file pcb_io_geda.cpp
* @brief Geda PCB file plugin implementation file.
*/
#include "pcb_io/geda/pcb_io_geda.h"
#include <wildcards_and_files_ext.h>
#include <string_utils.h>
#include <trace_helpers.h>
#include <math/util.h> // for KiROUND
@ -38,7 +40,6 @@
#include <macros.h>
#include <pcb_text.h>
#include <pcb_shape.h>
#include <pcb_io/geda/pcb_io_geda.h>
#include <reporter.h>
#include <wx_filename.h>

1
pcbnew/pcb_io/ipc2581/pcb_io_ipc2581.cpp
View File

@ -36,6 +36,7 @@
#include <pgm_base.h>
#include <progress_reporter.h>
#include <settings/settings_manager.h>
#include <string_utils.h>
#include <wx_fstream_progress.h>
#include <geometry/shape_line_chain.h>

18
pcbnew/pcb_io/odbpp/odb_eda_data.cpp
View File

@ -18,14 +18,16 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <build_version.h>
#include "odb_eda_data.h"
#include "hash_eda.h"
#include "netinfo.h"
#include "odb_feature.h"
#include "base_units.h"
#include "pcb_io_odbpp.h"
#include <base_units.h>
#include <build_version.h>
#include <hash_eda.h>
#include <string_utils.h>
#include <netinfo.h>
#include <odb_feature.h>
#include <pcb_io_odbpp.h>
EDA_DATA::EDA_DATA()
@ -212,7 +214,7 @@ void EDA_DATA::AddPackage( const FOOTPRINT* aFp )
size_t pkg_index = packages_map.size();
wxString fp_name = fp->GetFPID().GetLibItemName().wx_str();
ODB::RemoveWhitespace( fp_name );
if( fp_name.IsEmpty() )
fp_name = wxS( "__" );

8
pcbnew/pcb_io/odbpp/odb_feature.cpp
View File

@ -19,7 +19,12 @@
*/
#include "odb_feature.h"
#include <sstream>
#include <map>
#include <wx/log.h>
#include "pcb_shape.h"
#include "odb_defines.h"
#include "pcb_track.h"
@ -30,9 +35,8 @@
#include "geometry/eda_angle.h"
#include "odb_eda_data.h"
#include "pcb_io_odbpp.h"
#include <map>
#include "wx/log.h"
#include <callback_gal.h>
#include <string_utils.h>
void FEATURES_MANAGER::AddFeatureLine( const VECTOR2I& aStart, const VECTOR2I& aEnd,

6
pcbnew/pcbexpr_evaluator.cpp
View File

@ -21,17 +21,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "pcbexpr_evaluator.h"
#include <cstdio>
#include <memory>
#include <mutex>
#include <board.h>
#include <footprint.h>
#include <lset.h>
#include <board_connected_item.h>
#include <pcbexpr_evaluator.h>
#include <drc/drc_engine.h>
#include <component_classes/component_class.h>
#include <string_utils.h>
/* --------------------------------------------------------------------------------------------
* Specialized Expression References
@ -774,4 +777,3 @@ bool PCBEXPR_EVALUATOR::Evaluate( const wxString& aExpr )
return true;
}

2
pcbnew/pcbexpr_evaluator.h
View File

@ -27,6 +27,8 @@
#include <unordered_map>
#include <layer_ids.h>
#include <properties/property.h>
#include <properties/property_mgr.h>

12
pcbnew/python/scripting/pcb_scripting_tool.cpp
View File

@ -23,18 +23,20 @@
#include "pcb_scripting_tool.h"
#include <Python.h>
#include <wx/string.h>
#include <pybind11/eval.h>
#include <action_plugin.h>
#include <kiface_ids.h>
#include <kiway.h>
#include <macros.h>
#include <pgm_base.h>
#include <python_scripting.h>
#include <string_utils.h>
#include <tools/pcb_actions.h>
#include <pybind11/eval.h>
#include <Python.h>
#include <wx/string.h>
#include <launch_ext.h>
#ifdef KICAD_IPC_API

5
pcbnew/specctra_import_export/specctra.h
View File

@ -34,11 +34,16 @@
#include <specctra_import_export/specctra_lexer.h>
#include <map>
#include <memory>
#include <core/typeinfo.h>
#include <geometry/shape_poly_set.h>
#include <layer_ids.h>
// all outside the DSN namespace:
class BOARD;
class PAD;
class PCB_TRACK;
class PCB_ARC;
class PCB_VIA;

13
pcbnew/specctra_import_export/specctra_export.cpp
View File

@ -31,15 +31,20 @@
Also see the comments at the top of the specctra.cpp file itself.
*/
#include "specctra.h"
#include <set>
#include <map>
#include <wx/log.h>
#include <pcb_edit_frame.h>
#include <confirm.h> // DisplayErrorMessage()
#include <gestfich.h> // EDA_FileSelector()
#include <locale_io.h>
#include <macros.h>
#include <math/util.h> // for KiROUND
#include <set> // std::set
#include <map> // std::map
#include <string_utils.h>
#include <board.h>
#include <board_design_settings.h>
@ -55,9 +60,7 @@
#include <convert_basic_shapes_to_polygon.h>
#include <geometry/geometry_utils.h>
#include <pcbnew_settings.h>
#include <wx/log.h>
#include "specctra.h"
using namespace DSN;

3
pcbnew/specctra_import_export/specctra_import.cpp
View File

@ -31,6 +31,7 @@
Also see the comments at the top of the specctra.cpp file itself.
*/
#include "specctra.h"
#include <confirm.h> // DisplayErrorMessage()
#include <gestfich.h> // EDA_FileSelector()
@ -44,9 +45,9 @@
#include <pcb_track.h>
#include <connectivity/connectivity_data.h>
#include <view/view.h>
#include "specctra.h"
#include <math/util.h> // for KiROUND
#include <pcbnew_settings.h>
#include <string_utils.h>
using namespace DSN;

13
pcbnew/tools/convert_tool.cpp
View File

@ -21,13 +21,17 @@
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "convert_tool.h"
#include <ranges>
#include <bitmaps.h>
#include <dialog_shim.h>
#include <wx/statline.h>
#include <wx/checkbox.h>
#include <wx/button.h>
#include <wx/radiobut.h>
#include <bitmaps.h>
#include <dialog_shim.h>
#include <widgets/unit_binder.h>
#include <board.h>
#include <board_commit.h>
@ -43,6 +47,7 @@
#include <pcb_shape.h>
#include <pcb_track.h>
#include <pad.h>
#include <string_utils.h>
#include <tool/tool_manager.h>
#include <tools/edit_tool.h>
#include <tools/pcb_actions.h>
@ -52,10 +57,6 @@
#include <macros.h>
#include <zone.h>
#include <ranges>
#include "convert_tool.h"
class CONVERT_SETTINGS_DIALOG : public DIALOG_SHIM
{

1
pcbnew/widgets/pcb_net_inspector_panel.cpp
View File

@ -33,6 +33,7 @@
#include <pcb_painter.h>
#include <pgm_base.h>
#include <settings/settings_manager.h>
#include <string_utils.h>
#include <validators.h>
#include <wildcards_and_files_ext.h>
#include <eda_pattern_match.h>

1
pcbnew/widgets/pcb_net_inspector_panel_data_model.h
View File

@ -21,6 +21,7 @@
#define PCB_NET_INSPECTOR_PANEL_DATA_MODEL
#include <eda_pattern_match.h>
#include <string_utils.h>
/**