Cleanup some pgm_base.h includes

2021-06-08 21:56:00 -04:00 · 2021-06-08 21:56:00 -04:00 · d946d6e68f
parent 19faadf149
commit d946d6e68f
48 changed files with 14 additions and 41 deletions
--- a/3d-viewer/3d_cache/3d_plugin_manager.cpp
+++ b/3d-viewer/3d_cache/3d_plugin_manager.cpp
@ -36,7 +36,6 @@

 #include <common.h>
 #include <paths.h>
-#include <pgm_base.h>
 #include "3d_plugin_manager.h"
 #include "plugins/3d/3d_plugin.h"
 #include "3d_cache/sg/scenegraph.h"
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/bitmap2component/bitmap2cmp_gui.cpp
@ -30,7 +30,6 @@
 #include <kiface_i.h>
 #include <math/util.h>      // for KiROUND
 #include <kiway.h>
-#include <pgm_base.h>
 #include <potracelib.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/clipbrd.h>
--- a/common/env_paths.cpp
+++ b/common/env_paths.cpp
@ -21,6 +21,8 @@
 */

 #include <env_paths.h>
+#include <project.h>
+#include <wx/filename.h>

 static bool normalizeAbsolutePaths( const wxFileName& aPathA, const wxFileName& aPathB,
                                    wxString* aResultPath )
--- a/common/gal/dpi_scaling.cpp
+++ b/common/gal/dpi_scaling.cpp
@ -26,7 +26,6 @@
 #include <core/optional.h>

 #include <env_vars.h>
-#include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <kiplatform/ui.h>

--- a/common/kiway_player.cpp
+++ b/common/kiway_player.cpp
@ -23,7 +23,6 @@
 */


-#include <pgm_base.h>
 #include <kiway_player.h>
 #include <kiway_express.h>
 #include <kiway.h>
--- a/common/languages_menu.cpp
+++ b/common/languages_menu.cpp
@ -27,9 +27,9 @@
 * @brief build the standard menu to show the list of available translations
 */

-#include <pgm_base.h>
 #include <id.h>
 #include <menus_helpers.h>
+#include <pgm_base.h> // LanguagesList
 #include <tool/tool_interactive.h>
 #include <tool/action_menu.h>
 #include <tool/conditional_menu.h>
--- a/common/project.cpp
+++ b/common/project.cpp
@ -32,7 +32,6 @@
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <macros.h>
-#include <pgm_base.h>
 #include <project.h>
 #include <project/project_file.h>
 #include <trace_helpers.h>
--- a/common/widgets/grid_text_button_helpers.cpp
+++ b/common/widgets/grid_text_button_helpers.cpp
@ -33,6 +33,7 @@
 #include <dialog_shim.h>
 #include <common.h>
 #include <env_paths.h>
+#include <pgm_base.h>
 #include <widgets/wx_grid.h>
 #include <widgets/grid_text_button_helpers.h>
 #include <eda_doc.h>
--- a/eeschema/dialogs/dialog_edit_components_libid.cpp
+++ b/eeschema/dialogs/dialog_edit_components_libid.cpp
@ -34,7 +34,6 @@
 #include <sch_symbol.h>
 #include <sch_reference_list.h>
 #include <schematic.h>
-#include <pgm_base.h>
 #include <symbol_lib_table.h>
 #include <trace_helpers.h>
 #include <widgets/wx_grid.h>
--- a/eeschema/dialogs/dialog_edit_line_style.cpp
+++ b/eeschema/dialogs/dialog_edit_line_style.cpp
@ -26,7 +26,6 @@
 #include <sch_line.h>
 #include <dialog_edit_line_style.h>
 #include <dialogs/dialog_color_picker.h>
-#include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <sch_edit_frame.h>
 #include <widgets/color_swatch.h>
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@ -24,7 +24,6 @@
 */

 #include <gestfich.h>
-#include <pgm_base.h>
 #include <sch_screen.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
--- a/eeschema/dialogs/dialog_junction_props.cpp
+++ b/eeschema/dialogs/dialog_junction_props.cpp
@ -20,7 +20,6 @@

 #include <sch_junction.h>
 #include <dialog_junction_props.h>
-#include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <sch_edit_frame.h>
 #include <widgets/color_swatch.h>
--- a/eeschema/dialogs/dialog_lib_edit_text.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_text.cpp
@ -27,7 +27,6 @@
 #include <settings/settings_manager.h>
 #include <dialog_lib_edit_text.h>
 #include <symbol_editor/symbol_editor_settings.h>
-#include <pgm_base.h>
 #include <tools/symbol_editor_drawing_tools.h>


--- a/eeschema/dialogs/panel_eeschema_editing_options.cpp
+++ b/eeschema/dialogs/panel_eeschema_editing_options.cpp
@ -26,7 +26,6 @@
 #include <settings/settings_manager.h>
 #include <settings/color_settings.h>
 #include <painter.h>
