Eeschema: Minor code reorganization:

* move not shared files (sch_item_struct.*, sch_base_frame.h) to eeschema;
* move wxEeschemaStruct.h to eeschema and rename it schframe.h to be consistent with the other corresponding file name schframe.cpp;
* remove few not needed  #include

eeschema/CMakeLists.txt

@@ -138,6 +138,7 @@ set( EESCHEMA_SRCS
     sch_collectors.cpp
     sch_component.cpp
     sch_field.cpp
+    sch_item_struct.cpp
     sch_junction.cpp
     sch_line.cpp
     sch_marker.cpp
@@ -163,10 +164,6 @@ set( EESCHEMA_SRCS
     transform.cpp
     viewlib_frame.cpp
     viewlibs.cpp
-
-    # This file does not look common.
-    # Keep it after template_fieldnames_keywords.cpp
-    ../common/sch_item_struct.cpp
     )
 
 

eeschema/annotate.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <sch_reference_list.h>
 #include <class_library.h>

eeschema/backanno.cpp

@@ -33,7 +33,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <kiface_i.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <build_version.h>
 #include <wildcards_and_files_ext.h>
 

eeschema/block.cpp

@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <class_library.h>

eeschema/bus-wire-junction.cpp

@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <lib_draw_item.h>
 #include <lib_pin.h>

eeschema/busentry.cpp

@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <eeschema_id.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <sch_bus_entry.h>

eeschema/class_netlist_object.cpp

@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <macros.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <sch_component.h>
 #include <class_netlist_object.h>

eeschema/component_references_lister.cpp

-/*
+/**
  * @file component_references_lister.cpp
  * @brief Code for creating a flat list of components needed for annotation and BOM.
  */
@@ -35,7 +35,7 @@
 
 #include <fctsys.h>
 #include <kicad_string.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_reference_list.h>
 #include <sch_component.h>
 

eeschema/controle.cpp

@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <eda_dde.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <menus_helpers.h>
 #include <msgpanel.h>
 

eeschema/cross-probing.cpp

@@ -33,7 +33,7 @@
 #include <kiway_express.h>
 #include <macros.h>
 #include <eda_dde.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <eeschema_id.h>

eeschema/dialogs/dialog_annotate.cpp

@@ -29,7 +29,7 @@
 
 
 #include <fctsys.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <class_drawpanel.h>
 
 #include <invoke_sch_dialog.h>

eeschema/dialogs/dialog_bom.cpp

@@ -33,7 +33,7 @@
 #include <kiface_i.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <netlist.h>
 #include <sch_sheet.h>

eeschema/dialogs/dialog_edit_component_in_schematic.cpp

@@ -35,7 +35,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>

eeschema/dialogs/dialog_edit_label.cpp

@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <wx/valgen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <class_drawpanel.h>

eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp

@@ -31,7 +31,7 @@
 #include <kiway.h>
 #include <confirm.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <id.h>
 #include <base_units.h>
 

eeschema/dialogs/dialog_eeschema_config.cpp

@@ -31,7 +31,7 @@
 #include <kiway.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <invoke_sch_dialog.h>
 
 #include <general.h>

eeschema/dialogs/dialog_erc.cpp

@@ -34,7 +34,7 @@
 #include <gestfich.h>
 #include <pgm_base.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <invoke_sch_dialog.h>
 #include <project.h>
 

eeschema/dialogs/dialog_libedit_dimensions.cpp

@@ -27,7 +27,6 @@
  * Handles the dialog so set current texts and pins sizes in LibEdit
  */
 #include <fctsys.h>
-#include <wxEeschemaStruct.h>
 
 #include <general.h>
 #include <libeditframe.h>

eeschema/dialogs/dialog_netlist.cpp

@@ -42,7 +42,7 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <netlist.h>

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -34,7 +34,7 @@
 #include <worksheet.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet.h>
 #include <dialog_plot_schematic.h>

eeschema/dialogs/dialog_plot_schematic.h

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <dialog_plot_schematic_base.h>
 #include <reporter.h>
 

eeschema/dialogs/dialog_print_using_printer.cpp

@@ -28,7 +28,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>

eeschema/edit_bitmap.cpp

@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_bitmap.h>
 #include <dialog_image_editor.h>
 

eeschema/edit_component_in_schematic.cpp

@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <msgpanel.h>
 
 #include <general.h>

eeschema/edit_label.cpp

@@ -33,7 +33,7 @@
 #include <drawtxt.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kicad_device_context.h>
 
 #include <general.h>

eeschema/eeredraw.cpp

@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <general.h>
 
 

eeschema/eeschema.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <gestfich.h>
 #include <eda_dde.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <libeditframe.h>
 #include <viewlib_frame.h>
 #include <eda_text.h>

eeschema/eeschema_config.cpp

@@ -31,7 +31,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <invoke_sch_dialog.h>
 #include <common.h>
 

eeschema/erc.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <kicad_string.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <netlist.h>
 #include <class_netlist_object.h>

eeschema/events_called_functions_for_edit.cpp

@@ -31,7 +31,7 @@
 #include <class_drawpanel.h>
 #include <general.h>
 #include <kicad_device_context.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_component.h>
 #include <sch_text.h>
 

eeschema/files-io.cpp

@@ -32,7 +32,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <pgm_base.h>
 
 #include <eeschema_id.h>

eeschema/find.cpp

@@ -39,7 +39,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>

eeschema/getpart.cpp

@@ -34,7 +34,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kicad_device_context.h>
 #include <msgpanel.h>
 

eeschema/hierarch.cpp

 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
+ * Copyright (C) 2004 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>
  * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
  *
@@ -24,14 +24,14 @@
  */
 
 /**
- * @file hierarch.cpp
+ * @file hierarch.schframe
  */
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <id.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <sch_sheet.h>

eeschema/hotkeys.cpp

@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <eeschema_id.h>
 #include <hotkeys.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <class_drawpanel.h>
 
 #include <general.h>

eeschema/lib_pin.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <drawtxt.h>
 #include <plot_common.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <richio.h>
 #include <base_units.h>
 #include <msgpanel.h>

eeschema/libarch.cpp

@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <class_sch_screen.h>
 #include <wxstruct.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <class_library.h>
 #include <sch_component.h>

eeschema/libeditframe.cpp

@@ -35,7 +35,7 @@
 #include <confirm.h>
 #include <eda_doc.h>
 #include <gr_basic.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <msgpanel.h>
 
 #include <general.h>

eeschema/load_one_schematic_file.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <richio.h>
 #include <project.h>
 

eeschema/menubar.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <pgm_base.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <eeschema_id.h>

eeschema/netform.cpp

@@ -33,7 +33,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pgm_base.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <netlist.h>
 #include <sch_reference_list.h>

eeschema/netlist.cpp

@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <confirm.h>
 
 #include <netlist.h>

eeschema/onleftclick.cpp

@@ -31,7 +31,7 @@
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <menus_helpers.h>
 
 #include <sch_bus_entry.h>

eeschema/onrightclick.cpp

@@ -31,7 +31,7 @@
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <menus_helpers.h>
 
 #include <general.h>

eeschema/operations_on_items_lists.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <protos.h>

eeschema/plot_schematic_DXF.cpp

@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_sheet_path.h>
 #include <dialog_plot_schematic.h>
 #include <project.h>

eeschema/plot_schematic_HPGL.cpp

@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>
 #include <project.h>

eeschema/plot_schematic_PDF.cpp

@@ -28,7 +28,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>
 #include <dialog_plot_schematic.h>

eeschema/plot_schematic_PS.cpp

@@ -27,7 +27,7 @@
 #include <fctsys.h>
 #include <plot_common.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>
 #include <dialog_plot_schematic.h>

eeschema/plot_schematic_SVG.cpp

@@ -31,7 +31,7 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <class_sch_screen.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 #include <libeditframe.h>
 #include <sch_sheet_path.h>

eeschema/sch_bitmap.cpp

@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
-#include <wxEeschemaStruct.h>
+#include <macros.h>
 #include <sch_bitmap.h>
 
 #include <wx/mstream.h>

eeschema/sch_component.cpp

@@ -31,10 +31,9 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <gr_basic.h>
-#include <trigo.h>
 #include <kicad_string.h>
 #include <richio.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 #include <msgpanel.h>
 

eeschema/sch_field.cpp

@@ -41,8 +41,7 @@
 #include <gr_basic.h>
 #include <drawtxt.h>
 #include <macros.h>
-#include <trigo.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 
 #include <general.h>

common/sch_item_struct.cpp → eeschema/sch_item_struct.cpp

@@ -33,7 +33,7 @@
 #include <sch_item_struct.h>
 #include <class_sch_screen.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 

eeschema/sch_screen.cpp

@@ -37,7 +37,7 @@
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <sch_item_struct.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 
 #include <netlist.h>

eeschema/sch_sheet.cpp

@@ -32,7 +32,7 @@
 #include <drawtxt.h>
 #include <trigo.h>
 #include <richio.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 #include <kicad_string.h>
 #include <msgpanel.h>

eeschema/sch_sheet_pin.cpp

@@ -34,10 +34,9 @@
 #include <plot_common.h>
 #include <trigo.h>
 #include <richio.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
-#include <protos.h>
 #include <sch_sheet.h>
 #include <kicad_string.h>
 

eeschema/sch_text.cpp

@@ -35,7 +35,7 @@
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
 #include <drawtxt.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <plot_common.h>
 #include <base_units.h>
 #include <msgpanel.h>

eeschema/schedit.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <eda_doc.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kicad_device_context.h>
 #include <hotkeys_basic.h>
 

eeschema/schematic_undo_redo.cpp

@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 
 #include <general.h>
 #include <protos.h>

eeschema/schframe.cpp

@@ -43,7 +43,7 @@
 #include <netlist.h>
 #include <lib_pin.h>
 #include <class_library.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <sch_component.h>
 
 #include <dialog_helpers.h>

eeschema/sheet.cpp

@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <sch_sheet.h>

eeschema/sheetlab.cpp

@@ -33,7 +33,7 @@
 #include <macros.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <base_units.h>
 
 #include <general.h>

eeschema/tool_sch.cpp

@@ -29,7 +29,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <kiface_i.h>
 
 #include <general.h>

eeschema/viewlib_frame.cpp

@@ -32,7 +32,7 @@
 #include <pgm_base.h>
 #include <eeschema_id.h>
 #include <class_drawpanel.h>
-#include <wxEeschemaStruct.h>
+#include <schframe.h>
 #include <msgpanel.h>
 
 #include <general.h>