cvpcb: cleanup include statements

cvpcb/auto_associate.cpp

@@ -31,12 +31,7 @@
 // 'FT232BL'		'QFP:LQFP-32_7x7mm_Pitch0.8mm'
 
 
-#include <fctsys.h>
-#include <common.h>
 #include <kiface_i.h>
-#include <project.h>
-#include <gestfich.h>
-#include <pgm_base.h>
 #include <kicad_string.h>
 #include <macros.h>
 

cvpcb/cfg.cpp

@@ -26,19 +26,11 @@
  * @file cfg.cpp
  */
 
-#include <fctsys.h>
-#include <kiface_i.h>
-#include <fp_lib_table.h>
-#include <id.h>
-#include <common.h>
-#include <gestfich.h>
 #include <config_params.h>
-#include <wildcards_and_files_ext.h>
-#include <fp_lib_table.h>
-#include <confirm.h>
+#include <kiface_i.h>
+#include <project.h>
 
 #include <cvpcb_mainframe.h>
-#include <display_footprints_frame.h>
 
 
 PARAM_CFG_ARRAY& CVPCB_MAINFRAME::GetProjectFileParameters()

cvpcb/components_listbox.cpp

@@ -25,7 +25,6 @@
  * @file class_components_listbox.cpp
  */
 
-#include <fctsys.h>
 #include <trace_helpers.h>
 
 #include <cvpcb_mainframe.h>

cvpcb/cvpcb.cpp

@@ -28,10 +28,8 @@
  */
 
 #include <confirm.h>
-#include <fctsys.h>
 #include <fp_lib_table.h>
 #include <kiface_i.h>
-#include <macros.h>
 #include <pgm_base.h>
 
 #include <cvpcb_mainframe.h>

cvpcb/cvpcb_mainframe.cpp

@@ -24,22 +24,16 @@
  */
 
 #include <bitmaps.h>
-#include <build_version.h>
 #include <confirm.h>
 #include <eda_dde.h>
-#include <fctsys.h>
 #include <fp_lib_table.h>
-#include <html_messagebox.h>
-#include <invoke_pcb_dialog.h>
 #include <kiface_i.h>
-#include <kiface_ids.h>
 #include <kiway_express.h>
 #include <macros.h>
 #include <netlist_reader.h>
 #include <numeric>
 #include <tool/action_toolbar.h>
 #include <tool/common_control.h>
-#include <tool/conditional_menu.h>
 #include <tool/tool_dispatcher.h>
 #include <tool/tool_manager.h>
 #include <widgets/progress_reporter.h>

cvpcb/cvpcb_mainframe.h

@@ -26,23 +26,19 @@
 #define _CVPCB_MAINFRAME_H_
 
 #include <config_params.h>
-#include <footprint_info.h>
-#include <memory>
-#include <pcb_base_frame.h>
+#include <kiway_player.h>
 #include <pcb_netlist.h>
-#include <wx/filename.h>
-#include <wx/listctrl.h>
 
 #include <auto_associate.h>
 #include <cvpcb_association.h>
 #include <listboxes.h>
-#include <tool/action_menu.h>
 
-/*  Forward declarations of all top-level window classes. */
+/*  Forward declarations */
+class ACTION_TOOLBAR;
+class ACTION_MENU;
+class TOOL_DISPATCHER;
 class wxAuiToolBar;
 class DISPLAY_FOOTPRINTS_FRAME;
-class COMPONENT;
-class FP_LIB_TABLE;
 
 namespace CV { struct IFACE; }
 

cvpcb/dialogs/dialog_config_equfiles.cpp

@@ -26,9 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
 #include <pgm_base.h>
-#include <common.h>
 #include <confirm.h>
 #include <gestfich.h>
 #include <id.h>

cvpcb/dialogs/dialog_display_options.cpp

@@ -21,8 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
 #include <display_footprints_frame.h>
 #include <dialog_display_options.h>
 

cvpcb/display_footprints_frame.cpp

@@ -23,30 +23,27 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <fctsys.h>
-#include <common.h>
-#include <pcb_draw_panel_gal.h>
-#include <confirm.h>
-#include <macros.h>
 #include <bitmaps.h>
-#include <msgpanel.h>
-#include <wildcards_and_files_ext.h>
-#include <lib_id.h>
-#include <fp_lib_table.h>
-#include <eda_dockart.h>
-#include <class_module.h>
 #include <class_board.h>
+#include <class_module.h>
+#include <common.h>
+#include <confirm.h>
+#include <eda_dockart.h>
+#include <fp_lib_table.h>
+#include <id.h>
+#include <lib_id.h>
+#include <macros.h>
+#include <msgpanel.h>
+#include <pcb_draw_panel_gal.h>
 #include <pcb_painter.h>
-#include <cvpcb_mainframe.h>
-#include <display_footprints_frame.h>
-#include <cvpcb_id.h>
-#include <listboxes.h>
-#include <view/view.h>
-#include <tool/tool_manager.h>
-#include <tool/tool_dispatcher.h>
 #include <tool/action_toolbar.h>
 #include <tool/common_tools.h>
+#include <tool/tool_dispatcher.h>
+#include <tool/tool_manager.h>
 #include <tool/zoom_tool.h>