-#include <pgm_base.h>
 #include <eeschema_settings.h>
 #include "panel_eeschema_editing_options.h"

--- a/eeschema/dialogs/panel_setup_pinmap.cpp
+++ b/eeschema/dialogs/panel_setup_pinmap.cpp
@ -21,7 +21,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <kiface_i.h>
 #include <bitmaps.h>
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@ -30,7 +30,6 @@
 #include <general.h>
 #include <kiway.h>
 #include <symbol_viewer_frame.h>
-#include <pgm_base.h>
 #include <sch_symbol.h>
 #include <sch_edit_frame.h>
 #include <symbol_lib_table.h>
--- a/eeschema/lib_field.cpp
+++ b/eeschema/lib_field.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <pgm_base.h>
 #include <eda_item.h>
 #include <gr_text.h>
 #include <kicad_string.h>
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@ -28,7 +28,6 @@
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <schematic.h>
 #include <tool/action_manager.h>
 #include <tool/action_menu.h>
--- a/eeschema/netlist_exporters/netlist_exporter_base.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_base.cpp
@ -25,7 +25,6 @@

 #include <netlist_exporter_base.h>

-#include <pgm_base.h>
 #include <refdes_utils.h>

 #include <class_library.h>
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@ -35,6 +35,7 @@
 #include <sch_edit_frame.h>
 #include <sch_reference_list.h>
 #include <env_paths.h>
+#include <pgm_base.h>

 #include <wx/tokenzr.h>
 #include <wx/regex.h>
--- a/eeschema/netlist_exporters/netlist_generator.cpp
+++ b/eeschema/netlist_exporters/netlist_generator.cpp
@ -26,7 +26,6 @@
 #include <common.h>     // for ProcessExecute
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <pgm_base.h>
 #include <sch_edit_frame.h>
 #include <schematic.h>
 #include <reporter.h>
--- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
@ -29,7 +29,6 @@
 #include <wx/log.h>
 #include <wx/mstream.h>
 #include <advanced_config.h>
-#include <pgm_base.h>
 #include <trace_helpers.h>
 #include <locale_io.h>
 #include <sch_bitmap.h>
--- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
+++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp
@ -32,7 +32,6 @@
 #include <wx/textfile.h>
 #include <wx/tokenzr.h>

-#include <pgm_base.h>
 #include <gr_text.h>
 #include <kiway.h>
 #include <kicad_string.h>
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@ -36,7 +36,6 @@
 #include <id.h>
 #include <kicad_string.h>
 #include <kiway.h>
-#include <pgm_base.h>
 #include <plotter.h>
 #include <project.h>
 #include <reporter.h>
--- a/eeschema/symbol_editor/menubar_symbol_editor.cpp
+++ b/eeschema/symbol_editor/menubar_symbol_editor.cpp
@ -25,7 +25,6 @@

 #include <bitmaps.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
 #include <tools/ee_actions.h>
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@ -23,7 +23,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <pgm_base.h>
 #include <confirm.h>
 #include <kiway.h>
 #include <widgets/infobar.h>
--- a/gerbview/events_called_functions.cpp
+++ b/gerbview/events_called_functions.cpp
@ -22,7 +22,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <pgm_base.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <gerbview_id.h>
--- a/gerbview/widgets/dcode_selection_box.cpp
+++ b/gerbview/widgets/dcode_selection_box.cpp
@ -23,7 +23,6 @@
 */

 #include <wx/aui/aui.h>
-#include <pgm_base.h>
 #include <dcode.h>

 #include "dcode_selection_box.h"
--- a/include/env_paths.h
+++ b/include/env_paths.h
@ -26,7 +26,11 @@
 #ifndef ENV_PATHS_H
 #define ENV_PATHS_H

-#include <pgm_base.h>
+#include <wx/string.h>
+#include <settings/environment.h>
+
+class wxFileName;
+class PROJECT;

 /**
 * Normalize a file path to an environmental variable, if possible.
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@ -27,7 +27,6 @@
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/action_manager.h>
 #include <tool/action_menu.h>
 #include <tool/tool_manager.h>
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/pcbnew/dialogs/dialog_drc.cpp
@ -31,7 +31,6 @@
 #include <pad.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pgm_base.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <wildcards_and_files_ext.h>
--- a/pcbnew/dialogs/dialog_export_svg.cpp
+++ b/pcbnew/dialogs/dialog_export_svg.cpp
@ -40,6 +40,7 @@
 #include <widgets/unit_binder.h>
 #include <plotters/plotters_pslike.h>
 #include <wx/dirdlg.h>
+#include <pgm_base.h>

 class DIALOG_EXPORT_SVG : public DIALOG_EXPORT_SVG_BASE
 {
--- a/pcbnew/dialogs/dialog_gendrill.cpp
+++ b/pcbnew/dialogs/dialog_gendrill.cpp
@ -37,6 +37,7 @@
 #include <pad.h>
 #include <track.h>
 #include <paths.h>
+#include <project.h>
 #include <dialog_gendrill.h>
 #include <wildcards_and_files_ext.h>
 #include <reporter.h>
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@ -28,6 +28,7 @@
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <pcbplot.h>
+#include <pgm_base.h>
 #include <gerber_jobfile_writer.h>
 #include <reporter.h>
 #include <wildcards_and_files_ext.h>
--- a/pcbnew/edit.cpp
+++ b/pcbnew/edit.cpp
@ -24,7 +24,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */

