KIFACE_I -> KIFACE_BASE.

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>

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>

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;
 }

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

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>

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>

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>

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>

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>

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>

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>

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 )

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>

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>

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();
 }

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" );

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>

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>

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
     {

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>

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>

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 ) :

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>
 

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.

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>