Browse Source

KIFACE_I -> KIFACE_BASE.

6.0.7
Jeff Young 4 years ago
parent
commit
b84d1456d5
  1. 2
      3d-viewer/3d_viewer/tools/eda_3d_controller.cpp
  2. 2
      bitmap2component/bitmap2cmp_gui.cpp
  3. 8
      bitmap2component/bitmap2cmp_main.cpp
  4. 2
      common/CMakeLists.txt
  5. 2
      common/dialogs/dialog_color_picker.cpp
  6. 2
      common/dialogs/dialog_page_settings.cpp
  7. 2
      common/dialogs/panel_common_settings.cpp
  8. 2
      common/draw_panel_gal.cpp
  9. 2
      common/drawing_sheet/ds_data_model.cpp
  10. 2
      common/eda_base_frame.cpp
  11. 2
      common/eda_draw_frame.cpp
  12. 2
      common/footprint_info.cpp
  13. 2
      common/fp_lib_table.cpp
  14. 2
      common/hotkeys_basic.cpp
  15. 6
      common/kiface_base.cpp
  16. 4
      common/kiway.cpp
  17. 2
      common/lib_table_base.cpp
  18. 2
      common/lib_tree_model_adapter.cpp
  19. 4
      common/tool/action_menu.cpp
  20. 2
      common/tool/common_control.cpp
  21. 2
      common/tool/common_tools.cpp
  22. 2
      common/tool/conditional_menu.cpp
  23. 2
      cvpcb/auto_associate.cpp
  24. 8
      cvpcb/cvpcb.cpp
  25. 2
      cvpcb/cvpcb_mainframe.cpp
  26. 2
      cvpcb/display_footprints_frame.cpp
  27. 2
      cvpcb/tools/cvpcb_association_tool.cpp
  28. 2
      cvpcb/tools/cvpcb_control.cpp
  29. 2
      eeschema/autoplace_fields.cpp
  30. 2
      eeschema/cross-probing.cpp
  31. 2
      eeschema/dialogs/dialog_annotate.cpp
  32. 2
      eeschema/dialogs/dialog_bom.cpp
  33. 2
      eeschema/dialogs/dialog_choose_symbol.cpp
  34. 2
      eeschema/dialogs/dialog_eeschema_page_settings.cpp
  35. 2
      eeschema/dialogs/dialog_erc.cpp
  36. 2
      eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
  37. 2
      eeschema/dialogs/dialog_netlist.cpp
  38. 2
      eeschema/dialogs/dialog_plot_schematic.cpp
  39. 2
      eeschema/dialogs/dialog_rescue_each.cpp
  40. 2
      eeschema/dialogs/dialog_schematic_setup.cpp
  41. 2
      eeschema/dialogs/dialog_sheet_properties.cpp
  42. 2
      eeschema/dialogs/dialog_symbol_fields_table.cpp
  43. 2
      eeschema/dialogs/dialog_symbol_properties.cpp
  44. 2
      eeschema/dialogs/dialog_symbol_remap.cpp
  45. 2
      eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
  46. 2
      eeschema/dialogs/panel_setup_formatting.cpp
  47. 2
      eeschema/dialogs/panel_setup_pinmap.cpp
  48. 8
      eeschema/eeschema.cpp
  49. 2
      eeschema/files-io.cpp
  50. 2
      eeschema/hierarch.cpp
  51. 2
      eeschema/menubar.cpp
  52. 2
      eeschema/sch_edit_frame.cpp
  53. 2
      eeschema/sch_painter.cpp
  54. 2
      eeschema/schematic_settings.cpp
  55. 2
      eeschema/sheet.cpp
  56. 2
      eeschema/symbol_editor/symbol_edit_frame.cpp
  57. 2
      eeschema/symbol_library.cpp
  58. 2
      eeschema/symbol_viewer_frame.cpp
  59. 2
      eeschema/toolbars_sch_editor.cpp
  60. 2
      eeschema/tools/assign_footprints.cpp
  61. 2
      eeschema/tools/backannotate.cpp
  62. 2
      gerbview/dialogs/dialog_layers_select_to_pcb.cpp
  63. 2
      gerbview/dialogs/dialog_print_gerbview.cpp
  64. 8
      gerbview/gerbview.cpp
  65. 2
      gerbview/gerbview_frame.cpp
  66. 2
      gerbview/menubar.cpp
  67. 32
      include/kiface_base.h
  68. 2
      include/kiway_player.h
  69. 4
      include/tool/action_menu.h
  70. 4
      kicad/kicad.cpp
  71. 7
      kicad/pgm_kicad.h
  72. 2
      pagelayout_editor/menubar.cpp
  73. 8
      pagelayout_editor/pl_editor.cpp
  74. 2
      pagelayout_editor/pl_editor_frame.cpp
  75. 2
      pcb_calculator/attenuators/attenuator_classes.cpp
  76. 8
      pcb_calculator/pcb_calculator.cpp
  77. 2
      pcb_calculator/pcb_calculator_frame.cpp
  78. 2
      pcb_calculator/tracks_width_versus_current.cpp
  79. 2
      pcb_calculator/transline_ident.cpp
  80. 2
      pcb_calculator/via.cpp
  81. 2
      pcbnew/board_design_settings.cpp
  82. 2
      pcbnew/cross-probing.cpp
  83. 2
      pcbnew/dialogs/dialog_board_reannotate.cpp
  84. 2
      pcbnew/dialogs/dialog_board_setup.cpp
  85. 2
      pcbnew/dialogs/dialog_choose_footprint.cpp
  86. 2
      pcbnew/dialogs/dialog_copper_zones.cpp
  87. 2
      pcbnew/dialogs/dialog_drc.cpp
  88. 2
      pcbnew/dialogs/dialog_export_step.cpp
  89. 2
      pcbnew/dialogs/dialog_export_vrml.cpp
  90. 2
      pcbnew/dialogs/dialog_footprint_wizard_list.cpp
  91. 2
      pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp
  92. 2
      pcbnew/dialogs/dialog_netlist.cpp
  93. 2
      pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
  94. 2
      pcbnew/dialogs/dialog_plot.cpp
  95. 2
      pcbnew/dialogs/dialog_print_pcbnew.cpp
  96. 2
      pcbnew/dialogs/dialog_rule_area_properties.cpp
  97. 2
      pcbnew/dialogs/dialog_update_pcb.cpp
  98. 2
      pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
  99. 2
      pcbnew/edit.cpp
  100. 2
      pcbnew/edit_zone_helpers.cpp