+
+#include <cvpcb_mainframe.h>
+#include <display_footprints_frame.h>
 #include <tools/cvpcb_actions.h>
 #include <tools/cvpcb_fpviewer_control.h>
 #include <tools/cvpcb_fpviewer_selection_tool.h>

cvpcb/display_footprints_frame.h

@@ -33,8 +33,6 @@
 // The name (for wxWidgets) of the footprint viewer frame
 #define FOOTPRINTVIEWER_FRAME_NAME wxT( "FootprintViewerFrame" )
 
-class CVPCB_MAINFRAME;
-
 
 /**
  * Class DISPLAY_FOOTPRINTS_FRAME

cvpcb/footprints_listbox.cpp

@@ -27,8 +27,6 @@
  * class to display the list of available footprints
  */
 
-#include <eda_pattern_match.h>
-#include <fctsys.h>
 #include <footprint_filter.h>
 #include <tool/tool_manager.h>
 #include <trace_helpers.h>

cvpcb/library_listbox.cpp

@@ -26,8 +26,6 @@
  * class to display used library and selecting it
  */
 
-#include <fctsys.h>
-#include <macros.h>
 #include <trace_helpers.h>
 
 #include <cvpcb_mainframe.h>

cvpcb/listbox_base.cpp

@@ -26,12 +26,8 @@
  * @brief Implementation of class for displaying footprint list and component lists.
  */
 
-#include <fctsys.h>
-#include <macros.h>
-
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>
-#include <cvpcb_id.h>
 
 
 /******************************************************************************

cvpcb/menubar.cpp

@@ -24,13 +24,11 @@
 
 #include <bitmaps.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/actions.h>
 #include <tool/common_control.h>
 #include <tool/conditional_menu.h>
 #include <tool/tool_manager.h>
 
-#include <cvpcb_id.h>
 #include <cvpcb_mainframe.h>
 #include <tools/cvpcb_actions.h>
 

cvpcb/readwrite_dlgs.cpp

@@ -1,7 +1,3 @@
-/**
- * @file cvpcb/readwrite_dlgs.cpp
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -26,8 +22,7 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-#include <build_version.h>
-#include <common.h>
+
 #include <confirm.h>
 #include <fctsys.h>
 #include <fp_lib_table.h>

cvpcb/toolbars_cvpcb.cpp

@@ -24,9 +24,6 @@
  */
 
 #include <bitmaps.h>
-#include <common.h>
-#include <fctsys.h>
-#include <kiface_i.h>
 #include <tool/action_toolbar.h>
 #include <tool/actions.h>
 

cvpcb/tools/cvpcb_actions.cpp

@@ -19,8 +19,6 @@
  */
 
 #include <bitmaps.h>
-#include <frame_type.h>
-#include <tool/tool_manager.h>
 
 #include <cvpcb_mainframe.h>
 #include <listboxes.h>

cvpcb/tools/cvpcb_actions.h

@@ -28,10 +28,8 @@
 
 #include <core/optional.h>
 #include <tool/actions.h>
-#include <tool/tool_action.h>
-
-class TOOL_EVENT;
-class TOOL_MANAGER;
+#include <tool/tool_event.h>
+class TOOL_ACTION;
 
 /**
  * Class CVPCB_ACTIONS

cvpcb/tools/cvpcb_fpviewer_control.cpp

@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <cstdint>
 #include <functional>
 using namespace std::placeholders;
 

cvpcb/tools/cvpcb_fpviewer_selection_tool.cpp

@@ -18,18 +18,15 @@
  */
 
 #include <functional>
-#include <limits>
 using namespace std::placeholders;
 
 #include <bitmaps.h>
-#include <class_draw_panel_gal.h>
-#include <cvpcb_id.h>
 #include <preview_items/ruler_item.h>
 #include <tool/tool_event.h>
-#include <tool/tool_manager.h>
 #include <tools/cvpcb_actions.h>
 #include <tools/cvpcb_fpviewer_selection_tool.h>
 #include <view/view.h>
+#include <view/view_controls.h>
 
 CVPCB_FOOTPRINT_VIEWER_SELECTION_TOOL::CVPCB_FOOTPRINT_VIEWER_SELECTION_TOOL() :
         TOOL_INTERACTIVE( "cvpcb.FootprintViewerInteractiveSelection" ),

include/tool/action_toolbar.h

@@ -25,6 +25,7 @@
 #define ACTION_TOOLBAR_H
 
 #include <map>
+#include <wx/bitmap.h>          // Needed for the auibar include
 #include <wx/aui/auibar.h>
 #include <tool/tool_event.h>
 
@@ -52,11 +53,11 @@ public:
      * a TOOL_EVENT command containing name of the action is sent.
      */
     void Add( const TOOL_ACTION& aAction, bool aIsToggleEntry = false );
-    
+
     /**
      * Function AddButton()
      * Adds a large button such as used in the Kicad Manager Frame's launch bar.
-     * @param aAction 
+     * @param aAction
      */
     void AddButton( const TOOL_ACTION& aAction );
 
@@ -66,7 +67,7 @@ public:
      * for the custom-drawn layer pair bitmap.
      */
     void SetToolBitmap( const TOOL_ACTION& aAction, const wxBitmap& aBitmap );
-    
+
     /**
      * Applies the default toggle action.  For checked items this is check/uncheck; for
      * non-checked items it's enable/disable.