fix code after renaming files

common/tool/tool_base.cpp

@@ -25,7 +25,7 @@
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
 
-#include <wxPcbStruct.h> // LAME!
+#include <pcb_edit_frame.h>
 
 bool TOOL_BASE::IsToolActive() const
 {

common/tool/tool_dispatcher.cpp

@@ -23,8 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
-#include <pcb_base_frame.h>
 
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>

common/tool/tool_manager.cpp

@@ -41,7 +41,7 @@
 #include <tool/coroutine.h>
 #include <tool/action_manager.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_draw_panel_gal.h>
 
 /// Struct describing the current execution state of a TOOL

common/tool/zoom_tool.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_draw_panel_gal.h>
 #include <view/view_controls.h>
 #include <view/view.h>

common/wx_status_popup.cpp

@@ -27,7 +27,7 @@
  */
 
 #include <wx_status_popup.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 WX_STATUS_POPUP::WX_STATUS_POPUP( PCB_EDIT_FRAME* aParent ) :
     wxPopupWindow( aParent )

kicad/import_project.cpp

@@ -47,7 +47,7 @@
 
 #include <io_mgr.h>
 #include <sch_io_mgr.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <schframe.h>
 #include <netlist.h>
 

pcbnew/CMakeLists.txt

@@ -250,7 +250,7 @@ set( PCBNEW_CLASS_SRCS
     modedit.cpp
     modedit_onclick.cpp
     modeditoptions.cpp
-    moduleframe.cpp
+    footprint_edit_frame.cpp
     modules.cpp
     modview_frame.cpp
     move-drag_pads.cpp
@@ -263,7 +263,7 @@ set( PCBNEW_CLASS_SRCS
     pcb_base_edit_frame.cpp
 #    pcb_draw_panel_gal.cpp
 #    pcb_view.cpp
-    pcbframe.cpp
+    pcb_edit_frame.cpp
     pcbnew_config.cpp
     pcbplot.cpp
     plot_board_layers.cpp

pcbnew/append_board_to_current.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2004-2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2014 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2014 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
@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <properties.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew.h>
 #include <io_mgr.h>
 #include <class_module.h>

pcbnew/attribut.cpp

@@ -32,7 +32,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <gr_basic.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 
 #include <pcbnew.h>

pcbnew/autorouter/auto_place_footprints.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <gr_basic.h>
 #include <macros.h>
 #include <msgpanel.h>

pcbnew/autorouter/spread_footprints.cpp

@@ -41,7 +41,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 

pcbnew/block.cpp

@@ -33,7 +33,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <block_commande.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 
 #include <class_board.h>

pcbnew/block_module_editor.cpp

@@ -37,8 +37,7 @@
 #include <block_commande.h>
 #include <macros.h>
 
-#include <wxPcbStruct.h>
+#include <footprint_edit_frame.h>
-#include <module_editor_frame.h>
 #include <pcbplot.h>
 #include <trigo.h>
 

pcbnew/board_commit.cpp

@@ -24,7 +24,7 @@
 
 #include <class_board.h>
 #include <class_module.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <tool/tool_manager.h>
 #include <ratsnest_data.h>
 #include <view/view.h>

pcbnew/board_items_to_polygon_shape_transform.cpp

@@ -35,7 +35,7 @@
 #include <fctsys.h>
 #include <draw_graphic_text.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <class_board.h>
 #include <class_pad.h>

pcbnew/board_netlist_updater.cpp

@@ -46,7 +46,7 @@
 
 #include <board_netlist_updater.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 
 BOARD_NETLIST_UPDATER::BOARD_NETLIST_UPDATER( PCB_EDIT_FRAME* aFrame, BOARD* aBoard ) :

pcbnew/build_BOM_from_board.cpp

@@ -30,7 +30,7 @@
 #include <kicad_string.h>
 #include <gestfich.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <project.h>
 #include <wildcards_and_files_ext.h>

pcbnew/class_action_plugin.h

@@ -30,7 +30,7 @@
 #ifndef CLASS_ACTION_PLUGIN_H
 #define CLASS_ACTION_PLUGIN_H
 #include <vector>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 /**
  * Class ACTION_PLUGIN

pcbnew/class_dimension.cpp

@@ -36,7 +36,7 @@
 #include <kicad_string.h>
 #include <richio.h>
 #include <bitmaps.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_pcb_text.h>

pcbnew/class_drawsegment.cpp

@@ -39,7 +39,7 @@
 #include <msgpanel.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew.h>
 

pcbnew/class_edge_mod.cpp

@@ -44,7 +44,7 @@
 #include <base_units.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_edge_mod.h>

pcbnew/class_footprint_wizard.h

@@ -31,7 +31,7 @@
 #ifndef CLASS_FOOTPRINT_WIZARD_H
 #define CLASS_FOOTPRINT_WIZARD_H
 #include <vector>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 // Allowable parameter types for PCB wizards
 const wxString WIZARD_PARAM_UNITS_MM        = "mm";          // Millimetres

pcbnew/class_module.cpp

@@ -43,7 +43,7 @@
 #include <msgpanel.h>
 #include <bitmaps.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <class_edge_mod.h>
 #include <class_module.h>

pcbnew/class_pad_draw_functions.cpp

@@ -36,8 +36,7 @@
 #include <class_drawpanel.h>
 #include <draw_graphic_text.h>
 #include <layers_id_colors_and_visibility.h>
-#include <pcb_base_frame.h>
+#include <pcb_edit_frame.h>
-#include <wxPcbStruct.h>
 #include <pcbnew_id.h>             // ID_TRACK_BUTT
 #include <pcbnew.h>
 #include <class_board.h>

pcbnew/class_pcb_layer_box_selector.cpp

@@ -30,7 +30,7 @@
  */
 #include <common.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <layers_id_colors_and_visibility.h>
 

pcbnew/class_pcb_layer_widget.cpp

@@ -36,7 +36,7 @@
 #include <painter.h>
 
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_display_options.h>
 #include <layer_widget.h>
 #include <macros.h>

pcbnew/class_pcb_target.cpp

@@ -38,7 +38,7 @@
 #include <macros.h>
 #include <richio.h>
 #include <bitmaps.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_pcb_target.h>

pcbnew/class_pcb_text.cpp

@@ -37,7 +37,7 @@
 #include <richio.h>
 #include <class_drawpanel.h>
 #include <macros.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>

pcbnew/class_text_mod.cpp

@@ -36,7 +36,7 @@
 #include <kicad_string.h>
 #include <richio.h>
 #include <macros.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <msgpanel.h>
 #include <base_units.h>
 #include <bitmaps.h>

pcbnew/clean.cpp

@@ -31,7 +31,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew.h>
 #include <class_board.h>
 #include <class_track.h>

pcbnew/controle.cpp

@@ -30,7 +30,7 @@
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew_id.h>
 #include <class_board.h>
 #include <class_module.h>

pcbnew/cross-probing.cpp

@@ -14,7 +14,7 @@
 #include <pgm_base.h>
 #include <kiface_i.h>
 #include <kiway_express.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <eda_dde.h>
 #include <macros.h>
 

pcbnew/deltrack.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <connectivity_data.h>
 

pcbnew/dialogs/dialog_block_options.cpp

@@ -24,7 +24,7 @@
 
 #include <dialog_block_options.h>
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 
 DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,

pcbnew/dialogs/dialog_copper_zones.cpp

@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <PolyLine.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <zones.h>
 #include <base_units.h>
 #include <widgets/text_ctrl_eval.h>

pcbnew/dialogs/dialog_create_array.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 #include <boost/algorithm/string/join.hpp>

pcbnew/dialogs/dialog_design_rules.cpp

@@ -35,7 +35,7 @@
 #include <base_units.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 
 #include <pcbnew_id.h>

pcbnew/dialogs/dialog_display_options.cpp

@@ -26,7 +26,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_display_options.h>
 #include <config_map.h>
 

pcbnew/dialogs/dialog_drc.cpp

@@ -33,7 +33,7 @@
 #include <wildcards_and_files_ext.h>
 #include <pgm_base.h>
 #include <dialog_drc.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <class_board_design_settings.h>
 #include <class_draw_panel_gal.h>

pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

@@ -38,7 +38,7 @@
 #include <pgm_base.h>
 #include <gestfich.h>
 #include <3d_viewer.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <project.h>
 #include <board_commit.h>

pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp

@@ -38,7 +38,7 @@
 #include <kiface_i.h>
 #include <gestfich.h>
 #include <3d_viewer.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 #include <validators.h>
@@ -49,7 +49,7 @@
 
 #include <class_module.h>
 #include <class_text_mod.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <dialog_edit_module_for_Modedit.h>
 #include <wildcards_and_files_ext.h>
 #include <pgm_base.h>

pcbnew/dialogs/dialog_exchange_modules.cpp

@@ -29,7 +29,7 @@
 #include <class_draw_panel_gal.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <board_commit.h>
 #include <bitmaps.h>

pcbnew/dialogs/dialog_export_idf.cpp

@@ -26,7 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <kiface_i.h>
 #include <pcbnew.h>
 #include <class_board.h>
@@ -35,7 +35,7 @@
 
 // IDF export header generated by wxFormBuilder
 #include <dialog_export_idf_base.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #define OPTKEY_IDF_THOU wxT( "IDFExportThou" )
 #define OPTKEY_IDF_REF_AUTOADJ wxT( "IDFRefAutoAdj" )

pcbnew/dialogs/dialog_export_step.cpp

@@ -29,7 +29,7 @@
 #include <wx/choicdlg.h>
 #include <wx/stdpaths.h>
 
-#include "wxPcbStruct.h"
+#include "pcb_edit_frame.h"
 #include "kiface_i.h"
 #include "confirm.h"
 

pcbnew/dialogs/dialog_export_vrml.cpp

@@ -29,7 +29,7 @@
 #include <wx/dir.h>
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <kiface_i.h>
 
 #include <pcbnew.h>

pcbnew/dialogs/dialog_find.cpp

@@ -28,7 +28,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>

pcbnew/dialogs/dialog_freeroute_exchange.cpp

@@ -33,7 +33,7 @@
 #include <wildcards_and_files_ext.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <class_board.h>
 

pcbnew/dialogs/dialog_gencad_export_options.cpp

@@ -24,7 +24,7 @@
 
 #include "dialog_gencad_export_options.h"
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <project.h>
 #include <confirm.h>

pcbnew/dialogs/dialog_gendrill.cpp

@@ -30,7 +30,7 @@
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbplot.h>
 #include <gendrill_Excellon_writer.h>
 #include <gendrill_gerber_writer.h>

pcbnew/dialogs/dialog_general_options.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <kicad_string.h>
 #include <pcbnew_id.h>

pcbnew/dialogs/dialog_global_deletion.cpp

@@ -28,7 +28,7 @@ using namespace std::placeholders;
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <ratsnest_data.h>
 #include <board_commit.h>
 

pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp

@@ -25,7 +25,7 @@
 #include <fctsys.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_drawpanel.h>
 #include <base_units.h>
 

pcbnew/dialogs/dialog_global_modules_fields_edition.cpp

@@ -37,7 +37,7 @@
 #include <board_commit.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>

pcbnew/dialogs/dialog_global_pads_edition.cpp

@@ -25,7 +25,7 @@
 #include <dialog_global_pads_edition.h>
 
 #include <class_pad.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 
 DIALOG_GLOBAL_PADS_EDITION::DIALOG_GLOBAL_PADS_EDITION( PCB_BASE_FRAME* aParent, D_PAD* aPad ) :

pcbnew/dialogs/dialog_graphic_item_properties.cpp

@@ -41,7 +41,7 @@
 #include <confirm.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <base_units.h>
 #include <wx/valnum.h>

pcbnew/dialogs/dialog_graphic_item_properties_for_Modedit.cpp

@@ -38,9 +38,9 @@
 #include <confirm.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <base_units.h>
 #include <wx/valnum.h>
 #include <board_commit.h>

pcbnew/dialogs/dialog_graphic_items_options.cpp

@@ -25,11 +25,11 @@
 #include <fctsys.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <pcbnew_id.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <class_board.h>
 #include <widgets/text_ctrl_eval.h>
 

pcbnew/dialogs/dialog_keepout_area_properties.cpp

@@ -32,7 +32,7 @@
 #include <kiface_i.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_zone.h>
 #include <zones.h>
 #include <base_units.h>

pcbnew/dialogs/dialog_mask_clearance.cpp

@@ -26,7 +26,7 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <base_units.h>
 

pcbnew/dialogs/dialog_modedit_display_options.cpp

@@ -20,7 +20,7 @@
 #include <dialog_modedit_display_options.h>
 
 #include <class_drawpanel.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <view/view.h>
 

pcbnew/dialogs/dialog_modedit_options.cpp

@@ -26,12 +26,12 @@
 
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board_design_settings.h>
 #include <base_units.h>
 #include <widgets/text_ctrl_eval.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <dialog_modedit_options_base.h>
 

pcbnew/dialogs/dialog_move_exact.cpp

@@ -23,11 +23,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <widgets/text_ctrl_eval.h>
 
 #include "dialog_move_exact.h"

pcbnew/dialogs/dialog_netlist.cpp

@@ -34,7 +34,7 @@
 #include <dialog_helpers.h>
 #include <html_messagebox.h>
 #include <base_units.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_netlist.h>
 #include <netlist_reader.h>
 #include <reporter.h>

pcbnew/dialogs/dialog_non_copper_zones_properties.cpp

@@ -29,7 +29,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <class_board.h>

pcbnew/dialogs/dialog_pcb_text_properties.cpp

@@ -30,7 +30,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <draw_graphic_text.h>
 #include <confirm.h>
 #include <base_units.h>

pcbnew/dialogs/dialog_plot.cpp

@@ -29,7 +29,7 @@
 #include <kiface_i.h>
 #include <plotter.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbplot.h>
 #include <gerber_jobfile_writer.h>
 #include <base_units.h>

pcbnew/dialogs/dialog_position_relative.cpp

@@ -21,12 +21,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 #include <macros.h>
 #include <widgets/text_ctrl_eval.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include "dialog_position_relative.h"
 #include "tools/pcb_actions.h"

pcbnew/dialogs/dialog_print_for_modedit.cpp

@@ -29,8 +29,8 @@
 #include <class_drawpanel.h>
 #include <confirm.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <pcbplot.h>
 
 #include <dialog_print_for_modedit_base.h>

pcbnew/dialogs/dialog_print_using_printer.cpp

@@ -29,7 +29,7 @@
 #include <kiface_i.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
 #include <printout_controler.h>

pcbnew/dialogs/dialog_scripting.cpp

@@ -30,7 +30,7 @@
 #include <Python.h>
 #include <fctsys.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_scripting.h>
 
 

pcbnew/dialogs/dialog_select_net_from_list.cpp

@@ -34,7 +34,7 @@
 #include <kicad_device_context.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <class_board.h>
 #include <dialog_select_net_from_list_base.h>
 #include <eda_pattern_match.h>

pcbnew/dialogs/dialog_track_via_properties.cpp

@@ -26,7 +26,7 @@
 #include <class_pcb_layer_box_selector.h>
 #include <tools/selection_tool.h>
 #include <class_track.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <confirm.h>
 #include <widgets/text_ctrl_eval.h>
 

pcbnew/dialogs/dialog_update_pcb.cpp

@@ -26,7 +26,7 @@
  */
 
 #include <common.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcb_netlist.h>
 #include <dialog_update_pcb.h>
 #include <wx_html_report_panel.h>

pcbnew/dimension.cpp

@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <draw_graphic_text.h>
 #include <dialog_helpers.h>
 #include <macros.h>

pcbnew/drc.cpp

@@ -28,7 +28,7 @@
  */
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <base_units.h>
 #include <class_board_design_settings.h>

pcbnew/drc_clearance_test_functions.cpp

@@ -32,7 +32,7 @@
  */
 
 #include <fctsys.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 
 #include <pcbnew.h>

pcbnew/edgemod.cpp

@@ -36,10 +36,10 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <base_units.h>
 
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <class_board.h>
 #include <class_module.h>
 #include <class_edge_mod.h>

pcbnew/edit.cpp

@@ -37,11 +37,11 @@
 #include <eda_doc.h>
 #include <gestfich.h>
 #include <kicad_device_context.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew_id.h>
 #include <pcbnew.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>

pcbnew/edit_pcb_text.cpp

@@ -32,7 +32,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 
 #include <class_board.h>

pcbnew/edit_track_width.cpp

@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_track.h>

pcbnew/editedge.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <gr_basic.h>
 
 #include <pcbnew.h>

pcbnew/editmod.cpp

@@ -32,8 +32,8 @@
 #include <confirm.h>
 #include <class_drawpanel.h>
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <3d_viewer/eda_3d_viewer.h>
 
 #include <class_module.h>

pcbnew/editrack-part2.cpp

@@ -33,7 +33,7 @@
 #include <gr_basic.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>

pcbnew/editrack.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <trigo.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 
 #include <pcbnew.h>
 #include <drc.h>

pcbnew/edtxtmod.cpp

@@ -37,8 +37,8 @@
 #include <macros.h>
 
 #include <pcbnew.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>

pcbnew/event_handlers_tracks_vias_sizes.cpp

@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 
 #include <pcbnew_id.h>

pcbnew/exporters/export_d356.cpp

@@ -32,7 +32,7 @@
 #include <confirm.h>
 #include <gestfich.h>
 #include <kiface_i.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <build_version.h>
 #include <macros.h>

pcbnew/exporters/export_gencad.cpp

@@ -34,7 +34,7 @@
 #include <confirm.h>
 #include <gestfich.h>
 #include <pgm_base.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <trigo.h>
 #include <build_version.h>
 #include <macros.h>

pcbnew/exporters/export_idf.cpp

@@ -27,7 +27,7 @@
 
 
 #include <list>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <pcbnew.h>
 #include <class_board.h>

pcbnew/exporters/export_vrml.cpp

@@ -46,7 +46,7 @@
 #include "plugins/3dapi/ifsg_all.h"
 #include "streamwrapper.h"
 #include "vrml_layer.h"
-#include "wxPcbStruct.h"
+#include "pcb_edit_frame.h"
 #include "../../kicad/kicad.h"
 
 #include <zone_filler.h>

pcbnew/exporters/gen_modules_placefile.cpp

@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <build_version.h>
 #include <macros.h>

pcbnew/exporters/gendrill_Excellon_writer.cpp

@@ -39,7 +39,7 @@
 
 #include <plotter.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <build_version.h>
 

pcbnew/exporters/gendrill_gerber_writer.cpp

@@ -33,7 +33,7 @@
 
 #include <plotter.h>
 #include <kicad_string.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pgm_base.h>
 #include <build_version.h>
 

pcbnew/exporters/gerber_jobfile_writer.cpp

@@ -32,7 +32,7 @@
 #include <vector>
 
 #include <plotter.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <build_version.h>
 
 #include <class_board.h>

pcbnew/files.cpp

@@ -33,7 +33,7 @@
 #include <confirm.h>
 #include <kicad_string.h>
 #include <gestfich.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <macros.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <richio.h>
@@ -52,8 +52,6 @@
 
 #include <class_board.h>
 #include <build_version.h>      // LEGACY_BOARD_FILE_VERSION
-#include <module_editor_frame.h>
-#include <modview_frame.h>
 
 #include <wx/stdpaths.h>
 

pcbnew/footprint_edit_frame.cpp

@@ -34,7 +34,7 @@
 #include <class_drawpanel.h>
 #include <pcb_draw_panel_gal.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
@@ -50,7 +50,7 @@
 #include <hotkeys.h>
 #include <dialogs/dialog_modedit_display_options.h>
 #include <dialog_hotkeys_editor.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 #include <modview_frame.h>
 #include <wildcards_and_files_ext.h>
 #include <class_pcb_layer_widget.h>

pcbnew/footprint_edit_frame.h

@@ -18,12 +18,12 @@
  */
 
 /**
- * @file module_editor_frame.h
+ * @file footprint_edit_frame.h
  * @brief Definition of class FOOTPRINT_EDIT_FRAME.
  */
 
-#ifndef MODULE_EDITOR_FRAME_H_
+#ifndef FOOTPRINT_EDIT_FRAME_H
-#define MODULE_EDITOR_FRAME_H_
+#define FOOTPRINT_EDIT_FRAME_H
 
 #include <pcb_base_frame.h>
 #include <pcb_base_edit_frame.h>
@@ -535,4 +535,4 @@ private:
     void duplicateItems( bool aIncrement ) override;
 };
 
-#endif      // MODULE_EDITOR_FRAME_H_
+#endif      // FOOTPRINT_EDIT_FRAME_H

pcbnew/footprint_wizard.cpp

@@ -30,7 +30,7 @@
 #include <fctsys.h>
 #include <gr_basic.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <dialog_helpers.h>
 
 #include <class_board.h>

pcbnew/footprint_wizard_frame.cpp

@@ -4,7 +4,7 @@
  * Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo <miguelangel@nbee.es>
  * Copyright (C) 2012-2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2008-2015 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2004-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 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
@@ -31,7 +31,7 @@
 #include <fctsys.h>
 #include <kiface_i.h>
 #include <class_drawpanel.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
 #include <pcbnew.h>
 #include <3d_viewer/eda_3d_viewer.h>
 #include <msgpanel.h>
@@ -40,7 +40,7 @@
 
 #include <class_board.h>
 #include <class_module.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <pcbnew_id.h>
 #include "footprint_wizard_frame.h"

pcbnew/globaleditpad.cpp

@@ -30,8 +30,8 @@
 #include <common.h>
 #include <class_drawpanel.h>
 #include <confirm.h>
-#include <wxPcbStruct.h>
+#include <pcb_edit_frame.h>
-#include <module_editor_frame.h>
+#include <footprint_edit_frame.h>
 
 #include <class_board.h>
 #include <class_module.h>