Remove transitive inclusion of bitmaps.h

3d-viewer/3d_viewer/3d_menubar.cpp

@@ -4,7 +4,7 @@
  * Copyright (C) 2016 Mario Luzeiro <mrluzeiro@ua.pt>
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 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
@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <tool/conditional_menu.h>
 #include <eda_3d_viewer.h>
 #include <menus_helpers.h>

3d-viewer/3d_viewer/3d_toolbar.cpp

@@ -4,7 +4,7 @@
  * Copyright (C) 2016 Mario Luzeiro <mrluzeiro@ua.pt>
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 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
@@ -24,11 +24,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file 3d_toolbar.cpp
- */
-
 #include <wx/wupdlock.h>
+
+#include <bitmaps.h>
 #include <eda_3d_viewer.h>
 #include <menus_helpers.h>
 #include <tool/action_toolbar.h>

common/confirm.cpp

@@ -26,7 +26,6 @@
 #include <wx/richmsgdlg.h>
 #include <wx/choicdlg.h>
 #include <confirm.h>
-#include <bitmaps.h>
 #include <dialogs/html_messagebox.h>
 #include <functional>
 #include <unordered_map>

common/dialogs/dialog_configure_paths.cpp

@@ -24,6 +24,7 @@
 
 #include <dialogs/dialog_configure_paths.h>
 
+#include <bitmaps.h>
 #include <confirm.h>
 #include <menus_helpers.h>
 #include <validators.h>

common/tool/action_menu.cpp

@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <eda_base_frame.h>
 #include <functional>
 #include <id.h>

cvpcb/tools/cvpcb_fpviewer_selection_tool.cpp

@@ -20,14 +20,11 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <bitmaps.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" ),

eeschema/dialogs/dialog_bom.cpp

@@ -28,6 +28,7 @@
  */
 
 
+#include <bitmaps.h>
 #include <bom_plugins.h>
 #include <confirm.h>
 #include <dialog_bom_base.h>
@@ -38,12 +39,10 @@
 #include <i18n_utility.h> // for _HKI definition used in dialog_bom_help_md.h
 #include <invoke_sch_dialog.h>
 #include <kiface_i.h>
-#include <netlist.h>
 #include <netlist_exporter_xml.h>
 #include <pgm_base.h>
 #include <reporter.h>
 #include <sch_edit_frame.h>
-#include <schematic.h>
 #include <paths.h>
 
 #include <wx/filedlg.h>

eeschema/dialogs/dialog_edit_one_field.cpp

@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <kiway.h>
 #include <confirm.h>
 #include <kicad_string.h>

eeschema/dialogs/dialog_junction_props.cpp

@@ -18,7 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <bitmaps.h>
 #include <sch_junction.h>
 #include <dialog_junction_props.h>
 #include <pgm_base.h>

eeschema/dialogs/dialog_symbol_properties.cpp

@@ -23,6 +23,7 @@
 
 #include "dialog_symbol_properties.h"
 
+#include <bitmaps.h>
 #include <wx/tooltip.h>
 #include <grid_tricks.h>
 #include <confirm.h>

eeschema/menubar.cpp

@@ -24,6 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <filehistory.h>
 #include <kiface_i.h>
 #include <menus_helpers.h>

eeschema/pin_type.cpp

@@ -21,9 +21,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <pin_type.h>
-#include <lib_pin.h>
+#include <bitmaps.h>
 #include <core/arraydim.h>
+#include <lib_pin.h>
+#include <pin_type.h>
 
 
 // These are true singletons so it's OK for them to be globals.

eeschema/pin_type.h

@@ -25,7 +25,7 @@
 #define PIN_TYPE_H_
 
 #include <wx/arrstr.h>
-#include <bitmaps.h>
+#include <bitmap_types.h>
 #include <vector>
 
 /**

eeschema/sch_edit_frame.cpp

@@ -23,6 +23,7 @@
  */
 
 #include <base_units.h>
+#include <bitmaps.h>
 #include <class_library.h>
 #include <confirm.h>
 #include <connection_graph.h>

eeschema/sch_line.cpp

@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <core/mirror.h>
 #include <sch_painter.h>
 #include <plotter.h>

