From b84d1456d504a698dc54075ed11aaa59e61b31f9 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 14 Sep 2021 23:45:14 +0100
Subject: [PATCH] KIFACE_I -> KIFACE_BASE.
---
.../3d_viewer/tools/eda_3d_controller.cpp | 2 +-
bitmap2component/bitmap2cmp_gui.cpp | 2 +-
bitmap2component/bitmap2cmp_main.cpp | 8 ++---
common/CMakeLists.txt | 2 +-
common/dialogs/dialog_color_picker.cpp | 2 +-
common/dialogs/dialog_page_settings.cpp | 2 +-
common/dialogs/panel_common_settings.cpp | 2 +-
common/draw_panel_gal.cpp | 2 +-
common/drawing_sheet/ds_data_model.cpp | 2 +-
common/eda_base_frame.cpp | 2 +-
common/eda_draw_frame.cpp | 2 +-
common/footprint_info.cpp | 2 +-
common/fp_lib_table.cpp | 2 +-
common/hotkeys_basic.cpp | 2 +-
common/{kiface_i.cpp => kiface_base.cpp} | 6 ++--
common/kiway.cpp | 4 +--
common/lib_table_base.cpp | 2 +-
common/lib_tree_model_adapter.cpp | 2 +-
common/tool/action_menu.cpp | 4 +--
common/tool/common_control.cpp | 2 +-
common/tool/common_tools.cpp | 2 +-
common/tool/conditional_menu.cpp | 2 +-
cvpcb/auto_associate.cpp | 2 +-
cvpcb/cvpcb.cpp | 8 ++---
cvpcb/cvpcb_mainframe.cpp | 2 +-
cvpcb/display_footprints_frame.cpp | 2 +-
cvpcb/tools/cvpcb_association_tool.cpp | 2 +-
cvpcb/tools/cvpcb_control.cpp | 2 +-
eeschema/autoplace_fields.cpp | 2 +-
eeschema/cross-probing.cpp | 2 +-
eeschema/dialogs/dialog_annotate.cpp | 2 +-
eeschema/dialogs/dialog_bom.cpp | 2 +-
eeschema/dialogs/dialog_choose_symbol.cpp | 2 +-
.../dialogs/dialog_eeschema_page_settings.cpp | 2 +-
eeschema/dialogs/dialog_erc.cpp | 2 +-
.../dialog_global_sym_lib_table_config.cpp | 2 +-
eeschema/dialogs/dialog_netlist.cpp | 2 +-
eeschema/dialogs/dialog_plot_schematic.cpp | 2 +-
eeschema/dialogs/dialog_rescue_each.cpp | 2 +-
eeschema/dialogs/dialog_schematic_setup.cpp | 2 +-
eeschema/dialogs/dialog_sheet_properties.cpp | 2 +-
.../dialogs/dialog_symbol_fields_table.cpp | 2 +-
eeschema/dialogs/dialog_symbol_properties.cpp | 2 +-
eeschema/dialogs/dialog_symbol_remap.cpp | 2 +-
.../panel_eeschema_template_fieldnames.cpp | 2 +-
eeschema/dialogs/panel_setup_formatting.cpp | 2 +-
eeschema/dialogs/panel_setup_pinmap.cpp | 2 +-
eeschema/eeschema.cpp | 8 ++---
eeschema/files-io.cpp | 2 +-
eeschema/hierarch.cpp | 2 +-
eeschema/menubar.cpp | 2 +-
eeschema/sch_edit_frame.cpp | 2 +-
eeschema/sch_painter.cpp | 2 +-
eeschema/schematic_settings.cpp | 2 +-
eeschema/sheet.cpp | 2 +-
eeschema/symbol_editor/symbol_edit_frame.cpp | 2 +-
eeschema/symbol_library.cpp | 2 +-
eeschema/symbol_viewer_frame.cpp | 2 +-
eeschema/toolbars_sch_editor.cpp | 2 +-
eeschema/tools/assign_footprints.cpp | 2 +-
eeschema/tools/backannotate.cpp | 2 +-
.../dialogs/dialog_layers_select_to_pcb.cpp | 2 +-
gerbview/dialogs/dialog_print_gerbview.cpp | 2 +-
gerbview/gerbview.cpp | 8 ++---
gerbview/gerbview_frame.cpp | 2 +-
gerbview/menubar.cpp | 2 +-
include/{kiface_i.h => kiface_base.h} | 32 +++++++++----------
include/kiway_player.h | 2 +-
include/tool/action_menu.h | 4 +--
kicad/kicad.cpp | 4 +--
kicad/pgm_kicad.h | 7 ++--
pagelayout_editor/menubar.cpp | 2 +-
pagelayout_editor/pl_editor.cpp | 8 ++---
pagelayout_editor/pl_editor_frame.cpp | 2 +-
.../attenuators/attenuator_classes.cpp | 2 +-
pcb_calculator/pcb_calculator.cpp | 8 ++---
pcb_calculator/pcb_calculator_frame.cpp | 2 +-
.../tracks_width_versus_current.cpp | 2 +-
pcb_calculator/transline_ident.cpp | 2 +-
pcb_calculator/via.cpp | 2 +-
pcbnew/board_design_settings.cpp | 2 +-
pcbnew/cross-probing.cpp | 2 +-
pcbnew/dialogs/dialog_board_reannotate.cpp | 2 +-
pcbnew/dialogs/dialog_board_setup.cpp | 2 +-
pcbnew/dialogs/dialog_choose_footprint.cpp | 2 +-
pcbnew/dialogs/dialog_copper_zones.cpp | 2 +-
pcbnew/dialogs/dialog_drc.cpp | 2 +-
pcbnew/dialogs/dialog_export_step.cpp | 2 +-
pcbnew/dialogs/dialog_export_vrml.cpp | 2 +-
.../dialogs/dialog_footprint_wizard_list.cpp | 2 +-
.../dialog_global_fp_lib_table_config.cpp | 2 +-
pcbnew/dialogs/dialog_netlist.cpp | 2 +-
.../dialog_non_copper_zones_properties.cpp | 2 +-
pcbnew/dialogs/dialog_plot.cpp | 2 +-
pcbnew/dialogs/dialog_print_pcbnew.cpp | 2 +-
.../dialogs/dialog_rule_area_properties.cpp | 2 +-
pcbnew/dialogs/dialog_update_pcb.cpp | 2 +-
.../dialogs/panel_pcbnew_action_plugins.cpp | 2 +-
pcbnew/edit.cpp | 2 +-
pcbnew/edit_zone_helpers.cpp | 2 +-
pcbnew/exporters/export_d356.cpp | 2 +-
pcbnew/exporters/export_hyperlynx.cpp | 2 +-
pcbnew/exporters/gen_footprints_placefile.cpp | 2 +-
pcbnew/files.cpp | 2 +-
pcbnew/footprint_edit_frame.cpp | 2 +-
pcbnew/footprint_edit_frame.h | 2 +-
pcbnew/footprint_libraries_utils.cpp | 2 +-
pcbnew/footprint_wizard_frame.cpp | 2 +-
pcbnew/import_gfx/dialog_import_gfx.cpp | 2 +-
pcbnew/menubar_pcb_editor.cpp | 2 +-
pcbnew/pcb_base_edit_frame.cpp | 2 +-
pcbnew/pcb_base_frame.cpp | 2 +-
pcbnew/pcb_edit_frame.cpp | 2 +-
pcbnew/pcb_edit_frame.h | 2 +-
pcbnew/pcbnew.cpp | 8 ++---
pcbnew/plugins/kicad/kicad_plugin.cpp | 2 +-
pcbnew/toolbars_pcb_editor.cpp | 2 +-
pcbnew/tools/board_editor_control.cpp | 2 +-
pcbnew/tools/drc_tool.cpp | 2 +-
qa/common/common_mocks.cpp | 8 ++---
qa/eeschema/mocks_eeschema.cpp | 8 ++---
qa/qa_utils/mock_pgm.cpp | 8 ++---
qa/qa_utils/mocks.cpp | 8 ++---
qa/qa_utils/test_app_main.cpp | 8 ++---
scripting/kicad_scripting_main.cpp | 8 ++---
125 files changed, 187 insertions(+), 188 deletions(-)
rename common/{kiface_i.cpp => kiface_base.cpp} (96%)
rename include/{kiface_i.h => kiface_base.h} (80%)
diff --git a/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp b/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp
index 31e822c29e..2be8ea9ba2 100644
--- a/3d-viewer/3d_viewer/tools/eda_3d_controller.cpp
+++ b/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>
diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp
index fb1f849ba3..1d4f11ad25 100644
--- a/bitmap2component/bitmap2cmp_gui.cpp
+++ b/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>
diff --git a/bitmap2component/bitmap2cmp_main.cpp b/bitmap2component/bitmap2cmp_main.cpp
index 92dd22addd..fd56ae2416 100644
--- a/bitmap2component/bitmap2cmp_main.cpp
+++ b/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;
}
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 0221960800..035e54c685 100644
--- a/common/CMakeLists.txt
+++ b/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
diff --git a/common/dialogs/dialog_color_picker.cpp b/common/dialogs/dialog_color_picker.cpp
index d99b01c8fb..bcf14a03eb 100644
--- a/common/dialogs/dialog_color_picker.cpp
+++ b/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>
diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp
index c649b05dac..c057e91b6b 100644
--- a/common/dialogs/dialog_page_settings.cpp
+++ b/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>
diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp
index 231efaae52..b44ba1648d 100644
--- a/common/dialogs/panel_common_settings.cpp
+++ b/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>
diff --git a/common/draw_panel_gal.cpp b/common/draw_panel_gal.cpp
index 83a3c83777..e9b787bd0c 100644
--- a/common/draw_panel_gal.cpp
+++ b/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>
diff --git a/common/drawing_sheet/ds_data_model.cpp b/common/drawing_sheet/ds_data_model.cpp
index 88d82c445b..b1b41995a2 100644
--- a/common/drawing_sheet/ds_data_model.cpp
+++ b/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>
diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 5943f7271e..8c49c16a93 100644
--- a/common/eda_base_frame.cpp
+++ b/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>
diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp
index f27e89e692..a7e01d2cc1 100644
--- a/common/eda_draw_frame.cpp
+++ b/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>
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index 781f579f48..99e02ef434 100644
--- a/common/footprint_info.cpp
+++ b/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 )
diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp
index 92e70f6c67..2668b9a210 100644
--- a/common/fp_lib_table.cpp
+++ b/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>
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 77dd1ebda4..e993b74729 100644
--- a/common/hotkeys_basic.cpp
+++ b/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>
diff --git a/common/kiface_i.cpp b/common/kiface_base.cpp
similarity index 96%
rename from common/kiface_i.cpp
rename to common/kiface_base.cpp
index 5eb6c21b74..2550e5cf69 100644
--- a/common/kiface_i.cpp
+++ b/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();
}
diff --git a/common/kiway.cpp b/common/kiway.cpp
index d6bf2bb4ff..34494dd2d3 100644
--- a/common/kiway.cpp
+++ b/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" );
diff --git a/common/lib_table_base.cpp b/common/lib_table_base.cpp
index 477df51545..59b58bbe59 100644
--- a/common/lib_table_base.cpp
+++ b/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>
diff --git a/common/lib_tree_model_adapter.cpp b/common/lib_tree_model_adapter.cpp
index 42fe8e6043..4a8f89e99b 100644
--- a/common/lib_tree_model_adapter.cpp
+++ b/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>
diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp
index 45afd6cc11..0337d456a5 100644
--- a/common/tool/action_menu.cpp
+++ b/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
{
diff --git a/common/tool/common_control.cpp b/common/tool/common_control.cpp
index b6b404e73d..df02776c2b 100644
--- a/common/tool/common_control.cpp
+++ b/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>
diff --git a/common/tool/common_tools.cpp b/common/tool/common_tools.cpp
index bccc82c187..04b3c8a93e 100644
--- a/common/tool/common_tools.cpp
+++ b/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>
diff --git a/common/tool/conditional_menu.cpp b/common/tool/conditional_menu.cpp
index 9ca5f740c7..8a434efe56 100644
--- a/common/tool/conditional_menu.cpp
+++ b/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 ) :
diff --git a/cvpcb/auto_associate.cpp b/cvpcb/auto_associate.cpp
index bc412faf03..e677a6fa55 100644
--- a/cvpcb/auto_associate.cpp
+++ b/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>
diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index 45a0ae8f90..89cc101e8c 100644
--- a/cvpcb/cvpcb.cpp
+++ b/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.
diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index d056aac668..96ff982474 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/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>
diff --git a/cvpcb/display_footprints_frame.cpp b/cvpcb/display_footprints_frame.cpp
index 36a5365c87..bf942a47f1 100644
--- a/cvpcb/display_footprints_frame.cpp
+++ b/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>
diff --git a/cvpcb/tools/cvpcb_association_tool.cpp b/cvpcb/tools/cvpcb_association_tool.cpp
index 7d7b170dd9..7dceb4acfc 100644
--- a/cvpcb/tools/cvpcb_association_tool.cpp
+++ b/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>
diff --git a/cvpcb/tools/cvpcb_control.cpp b/cvpcb/tools/cvpcb_control.cpp
index 5276df1912..c29a33a50f 100644
--- a/cvpcb/tools/cvpcb_control.cpp
+++ b/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>
diff --git a/eeschema/autoplace_fields.cpp b/eeschema/autoplace_fields.cpp
index bc8106ef99..84e7217142 100644
--- a/eeschema/autoplace_fields.cpp
+++ b/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>
diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp
index c14d85f68b..fffed2a54a 100644
--- a/eeschema/cross-probing.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp
index b22a735043..40d1945ff2 100644
--- a/eeschema/dialogs/dialog_annotate.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 642bc91c63..d689378146 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_choose_symbol.cpp b/eeschema/dialogs/dialog_choose_symbol.cpp
index cf589f480f..545d8d03c9 100644
--- a/eeschema/dialogs/dialog_choose_symbol.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_eeschema_page_settings.cpp b/eeschema/dialogs/dialog_eeschema_page_settings.cpp
index fb6da751c1..afc22dc9b1 100644
--- a/eeschema/dialogs/dialog_eeschema_page_settings.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 8db3a29b72..7c71d18bfb 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp b/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
index 77920399ec..e3539da8a9 100644
--- a/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp
+++ b/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"
diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp
index ab67ce605f..82e348923b 100644
--- a/eeschema/dialogs/dialog_netlist.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp
index 854f49354b..e1e6d77b30 100644
--- a/eeschema/dialogs/dialog_plot_schematic.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_rescue_each.cpp b/eeschema/dialogs/dialog_rescue_each.cpp
index 078b82066a..3e1f979a6a 100644
--- a/eeschema/dialogs/dialog_rescue_each.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp
index 397607fa69..6d121a6e17 100644
--- a/eeschema/dialogs/dialog_schematic_setup.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp
index f07376731b..5cb52c3873 100644
--- a/eeschema/dialogs/dialog_sheet_properties.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp
index 69bbbe0386..2b1fcad341 100644
--- a/eeschema/dialogs/dialog_symbol_fields_table.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp
index df24548d83..0865456f39 100644
--- a/eeschema/dialogs/dialog_symbol_properties.cpp
+++ b/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>
diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp
index 1f9cbb2fdc..9fd189dc6b 100644
--- a/eeschema/dialogs/dialog_symbol_remap.cpp
+++ b/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>
diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
index 71a8cb2617..181659f265 100644
--- a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
+++ b/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,
diff --git a/eeschema/dialogs/panel_setup_formatting.cpp b/eeschema/dialogs/panel_setup_formatting.cpp
index ec451148e1..eb46ec3452 100644
--- a/eeschema/dialogs/panel_setup_formatting.cpp
+++ b/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>
diff --git a/eeschema/dialogs/panel_setup_pinmap.cpp b/eeschema/dialogs/panel_setup_pinmap.cpp
index 8b9c371840..85c7067823 100644
--- a/eeschema/dialogs/panel_setup_pinmap.cpp
+++ b/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>
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 0b085ec175..3ddc2671f4 100644
--- a/eeschema/eeschema.cpp
+++ b/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.
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 6f7e46ddb4..1c99c614c8 100644
--- a/eeschema/files-io.cpp
+++ b/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>
diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp
index b25ba9e402..c9e91fca96 100644
--- a/eeschema/hierarch.cpp
+++ b/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>
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index dd252a4c9d..fe241f4d60 100644
--- a/eeschema/menubar.cpp
+++ b/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>
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index a244e00815..e5748f7e10 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/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>
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index e1622d8bd5..93b69bf7e3 100644
--- a/eeschema/sch_painter.cpp
+++ b/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>
diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp
index 9a123b9e3e..d778dd2ca2 100644
--- a/eeschema/schematic_settings.cpp
+++ b/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>
diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index 6acfbbbd11..933ca5232e 100644
--- a/eeschema/sheet.cpp
+++ b/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>
diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp
index 083f8a6207..d11c3f3017 100644
--- a/eeschema/symbol_editor/symbol_edit_frame.cpp
+++ b/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>
diff --git a/eeschema/symbol_library.cpp b/eeschema/symbol_library.cpp
index d1bf24f2b7..57ebd509f9 100644
--- a/eeschema/symbol_library.cpp
+++ b/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>
diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index ecfd5bcc4e..b1f94fd759 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/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>
diff --git a/eeschema/toolbars_sch_editor.cpp b/eeschema/toolbars_sch_editor.cpp
index 32fbaf2094..4a2fdf87f6 100644
--- a/eeschema/toolbars_sch_editor.cpp
+++ b/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>
diff --git a/eeschema/tools/assign_footprints.cpp b/eeschema/tools/assign_footprints.cpp
index 1f4e47c3e9..5bf739149f 100644
--- a/eeschema/tools/assign_footprints.cpp
+++ b/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>
diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp
index a8d37fc305..699a3e459b 100644
--- a/eeschema/tools/backannotate.cpp
+++ b/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>
diff --git a/gerbview/dialogs/dialog_layers_select_to_pcb.cpp b/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
index a3a38cae47..a4513e895a 100644
--- a/gerbview/dialogs/dialog_layers_select_to_pcb.cpp
+++ b/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>
diff --git a/gerbview/dialogs/dialog_print_gerbview.cpp b/gerbview/dialogs/dialog_print_gerbview.cpp
index 2a9355a6ea..3535a61060 100644
--- a/gerbview/dialogs/dialog_print_gerbview.cpp
+++ b/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>
diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp
index ea00aa1128..dc8c08afa0 100644
--- a/gerbview/gerbview.cpp
+++ b/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.
diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp
index c0f0a7c913..edb05ae6fd 100644
--- a/gerbview/gerbview_frame.cpp
+++ b/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>
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index e670345dfa..2c1386cced 100644
--- a/gerbview/menubar.cpp
+++ b/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>
diff --git a/include/kiface_i.h b/include/kiface_base.h
similarity index 80%
rename from include/kiface_i.h
rename to include/kiface_base.h
index 9f8f5587c3..547a21a3ab 100644
--- a/include/kiface_i.h
+++ b/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
diff --git a/include/kiway_player.h b/include/kiway_player.h
index cb22e4ac84..ac2c771743 100644
--- a/include/kiway_player.h
+++ b/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;
diff --git a/include/tool/action_menu.h b/include/tool/action_menu.h
index cf43deb32c..efe428e69f 100644
--- a/include/tool/action_menu.h
+++ b/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).
diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp
index 70ff3466c2..67f4e570bc 100644
--- a/kicad/kicad.cpp
+++ b/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,
diff --git a/kicad/pgm_kicad.h b/kicad/pgm_kicad.h
index 299071b3a7..bd950e563e 100644
--- a/kicad/pgm_kicad.h
+++ b/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
{
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index 0111727ecb..c4994daec2 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/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>
diff --git a/pagelayout_editor/pl_editor.cpp b/pagelayout_editor/pl_editor.cpp
index 6370031a8e..d736131bb9 100644
--- a/pagelayout_editor/pl_editor.cpp
+++ b/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.
diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp
index 33ee4f9712..e6c8dfcada 100644
--- a/pagelayout_editor/pl_editor_frame.cpp
+++ b/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>
diff --git a/pcb_calculator/attenuators/attenuator_classes.cpp b/pcb_calculator/attenuators/attenuator_classes.cpp
index db1d780811..3d161b1a54 100644
--- a/pcb_calculator/attenuators/attenuator_classes.cpp
+++ b/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"
diff --git a/pcb_calculator/pcb_calculator.cpp b/pcb_calculator/pcb_calculator.cpp
index 04f57b7167..de7988ae55 100644
--- a/pcb_calculator/pcb_calculator.cpp
+++ b/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.
diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp
index e0ba77b6f9..8608017712 100644
--- a/pcb_calculator/pcb_calculator_frame.cpp
+++ b/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"
diff --git a/pcb_calculator/tracks_width_versus_current.cpp b/pcb_calculator/tracks_width_versus_current.cpp
index ef2058aaab..4ca961d266 100644
--- a/pcb_calculator/tracks_width_versus_current.cpp
+++ b/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"
diff --git a/pcb_calculator/transline_ident.cpp b/pcb_calculator/transline_ident.cpp
index 228d157280..55c30a4d16 100644
--- a/pcb_calculator/transline_ident.cpp
+++ b/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:
diff --git a/pcb_calculator/via.cpp b/pcb_calculator/via.cpp
index 4140d19278..424275b523 100644
--- a/pcb_calculator/via.cpp
+++ b/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"
diff --git a/pcbnew/board_design_settings.cpp b/pcbnew/board_design_settings.cpp
index ea07393d8c..275b78434f 100644
--- a/pcbnew/board_design_settings.cpp
+++ b/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>
diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp
index ac73ddda77..30bbab370a 100644
--- a/pcbnew/cross-probing.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index ccf1987a5b..927b7763a7 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp
index 93fda1eb3d..36e705f347 100644
--- a/pcbnew/dialogs/dialog_board_setup.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_choose_footprint.cpp b/pcbnew/dialogs/dialog_choose_footprint.cpp
index 091ce1167a..867a4ccf83 100644
--- a/pcbnew/dialogs/dialog_choose_footprint.cpp
+++ b/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,
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index a1984bca54..939f692991 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp
index aa729fa7d5..34bb5bf1d7 100644
--- a/pcbnew/dialogs/dialog_drc.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp
index a01c4df4e1..3e7c6e9c45 100644
--- a/pcbnew/dialogs/dialog_export_step.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp
index 87e59d3afe..79f7e9547e 100644
--- a/pcbnew/dialogs/dialog_export_vrml.cpp
+++ b/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
diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
index 1f9909649d..7bbe45de9d 100644
--- a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp b/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp
index e20f3cf332..6d6d8f83c9 100644
--- a/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp
+++ b/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"
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index ea7e3d1ae0..49c3438afd 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
index d48095dda3..ccf0e2fd5e 100644
--- a/pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 137e25c547..ee5392c741 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_print_pcbnew.cpp b/pcbnew/dialogs/dialog_print_pcbnew.cpp
index 707e2b6599..3d751b2dd6 100644
--- a/pcbnew/dialogs/dialog_print_pcbnew.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_rule_area_properties.cpp b/pcbnew/dialogs/dialog_rule_area_properties.cpp
index 133a8a1314..a785c3f465 100644
--- a/pcbnew/dialogs/dialog_rule_area_properties.cpp
+++ b/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>
diff --git a/pcbnew/dialogs/dialog_update_pcb.cpp b/pcbnew/dialogs/dialog_update_pcb.cpp
index bc08fce9ae..6f278a878e 100644
--- a/pcbnew/dialogs/dialog_update_pcb.cpp
+++ b/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;
diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
index 6862911417..1057cb80d9 100644
--- a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
+++ b/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>
diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp
index f476a617f0..f33dd0d19f 100644
--- a/pcbnew/edit.cpp
+++ b/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>
diff --git a/pcbnew/edit_zone_helpers.cpp b/pcbnew/edit_zone_helpers.cpp
index ab9c472cc8..b35a391bdd 100644
--- a/pcbnew/edit_zone_helpers.cpp
+++ b/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>
diff --git a/pcbnew/exporters/export_d356.cpp b/pcbnew/exporters/export_d356.cpp
index f3e54b8742..b20e24b8af 100644
--- a/pcbnew/exporters/export_d356.cpp
+++ b/pcbnew/exporters/export_d356.cpp
@@ -29,7 +29,7 @@
#include <confirm.h>
#include <gestfich.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <pcb_edit_frame.h>
#include <trigo.h>
#include <build_version.h>
diff --git a/pcbnew/exporters/export_hyperlynx.cpp b/pcbnew/exporters/export_hyperlynx.cpp
index 428a9270fd..fb956338c5 100644
--- a/pcbnew/exporters/export_hyperlynx.cpp
+++ b/pcbnew/exporters/export_hyperlynx.cpp
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <macros.h>
#include <pcb_edit_frame.h>
#include <board.h>
diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp
index 75595b7ea3..9739586e7a 100644
--- a/pcbnew/exporters/gen_footprints_placefile.cpp
+++ b/pcbnew/exporters/gen_footprints_placefile.cpp
@@ -37,7 +37,7 @@
#include <board.h>
#include <footprint.h>
#include <wildcards_and_files_ext.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <wx_html_report_panel.h>
#include <dialog_gen_footprint_position_file_base.h>
#include <export_footprints_placefile.h>
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index a353cd73ad..71dbfea4fe 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -31,7 +31,7 @@
#include <3d_viewer/eda_3d_viewer_frame.h>
#include <widgets/msgpanel.h>
#include <fp_lib_table.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <macros.h>
#include <trace_helpers.h>
#include <lockfile.cpp>
diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index 4a6b2ec89e..618d86f0be 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -47,7 +47,7 @@
#include <footprint_tree_pane.h>
#include <fp_lib_table.h>
#include <plugins/kicad/kicad_plugin.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiplatform/app.h>
#include <kiway.h>
#include <macros.h>
diff --git a/pcbnew/footprint_edit_frame.h b/pcbnew/footprint_edit_frame.h
index ae2b5b73e8..10fd87b7c4 100644
--- a/pcbnew/footprint_edit_frame.h
+++ b/pcbnew/footprint_edit_frame.h
@@ -32,7 +32,7 @@ class FOOTPRINT_TREE_PANE;
class SYMBOL_LIBRARY_MANAGER;
class FOOTPRINT_EDITOR_SETTINGS;
-namespace PCB { struct IFACE; } // A KIFACE_I coded in pcbnew.c
+namespace PCB { struct IFACE; } // A KIFACE coded in pcbnew.cpp
class FOOTPRINT_EDIT_FRAME : public PCB_BASE_EDIT_FRAME
diff --git a/pcbnew/footprint_libraries_utils.cpp b/pcbnew/footprint_libraries_utils.cpp
index da8c9c0235..121622c924 100644
--- a/pcbnew/footprint_libraries_utils.cpp
+++ b/pcbnew/footprint_libraries_utils.cpp
@@ -23,7 +23,7 @@
#include <wx/ffile.h>
#include <pgm_base.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <confirm.h>
#include <string_utils.h>
#include <macros.h>
diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp
index 9eb9e10a26..ca74799eff 100644
--- a/pcbnew/footprint_wizard_frame.cpp
+++ b/pcbnew/footprint_wizard_frame.cpp
@@ -24,7 +24,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <pcb_draw_panel_gal.h>
#include <pcb_edit_frame.h>
#include <3d_viewer/eda_3d_viewer_frame.h>
diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx.cpp
index 08b35e047a..cf872801fd 100644
--- a/pcbnew/import_gfx/dialog_import_gfx.cpp
+++ b/pcbnew/import_gfx/dialog_import_gfx.cpp
@@ -25,7 +25,7 @@
#include <dialogs/html_message_box.h>
#include "dialog_import_gfx.h"
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <locale_io.h>
#include <pcb_layer_box_selector.h>
#include <wildcards_and_files_ext.h>
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 661cca719b..c1b69654c9 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -27,7 +27,7 @@
#include <advanced_config.h>
#include <bitmaps.h>
#include <filehistory.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <menus_helpers.h>
#include <pcb_edit_frame.h>
#include <pcbnew_id.h>
diff --git a/pcbnew/pcb_base_edit_frame.cpp b/pcbnew/pcb_base_edit_frame.cpp
index fe6813a186..aba582afbb 100644
--- a/pcbnew/pcb_base_edit_frame.cpp
+++ b/pcbnew/pcb_base_edit_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 <pcb_base_edit_frame.h>
#include <tool/tool_manager.h>
#include <tools/pcb_actions.h>
diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp
index f7fd275727..76ee26937a 100644
--- a/pcbnew/pcb_base_frame.cpp
+++ b/pcbnew/pcb_base_frame.cpp
@@ -32,7 +32,7 @@
#include <boost/uuid/entropy_error.hpp>
#endif
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <confirm.h>
#include <pcb_base_frame.h>
#include <base_units.h>
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 524b0ea3ba..e19b1a09a0 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -21,7 +21,7 @@
*/
#include <advanced_config.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiway.h>
#include <pgm_base.h>
#include <pcb_edit_frame.h>
diff --git a/pcbnew/pcb_edit_frame.h b/pcbnew/pcb_edit_frame.h
index d20c08ddf6..a0b88a0585 100644
--- a/pcbnew/pcb_edit_frame.h
+++ b/pcbnew/pcb_edit_frame.h
@@ -60,7 +60,7 @@ class TOOL_ACTION;
enum LAST_PATH_TYPE : unsigned int;
-namespace PCB { struct IFACE; } // KIFACE_I is in pcbnew.cpp
+namespace PCB { struct IFACE; } // KIFACE is in pcbnew.cpp
/**
* The main frame for Pcbnew.
diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp
index b6a1cf80f7..e82abc2e9a 100644
--- a/pcbnew/pcbnew.cpp
+++ b/pcbnew/pcbnew.cpp
@@ -30,7 +30,7 @@
#include <pcbnew_scripting_helpers.h>
#include <pgm_base.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiface_ids.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
@@ -62,12 +62,12 @@ extern "C" PyObject* PyInit__pcbnew( void );
namespace PCB {
-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;
@@ -190,7 +190,7 @@ using namespace PCB;
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.
diff --git a/pcbnew/plugins/kicad/kicad_plugin.cpp b/pcbnew/plugins/kicad/kicad_plugin.cpp
index a4a3c603df..e6e8614070 100644
--- a/pcbnew/plugins/kicad/kicad_plugin.cpp
+++ b/pcbnew/plugins/kicad/kicad_plugin.cpp
@@ -34,7 +34,7 @@
#include <footprint.h>
#include <fp_shape.h>
#include <string_utils.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <locale_io.h>
#include <macros.h>
#include <pad.h>
diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp
index b54ab790e2..d34243ce97 100644
--- a/pcbnew/toolbars_pcb_editor.cpp
+++ b/pcbnew/toolbars_pcb_editor.cpp
@@ -30,7 +30,7 @@
#include <bitmaps.h>
#include <board.h>
#include <board_design_settings.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <macros.h>
#include <pcb_edit_frame.h>
#include <pcb_layer_box_selector.h>
diff --git a/pcbnew/tools/board_editor_control.cpp b/pcbnew/tools/board_editor_control.cpp
index 8abce3a1ba..7509b5b15f 100644
--- a/pcbnew/tools/board_editor_control.cpp
+++ b/pcbnew/tools/board_editor_control.cpp
@@ -42,7 +42,7 @@
#include <confirm.h>
#include <dialogs/dialog_page_settings.h>
#include <dialogs/dialog_update_pcb.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiway.h>
#include <netlist_reader/pcb_netlist.h>
#include <origin_viewitem.h>
diff --git a/pcbnew/tools/drc_tool.cpp b/pcbnew/tools/drc_tool.cpp
index b6b46a86f6..02d71cc10d 100644
--- a/pcbnew/tools/drc_tool.cpp
+++ b/pcbnew/tools/drc_tool.cpp
@@ -28,7 +28,7 @@
#include <tools/pcb_tool_base.h>
#include <tools/zone_filler_tool.h>
#include <tools/drc_tool.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <dialog_drc.h>
#include <board_commit.h>
#include <board_design_settings.h>
diff --git a/qa/common/common_mocks.cpp b/qa/common/common_mocks.cpp
index 1ac749693f..18f5551a36 100644
--- a/qa/common/common_mocks.cpp
+++ b/qa/common/common_mocks.cpp
@@ -27,7 +27,7 @@
*/
#include <pgm_base.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
struct PGM_TEST_FRAME : public PGM_BASE
@@ -42,7 +42,7 @@ PGM_BASE& Pgm()
return program;
}
-static struct IFACE : public KIFACE_I
+static struct IFACE : public KIFACE_BASE
{
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override
{
@@ -60,12 +60,12 @@ static struct IFACE : public KIFACE_I
}
IFACE( const char* aDSOname, KIWAY::FACE_T aType ) :
- KIFACE_I( aDSOname, aType )
+ KIFACE_BASE( aDSOname, aType )
{}
} kiface( "common_test", KIWAY::KIWAY_FACE_COUNT );
-KIFACE_I& Kiface()
+KIFACE_BASE& Kiface()
{
return kiface;
}
\ No newline at end of file
diff --git a/qa/eeschema/mocks_eeschema.cpp b/qa/eeschema/mocks_eeschema.cpp
index 57916ca9cb..7abef428b0 100644
--- a/qa/eeschema/mocks_eeschema.cpp
+++ b/qa/eeschema/mocks_eeschema.cpp
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <pgm_base.h>
#include <transform.h>
@@ -35,11 +35,11 @@
TRANSFORM DefaultTransform = TRANSFORM( 1, 0, 0, -1 );
-static struct IFACE : public KIFACE_I
+static struct IFACE : public KIFACE_BASE
{
// Of course all are overloads, implementations of the KIFACE.
- IFACE( const char* aName, KIWAY::FACE_T aType ) : KIFACE_I( aName, aType )
+ IFACE( const char* aName, KIWAY::FACE_T aType ) : KIFACE_BASE( aName, aType )
{
}
@@ -125,7 +125,7 @@ PGM_BASE* PgmOrNull()
}
-KIFACE_I& Kiface()
+KIFACE_BASE& Kiface()
{
return kiface;
}
diff --git a/qa/qa_utils/mock_pgm.cpp b/qa/qa_utils/mock_pgm.cpp
index 5dda3f69fe..5aebffc848 100644
--- a/qa/qa_utils/mock_pgm.cpp
+++ b/qa/qa_utils/mock_pgm.cpp
@@ -22,19 +22,19 @@
*/
#include <pgm_base.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiway.h>
#include <kiway_player.h>
#include <wx/app.h>
-static struct IFACE : public KIFACE_I
+static struct IFACE : public KIFACE_BASE
{
// Of course all are 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
@@ -116,7 +116,7 @@ PGM_BASE* PgmOrNull()
}
-KIFACE_I& Kiface()
+KIFACE_BASE& Kiface()
{
return kiface;
}
diff --git a/qa/qa_utils/mocks.cpp b/qa/qa_utils/mocks.cpp
index e59032d107..796bb8d4a4 100644
--- a/qa/qa_utils/mocks.cpp
+++ b/qa/qa_utils/mocks.cpp
@@ -22,7 +22,7 @@
*/
#include <pgm_base.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <confirm.h>
#include <pcb_edit_frame.h>
#include <eda_dde.h>
@@ -44,12 +44,12 @@ FP_LIB_TABLE GFootprintTable;
#if 0
-static struct IFACE : public KIFACE_I
+static struct IFACE : public KIFACE_BASE
{
// Of course all are 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
@@ -131,7 +131,7 @@ PGM_BASE* PgmOrNull()
}
-KIFACE_I& Kiface()
+KIFACE_BASE& Kiface()
{
return kiface;
}
diff --git a/qa/qa_utils/test_app_main.cpp b/qa/qa_utils/test_app_main.cpp
index 02c7748a5e..e7914313fd 100644
--- a/qa/qa_utils/test_app_main.cpp
+++ b/qa/qa_utils/test_app_main.cpp
@@ -39,7 +39,7 @@
#include <wx/snglinst.h>
#include <wx/html/htmlwin.h>
#include <pgm_base.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiway.h>
#include <pgm_base.h>
@@ -49,12 +49,12 @@
#include <qa_utils/utility_registry.h>
-static struct IFACE : public KIFACE_I
+static struct IFACE : public KIFACE_BASE
{
// Of course all are 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
@@ -143,7 +143,7 @@ PGM_BASE* PgmOrNull()
}
-KIFACE_I& Kiface()
+KIFACE_BASE& Kiface()
{
return kiface;
}
diff --git a/scripting/kicad_scripting_main.cpp b/scripting/kicad_scripting_main.cpp
index 486ea56283..3aa049f713 100644
--- a/scripting/kicad_scripting_main.cpp
+++ b/scripting/kicad_scripting_main.cpp
@@ -18,7 +18,7 @@
*/
#include <eda_dde.h>
-#include <kiface_i.h>
+#include <kiface_base.h>
#include <kiface_ids.h>
#include <kipython_frame.h>
#include <kipython_settings.h>
@@ -33,7 +33,7 @@
namespace KIPYTHON {
-static struct IFACE : public KIFACE_I
+static struct IFACE : public KIFACE_BASE
{
bool OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) override;
@@ -69,7 +69,7 @@ static struct IFACE : public KIFACE_I
}
IFACE( const char* aDSOname, KIWAY::FACE_T aType ) :
- KIFACE_I( aDSOname, aType )
+ KIFACE_BASE( aDSOname, aType )
{}
} kiface( "KIPYTHON", KIWAY::FACE_PYTHON );
@@ -80,7 +80,7 @@ using namespace KIPYTHON;
static PGM_BASE* process;
-KIFACE_I& Kiface()
+KIFACE_BASE& Kiface()
{
return kiface;
}