-#include <pgm_base.h>
 #include <kiface_i.h>
 #include <confirm.h>
 #include <gestfich.h>
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@ -31,7 +31,6 @@
 #include <gestfich.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pgm_base.h>
 #include <bitmaps.h>
 #include <reporter.h>
 #include <tools/board_editor_control.h>
--- a/pcbnew/exporters/gendrill_Excellon_writer.cpp
+++ b/pcbnew/exporters/gendrill_Excellon_writer.cpp
@ -40,7 +40,6 @@
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
-#include <pgm_base.h>
 #include <build_version.h>
 #include <math/util.h>      // for KiROUND
 #include <trigo.h>
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@ -34,7 +34,6 @@
 #include <kicad_string.h>
 #include <locale_io.h>
 #include <pcb_edit_frame.h>
-#include <pgm_base.h>
 #include <board.h>
 #include <footprint.h>
 #include <track.h>
--- a/pcbnew/exporters/gerber_placefile_writer.cpp
+++ b/pcbnew/exporters/gerber_placefile_writer.cpp
@ -33,7 +33,6 @@
 #include <locale_io.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
-#include <pgm_base.h>

 #include <board.h>
 #include <board_design_settings.h>
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@ -30,7 +30,6 @@
 #include <pcb_edit_frame.h>
 #include <board_design_settings.h>
 #include <3d_viewer/eda_3d_viewer.h>
-#include <pgm_base.h>
 #include <widgets/msgpanel.h>
 #include <fp_lib_table.h>
 #include <kiface_i.h>
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@ -32,7 +32,6 @@
 #include <kiface_ids.h>
 #include <kiway.h>
 #include <lib_id.h>
-#include <pgm_base.h>
 #include <wildcards_and_files_ext.h>
 #include <widgets/progress_reporter.h>
 #include <wx/textfile.h>
--- a/pcbnew/load_select_footprint.cpp
+++ b/pcbnew/load_select_footprint.cpp
@ -45,7 +45,6 @@ using namespace std::placeholders;
 #include <macros.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
-#include <pgm_base.h>
 #include <view/view_controls.h>
 #include <widgets/lib_tree.h>
 #include <widgets/progress_reporter.h>
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@ -31,7 +31,6 @@
 #include <menus_helpers.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
-#include <pgm_base.h>
 #include <python_scripting.h>
 #include <tool/action_manager.h>
 #include <tool/actions.h>
--- a/pcbnew/pcbnew_config.cpp
+++ b/pcbnew/pcbnew_config.cpp
@ -37,6 +37,7 @@
 #include <drawing_sheet/ds_data_model.h>
 #include <pcbplot.h>
 #include <pcb_painter.h>
+#include <project.h>
 #include <invoke_pcb_dialog.h>
 #include <widgets/appearance_controls.h>
 #include <widgets/paged_dialog.h>
--- a/pcbnew/pcbplot.h
+++ b/pcbnew/pcbplot.h
@ -32,7 +32,6 @@
 #include <layers_id_colors_and_visibility.h>
 #include <pad_shapes.h>
 #include <pcb_plot_params.h>
-#include <pgm_base.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>

--- a/pcbnew/python/scripting/pcbnew_scripting.cpp
+++ b/pcbnew/python/scripting/pcbnew_scripting.cpp
@ -40,7 +40,6 @@
 #include <kicad_string.h>
 #include <macros.h>
 #include <paths.h>
-#include <pgm_base.h>
 #include <settings/settings_manager.h>

 #include <kiplatform/environment.h>
--- a/pcbnew/router/pns_router.cpp
+++ b/pcbnew/router/pns_router.cpp
@ -27,7 +27,6 @@
 #include <view/view_group.h>
 #include <gal/graphics_abstraction_layer.h>

-#include <pgm_base.h>
 #include <settings/settings_manager.h>

 #include <pcb_painter.h>
--- a/pcbnew/zones_functions_for_undo_redo.cpp
+++ b/pcbnew/zones_functions_for_undo_redo.cpp
@ -41,7 +41,6 @@
 * are really modified, and ones they are modified (changes, deletion or addition)
 */

-#include <pgm_base.h>
 #include <pcb_edit_frame.h>

 #include <board.h>