eeschema/sch_sheet.cpp

@@ -22,6 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <core/mirror.h>
 #include <sch_draw_panel.h>
 #include <gr_text.h>

eeschema/sch_symbol.h

@@ -43,7 +43,6 @@
 #include <wx/gdicmn.h>
 #include <wx/string.h>
 
-#include <bitmaps.h>
 #include <sch_field.h>
 #include <sch_item.h>
 #include <sch_pin.h>

eeschema/symbol_editor/menubar_symbol_editor.cpp

@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <menus_helpers.h>
 #include <pgm_base.h>
 #include <tool/action_menu.h>

eeschema/symbol_editor/symbol_edit_frame.cpp

@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <wx/hyperlink.h>
 #include <base_screen.h>
 #include <class_library.h>
@@ -40,7 +41,6 @@
 #include <symbol_editor_settings.h>
 #include <paths.h>
 #include <pgm_base.h>
-#include <sch_draw_panel.h>
 #include <sch_painter.h>
 #include <sch_view.h>
 #include <settings/settings_manager.h>

eeschema/toolbars_symbol_viewer.cpp

@@ -20,19 +20,19 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+#include <bitmaps.h>
 #include <macros.h>
-#include "class_library.h"
-#include "eeschema_id.h"
-#include "symbol_viewer_frame.h"
-#include "sch_painter.h"
+#include <class_library.h>
+#include <eeschema_id.h>
+#include <symbol_viewer_frame.h>
+#include <sch_painter.h>
 #include <tool/action_menu.h>
 #include <tool/action_toolbar.h>
-#include <tool/tool_manager.h>
 #include <tools/ee_actions.h>
 #include <tools/symbol_editor_control.h>
 #include <widgets/wx_menubar.h>
 
+
 void SYMBOL_VIEWER_FRAME::ReCreateHToolbar()
 {
     if( m_mainToolBar )

eeschema/tools/ee_selection_tool.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
+#include <bitmaps.h>
 #include <core/typeinfo.h>
 #include <ee_actions.h>
 #include <ee_collectors.h>

gerbview/menubar.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2021 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
@@ -22,12 +22,13 @@
  * or you may write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
+
 #include "gerbview_frame.h"
 
+#include <bitmaps.h>
 #include "gerbview_id.h"
 #include <kiface_i.h>
 #include <menus_helpers.h>
-#include <pgm_base.h>
 #include <tool/action_menu.h>
 #include <tool/actions.h>
 #include <tool/tool_manager.h>

gerbview/tools/gerbview_selection_tool.cpp

@@ -22,20 +22,16 @@
 #include <functional>
 using namespace std::placeholders;
 
-#include <eda_item.h>
 #include <bitmaps.h>
+#include <eda_item.h>
 #include <gerber_collectors.h>
 #include <class_draw_panel_gal.h>
 #include <kicad_string.h>
 #include <view/view.h>
-#include <view/view_controls.h>
 #include <view/view_group.h>
 #include <painter.h>
-#include <bitmaps.h>
 #include <tool/tool_event.h>
 #include <tool/tool_manager.h>
-#include <preview_items/ruler_item.h>
-#include <preview_items/selection_area.h>
 #include <gerbview_id.h>
 #include <gerbview_painter.h>
 #include "gerbview_selection_tool.h"

gerbview/widgets/gerbview_layer_widget.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2004-2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2018-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2018-2021 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
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <bitmaps.h>
 #include <menus_helpers.h>
 #include <gerbview.h>
 #include <gerbview_frame.h>

gerbview/widgets/layer_widget.cpp

@@ -3,7 +3,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2010-2020 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2010-2021 KiCad Developers, see change_log.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
@@ -35,15 +35,13 @@
 
 #include "layer_widget.h"
 
+#include <bitmaps.h>
 #include <macros.h>
-#include <common.h>
-
+#include <menus_helpers.h>
 #include <widgets/indicator_icon.h>
 
 #include <algorithm>
 
-#include <menus_helpers.h>
-
 
 const wxEventType LAYER_WIDGET::EVT_LAYER_COLOR_CHANGE = wxNewEventType();