Initial rename of file plugin infrastructure components to IO

common/CMakeLists.txt

@@ -117,7 +117,7 @@ set( KICOMMON_SRCS
     trace_helpers.cpp
     wx_filename.cpp
 
-    plugins/kicad/kicad_plugin_utils.cpp    # needed by richio
+    io/kicad/kicad_io_utils.cpp    # needed by richio
     )
 
 add_library( kicommon SHARED
@@ -376,28 +376,28 @@ set( PLOTTERS_CONTROL_SRCS
     plotters/common_plot_functions.cpp
     )
 
-set( PLUGINS_ALTIUM_SRCS
-    plugins/altium/altium_parser.cpp
-    plugins/altium/altium_parser_utils.cpp
-    )
+set( COMMON_IO_SRCS
+    io/plugin_file_desc.cpp
+    io/io_utils.cpp
 
-set( PLUGINS_CADSTAR_SRCS
-    plugins/cadstar/cadstar_archive_parser.cpp
-    plugins/cadstar/cadstar_parts_lib_parser.cpp
-    )
+    # Altium
+    io/altium/altium_parser.cpp
+    io/altium/altium_parser_utils.cpp
 
-set( PLUGINS_EAGLE_SRCS
-    plugins/eagle/eagle_parser.cpp
-    )
+    # Cadstar
+    io/cadstar/cadstar_archive_parser.cpp
+    io/cadstar/cadstar_parts_lib_parser.cpp
 
-set( PLUGINS_EASYEDA_SRCS
-    plugins/easyeda/easyeda_parser_base.cpp
-    plugins/easyeda/easyeda_parser_structs.cpp
-    )
+    # Eagle
+    io/eagle/eagle_parser.cpp
 
-set( PLUGINS_EASYEDAPRO_SRCS
-    plugins/easyedapro/easyedapro_parser.cpp
-    plugins/easyedapro/easyedapro_import_utils.cpp
+    # EasyEDA
+    io/easyeda/easyeda_parser_base.cpp
+    io/easyeda/easyeda_parser_structs.cpp
+
+    # EasyEDA pro
+    io/easyedapro/easyedapro_parser.cpp
+    io/easyedapro/easyedapro_import_utils.cpp
     )
 
 set( COMMON_IMPORT_GFX_SRCS
@@ -430,11 +430,7 @@ set( COMMON_SRCS
     ${COMMON_DRAWING_SHEET_SRCS}
     ${COMMON_PREVIEW_ITEMS_SRCS}
     ${PLOTTERS_CONTROL_SRCS}
-    ${PLUGINS_ALTIUM_SRCS}
-    ${PLUGINS_CADSTAR_SRCS}
-    ${PLUGINS_EAGLE_SRCS}
-    ${PLUGINS_EASYEDA_SRCS}
-    ${PLUGINS_EASYEDAPRO_SRCS}
+    ${COMMON_IO_SRCS}
 	${FONT_SRCS}
     ${COMMON_IMPORT_GFX_SRCS}
     ${COMMON_GIT_SRCS}
@@ -493,8 +489,6 @@ set( COMMON_SRCS
     notifications_manager.cpp
     origin_transforms.cpp
     page_info.cpp
-    plugin_file_desc.cpp
-    plugins/plugin_utils.cpp
     printout.cpp
     project.cpp
     ptree.cpp
@@ -702,28 +696,21 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_rule_condition.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_rule_parser.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/drc/drc_test_provider.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/eagle/eagle_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/footprint_editor_settings.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/geda/gpcb_plugin.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/io_mgr.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/generators_mgr.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/kicad_clipboard.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/kicad_netlist_reader.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/kicad/pcb_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/legacy_netlist_reader.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/legacy/legacy_plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/netlist_reader.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pad_custom_shape_functions.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_draw_panel_gal.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/netlist_reader/pcb_netlist.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_origin_transforms.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_painter.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/plugins/kicad/pcb_parser.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_plot_params.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_screen.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcb_view.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/pcbnew_settings.cpp
-    ${CMAKE_SOURCE_DIR}/pcbnew/plugin.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/ratsnest/ratsnest_data.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/ratsnest/ratsnest_view_item.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/sel_layer.cpp
@@ -732,6 +719,15 @@ set( PCB_COMMON_SRCS
     ${CMAKE_SOURCE_DIR}/pcbnew/teardrop/teardrop_utils.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/zone_settings.cpp
 
+    # IO files
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/pcb_io.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/pcb_io_mgr.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/legacy/legacy_plugin.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad/pcb_plugin.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad/pcb_parser.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/eagle/eagle_plugin.cpp
+    ${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/geda/gpcb_plugin.cpp
+
     ${CMAKE_SOURCE_DIR}/pcbnew/tools/pcb_grid_helper.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/tools/pcb_actions.cpp
     ${CMAKE_SOURCE_DIR}/pcbnew/tools/pcb_editor_conditions.cpp

common/dialogs/dialog_import_choose_project.h

@@ -21,7 +21,7 @@
 #define DIALOG_IMPORT_CHOOSE_PROJECT_H
 
 #include "dialog_import_choose_project_base.h"
-#include <plugins/common/plugin_common_choose_project.h>
+#include <io/common/plugin_common_choose_project.h>
 
 
 class DIALOG_IMPORT_CHOOSE_PROJECT : public DIALOG_IMPORT_CHOOSE_PROJECT_BASE

common/fp_lib_table.cpp

@@ -56,10 +56,10 @@ bool FP_LIB_TABLE_ROW::operator==( const FP_LIB_TABLE_ROW& aRow ) const
 
 void FP_LIB_TABLE_ROW::SetType( const wxString& aType )
 {
-    type = IO_MGR::EnumFromStr( aType );
+    type = PCB_IO_MGR::EnumFromStr( aType );
 
-    if( IO_MGR::PCB_FILE_T( -1 ) == type )
-        type = IO_MGR::KICAD_SEXP;
+    if( PCB_IO_MGR::PCB_FILE_T( -1 ) == type )
+        type = PCB_IO_MGR::KICAD_SEXP;
 
     plugin.release();
 }
@@ -303,7 +303,7 @@ void FP_LIB_TABLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxS
                                        bool aBestEfforts )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
     row->plugin->FootprintEnumerate( aFootprintNames, row->GetFullURI( true ), aBestEfforts,
                                      row->GetProperties() );
 }
@@ -312,7 +312,7 @@ void FP_LIB_TABLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxS
 void FP_LIB_TABLE::PrefetchLib( const wxString& aNickname )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
     row->plugin->PrefetchLib( row->GetFullURI( true ), row->GetProperties() );
 }
 
@@ -332,10 +332,10 @@ const FP_LIB_TABLE_ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname, bool a
     }
 
     // We've been 'lazy' up until now, but it cannot be deferred any longer,
-    // instantiate a PLUGIN of the proper kind if it is not already in this
+    // instantiate a PCB_IO of the proper kind if it is not already in this
     // FP_LIB_TABLE_ROW.
     if( !row->plugin )
-        row->setPlugin( IO_MGR::PluginFind( row->type ) );
+        row->setPlugin( PCB_IO_MGR::PluginFind( row->type ) );
 
     return row;
 }
@@ -369,7 +369,7 @@ const FOOTPRINT* FP_LIB_TABLE::GetEnumeratedFootprint( const wxString& aNickname
                                                        const wxString& aFootprintName )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
 
     return row->plugin->GetEnumeratedFootprint( row->GetFullURI( true ), aFootprintName,
                                                 row->GetProperties() );
@@ -381,7 +381,7 @@ bool FP_LIB_TABLE::FootprintExists( const wxString& aNickname, const wxString& a
     try
     {
         const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-        wxASSERT( (PLUGIN*) row->plugin );
+        wxASSERT( (PCB_IO*) row->plugin );
 
         return row->plugin->FootprintExists( row->GetFullURI( true ), aFootprintName,
                                              row->GetProperties() );
@@ -397,7 +397,7 @@ FOOTPRINT* FP_LIB_TABLE::FootprintLoad( const wxString& aNickname,
                                         const wxString& aFootprintName, bool aKeepUUID )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
 
     FOOTPRINT* ret = row->plugin->FootprintLoad( row->GetFullURI( true ), aFootprintName,
                                                  aKeepUUID, row->GetProperties() );
@@ -412,7 +412,7 @@ FP_LIB_TABLE::SAVE_T FP_LIB_TABLE::FootprintSave( const wxString& aNickname,
                                                   const FOOTPRINT* aFootprint, bool aOverwrite )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
 
     if( !aOverwrite )
     {
@@ -438,7 +438,7 @@ FP_LIB_TABLE::SAVE_T FP_LIB_TABLE::FootprintSave( const wxString& aNickname,
 void FP_LIB_TABLE::FootprintDelete( const wxString& aNickname, const wxString& aFootprintName )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
     return row->plugin->FootprintDelete( row->GetFullURI( true ), aFootprintName,
                                          row->GetProperties() );
 }
@@ -447,7 +447,7 @@ void FP_LIB_TABLE::FootprintDelete( const wxString& aNickname, const wxString& a
 bool FP_LIB_TABLE::IsFootprintLibWritable( const wxString& aNickname )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
     return row->plugin->IsFootprintLibWritable( row->GetFullURI( true ) );
 }
 
@@ -455,7 +455,7 @@ bool FP_LIB_TABLE::IsFootprintLibWritable( const wxString& aNickname )
 void FP_LIB_TABLE::FootprintLibDelete( const wxString& aNickname )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
     row->plugin->FootprintLibDelete( row->GetFullURI( true ), row->GetProperties() );
 }
 
@@ -463,7 +463,7 @@ void FP_LIB_TABLE::FootprintLibDelete( const wxString& aNickname )
 void FP_LIB_TABLE::FootprintLibCreate( const wxString& aNickname )
 {
     const FP_LIB_TABLE_ROW* row = FindRow( aNickname, true );
-    wxASSERT( (PLUGIN*) row->plugin );
+    wxASSERT( (PCB_IO*) row->plugin );
     row->plugin->FootprintLibCreate( row->GetFullURI( true ), row->GetProperties() );
 }
 

common/io/cadstar/cadstar_archive_parser.cpp

@@ -28,7 +28,7 @@
 
 #include <dsnlexer.h>
 #include <geometry/shape_poly_set.h>
-#include <plugins/cadstar/cadstar_archive_parser.h>
+#include <io/cadstar/cadstar_archive_parser.h>
 #include <eda_item.h>
 #include <eda_text.h>
 #include <macros.h>

common/io/cadstar/cadstar_archive_parser.h

@@ -35,7 +35,7 @@
 #include <xnode.h>
 
 #include <math/vector2d.h>
-#include <plugins/cadstar/cadstar_archive_objects.h>
+#include <io/cadstar/cadstar_archive_objects.h>
 
 // THROW_IO_ERROR definitions to ensure consistent wording is used in the error messages
 

common/io/cadstar/cadstar_parts_lib_model.h

@@ -25,7 +25,7 @@
 #include <optional>
 #include <string>
 #include <vector>
-#include <plugins/cadstar/cadstar_archive_objects.h>
+#include <io/cadstar/cadstar_archive_objects.h>
 
 struct CADSTAR_PART_ENTRY;
 struct CADSTAR_SWAP_GROUP;

common/io/common/plugin_common_choose_project.h

@@ -22,6 +22,7 @@
 
 #include <functional>
 #include <map>
+#include <wx/string.h>
 
 /**
  * @brief Describes how non-KiCad boards and schematics should be imported as KiCad projects

common/io/eagle/eagle_parser.cpp

@@ -25,7 +25,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <plugins/eagle/eagle_parser.h>
+#include <io/eagle/eagle_parser.h>
 
 #include <string_utils.h>
 #include <richio.h>

common/io/easyedapro/easyedapro_import_utils.cpp

@@ -25,7 +25,7 @@
 #include "easyedapro_import_utils.h"
 #include "easyedapro_parser.h"
 
-#include <plugins/common/plugin_common_choose_project.h>
+#include <io/common/plugin_common_choose_project.h>
 
 #include <ki_exception.h>
 #include <string_utils.h>