Fix code after renaming files, and a bit of code cleanup (remove useless includes and multiple includes of the same files)

common/dialogs/dialog_page_settings.cpp

@@ -43,7 +43,7 @@
 #include <wx/tokenzr.h>
 
 #ifdef EESCHEMA
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <general.h>
 #endif
 

eeschema/CMakeLists.txt

@@ -103,10 +103,8 @@ set( EESCHEMA_SRCS
     bom_table_model.cpp
     bus-wire-junction.cpp
     busentry.cpp
-    class_drc_erc_item.cpp
     class_libentry.cpp
     class_library.cpp
-    class_netlist_object.cpp
     cmp_library_keywords.cpp
     cmp_library_lexer.cpp
     cmp_tree_model.cpp
@@ -115,6 +113,7 @@ set( EESCHEMA_SRCS
     component_references_lister.cpp
     controle.cpp
     cross-probing.cpp
+    drc_erc_item.cpp
     edit_bitmap.cpp
     edit_component_in_schematic.cpp
     edit_label.cpp
@@ -155,6 +154,7 @@ set( EESCHEMA_SRCS
     menubar_libedit.cpp
     netform.cpp
     netlist.cpp
+    netlist_object.cpp
     onleftclick.cpp
     onrightclick.cpp
     operations_on_items_lists.cpp

eeschema/bom_table_model.h

@@ -33,7 +33,7 @@
 
 #include <sch_component.h>
 #include <sch_reference_list.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <template_fieldnames.h>
 
 #include "bom_table_column.h"

eeschema/class_libentry.cpp

@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <plotter.h>
 #include <gr_basic.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <richio.h>
 
 #include <general.h>

eeschema/dialogs/dialog_bom_editor.h

@@ -23,12 +23,12 @@
  */
 
 /**
- * @file eeschema/dialogs/dialog_bom.cpp
+ * @file eeschema/dialogs/dialog_bom_editor.cpp
  * @brief Dialog box for creating bom and other documents from generic netlist.
  */
 
-#ifndef EESCHEMA_DIALOGS_DIALOG_BOM_EDITOR_H_
+#ifndef DIALOG_BOM_EDITOR_H
-#define EESCHEMA_DIALOGS_DIALOG_BOM_EDITOR_H_
+#define DIALOG_BOM_EDITOR_H
 
 #include <wx/dataview.h>
 
@@ -38,7 +38,7 @@
 #include <sch_component.h>
 #include <invoke_sch_dialog.h>
 #include <dialog_bom_editor_base.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <sch_reference_list.h>
 #include <vector>
 
@@ -95,4 +95,4 @@ private:
 
 };
 
-#endif /* EESCHEMA_DIALOGS_DIALOG_BOM_EDITOR_H_ */
+#endif /* DIALOG_BOM_EDITOR_H */

eeschema/dialogs/dialog_edit_component_in_schematic.cpp

@@ -29,15 +29,11 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <kiway.h>
-#include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
 
-#include <general.h>
-#include <sch_base_frame.h>
 #include <sch_reference_list.h>
 #include <class_library.h>
 #include <sch_component.h>
@@ -978,6 +974,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copySelectedFieldToPanel()
     // only user defined fields may be moved, and not the top most user defined
     // field since it would be moving up into the fixed fields, > not >=
     moveUpButton->Enable( fieldNdx > MANDATORY_FIELDS );
+    moveDownButton->Enable( ( fieldNdx >= MANDATORY_FIELDS ) && ( fieldNdx < ( m_FieldsBuf.size() - 1 ) ) );
 
     // may only delete user defined fields
     deleteFieldButton->Enable( fieldNdx >= MANDATORY_FIELDS );

eeschema/dialogs/dialog_erc.cpp

@@ -33,7 +33,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pgm_base.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <schframe.h>
 #include <invoke_sch_dialog.h>
 #include <project.h>
@@ -42,7 +42,7 @@
 #include <wildcards_and_files_ext.h>
 
 #include <netlist.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <sch_marker.h>
 #include <sch_sheet.h>
 #include <lib_pin.h>

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -4,11 +4,11 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2015 Jean-Pierre Charras jp.charras at wanadoo.fr
+ * Copyright (C) 1992-2018 Jean-Pierre Charras jp.charras at wanadoo.fr
  * Copyright (C) 1992-2010 Lorenzo Marcantonio
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
  *
- * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,12 +28,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <worksheet.h>
-#include <class_sch_screen.h>
-#include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet.h>
 #include <dialog_plot_schematic.h>

eeschema/dialogs/dialog_plot_schematic.h

@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <plotter.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <schframe.h>
 #include <dialog_plot_schematic_base.h>
 #include <reporter.h>

eeschema/dialogs/dialog_print_using_printer.cpp

@@ -27,7 +27,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
 

eeschema/dialogs/dialog_symbol_remap.cpp

@@ -35,7 +35,7 @@
 #include <sch_io_mgr.h>
 #include <sch_sheet.h>
 #include <sch_component.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <schframe.h>
 #include <symbol_lib_table.h>
 #include <env_paths.h>

eeschema/erc.cpp

@@ -34,7 +34,7 @@
 #include <schframe.h>
 
 #include <netlist.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <lib_pin.h>
 #include <erc.h>
 #include <sch_marker.h>

eeschema/hierarch.cpp

@@ -42,7 +42,7 @@
 #include <wx/imaglist.h>
 #include <wx/treectrl.h>
 
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <sch_sheet_path.h>
 
 

eeschema/highlight_connection.cpp

@@ -33,7 +33,7 @@
 #include <schframe.h>
 #include <erc.h>
 
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 
 bool SCH_EDIT_FRAME::HighlightConnectionAtPosition( wxPoint aPosition )

eeschema/lib_manager.h

@@ -32,7 +32,7 @@
 #include <memory>
 #include <wx/arrstr.h>
 #include <lib_manager_adapter.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 
 class LIB_ALIAS;
 class LIB_PART;

eeschema/libarch.cpp

@@ -32,7 +32,6 @@
 #include <confirm.h>
 #include <wildcards_and_files_ext.h>
 
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <symbol_lib_table.h>
 #include <class_library.h>

eeschema/libedit.cpp

@@ -36,7 +36,6 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <gestfich.h>
-#include <class_sch_screen.h>
 
 #include <eeschema_id.h>
 #include <general.h>

eeschema/libedit_onrightclick.cpp

@@ -31,7 +31,7 @@
 #include <eeschema_id.h>
 #include <hotkeys.h>
 #include <class_drawpanel.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <msgpanel.h>
 
 #include <general.h>

eeschema/libedit_plot_component.cpp

@@ -34,7 +34,7 @@
 #include <confirm.h>
 #include <gestfich.h>
 #include <eeschema_id.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 
 #include <general.h>
 #include <libeditframe.h>

eeschema/libeditframe.h

@@ -34,8 +34,7 @@
 #define LIBEDITFRM_H_
 
 #include <sch_base_frame.h>
-#include <base_screen.h>
+#include <sch_screen.h>
-#include <class_sch_screen.h>
 
 #include <lib_draw_item.h>
 #include <lib_collectors.h>

eeschema/libfield.cpp

@@ -26,9 +26,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <class_sch_screen.h>
 
-#include <general.h>
 #include <sch_component.h>
 #include <libeditframe.h>
 #include <class_library.h>

eeschema/netlist.cpp

@@ -34,7 +34,7 @@
 #include <kiway.h>
 
 #include <netlist.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <class_library.h>
 #include <lib_pin.h>
 #include <sch_junction.h>

eeschema/netlist_exporters/netlist_exporter.cpp

@@ -35,12 +35,7 @@
 #include <pgm_base.h>
 
 #include <sch_reference_list.h>
-#include <class_netlist_object.h>
 #include <class_library.h>
-#include <lib_pin.h>
-#include <sch_component.h>
-#include <sch_text.h>
-#include <sch_sheet.h>
 
 #include <netlist.h>
 #include <netlist_exporter.h>

eeschema/netlist_exporters/netlist_exporter.h

@@ -29,7 +29,7 @@
 #include <kicad_string.h>
 
 #include <class_libentry.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <lib_pin.h>
 #include <sch_component.h>
 #include <sch_text.h>

eeschema/netlist_exporters/netlist_exporter_cadstar.cpp

@@ -29,7 +29,6 @@
 
 #include <schframe.h>
 #include <sch_reference_list.h>
-#include <class_netlist_object.h>
 
 #include "netlist_exporter_cadstar.h"
 

eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp

@@ -30,7 +30,6 @@
 #include <schframe.h>
 #include <sch_reference_list.h>
 #include <class_library.h>
-#include <class_netlist_object.h>
 #include <symbol_lib_table.h>
 
 #include <netlist.h>

eeschema/netlist_exporters/netlist_exporter_pspice.cpp

@@ -34,7 +34,6 @@
 #include <schframe.h>
 #include <netlist.h>
 #include <sch_reference_list.h>
-#include <class_netlist_object.h>
 #include <env_paths.h>
 
 #include <wx/tokenzr.h>

eeschema/netlist_object.cpp

@@ -24,7 +24,7 @@
  */
 
 /**
- * @file class_netlist_object.cpp
+ * @file netlist_object.cpp
  * @brief Class NETLIST_OBJECT to handle 1 item connected (in netlist and erc calculations)
  */
 
@@ -33,7 +33,7 @@
 #include <schframe.h>
 
 #include <sch_component.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 #include <wx/regex.h>
 

eeschema/netlist_object.h

@@ -24,12 +24,12 @@
  */
 
 /**
- * @file class_netlist_object.h
+ * @file netlist_object.h
  * @brief Definition of the NETLIST_OBJECT class.
  */
 
-#ifndef _CLASS_NETLIST_OBJECT_H_
+#ifndef NETLIST_OBJECT_H
-#define _CLASS_NETLIST_OBJECT_H_
+#define NETLIST_OBJECT_H
 
 
 #include <sch_sheet_path.h>
@@ -503,4 +503,4 @@ private:
  */
 extern bool IsBusLabel( const wxString& aLabel );
 
-#endif    // _CLASS_NETLIST_OBJECT_H_
+#endif    // NETLIST_OBJECT_H

eeschema/onleftclick.cpp

@@ -47,8 +47,8 @@
 #include <sch_sheet_path.h>
 #include <sch_bitmap.h>
 
-#include <class_netlist_object.h>
+#include <netlist_object.h>
-#include <class_library.h>      // fo class SCHLIB_FILTER to filter power parts
+#include <class_library.h>      // for class SCHLIB_FILTER to filter power parts
 
 
 // TODO(hzeller): These pairs of elmenets should be represented by an object, but don't want

eeschema/pinedit.cpp

@@ -32,7 +32,6 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <class_sch_screen.h>
 #include <base_units.h>
 #include <msgpanel.h>
 

eeschema/plot_schematic_DXF.cpp

@@ -27,7 +27,6 @@
 
 #include <fctsys.h>
 #include <plotter.h>
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <sch_sheet_path.h>
 #include <project.h>

eeschema/plot_schematic_HPGL.cpp

@@ -27,7 +27,6 @@
 
 #include <fctsys.h>
 #include <plotter.h>
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>

eeschema/plot_schematic_PDF.cpp

@@ -27,7 +27,6 @@
 
 #include <fctsys.h>
 #include <plotter.h>
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>

eeschema/plot_schematic_PS.cpp

@@ -26,7 +26,6 @@
 
 #include <fctsys.h>
 #include <plotter.h>
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
 #include <sch_sheet_path.h>

eeschema/plot_schematic_SVG.cpp

@@ -30,7 +30,6 @@
 #include <fctsys.h>
 #include <pgm_base.h>
 #include <class_drawpanel.h>
-#include <class_sch_screen.h>
 #include <schframe.h>
 #include <base_units.h>
 #include <libeditframe.h>

eeschema/sch_base_frame.h

@@ -28,7 +28,7 @@
 #include <lib_id.h>
 #include <draw_frame.h>
 
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 
 class PAGE_INFO;
 class TITLE_BLOCK;

eeschema/sch_component.cpp

@@ -46,7 +46,7 @@
 #include <sch_component.h>
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <lib_draw_item.h>
 #include <symbol_lib_table.h>
 

eeschema/sch_eagle_plugin.cpp

@@ -32,7 +32,7 @@
 #include <schframe.h>
 #include <template_fieldnames.h>
 #include <wildcards_and_files_ext.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <class_library.h>
 #include <class_libentry.h>
 #include <lib_draw_item.h>

eeschema/sch_item_struct.cpp

@@ -31,7 +31,7 @@
 #include <gr_basic.h>
 #include <base_struct.h>
 #include <sch_item_struct.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <class_drawpanel.h>
 #include <schframe.h>
 

eeschema/sch_junction.cpp

@@ -37,7 +37,7 @@
 #include <bitmaps.h>
 
 #include <sch_junction.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 
 int SCH_JUNCTION::m_symbolSize = 40;    // Default diameter of the junction symbol

eeschema/sch_legacy_plugin.cpp

@@ -46,7 +46,7 @@
 #include <sch_sheet.h>
 #include <sch_legacy_plugin.h>
 #include <template_fieldnames.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <class_libentry.h>
 #include <class_library.h>
 #include <lib_arc.h>

eeschema/sch_line.cpp

@@ -38,7 +38,7 @@
 #include <list_operations.h>
 #include <sch_line.h>
 #include <schframe.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 #include <dialogs/dialog_edit_line_style.h>
 

eeschema/sch_no_connect.cpp

@@ -37,7 +37,7 @@
 
 #include <general.h>
 #include <sch_no_connect.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 
 SCH_NO_CONNECT::SCH_NO_CONNECT( const wxPoint& pos ) :

eeschema/sch_screen.cpp

@@ -42,7 +42,7 @@
 #include <plotter.h>
 
 #include <netlist.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 #include <class_library.h>
 #include <sch_junction.h>
 #include <sch_bus_entry.h>

eeschema/sch_screen.h

@@ -23,12 +23,12 @@
  */
 
 /**
- * @file class_sch_screen.h
+ * @file sch_screen.h
  * @brief Definitions for the Eeschema program SCH_SCREEN class.
  */
 
-#ifndef CLASS_SCREEN_H
+#ifndef SCREEN_H
-#define CLASS_SCREEN_H
+#define SCREEN_H
 
 #include <macros.h>
 #include <dlist.h>
@@ -595,4 +595,4 @@ private:
     void buildScreenList( SCH_SHEET* aSheet);
 };
 
-#endif /* CLASS_SCREEN_H */
+#endif /* SCREEN_H */

eeschema/sch_sheet.cpp

@@ -40,7 +40,7 @@
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <sch_component.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 
 SCH_SHEET::SCH_SHEET( const wxPoint& pos ) :

eeschema/sch_sheet_path.cpp

@@ -30,9 +30,8 @@
 
 #include <fctsys.h>
 
-#include <general.h>
 #include <dlist.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 #include <sch_item_struct.h>
 
 #include <sch_reference_list.h>

eeschema/sch_text.cpp

@@ -42,7 +42,7 @@
 
 #include <list_operations.h>
 #include <sch_text.h>
-#include <class_netlist_object.h>
+#include <netlist_object.h>
 
 
 extern void IncrementLabelMember( wxString& name, int aIncrement );

eeschema/schframe.h

@@ -35,7 +35,6 @@
 #include <class_undoredo_container.h>
 #include <template_fieldnames.h>
 #include <block_commande.h>
-#include <class_sch_screen.h>
 #include <sch_collectors.h>
 
 // enum PINSHEETLABEL_SHAPE

eeschema/symbdraw.cpp

@@ -29,15 +29,12 @@
  */
 
 #include <fctsys.h>
-#include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <class_sch_screen.h>
 #include <base_units.h>
 #include <msgpanel.h>
 
 #include <eeschema_id.h>
-#include <general.h>
 #include <libeditframe.h>
 #include <class_libentry.h>
 #include <lib_arc.h>

eeschema/symbedit.cpp

@@ -36,8 +36,6 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 
-#include <class_sch_screen.h>
-#include <general.h>
 #include <libeditframe.h>
 #include <class_libentry.h>
 #include <wildcards_and_files_ext.h>

eeschema/viewlib_frame.h

@@ -34,7 +34,7 @@
 #include <wx/gdicmn.h>
 
 #include <sch_base_frame.h>
-#include <class_sch_screen.h>
+#include <sch_screen.h>
 
 class wxListBox;
 class SCHLIB_FILTER;

eeschema/viewlibs.cpp

@@ -28,14 +28,11 @@
 
 #include <fctsys.h>
 #include <kiway.h>
-#include <gr_basic.h>
 #include <pgm_base.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <eda_doc.h>
 
-#include <class_sch_screen.h>
-#include <general.h>
 #include <viewlib_frame.h>
 #include <eeschema_id.h>
 #include <class_library.h>