2
3d-viewer/3d_viewer/tools/eda_3d_controller.cpp

@ -26,7 +26,7 @@
#include <eda_3d_canvas.h>
#include <eda_3d_viewer_frame.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <tools/eda_3d_controller.h>
#include "eda_3d_actions.h"
#include <3d_rendering/legacy/render_3d_legacy.h>

2
bitmap2component/bitmap2cmp_gui.cpp

@ -27,7 +27,7 @@
#include <bitmap2cmp_settings.h>
#include <bitmap_io.h>
#include <bitmaps.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <math/util.h> // for KiROUND
#include <kiway.h>
#include <potracelib.h>

8
bitmap2component/bitmap2cmp_main.cpp

@ -24,7 +24,7 @@
#include <bitmap2cmp_gui.h>
#include <bitmap2cmp_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway.h>
#include <pgm_base.h>
#include <settings/settings_manager.h>
@ -32,7 +32,7 @@
namespace BMP2CMP {
static struct IFACE : public KIFACE_I
static struct IFACE : public KIFACE_BASE
{
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@ -60,7 +60,7 @@ static struct IFACE : public KIFACE_I
}
IFACE( const char* aDSOname, KIWAY::FACE_T aType ) :
KIFACE_I( aDSOname, aType )
KIFACE_BASE( aDSOname, aType )
{}
} kiface( "BMP2CMP", KIWAY::FACE_BMP2CMP );
@ -72,7 +72,7 @@ using namespace BMP2CMP;
static PGM_BASE* process;
KIFACE_I& Kiface()
KIFACE_BASE& Kiface()
{
return kiface;
}

2
common/CMakeLists.txt

@ -347,7 +347,7 @@ set( COMMON_SRCS
grid_tricks.cpp
hotkey_store.cpp
hotkeys_basic.cpp
kiface_i.cpp
kiface_base.cpp
kiid.cpp
kiway.cpp
kiway_express.cpp

2
common/dialogs/dialog_color_picker.cpp

@ -21,7 +21,7 @@
#include <dialogs/dialog_color_picker.h>
#include <cmath>
#include <algorithm>
#include <kiface_i.h>
#include <kiface_base.h>
#include <settings/app_settings.h>
#include <widgets/color_swatch.h>
#include <wx/bitmap.h>

2
common/dialogs/dialog_page_settings.cpp

@ -24,7 +24,7 @@
#include <eda_draw_frame.h>
#include <eda_item.h>
#include <gr_basic.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <macros.h>
#include <math/util.h> // for KiROUND, Clamp
#include <project.h>

2
common/dialogs/panel_common_settings.cpp

@ -27,7 +27,7 @@
#include <bitmaps.h>
#include <dialog_shim.h>
#include <gal/dpi_scaling.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <pgm_base.h>
#include <id.h>
#include <settings/common_settings.h>

2
common/draw_panel_gal.cpp

@ -27,7 +27,7 @@
#include <confirm.h>
#include <eda_draw_frame.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <macros.h>
#include <settings/app_settings.h>
#include <trace_helpers.h>

2
common/drawing_sheet/ds_data_model.cpp

@ -44,7 +44,7 @@
* storage (wrapped in a DS_PROXY_UNDO_ITEM).
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <title_block.h>
#include <common.h>
#include <eda_item.h>

2
common/eda_base_frame.cpp

@ -31,7 +31,7 @@
#include <eda_dde.h>
#include <filehistory.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <menus_helpers.h>
#include <panel_hotkeys_editor.h>
#include <paths.h>

2
common/eda_draw_frame.cpp

@ -31,7 +31,7 @@
#include <eda_draw_frame.h>
#include <filehistory.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <lockfile.h>
#include <macros.h>
#include <page_info.h>

2
common/footprint_info.cpp

@ -37,7 +37,7 @@
#include <lib_id.h>
#include <thread>
#include <utility>
#include <kiface_i.h>
#include <kiface_base.h>
FOOTPRINT_INFO* FOOTPRINT_LIST::GetFootprintInfo( const wxString& aLibNickname,
const wxString& aFootprintName )

2
common/fp_lib_table.cpp

@ -24,7 +24,7 @@
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <footprint_info.h>
#include <lib_id.h>
#include <lib_table_lexer.h>

2
common/hotkeys_basic.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <hotkeys_basic.h>
#include <id.h>
#include <string_utils.h>

6
common/kiface_i.cpp → common/kiface_base.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway.h>
#include <search_stack.h>
#include <systemdirsappend.h>
@ -81,7 +81,7 @@ static void setSearchPaths( SEARCH_STACK* aDst, KIWAY::FACE_T aId )
}
bool KIFACE_I::start_common( int aCtlBits )
bool KIFACE_BASE::start_common( int aCtlBits )
{
m_start_flags = aCtlBits;
m_bm.Init();
@ -91,7 +91,7 @@ bool KIFACE_I::start_common( int aCtlBits )
}
void KIFACE_I::end_common()
void KIFACE_BASE::end_common()
{
m_bm.End();
}

