From 8022f1cc01493126e004b49bdc7db48175d83bd3 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 30 Jan 2018 11:49:51 +0100 Subject: [PATCH] fix code after renamin files --- eeschema/CMakeLists.txt | 4 ++-- eeschema/annotate.cpp | 2 +- eeschema/autoplace_fields.cpp | 2 +- eeschema/backanno.cpp | 2 +- eeschema/block.cpp | 2 +- eeschema/block_libedit.cpp | 2 +- eeschema/bus-wire-junction.cpp | 2 +- eeschema/busentry.cpp | 2 +- eeschema/component_references_lister.cpp | 2 +- eeschema/controle.cpp | 4 ++-- eeschema/cross-probing.cpp | 2 +- eeschema/dialogs/dialog_annotate.cpp | 2 +- eeschema/dialogs/dialog_bom.cpp | 2 +- eeschema/dialogs/dialog_bom_editor.h | 2 +- eeschema/dialogs/dialog_edit_component_in_lib.cpp | 2 +- .../dialogs/dialog_edit_component_in_schematic.cpp | 2 +- eeschema/dialogs/dialog_edit_components_libid.cpp | 2 +- eeschema/dialogs/dialog_edit_label.cpp | 2 +- .../dialogs/dialog_edit_libentry_fields_in_lib.cpp | 4 ++-- eeschema/dialogs/dialog_eeschema_options.cpp | 2 +- eeschema/dialogs/dialog_erc.cpp | 2 +- eeschema/dialogs/dialog_lib_edit_pin.cpp | 2 +- eeschema/dialogs/dialog_lib_edit_text.cpp | 2 +- eeschema/dialogs/dialog_libedit_options.cpp | 2 +- eeschema/dialogs/dialog_netlist.cpp | 2 +- eeschema/dialogs/dialog_plot_schematic.h | 2 +- eeschema/dialogs/dialog_print_using_printer.cpp | 2 +- eeschema/dialogs/dialog_rescue_each.cpp | 2 +- eeschema/dialogs/dialog_symbol_remap.cpp | 2 +- eeschema/dialogs/dialog_update_fields.cpp | 2 +- eeschema/edit_bitmap.cpp | 2 +- eeschema/edit_component_in_schematic.cpp | 2 +- eeschema/edit_label.cpp | 2 +- eeschema/eeredraw.cpp | 2 +- eeschema/eeschema.cpp | 4 ++-- eeschema/eeschema_config.cpp | 4 ++-- eeschema/erc.cpp | 2 +- eeschema/events_called_functions_for_edit.cpp | 2 +- eeschema/files-io.cpp | 4 ++-- eeschema/find.cpp | 2 +- eeschema/getpart.cpp | 4 ++-- eeschema/hierarch.cpp | 2 +- eeschema/highlight_connection.cpp | 2 +- eeschema/hotkeys.cpp | 4 ++-- eeschema/lib_edit_frame.cpp | 8 ++++---- eeschema/lib_edit_frame.h | 8 ++++---- eeschema/lib_export.cpp | 2 +- eeschema/lib_manager.cpp | 4 ++-- eeschema/lib_pin.cpp | 4 ++-- eeschema/libarch.cpp | 2 +- eeschema/libedit.cpp | 4 ++-- eeschema/libedit_onleftclick.cpp | 2 +- eeschema/libedit_onrightclick.cpp | 2 +- eeschema/libedit_plot_component.cpp | 2 +- eeschema/libedit_undo_redo.cpp | 2 +- eeschema/libfield.cpp | 2 +- eeschema/menubar.cpp | 2 +- eeschema/menubar_libedit.cpp | 2 +- .../netlist_exporters/netlist_exporter_cadstar.cpp | 2 +- .../netlist_exporters/netlist_exporter_generic.cpp | 2 +- eeschema/netlist_exporters/netlist_exporter_kicad.cpp | 2 +- .../netlist_exporters/netlist_exporter_orcadpcb2.cpp | 2 +- eeschema/netlist_exporters/netlist_exporter_pspice.cpp | 2 +- eeschema/netlist_generator.cpp | 2 +- eeschema/netlist_object.cpp | 2 +- eeschema/onleftclick.cpp | 2 +- eeschema/onrightclick.cpp | 2 +- eeschema/operations_on_items_lists.cpp | 2 +- eeschema/pinedit.cpp | 2 +- eeschema/plot_schematic_DXF.cpp | 2 +- eeschema/plot_schematic_HPGL.cpp | 2 +- eeschema/plot_schematic_PDF.cpp | 2 +- eeschema/plot_schematic_PS.cpp | 2 +- eeschema/plot_schematic_SVG.cpp | 4 ++-- eeschema/project_rescue.cpp | 2 +- eeschema/sch_base_frame.cpp | 2 +- eeschema/sch_component.cpp | 2 +- eeschema/sch_eagle_plugin.cpp | 2 +- eeschema/sch_edit_frame.cpp | 6 +++--- eeschema/sch_edit_frame.h | 8 ++++---- eeschema/sch_field.cpp | 2 +- eeschema/sch_item_struct.cpp | 2 +- eeschema/sch_line.cpp | 2 +- eeschema/sch_screen.cpp | 2 +- eeschema/sch_sheet.cpp | 2 +- eeschema/sch_sheet_pin.cpp | 2 +- eeschema/sch_text.cpp | 2 +- eeschema/schedit.cpp | 2 +- eeschema/schematic_undo_redo.cpp | 2 +- eeschema/sheet.cpp | 2 +- eeschema/sheetlab.cpp | 2 +- eeschema/sim/sim_plot_frame.cpp | 10 +++++----- eeschema/sim/simulate.cpp | 2 +- eeschema/symbdraw.cpp | 2 +- eeschema/symbedit.cpp | 2 +- eeschema/tool_lib.cpp | 2 +- eeschema/tool_sch.cpp | 2 +- eeschema/viewlib_frame.cpp | 2 +- eeschema/widgets/cmp_tree_pane.cpp | 2 +- 99 files changed, 126 insertions(+), 126 deletions(-) diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 3937719be1..1c8035b1e4 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -148,7 +148,7 @@ set( EESCHEMA_SRCS libedit_onrightclick.cpp libedit_plot_component.cpp libedit_undo_redo.cpp - libeditframe.cpp + lib_edit_frame.cpp libfield.cpp menubar.cpp menubar_libedit.cpp @@ -191,7 +191,7 @@ set( EESCHEMA_SRCS sch_validators.cpp schedit.cpp schematic_undo_redo.cpp - schframe.cpp + sch_edit_frame.cpp selpart.cpp sheet.cpp sheetlab.cpp diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp index 9436c288a9..e674f9c6d7 100644 --- a/eeschema/annotate.cpp +++ b/eeschema/annotate.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/autoplace_fields.cpp b/eeschema/autoplace_fields.cpp index e15dadf52a..6e410c1e6c 100644 --- a/eeschema/autoplace_fields.cpp +++ b/eeschema/autoplace_fields.cpp @@ -52,7 +52,7 @@ #include -#include +#include #include #include #include diff --git a/eeschema/backanno.cpp b/eeschema/backanno.cpp index f7ee7d35cd..3e370324e5 100644 --- a/eeschema/backanno.cpp +++ b/eeschema/backanno.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/block.cpp b/eeschema/block.cpp index 011789901e..3b6e2d8757 100644 --- a/eeschema/block.cpp +++ b/eeschema/block.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/block_libedit.cpp b/eeschema/block_libedit.cpp index bb5dee6861..912493486b 100644 --- a/eeschema/block_libedit.cpp +++ b/eeschema/block_libedit.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include static void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition, diff --git a/eeschema/bus-wire-junction.cpp b/eeschema/bus-wire-junction.cpp index 801ce7d44f..3c170abebe 100644 --- a/eeschema/bus-wire-junction.cpp +++ b/eeschema/bus-wire-junction.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/busentry.cpp b/eeschema/busentry.cpp index 06c3ba3914..603110dc7a 100644 --- a/eeschema/busentry.cpp +++ b/eeschema/busentry.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp index 9fe20adc31..1b9e57c340 100644 --- a/eeschema/component_references_lister.cpp +++ b/eeschema/component_references_lister.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp index ad7e3c4aa5..81114688d3 100644 --- a/eeschema/controle.cpp +++ b/eeschema/controle.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/cross-probing.cpp b/eeschema/cross-probing.cpp index d0e71d2fca..ac71abce34 100644 --- a/eeschema/cross-probing.cpp +++ b/eeschema/cross-probing.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp index 6b7cf21754..d50c93a531 100644 --- a/eeschema/dialogs/dialog_annotate.cpp +++ b/eeschema/dialogs/dialog_annotate.cpp @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp index bf894ec02c..0da14d41c7 100644 --- a/eeschema/dialogs/dialog_bom.cpp +++ b/eeschema/dialogs/dialog_bom.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_bom_editor.h b/eeschema/dialogs/dialog_bom_editor.h index aff581ce4e..7ccb98483d 100644 --- a/eeschema/dialogs/dialog_bom_editor.h +++ b/eeschema/dialogs/dialog_bom_editor.h @@ -32,7 +32,7 @@ #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.cpp b/eeschema/dialogs/dialog_edit_component_in_lib.cpp index e403acc1f5..eb375964fd 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include // for MAX_UNIT_COUNT_PER_PACKAGE definition #include diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp index 956da33409..8a9de426bb 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp index 0fab7d1d7d..c43be3670f 100644 --- a/eeschema/dialogs/dialog_edit_components_libid.cpp +++ b/eeschema/dialogs/dialog_edit_components_libid.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index e7daef465d..740c7f4d88 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp index 27cc749c80..8c67d1ae0e 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp @@ -31,12 +31,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp index 4f43b13767..864b625680 100644 --- a/eeschema/dialogs/dialog_eeschema_options.cpp +++ b/eeschema/dialogs/dialog_eeschema_options.cpp @@ -32,7 +32,7 @@ #include #include #include "../widgets/widget_eeschema_color_config.h" -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index 7a9312d73a..a417e00cbe 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp index 432d4b43ef..89c248d499 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp index f42dca81e7..90f441b5fc 100644 --- a/eeschema/dialogs/dialog_lib_edit_text.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_libedit_options.cpp b/eeschema/dialogs/dialog_libedit_options.cpp index c45774fcfe..59c0f495e5 100644 --- a/eeschema/dialogs/dialog_libedit_options.cpp +++ b/eeschema/dialogs/dialog_libedit_options.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include DIALOG_LIBEDIT_OPTIONS::DIALOG_LIBEDIT_OPTIONS( LIB_EDIT_FRAME* parent ) : diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp index e5c628d282..13b87ed39c 100644 --- a/eeschema/dialogs/dialog_netlist.cpp +++ b/eeschema/dialogs/dialog_netlist.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_plot_schematic.h b/eeschema/dialogs/dialog_plot_schematic.h index e49ff92b79..353f950558 100644 --- a/eeschema/dialogs/dialog_plot_schematic.h +++ b/eeschema/dialogs/dialog_plot_schematic.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_print_using_printer.cpp b/eeschema/dialogs/dialog_print_using_printer.cpp index a1bba0c50f..cdbca988e1 100644 --- a/eeschema/dialogs/dialog_print_using_printer.cpp +++ b/eeschema/dialogs/dialog_print_using_printer.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_rescue_each.cpp b/eeschema/dialogs/dialog_rescue_each.cpp index 357d92926f..cff704a93a 100644 --- a/eeschema/dialogs/dialog_rescue_each.cpp +++ b/eeschema/dialogs/dialog_rescue_each.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include diff --git a/eeschema/dialogs/dialog_symbol_remap.cpp b/eeschema/dialogs/dialog_symbol_remap.cpp index 39817d0a4b..b11b1e0950 100644 --- a/eeschema/dialogs/dialog_symbol_remap.cpp +++ b/eeschema/dialogs/dialog_symbol_remap.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/dialogs/dialog_update_fields.cpp b/eeschema/dialogs/dialog_update_fields.cpp index 9af7e90b98..b794cc5793 100644 --- a/eeschema/dialogs/dialog_update_fields.cpp +++ b/eeschema/dialogs/dialog_update_fields.cpp @@ -24,7 +24,7 @@ #include "dialog_update_fields.h" -#include +#include #include #include #include diff --git a/eeschema/edit_bitmap.cpp b/eeschema/edit_bitmap.cpp index 058e51580c..3dc54c8cc1 100644 --- a/eeschema/edit_bitmap.cpp +++ b/eeschema/edit_bitmap.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp index f6fcbcb5d7..0ea4585fad 100644 --- a/eeschema/edit_component_in_schematic.cpp +++ b/eeschema/edit_component_in_schematic.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp index 16ab20d5a3..405615fbaf 100644 --- a/eeschema/edit_label.cpp +++ b/eeschema/edit_label.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/eeredraw.cpp b/eeschema/eeredraw.cpp index ddcc6910d0..8e116ac447 100644 --- a/eeschema/eeredraw.cpp +++ b/eeschema/eeredraw.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index 593e5a8675..5e4fd23e6e 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 6a6b6db713..f98a123ed8 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -31,13 +31,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/erc.cpp b/eeschema/erc.cpp index 82406e46f4..8fdee6f153 100644 --- a/eeschema/erc.cpp +++ b/eeschema/erc.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/events_called_functions_for_edit.cpp b/eeschema/events_called_functions_for_edit.cpp index bc7c69acbf..168f1a0efc 100644 --- a/eeschema/events_called_functions_for_edit.cpp +++ b/eeschema/events_called_functions_for_edit.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index a614042905..ecbff0861f 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -32,14 +32,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/find.cpp b/eeschema/find.cpp index d6f223361d..335a42c69f 100644 --- a/eeschema/find.cpp +++ b/eeschema/find.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp index 0b23cf2f80..7f226d14ab 100644 --- a/eeschema/getpart.cpp +++ b/eeschema/getpart.cpp @@ -35,14 +35,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/hierarch.cpp b/eeschema/hierarch.cpp index 08316ea903..d351681341 100644 --- a/eeschema/hierarch.cpp +++ b/eeschema/hierarch.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/highlight_connection.cpp b/eeschema/highlight_connection.cpp index 094272b2de..91ab318a78 100644 --- a/eeschema/highlight_connection.cpp +++ b/eeschema/highlight_connection.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index e13187b7e7..6a75d96dd5 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -30,11 +30,11 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/eeschema/lib_edit_frame.cpp b/eeschema/lib_edit_frame.cpp index b4e347d614..f298e50072 100644 --- a/eeschema/lib_edit_frame.cpp +++ b/eeschema/lib_edit_frame.cpp @@ -24,8 +24,8 @@ */ /** - * @file libeditframe.cpp - * @brief LIB_EDIT_FRAME class is the component library editor frame. + * @file lib_edit_frame.cpp + * @brief LIB_EDIT_FRAME class is the symbol library editor frame. */ #include @@ -36,13 +36,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/lib_edit_frame.h b/eeschema/lib_edit_frame.h index f1c7b1d506..ff56c72129 100644 --- a/eeschema/lib_edit_frame.h +++ b/eeschema/lib_edit_frame.h @@ -26,12 +26,12 @@ */ /** - * @file libeditframe.h + * @file lib_edit_frame.h * @brief Definition of class LIB_EDIT_FRAME */ -#ifndef LIBEDITFRM_H_ -#define LIBEDITFRM_H_ +#ifndef LIB_EDIT_FRAME_H +#define LIB_EDIT_FRAME_H #include #include @@ -772,4 +772,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif // LIBEDITFRM_H_ +#endif // LIB_EDIT_FRAME_H diff --git a/eeschema/lib_export.cpp b/eeschema/lib_export.cpp index c42b95c2d7..3d532dc2c0 100644 --- a/eeschema/lib_export.cpp +++ b/eeschema/lib_export.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/lib_manager.cpp b/eeschema/lib_manager.cpp index fc82ed2f42..9e44bc7936 100644 --- a/eeschema/lib_manager.cpp +++ b/eeschema/lib_manager.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -320,7 +320,7 @@ LIB_PART* LIB_MANAGER::GetBufferedPart( const wxString& aAlias, const wxString& bufferedPart = new LIB_PART( *alias->GetPart(), nullptr ); libBuf.CreateBuffer( bufferedPart, new SCH_SCREEN( &m_frame.Kiway() ) ); } - catch( IO_ERROR& e ) + catch( IO_ERROR& e ) { bufferedPart = nullptr; } diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp index 7db39e997c..994aea4c2b 100644 --- a/eeschema/lib_pin.cpp +++ b/eeschema/lib_pin.cpp @@ -37,12 +37,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp index 5f3bc6b8aa..a4f3bb82a5 100644 --- a/eeschema/libarch.cpp +++ b/eeschema/libarch.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp index e9feb73b54..716b5db2f8 100644 --- a/eeschema/libedit.cpp +++ b/eeschema/libedit.cpp @@ -39,11 +39,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/libedit_onleftclick.cpp b/eeschema/libedit_onleftclick.cpp index 8915acb223..26a8b01a0e 100644 --- a/eeschema/libedit_onleftclick.cpp +++ b/eeschema/libedit_onleftclick.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp index c530941a51..b9834dc5cd 100644 --- a/eeschema/libedit_onrightclick.cpp +++ b/eeschema/libedit_onrightclick.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/libedit_plot_component.cpp b/eeschema/libedit_plot_component.cpp index 1de7f41562..ddec67acd6 100644 --- a/eeschema/libedit_plot_component.cpp +++ b/eeschema/libedit_plot_component.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/libedit_undo_redo.cpp b/eeschema/libedit_undo_redo.cpp index a510408084..fe39e46407 100644 --- a/eeschema/libedit_undo_redo.cpp +++ b/eeschema/libedit_undo_redo.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/libfield.cpp b/eeschema/libfield.cpp index 9a398a384e..425764d9e7 100644 --- a/eeschema/libfield.cpp +++ b/eeschema/libfield.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index fb4ece53cc..9aedeab590 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -37,7 +37,7 @@ #include "general.h" #include "help_common_strings.h" #include "hotkeys.h" -#include "schframe.h" +#include "sch_edit_frame.h" // helper functions that build specific submenus: diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index 627575c610..8cbb4ce6f9 100644 --- a/eeschema/menubar_libedit.cpp +++ b/eeschema/menubar_libedit.cpp @@ -35,7 +35,7 @@ #include "general.h" #include "help_common_strings.h" #include "hotkeys.h" -#include "libeditframe.h" +#include "lib_edit_frame.h" /** diff --git a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp index ac09d7ad42..05266b9a2f 100644 --- a/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_cadstar.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "netlist_exporter_cadstar.h" diff --git a/eeschema/netlist_exporters/netlist_exporter_generic.cpp b/eeschema/netlist_exporters/netlist_exporter_generic.cpp index f8f704e6b1..9556b2a223 100644 --- a/eeschema/netlist_exporters/netlist_exporter_generic.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_generic.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include "netlist_exporter_generic.h" diff --git a/eeschema/netlist_exporters/netlist_exporter_kicad.cpp b/eeschema/netlist_exporters/netlist_exporter_kicad.cpp index b9dd37e3b7..f000f8bcc1 100644 --- a/eeschema/netlist_exporters/netlist_exporter_kicad.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_kicad.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include "netlist_exporter_kicad.h" bool NETLIST_EXPORTER_KICAD::WriteNetlist( const wxString& aOutFileName, unsigned aNetlistOptions ) diff --git a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp index f7bc5c33b2..a95b3b6074 100644 --- a/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_orcadpcb2.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp index 0deb876388..229514b1c6 100644 --- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp +++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/netlist_generator.cpp b/eeschema/netlist_generator.cpp index ce2f216bea..94813a0ca4 100644 --- a/eeschema/netlist_generator.cpp +++ b/eeschema/netlist_generator.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/netlist_object.cpp b/eeschema/netlist_object.cpp index ebf3eb31bb..ef8992707b 100644 --- a/eeschema/netlist_object.cpp +++ b/eeschema/netlist_object.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp index 636a7828e8..6efcc73eec 100644 --- a/eeschema/onleftclick.cpp +++ b/eeschema/onleftclick.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index 9b74920a06..659cb883c9 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/operations_on_items_lists.cpp b/eeschema/operations_on_items_lists.cpp index 2f484a99c0..9b3fb3076d 100644 --- a/eeschema/operations_on_items_lists.cpp +++ b/eeschema/operations_on_items_lists.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp index 2bcc030cad..375f3dc0c1 100644 --- a/eeschema/pinedit.cpp +++ b/eeschema/pinedit.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/plot_schematic_DXF.cpp b/eeschema/plot_schematic_DXF.cpp index b52cc02fa5..c0f41771d6 100644 --- a/eeschema/plot_schematic_DXF.cpp +++ b/eeschema/plot_schematic_DXF.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/plot_schematic_HPGL.cpp b/eeschema/plot_schematic_HPGL.cpp index 3b494980c1..8928817ef8 100644 --- a/eeschema/plot_schematic_HPGL.cpp +++ b/eeschema/plot_schematic_HPGL.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/plot_schematic_PDF.cpp b/eeschema/plot_schematic_PDF.cpp index 4458117d55..f274087779 100644 --- a/eeschema/plot_schematic_PDF.cpp +++ b/eeschema/plot_schematic_PDF.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/plot_schematic_PS.cpp b/eeschema/plot_schematic_PS.cpp index 812fd7478e..252c0a7178 100644 --- a/eeschema/plot_schematic_PS.cpp +++ b/eeschema/plot_schematic_PS.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/plot_schematic_SVG.cpp b/eeschema/plot_schematic_SVG.cpp index 36f55969e9..b297077547 100644 --- a/eeschema/plot_schematic_SVG.cpp +++ b/eeschema/plot_schematic_SVG.cpp @@ -30,9 +30,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/eeschema/project_rescue.cpp b/eeschema/project_rescue.cpp index 1dd76cb819..f2b2b3ae0e 100644 --- a/eeschema/project_rescue.cpp +++ b/eeschema/project_rescue.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp index 472286eb70..0ee53efcdd 100644 --- a/eeschema/sch_base_frame.cpp +++ b/eeschema/sch_base_frame.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp index 43a318e8af..b95b2430aa 100644 --- a/eeschema/sch_component.cpp +++ b/eeschema/sch_component.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_eagle_plugin.cpp b/eeschema/sch_eagle_plugin.cpp index 32521dfeeb..1278fa8e5c 100644 --- a/eeschema/sch_eagle_plugin.cpp +++ b/eeschema/sch_eagle_plugin.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp index fb7bdb673c..f0c75d37ee 100644 --- a/eeschema/sch_edit_frame.cpp +++ b/eeschema/sch_edit_frame.cpp @@ -23,7 +23,7 @@ */ /** - * @file schframe.cpp + * @file sch_edit_frame.cpp */ #include @@ -43,12 +43,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_edit_frame.h b/eeschema/sch_edit_frame.h index 4dc7c3152f..fbc2789c9d 100644 --- a/eeschema/sch_edit_frame.h +++ b/eeschema/sch_edit_frame.h @@ -24,11 +24,11 @@ */ /** - * @file schframe.h + * @file sch_edit_frame.h */ -#ifndef _SCHFRAME_H_ -#define _SCHFRAME_H_ +#ifndef SCH_EDIT_FRAME_H +#define SCH_EDIT_FRAME_H #include #include @@ -1488,4 +1488,4 @@ public: }; -#endif // _SCHFRAME_H_ +#endif // SCH_EDIT_FRAME_H diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index af856b7a4c..15609b1b72 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/sch_item_struct.cpp b/eeschema/sch_item_struct.cpp index 90a9f804bf..f73ccf16be 100644 --- a/eeschema/sch_item_struct.cpp +++ b/eeschema/sch_item_struct.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index d898e7f6e9..b0d9f12065 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index 4e9887d04e..aefc6c25ee 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp index e24ded23af..b52b59d1b3 100644 --- a/eeschema/sch_sheet.cpp +++ b/eeschema/sch_sheet.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/sch_sheet_pin.cpp b/eeschema/sch_sheet_pin.cpp index f032113827..780e56fbc4 100644 --- a/eeschema/sch_sheet_pin.cpp +++ b/eeschema/sch_sheet_pin.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp index f13a78bd96..782b885f12 100644 --- a/eeschema/sch_text.cpp +++ b/eeschema/sch_text.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp index 23fc593435..bc3525bdf6 100644 --- a/eeschema/schedit.cpp +++ b/eeschema/schedit.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp index 75c1731eb2..06703a2637 100644 --- a/eeschema/schematic_undo_redo.cpp +++ b/eeschema/schematic_undo_redo.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp index efd2300a1e..99823ba123 100644 --- a/eeschema/sheet.cpp +++ b/eeschema/sheet.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/sheetlab.cpp b/eeschema/sheetlab.cpp index b7412479be..7387755b08 100644 --- a/eeschema/sheetlab.cpp +++ b/eeschema/sheetlab.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp index ba0134d7e3..f152fac6d5 100644 --- a/eeschema/sim/sim_plot_frame.cpp +++ b/eeschema/sim/sim_plot_frame.cpp @@ -24,7 +24,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include #include #include @@ -708,15 +708,15 @@ bool SIM_PLOT_FRAME::loadWorkbook( const wxString& aPath ) bool SIM_PLOT_FRAME::saveWorkbook( const wxString& aPath ) { - + wxString savePath = aPath; - + if( !savePath.Lower().EndsWith(".wbk")) { savePath += ".wbk"; }; - - + + wxTextFile file( savePath ); if( file.Exists() ) diff --git a/eeschema/sim/simulate.cpp b/eeschema/sim/simulate.cpp index f093490c71..aca3799474 100644 --- a/eeschema/sim/simulate.cpp +++ b/eeschema/sim/simulate.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include "sim_plot_frame.h" void SCH_EDIT_FRAME::OnSimulate( wxCommandEvent& event ) diff --git a/eeschema/symbdraw.cpp b/eeschema/symbdraw.cpp index 4787f57615..72f9e7a2d5 100644 --- a/eeschema/symbdraw.cpp +++ b/eeschema/symbdraw.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/symbedit.cpp b/eeschema/symbedit.cpp index 04ad5c6259..7013513796 100644 --- a/eeschema/symbedit.cpp +++ b/eeschema/symbedit.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp index f3d128cfcf..e79a69cec7 100644 --- a/eeschema/tool_lib.cpp +++ b/eeschema/tool_lib.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index ae6d9fca89..a4e60c9e56 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 02d4ba03b7..8c6aa8b97e 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/eeschema/widgets/cmp_tree_pane.cpp b/eeschema/widgets/cmp_tree_pane.cpp index 85394749c1..ea506402e8 100644 --- a/eeschema/widgets/cmp_tree_pane.cpp +++ b/eeschema/widgets/cmp_tree_pane.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include