Class name <-> file name sync.

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -53,7 +53,7 @@
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>
 #include <tool/action_toolbar.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 
 #if defined( KICAD_USE_3DCONNEXION )

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -38,7 +38,7 @@
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/settings_manager.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <eda_3d_viewer_settings.h>
 #include <board_design_settings.h>
 

common/CMakeLists.txt

@@ -169,7 +169,7 @@ set( COMMON_WIDGET_SRCS
     widgets/bitmap_button.cpp
     widgets/bitmap_toggle.cpp
     widgets/button_row_panel.cpp
-    widgets/collapsible_pane.cpp
+        widgets/wx_collapsible_pane.cpp
     widgets/color_swatch.cpp
     widgets/font_choice.cpp
     widgets/footprint_choice.cpp
@@ -183,7 +183,7 @@ set( COMMON_WIDGET_SRCS
     widgets/grid_text_button_helpers.cpp
     widgets/grid_text_helpers.cpp
     widgets/indicator_icon.cpp
-    widgets/infobar.cpp
+        widgets/wx_infobar.cpp
     widgets/layer_box_selector.cpp
     widgets/lib_tree.cpp
     widgets/mathplot.cpp
@@ -324,7 +324,7 @@ set( COMMON_SRCS
     exceptions.cpp
     executable_names.cpp
     filename_resolver.cpp
-    filehistory.cpp
+        file_history.cpp
     filter_reader.cpp
     footprint_filter.cpp
     footprint_info.cpp

common/draw_panel_gal.cpp

@@ -46,7 +46,7 @@
 #include <tool/tool_dispatcher.h>
 #include <tool/tool_manager.h>
 
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 
 #include <kiplatform/ui.h>
 

common/eda_base_frame.cpp

@@ -30,7 +30,7 @@
 #include <dialogs/panel_mouse_settings.h>
 #include <dialogs/panel_data_collection.h>
 #include <eda_dde.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <id.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
@@ -53,7 +53,7 @@
 #include <tool/tool_dispatcher.h>
 #include <trace_helpers.h>
 #include <widgets/paged_dialog.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_aui_art_providers.h>
 #include <wx/app.h>
 #include <wx/config.h>

common/eda_draw_frame.cpp

@@ -29,7 +29,7 @@
 #include <core/arraydim.h>
 #include <dialog_shim.h>
 #include <eda_draw_frame.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <id.h>
 #include <kiface_base.h>
 #include <lockfile.h>

common/filehistory.cpp → common/file_history.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <filehistory.h>
+#include <file_history.h>
 #include <id.h>
 #include <settings/app_settings.h>
 #include <tool/action_menu.h>

common/reporter.cpp

@@ -27,7 +27,7 @@
 
 #include <macros.h>
 #include <reporter.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_html_report_panel.h>
 #include <wx/log.h>
 #include <wx/textctrl.h>

common/widgets/paged_dialog.cpp

@@ -26,7 +26,7 @@
 #include <wx/treebook.h>
 #include <wx/treectrl.h>
 
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/paged_dialog.h>
 #include <wx/stc/stc.h>
 

common/widgets/collapsible_pane.cpp → common/widgets/wx_collapsible_pane.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <bitmaps.h>
-#include <widgets/collapsible_pane.h>
+#include <widgets/wx_collapsible_pane.h>
 
 #include <wx/collpane.h>
 #include <wx/dc.h>

common/widgets/infobar.cpp → common/widgets/wx_infobar.cpp

@@ -20,7 +20,7 @@
 
 #include <id.h>
 #include <kiplatform/ui.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include "wx/artprov.h"
 #include <wx/aui/framemanager.h>
 #include <wx/debug.h>

cvpcb/display_footprints_frame.cpp

@@ -54,7 +54,7 @@
 #include <tools/pcb_editor_conditions.h>  // Shared conditions with other Pcbnew frames
 #include <tools/pcb_viewer_tools.h>       // shared tools with other Pcbnew frames
 #include <tools/cvpcb_fpviewer_selection_tool.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wx/choice.h>
 #include <wx/debug.h>
 #include <cvpcb_id.h>

eeschema/dialogs/dialog_annotate_base.cpp

@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/wx_html_report_panel.h"
 
 #include "dialog_annotate_base.h"

eeschema/dialogs/dialog_erc_base.cpp

@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/wx_html_report_box.h"
 
 #include "dialog_erc_base.h"

eeschema/dialogs/dialog_pin_properties_base.cpp

@@ -7,7 +7,7 @@
 
 #include "pin_shape_combobox.h"
 #include "pin_type_combobox.h"
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/std_bitmap_button.h"
 #include "widgets/wx_grid.h"
 #include "wx/bmpcbox.h"

eeschema/dialogs/dialog_shape_properties_base.cpp

@@ -6,7 +6,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include "widgets/color_swatch.h"
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 
 #include "dialog_shape_properties_base.h"
 

eeschema/dialogs/dialog_sheet_properties_base.cpp

@@ -5,7 +5,7 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/std_bitmap_button.h"
 #include "widgets/wx_grid.h"
 

eeschema/dialogs/dialog_text_properties_base.cpp

@@ -8,7 +8,7 @@
 #include "widgets/bitmap_button.h"
 #include "widgets/color_swatch.h"
 #include "widgets/font_choice.h"
-#include "widgets/infobar.h"
+#include "widgets/wx_infobar.h"
 #include "widgets/wx_combobox.h"
 
 #include "dialog_text_properties_base.h"

eeschema/files-io.cpp

@@ -55,7 +55,7 @@
 #include <tools/sch_editor_control.h>
 #include <tools/sch_navigate_tool.h>
 #include <trace_helpers.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <wx/app.h>

eeschema/menubar.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
 #include <schematic.h>

eeschema/sch_edit_frame.cpp

@@ -77,7 +77,7 @@
 #include <tools/sch_move_tool.h>
 #include <tools/sch_navigate_tool.h>
 #include <view/view_controls.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/hierarchy_pane.h>
 #include <wildcards_and_files_ext.h>
 #include <wx/cmdline.h>

eeschema/symbol_editor/symbol_edit_frame.cpp

@@ -65,7 +65,7 @@
 #include <tools/symbol_editor_move_tool.h>
 #include <tools/symbol_editor_pin_tool.h>
 #include <widgets/app_progress_dialog.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/lib_tree.h>
 #include <widgets/wx_progress_reporters.h>
 #include <widgets/symbol_tree_pane.h>

eeschema/symbol_editor/symbol_editor.cpp

@@ -26,7 +26,7 @@
 #include <pgm_base.h>
 #include <confirm.h>
 #include <kiway.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_drawing_tools.h>
 #include <symbol_edit_frame.h>

gerbview/gerbview_frame.h

@@ -22,7 +22,7 @@
 #ifndef  WX_GERBER_STRUCT_H
 #define  WX_GERBER_STRUCT_H
 
-#include <filehistory.h>
+#include <file_history.h>
 #include <config_params.h>
 #include <eda_draw_frame.h>
 #include <layer_ids.h>

include/eda_base_frame.h

@@ -42,7 +42,7 @@
 #include <kiway_holder.h>
 #include <tool/tools_holder.h>
 #include <widgets/ui_common.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <undo_redo_container.h>
 #include <units_provider.h>
 #include <origin_transforms.h>

include/widgets/collapsible_pane.h → include/widgets/wx_collapsible_pane.h

@@ -17,8 +17,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KICAD_COLLAPSIBLE_PANE_H
-#define KICAD_COLLAPSIBLE_PANE_H
+#ifndef KICAD_WX_COLLAPSIBLE_PANE_H
+#define KICAD_WX_COLLAPSIBLE_PANE_H
 
 #include <wx/control.h>
 #include <wx/containr.h>
@@ -172,4 +172,4 @@ private:
     void onHeaderClicked( wxCommandEvent& aEvent );
 };
 
-#endif // KICAD_COLLAPSIBLE_PANE_H
+#endif // KICAD_WX_COLLAPSIBLE_PANE_H

kicad/kicad.cpp

@@ -35,7 +35,7 @@
 #include <wx/msgdlg.h>
 #include <wx/cmdline.h>
 
-#include <filehistory.h>
+#include <file_history.h>
 #include <hotkeys_basic.h>
 #include <kiway.h>
 #include <macros.h>

kicad/kicad_manager_frame.cpp

@@ -35,7 +35,7 @@
 #include <dialogs/panel_kicad_launcher.h>
 #include <eda_base_frame.h>
 #include <executable_names.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <policy_keys.h>
 #include <gestfich.h>
 #include <kiplatform/app.h>

kicad/menubar.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiplatform/policy.h>
 #include <menus_helpers.h>
 #include <paths.h>

pagelayout_editor/files.cpp

@@ -29,7 +29,7 @@
 #include <drawing_sheet/ds_data_model.h>
 #include <drawing_sheet/ds_file_versions.h>
 #include <paths.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wildcards_and_files_ext.h>
 
 #include "pl_editor_frame.h"

pagelayout_editor/menubar.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
 #include <tool/action_manager.h>

pcbnew/autorouter/autoplace_tool.cpp

@@ -24,7 +24,7 @@
 
 #include <board_commit.h>
 #include <tools/pcb_actions.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_progress_reporters.h>
 
 #include "ar_autoplacer.h"

pcbnew/files.cpp

@@ -47,7 +47,7 @@
 #include <ratsnest/ratsnest_data.h>
 #include <kiplatform/app.h>
 #include <widgets/appearance_controls.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_progress_reporters.h>
 #include <settings/settings_manager.h>
 #include <paths.h>

pcbnew/menubar_pcb_editor.cpp

@@ -26,7 +26,7 @@
 
 #include <advanced_config.h>
 #include <bitmaps.h>
-#include <filehistory.h>
+#include <file_history.h>
 #include <kiface_base.h>
 #include <menus_helpers.h>
 #include <pcb_edit_frame.h>

pcbnew/pcb_edit_frame.cpp

@@ -96,7 +96,7 @@
 #include <ratsnest/ratsnest_view_item.h>
 #include <widgets/appearance_controls.h>
 #include <widgets/pcb_search_pane.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/panel_selection_filter.h>
 #include <widgets/pcb_properties_panel.h>
 #include <widgets/wx_aui_utils.h>

pcbnew/router/router_tool.cpp

@@ -41,7 +41,7 @@ using namespace std::placeholders;
 #include <dialogs/dialog_pns_settings.h>
 #include <dialogs/dialog_pns_diff_pair_dimensions.h>
 #include <dialogs/dialog_track_via_size.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/appearance_controls.h>
 #include <connectivity/connectivity_data.h>
 #include <connectivity/connectivity_algo.h>

pcbnew/tools/drawing_tool.cpp

@@ -48,7 +48,7 @@
 #include <tools/zone_filler_tool.h>
 #include <view/view.h>
 #include <widgets/appearance_controls.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wx/filedlg.h>
 
 #include <bitmaps.h>

pcbnew/tools/footprint_editor_control.cpp

@@ -32,7 +32,7 @@
 #include <footprint_edit_frame.h>
 #include <pcbnew_id.h>
 #include <confirm.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <footprint.h>
 #include <pad.h>
 #include <pcb_group.h>

pcbnew/tools/pad_tool.cpp

@@ -41,7 +41,7 @@
 #include <tools/pcb_selection_conditions.h>
 #include <tools/edit_tool.h>
 #include <dialogs/dialog_enum_pads.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 
 PAD_TOOL::PAD_TOOL() :
         PCB_TOOL_BASE( "pcbnew.PadTool" ),

pcbnew/tools/pcb_control.cpp

@@ -59,7 +59,7 @@
 #include <tool/tool_manager.h>
 #include <footprint_edit_frame.h>
 #include <widgets/wx_progress_reporters.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <wx/hyperlink.h>
 
 using namespace std::placeholders;

pcbnew/tools/zone_filler_tool.cpp

@@ -33,7 +33,7 @@
 #include <pcb_group.h>
 #include <board_design_settings.h>
 #include <progress_reporter.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_progress_reporters.h>
 #include <wx/event.h>
 #include <wx/hyperlink.h>

pcbnew/widgets/appearance_controls.cpp

@@ -40,13 +40,13 @@
 #include <tools/pcb_actions.h>
 #include <widgets/bitmap_button.h>
 #include <widgets/bitmap_toggle.h>
-#include <widgets/collapsible_pane.h>
+#include <widgets/wx_collapsible_pane.h>
 #include <widgets/color_swatch.h>
 #include <widgets/grid_bitmap_toggle.h>
 #include <widgets/grid_color_swatch_helpers.h>
 #include <widgets/grid_text_helpers.h>
 #include <widgets/indicator_icon.h>
-#include <widgets/infobar.h>
+#include <widgets/wx_infobar.h>
 #include <widgets/wx_grid.h>
 #include <dialogs/eda_view_switcher.h>
 #include <wx/bmpbuttn.h>