4
common/kiway.cpp

@ -290,12 +290,12 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
// by dso destructor.
// However:
// There is a file installation bug. We only look for KIFACE_I's which we know
// There is a file installation bug. We only look for KIFACE's which we know
// to exist, and we did not find one. If we do not find one, this is an
// installation bug.
msg = wxString::Format( _( "Fatal Installation Bug. File:\n"
"\"%s\"\ncould not be loaded\n" ), dname );
"'%s'\ncould not be loaded\n" ), dname );
if( ! wxFileExists( dname ) )
msg << _( "It is missing.\n" );

2
common/lib_table_base.cpp

@ -27,7 +27,7 @@
#include <wx/filename.h>
#include <set>
#include <common.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <lib_table_base.h>
#include <lib_table_lexer.h>
#include <macros.h>

2
common/lib_tree_model_adapter.cpp

@ -21,7 +21,7 @@
#include <eda_base_frame.h>
#include <eda_pattern_match.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <config_params.h>
#include <lib_tree_model_adapter.h>
#include <project/project_file.h>

4
common/tool/action_menu.cpp

@ -28,7 +28,7 @@
#include <eda_base_frame.h>
#include <functional>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <menus_helpers.h>
#include <tool/action_menu.h>
#include <tool/actions.h>
@ -218,7 +218,7 @@ void ACTION_MENU::AddClose( const wxString& aAppname )
}
void ACTION_MENU::AddQuitOrClose( KIFACE_I* aKiface, wxString aAppname )
void ACTION_MENU::AddQuitOrClose( KIFACE_BASE* aKiface, wxString aAppname )
{
if( !aKiface || aKiface->IsSingle() ) // not when under a project mgr
{

2
common/tool/common_control.cpp

@ -38,7 +38,7 @@
#include <base_screen.h>
#include <tool/common_control.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <dialogs/dialog_configure_paths.h>
#include <eda_doc.h>
#include <wx/msgdlg.h>

2
common/tool/common_tools.cpp

@ -31,7 +31,7 @@
#include <eda_draw_frame.h>
#include <gal/graphics_abstraction_layer.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <project.h>
#include <settings/app_settings.h>
#include <tool/actions.h>

2
common/tool/conditional_menu.cpp

@ -27,7 +27,7 @@
#include <tool/conditional_menu.h>
#include <tool/action_menu.h>
#include <menus_helpers.h>
#include <kiface_i.h>
#include <kiface_base.h>
CONDITIONAL_MENU::CONDITIONAL_MENU( TOOL_INTERACTIVE* aTool ) :

2
cvpcb/auto_associate.cpp

@ -31,7 +31,7 @@
// 'FT232BL' 'QFP:LQFP-32_7x7mm_Pitch0.8mm'
#include <kiface_i.h>
#include <kiface_base.h>
#include <string_utils.h>
#include <macros.h>

8
cvpcb/cvpcb.cpp

@ -26,7 +26,7 @@
#include <confirm.h>
#include <fp_lib_table.h>
#include <footprint_info_impl.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <pgm_base.h>
#include <settings/settings_manager.h>
@ -37,12 +37,12 @@
namespace CV {
static struct IFACE : public KIFACE_I
static struct IFACE : public KIFACE_BASE
{
// Of course all are virtual overloads, implementations of the KIFACE.
IFACE( const char* aName, KIWAY::FACE_T aType ) :
KIFACE_I( aName, aType )
KIFACE_BASE( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@ -101,7 +101,7 @@ using namespace CV;
static PGM_BASE* process;
KIFACE_I& Kiface() { return kiface; }
KIFACE_BASE& Kiface() { return kiface; }
// KIFACE_GETTER's actual spelling is a substitution macro found in kiway.h.

2
cvpcb/cvpcb_mainframe.cpp

@ -27,7 +27,7 @@
#include <confirm.h>
#include <eda_dde.h>
#include <fp_lib_table.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiplatform/app.h>
#include <kiway_express.h>
#include <macros.h>

2
cvpcb/display_footprints_frame.cpp

@ -32,7 +32,7 @@
#include <footprint_editor_settings.h>
#include <fp_lib_table.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <lib_id.h>
#include <macros.h>
#include <widgets/msgpanel.h>

2
cvpcb/tools/cvpcb_association_tool.cpp

@ -21,7 +21,7 @@
#include <confirm.h>
#include <cstdint>
#include <functional>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway_express.h>
#include <lib_id.h>
#include <tool/actions.h>

2
cvpcb/tools/cvpcb_control.cpp

@ -21,7 +21,7 @@
#include <confirm.h>
#include <cstdint>
#include <functional>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway_express.h>
#include <lib_id.h>
#include <tool/actions.h>

2
eeschema/autoplace_fields.cpp

@ -58,7 +58,7 @@
#include <sch_line.h>
#include <lib_pin.h>
#include <sch_draw_panel.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <vector>
#include <algorithm>
#include <tool/tool_manager.h>

2
eeschema/cross-probing.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway_express.h>
#include <eda_dde.h>
#include <connection_graph.h>

2
eeschema/dialogs/dialog_annotate.cpp

@ -28,7 +28,7 @@
#include <confirm.h>
#include <dialog_annotate_base.h>
#include <eeschema_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <widgets/infobar.h>
#include <wx_html_report_panel.h>
#include <schematic.h>

2
eeschema/dialogs/dialog_bom.cpp

@ -38,7 +38,7 @@
#include <dialogs/html_message_box.h>
#include <i18n_utility.h> // for _HKI definition used in dialog_bom_help_md.h
#include <invoke_sch_dialog.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <netlist_exporter_xml.h>
#include <pgm_base.h>
#include <reporter.h>

2
eeschema/dialogs/dialog_choose_symbol.cpp

@ -26,7 +26,7 @@
#include <symbol_library.h>
#include <dialog_choose_symbol.h>
#include <eeschema_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <sch_base_frame.h>
#include <template_fieldnames.h>
#include <widgets/footprint_preview_widget.h>

2
eeschema/dialogs/dialog_eeschema_page_settings.cpp

@ -19,7 +19,7 @@
#include "dialog_eeschema_page_settings.h"
#include <kiface_i.h>
#include <kiface_base.h>
#include <general.h>
#include <sch_edit_frame.h>
#include <sch_screen.h>

2
eeschema/dialogs/dialog_erc.cpp

@ -28,7 +28,7 @@
#include <sch_edit_frame.h>
#include <schematic.h>
#include <project.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <bitmaps.h>
#include <reporter.h>
#include <wildcards_and_files_ext.h>

2
eeschema/dialogs/dialog_global_sym_lib_table_config.cpp

@ -21,7 +21,7 @@
#include "dialog_global_sym_lib_table_config.h"
#include <confirm.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <macros.h>
#include "symbol_lib_table.h"

2
eeschema/dialogs/dialog_netlist.cpp

@ -34,7 +34,7 @@
*/
#include <pgm_base.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <gestfich.h>
#include <sch_edit_frame.h>
#include <general.h>

2
eeschema/dialogs/dialog_plot_schematic.cpp

@ -29,7 +29,7 @@
#include <dialogs/wx_html_report_panel.h>
#include <dialog_plot_schematic.h>
#include <eeschema_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <locale_io.h>
#include <plotters/plotter_hpgl.h>
#include <plotters/plotter_dxf.h>

2
eeschema/dialogs/dialog_rescue_each.cpp

@ -26,7 +26,7 @@
#include <dialog_rescue_each_base.h>
#include <eeschema_settings.h>
#include <invoke_sch_dialog.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <project_rescue.h>
#include <sch_symbol.h>
#include <sch_edit_frame.h>

2
eeschema/dialogs/dialog_schematic_setup.cpp

@ -20,7 +20,7 @@
#include <confirm.h>
#include <sch_edit_frame.h>
#include <schematic.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <dialog_sch_import_settings.h>
#include <dialogs/panel_setup_netclasses.h>
#include <dialogs/panel_setup_severities.h>

2
eeschema/dialogs/dialog_sheet_properties.cpp

@ -23,7 +23,7 @@
*/
#include <dialog_sheet_properties.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <wx/string.h>
#include <wx/log.h>
#include <wx/tooltip.h>

2
eeschema/dialogs/dialog_symbol_fields_table.cpp

@ -32,7 +32,7 @@
#include <general.h>
#include <grid_tricks.h>
#include <string_utils.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <sch_edit_frame.h>
#include <sch_reference_list.h>
#include <schematic.h>

2
eeschema/dialogs/dialog_symbol_properties.cpp

@ -27,7 +27,7 @@
#include <wx/tooltip.h>
#include <grid_tricks.h>
#include <confirm.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <pin_numbers.h>
#include <string_utils.h>
#include <menus_helpers.h>

2
eeschema/dialogs/dialog_symbol_remap.cpp

@ -24,7 +24,7 @@
#include <macros.h>
#include <pgm_base.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <project.h>
#include <confirm.h>
#include <reporter.h>

2
eeschema/dialogs/panel_eeschema_template_fieldnames.cpp

@ -29,7 +29,7 @@
#include <bitmaps.h>
#include <schematic.h>
#include <panel_eeschema_template_fieldnames.h>
#include <kiface_i.h>
#include <kiface_base.h>
PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT_FRAME* aFrame,
wxWindow* aWindow,

2
eeschema/dialogs/panel_setup_formatting.cpp

@ -23,7 +23,7 @@
#include <sch_edit_frame.h>
#include <sch_painter.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <panel_setup_formatting.h>
#include <sch_junction.h>
#include <schematic.h>

2
eeschema/dialogs/panel_setup_pinmap.cpp

@ -22,7 +22,7 @@
*/
#include <sch_edit_frame.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <bitmaps.h>
#include <wildcards_and_files_ext.h>
#include <schematic.h>

8
eeschema/eeschema.cpp

@ -24,7 +24,7 @@
*/
#include <pgm_base.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <gestfich.h>
#include <eda_dde.h>
@ -111,12 +111,12 @@ bool generateSchematicNetlist( const wxString& aFilename, wxString& aNetlist )
}
static struct IFACE : public KIFACE_I
static struct IFACE : public KIFACE_BASE
{
// Of course all are virtual overloads, implementations of the KIFACE.
IFACE( const char* aName, KIWAY::FACE_T aType ) :
KIFACE_I( aName, aType )
KIFACE_BASE( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@ -211,7 +211,7 @@ using namespace SCH;
static PGM_BASE* process;
KIFACE_I& Kiface() { return kiface; }
KIFACE_BASE& Kiface() { return kiface; }
// KIFACE_GETTER's actual spelling is a substitution macro found in kiway.h.

2
eeschema/files-io.cpp

@ -31,7 +31,7 @@
#include <dialog_symbol_remap.h>
#include <eeschema_settings.h>
#include <id.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiplatform/app.h>
#include <pgm_base.h>
#include <profile.h>

2
eeschema/hierarch.cpp

@ -39,7 +39,7 @@
#include <hierarch.h>
#include <view/view.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include "eeschema_settings.h"
#include <wx/object.h>

2
eeschema/menubar.cpp

@ -26,7 +26,7 @@
#include <bitmaps.h>
#include <filehistory.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <menus_helpers.h>
#include <schematic.h>
#include <tool/action_manager.h>

2
eeschema/sch_edit_frame.cpp

@ -35,7 +35,7 @@
#include <dialogs/html_message_box.h>
#include <invoke_sch_dialog.h>
#include <string_utils.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiplatform/app.h>
#include <kiway.h>
#include <symbol_edit_frame.h>

2
eeschema/sch_painter.cpp

@ -60,7 +60,7 @@
#include <schematic.h>
#include <settings/color_settings.h>
#include <view/view.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <default_values.h>
#include <advanced_config.h>
#include <string_utils.h>

2
eeschema/schematic_settings.cpp

@ -24,7 +24,7 @@
#include <convert_to_biu.h>
#include <default_values.h>
#include <eeschema_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <macros.h>
#include <schematic_settings.h>
#include <settings/json_settings_internals.h>

2
eeschema/sheet.cpp

@ -24,7 +24,7 @@
#include <sch_draw_panel.h>
#include <confirm.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <project.h>
#include <wildcards_and_files_ext.h>
#include <tool/tool_manager.h>

2
eeschema/symbol_editor/symbol_edit_frame.cpp

@ -32,7 +32,7 @@
#include <eeschema_id.h>
#include <eeschema_settings.h>
#include <env_paths.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiplatform/app.h>
#include <kiway_express.h>
#include <symbol_edit_frame.h>

2
eeschema/symbol_library.cpp

@ -24,7 +24,7 @@
*/
#include <algorithm>
#include <kiface_i.h>
#include <kiface_base.h>
#include <eda_base_frame.h>
#include <string_utils.h>
#include <macros.h>

2
eeschema/symbol_viewer_frame.cpp

@ -29,7 +29,7 @@
#include <dialog_choose_symbol.h>
#include <eeschema_id.h>
#include <eeschema_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway.h>
#include <symbol_viewer_frame.h>
#include <widgets/msgpanel.h>

2
eeschema/toolbars_sch_editor.cpp

@ -26,7 +26,7 @@
#include <sch_draw_panel.h>
#include <sch_edit_frame.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <bitmaps.h>
#include <eeschema_id.h>
#include <python_scripting.h>

2
eeschema/tools/assign_footprints.cpp

@ -25,7 +25,7 @@
#include <confirm.h>
#include <string_utils.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <sch_edit_frame.h>
#include <wildcards_and_files_ext.h>
#include <sch_sheet_path.h>

2
eeschema/tools/backannotate.cpp

@ -33,7 +33,7 @@
#include <sch_sheet_path.h>
#include <schematic.h>
#include <string_utils.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <wildcards_and_files_ext.h>
#include <connection_graph.h>
#include <wx/log.h>

2
gerbview/dialogs/dialog_layers_select_to_pcb.cpp

@ -33,7 +33,7 @@
#include <gerbview_frame.h>
#include <gerbview_id.h>
#include <gerbview_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <layer_ids.h>
#include <dialogs/dialog_layers_select_to_pcb.h>

2
gerbview/dialogs/dialog_print_gerbview.cpp

@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <dialogs/dialog_print_generic.h>
#include <gerbview_printout.h>

8
gerbview/gerbview.cpp

@ -30,7 +30,7 @@
#include <gerbview_frame.h>
#include <gerbview_settings.h>
#include <gestfich.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <macros.h>
#include <nlohmann/json.hpp>
#include <pgm_base.h>
@ -43,12 +43,12 @@ using json = nlohmann::json;
namespace GERBV {
static struct IFACE : public KIFACE_I
static struct IFACE : public KIFACE_BASE
{
// Of course all are virtual overloads, implementations of the KIFACE.
IFACE( const char* aName, KIWAY::FACE_T aType ) :
KIFACE_I( aName, aType )
KIFACE_BASE( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@ -109,7 +109,7 @@ using namespace GERBV;
static PGM_BASE* process;
KIFACE_I& Kiface() { return kiface; }
KIFACE_BASE& Kiface() { return kiface; }
// KIFACE_GETTER's actual spelling is a substitution macro found in kiway.h.

2
gerbview/gerbview_frame.cpp

@ -18,7 +18,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <pgm_base.h>
#include <eda_base_frame.h>
#include <base_units.h>

2
gerbview/menubar.cpp

@ -27,7 +27,7 @@
#include <bitmaps.h>
#include "gerbview_id.h"
#include <kiface_i.h>
#include <kiface_base.h>
#include <menus_helpers.h>
#include <tool/action_manager.h>
#include <tool/action_menu.h>

32
include/kiface_i.h → include/kiface_base.h

@ -21,20 +21,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef KIFACE_I_H_
#define KIFACE_I_H_
#ifndef KIFACE_BASE_H
#define KIFACE_BASE_H
#include <kiway.h>
#include <bin_mod.h>
/**
* A #KIFACE (I)mplementation.
* A #KIFACE implementation.
*
* This has useful for DSOs which implement a #KIFACE. It is abstract so a few functions
* must be implemented in derivations.
*/
class KIFACE_I : public KIFACE
class KIFACE_BASE : public KIFACE
{
public:
/**
@ -61,14 +61,14 @@ public:
* @param aId is the type of DSO ( #FACE_SCH, #FACE_PCB, #FACE_CVPCB, #FACE_GERBVIEW,
* #FACE_PL_EDITOR, #FACE_PCB_CALCULATOR, #FACE_BMP2CMP)
*/
KIFACE_I( const char* aKifaceName, KIWAY::FACE_T aId ) :
KIFACE_BASE( const char* aKifaceName, KIWAY::FACE_T aId ) :
m_id( aId ),
m_bm( aKifaceName ),
m_start_flags( 0 )
{
}
// ~KIFACE_I();
// ~KIFACE_BASE();
protected:
@ -89,28 +89,28 @@ public:
return wxString::FromUTF8( m_bm.m_name );
}
APP_SETTINGS_BASE* KifaceSettings() const { return m_bm.m_config; }
APP_SETTINGS_BASE* KifaceSettings() const { return m_bm.m_config; }
void InitSettings( APP_SETTINGS_BASE* aSettings ) { m_bm.InitSettings( aSettings ); }
void InitSettings( APP_SETTINGS_BASE* aSettings ) { m_bm.InitSettings( aSettings ); }
/**
* Return whatever was passed as @a aCtlBits to OnKifaceStart().
*/
int StartFlags() const { return m_start_flags; }
int StartFlags() const { return m_start_flags; }
/**
* Is this KIFACE_I running under single_top?
* Is this KIFACE running under single_top?
*/
bool IsSingle() const { return m_start_flags & KFCTL_STANDALONE; }
bool IsSingle() const { return m_start_flags & KFCTL_STANDALONE; }
/**
* Return just the basename portion of the current help file.
*/
const wxString& GetHelpFileName() const { return m_bm.m_help_file; }
const wxString& GetHelpFileName() const { return m_bm.m_help_file; }
/// Only for DSO specific 'non-library' files.
/// (The library search path is in the PROJECT class.)
SEARCH_STACK& KifaceSearch() { return m_bm.m_search; }
SEARCH_STACK& KifaceSearch() { return m_bm.m_search; }
private:
KIWAY::FACE_T m_id;
@ -121,7 +121,7 @@ private:
};
/// Global KIFACE_I "get" accessor.
KIFACE_I& Kiface();
/// Global KIFACE_BASE "get" accessor.
KIFACE_BASE& Kiface();
#endif // KIFACE_I_H_
#endif // KIFACE_BASE_H

2
include/kiway_player.h

@ -34,7 +34,7 @@
class KIWAY;
class PROJECT;
struct KIFACE;
class KIFACE_I;
class KIFACE_BASE;
class TOOL_MANAGER;
class KIWAY_EXPRESS;

4
include/tool/action_menu.h

@ -36,7 +36,7 @@
#include <wx/textentry.h>
#include <tool/tool_event.h>
class KIFACE_I;
class KIFACE_BASE;
class TOOL_INTERACTIVE;
class TOOL_MANAGER;
@ -125,7 +125,7 @@ public:
*
* @param aAppname is the application name to append to the tooltip.
*/
void AddQuitOrClose( KIFACE_I* aKiface, wxString aAppname = "" );
void AddQuitOrClose( KIFACE_BASE* aKiface, wxString aAppname = "" );
/**
* Remove all the entries from the menu (as well as its title).

4
kicad/kicad.cpp

@ -56,8 +56,8 @@
// a dummy to quiet linking with EDA_BASE_FRAME::config();
#include <kiface_i.h>
KIFACE_I& Kiface()
#include <kiface_base.h>
KIFACE_BASE& Kiface()
{
// This function should never be called. It is only referenced from
// EDA_BASE_FRAME::config() and this is only provided to satisfy the linker,

7
kicad/pgm_kicad.h

@ -30,10 +30,9 @@
/**
* PGM_KICAD
* extends PGM_BASE to bring in FileHistory() and PdfBrowser() which were moved
* from EDA_APP into KIFACE_I. KIFACE_I is not applicable in the project manager
* since it is not a KIFACE. This header is in the kicad directory since nobody
* else needs to know about it.
* extends PGM_BASE to bring in FileHistory() and PdfBrowser() which were moved from EDA_APP
* into KIFACE_BASE. KIFACE_BASE is not applicable in the project manager since it is not a
* KIFACE. This header is in the kicad directory since nobody else needs to know about it.
*/
class PGM_KICAD : public PGM_BASE
{

2
pagelayout_editor/menubar.cpp

@ -25,7 +25,7 @@
#include <bitmaps.h>
#include <filehistory.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <menus_helpers.h>
#include <tool/action_manager.h>
#include <tool/action_menu.h>

8
pagelayout_editor/pl_editor.cpp

@ -26,7 +26,7 @@
#include <wx/file.h>
#include <wx/snglinst.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <gestfich.h>
#include <pgm_base.h>
@ -38,12 +38,12 @@
namespace PGE {
static struct IFACE : public KIFACE_I
static struct IFACE : public KIFACE_BASE
{
// Of course all are virtual overloads, implementations of the KIFACE.
IFACE( const char* aName, KIWAY::FACE_T aType ) :
KIFACE_I( aName, aType )
KIFACE_BASE( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@ -104,7 +104,7 @@ using namespace PGE;
static PGM_BASE* process;
KIFACE_I& Kiface() { return kiface; }
KIFACE_BASE& Kiface() { return kiface; }
// KIFACE_GETTER's actual spelling is a substitution macro found in kiway.h.

2
pagelayout_editor/pl_editor_frame.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <pgm_base.h>
#include <bitmaps.h>
#include <core/arraydim.h>

2
pcb_calculator/attenuators/attenuator_classes.cpp

@ -9,7 +9,7 @@
#include <wx/bitmap.h>
#include <i18n_utility.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <bitmaps.h>
#include "attenuator_classes.h"

8
pcb_calculator/pcb_calculator.cpp

@ -19,7 +19,7 @@
*/
#include <pgm_base.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <settings/settings_manager.h>
#include "pcb_calculator_frame.h"
@ -31,12 +31,12 @@ const wxString PcbCalcDataFileExt( wxT( "pcbcalc" ) );
namespace PCBCALC {
static struct IFACE : public KIFACE_I
static struct IFACE : public KIFACE_BASE
{
// Of course all are virtual overloads, implementations of the KIFACE.
IFACE( const char* aName, KIWAY::FACE_T aType ) :
KIFACE_I( aName, aType )
KIFACE_BASE( aName, aType )
{}
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@ -75,7 +75,7 @@ using namespace PCBCALC;
static PGM_BASE* process;
KIFACE_I& Kiface() { return kiface; }
KIFACE_BASE& Kiface() { return kiface; }
// KIFACE_GETTER's actual spelling is a substitution macro found in kiway.h.

2
pcb_calculator/pcb_calculator_frame.cpp

@ -20,7 +20,7 @@
#include <wx/msgdlg.h>
#include <bitmaps.h>
#include <geometry/shape_poly_set.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include "attenuators/attenuator_classes.h"
#include "class_regulator_data.h"
#include "pcb_calculator_frame.h"

2
pcb_calculator/tracks_width_versus_current.cpp

@ -26,7 +26,7 @@
#include <cassert>
#include <cmath>
#include <kiface_i.h>
#include <kiface_base.h>
#include <string_utils.h>
#include "class_regulator_data.h"

2
pcb_calculator/transline_ident.cpp

@ -24,7 +24,7 @@
#include <wx/intl.h>
#include <wx/arrstr.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <bitmaps.h>
// transline specific functions:

2
pcb_calculator/via.cpp

@ -45,7 +45,7 @@
#include <cmath>
#include <wx/choicdlg.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include "attenuators/attenuator_classes.h"
#include "common_data.h"

2
pcbnew/board_design_settings.cpp

@ -24,7 +24,7 @@
#include <pcb_dimension.h>
#include <pcb_track.h>
#include <layer_ids.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <pad.h>
#include <board_design_settings.h>
#include <drc/drc_item.h>

2
pcbnew/cross-probing.cpp

@ -39,7 +39,7 @@
#include <zone.h>
#include <collectors.h>
#include <eda_dde.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiway_express.h>
#include <netlist_reader/pcb_netlist.h>
#include <netlist_reader/board_netlist_updater.h>

2
pcbnew/dialogs/dialog_board_reannotate.cpp

@ -32,7 +32,7 @@
#include <dialog_board_reannotate.h>
#include <fstream>
#include <string_utils.h> // StrNumCmp
#include <kiface_i.h>
#include <kiface_base.h>
#include <mail_type.h>
#include <pcbnew_settings.h>
#include <refdes_utils.h>

2
pcbnew/dialogs/dialog_board_setup.cpp

@ -27,7 +27,7 @@
#include <../board_stackup_manager/panel_board_finish.h>
#include <confirm.h>
#include <board_design_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <drc/drc_item.h>
#include <dialog_import_settings.h>
#include <io_mgr.h>

2
pcbnew/dialogs/dialog_choose_footprint.cpp

@ -39,7 +39,7 @@
#include <widgets/lib_tree.h>
#include <widgets/footprint_preview_widget.h>
#include <widgets/footprint_select_widget.h>
#include <kiface_i.h>
#include <kiface_base.h>
DIALOG_CHOOSE_FOOTPRINT::DIALOG_CHOOSE_FOOTPRINT( PCB_BASE_FRAME* aParent,

2
pcbnew/dialogs/dialog_copper_zones.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
#include <pcbnew_settings.h>

2
pcbnew/dialogs/dialog_drc.cpp

@ -26,7 +26,7 @@
#include <confirm.h>
#include <dialog_drc.h>
#include <board_design_settings.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <macros.h>
#include <pad.h>
#include <pcb_edit_frame.h>

2
pcbnew/dialogs/dialog_export_step.cpp

@ -32,7 +32,7 @@
#include <confirm.h>
#include <dialog_export_step_base.h>
#include <footprint.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <locale_io.h>
#include <math/vector3.h>
#include <pcb_edit_frame.h>

2
pcbnew/dialogs/dialog_export_vrml.cpp

@ -30,7 +30,7 @@
#include <board.h>
#include <confirm.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <pcb_edit_frame.h>
#include <pcbnew_settings.h>
#include <project/project_file.h> // LAST_PATH_TYPE

2
pcbnew/dialogs/dialog_footprint_wizard_list.cpp

@ -32,7 +32,7 @@
#include <pgm_base.h>
#include <settings/settings_manager.h>
#include <string_utils.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <dialog_footprint_wizard_list.h>
#include <footprint_wizard_frame.h>

2
pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp

@ -21,7 +21,7 @@
#include "dialog_global_fp_lib_table_config.h"
#include <confirm.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include "fp_lib_table.h"

2
pcbnew/dialogs/dialog_netlist.cpp

@ -22,7 +22,7 @@
*/
#include <project.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <dialogs/html_message_box.h>
#include <pcb_edit_frame.h>

2
pcbnew/dialogs/dialog_non_copper_zones_properties.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
#include <pcbnew_settings.h>

2
pcbnew/dialogs/dialog_plot.cpp

@ -22,7 +22,7 @@
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <plotters/plotter.h>
#include <confirm.h>
#include <pcb_edit_frame.h>

2
pcbnew/dialogs/dialog_print_pcbnew.cpp

@ -25,7 +25,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <core/arraydim.h>
#include <base_units.h>

2
pcbnew/dialogs/dialog_rule_area_properties.cpp

@ -23,7 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
#include <pcbnew_settings.h>

2
pcbnew/dialogs/dialog_update_pcb.cpp

@ -30,7 +30,7 @@
#include <netlist_reader/board_netlist_updater.h>
#include <tool/tool_manager.h>
#include <tools/pcb_actions.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <kiplatform/ui.h>
bool DIALOG_UPDATE_PCB::m_warnForNoNetPads = false;

2
pcbnew/dialogs/panel_pcbnew_action_plugins.cpp

@ -22,7 +22,7 @@
#include <bitmaps.h>
#include <dialog_footprint_wizard_list.h>
#include <grid_tricks.h>
#include <kiface_i.h>
#include <kiface_base.h>
#include <panel_pcbnew_action_plugins.h>
#include <pcb_edit_frame.h>
#include <python/scripting/pcbnew_scripting.h>

2
pcbnew/edit.cpp

@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <gestfich.h>
#include <pcb_edit_frame.h>

2
pcbnew/edit_zone_helpers.cpp

@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <kiface_i.h>
#include <kiface_base.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
#include <pcbnew_settings.h>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save