Rename layer ids file.

It hasn't had anything to do with colors or visibility for some time
now.

3d-viewer/3d_canvas/board_adapter.h

@@ -35,7 +35,7 @@
 #include "../3d_cache/3d_cache.h"
 #include "../common_ogl/ogl_attr_list.h"
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pad.h>
 #include <pcb_track.h>
 #include <wx/gdicmn.h>

3d-viewer/3d_viewer/eda_3d_viewer.cpp

@@ -39,7 +39,7 @@
 #include <board_design_settings.h>
 #include <board_stackup_manager/board_stackup.h>
 #include <core/arraydim.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/dpi_scaling.h>
 #include <pgm_base.h>
 #include <project.h>

bitmap2component/bitmap2component.cpp

@@ -32,7 +32,7 @@
 #include <vector>
 
 #include <convert_to_biu.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <locale_io.h>
 #include <potracelib.h>

common/dialogs/panel_color_settings.cpp

@@ -21,7 +21,7 @@
 #include <bitmaps.h>
 #include <dialogs/dialog_color_picker.h>
 #include <launch_ext.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <menus_helpers.h>
 #include <dialogs/panel_color_settings.h>
 #include <pgm_base.h>

common/drawing_sheet/ds_draw_item.cpp

@@ -55,7 +55,7 @@
 #include <drawing_sheet/ds_data_model.h>
 #include <base_units.h>
 #include <page_info.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gr_basic.h>
 #include <trigo.h>
 #include <render_settings.h>

common/drawing_sheet/ds_proxy_view_item.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <page_info.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
 #include <drawing_sheet/ds_draw_item.h>

common/layer_id.cpp

@@ -17,7 +17,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <wx/translation.h>
 
 /**

common/lset.cpp

@@ -30,7 +30,7 @@
 
 #include <core/arraydim.h>
 #include <math/util.h>                        // for Clamp
-#include <layers_id_colors_and_visibility.h>  // for LSET, PCB_LAYER_ID, LSEQ
+#include <layer_ids.h>  // for LSET, PCB_LAYER_ID, LSEQ
 #include <macros.h>                           // for arrayDim
 #include <wx/debug.h>                         // for wxASSERT, wxASSERT_MSG
 #include <wx/string.h>

common/plugins/eagle/eagle_parser.h

@@ -37,7 +37,7 @@
 #include <wx/string.h>
 #include <wx/filename.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <trigo.h>
 #include <core/wx_stl_compat.h>
 

common/preview_items/ruler_item.cpp

@@ -24,7 +24,7 @@
 #include <preview_items/ruler_item.h>
 #include <preview_items/preview_utils.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <painter.h>
 #include <view/view.h>
 #include <trigo.h>

common/settings/app_settings.cpp

@@ -20,7 +20,7 @@
 
 #include <class_draw_panel_gal.h>
 #include <common.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/app_settings.h>
 #include <settings/json_settings_internals.h>

common/settings/color_settings.cpp

@@ -18,7 +18,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/color_settings.h>
 #include <settings/json_settings_internals.h>

common/swig/kicad.i

@@ -100,7 +100,7 @@ principle should be easily implemented by adapting the current STL containers.
     #include <convert_to_biu.h>
     #include <id.h>
     #include <build_version.h>
-    #include <layers_id_colors_and_visibility.h>
+    #include <layer_ids.h>
     #include <settings/settings_manager.h>
 %}
 

common/view/view.cpp

@@ -27,7 +27,7 @@
 
 
 #include <eda_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <trace_helpers.h>
 
 #include <view/view.h>

common/view/view_group.cpp

@@ -36,7 +36,7 @@
 #include <view/view.h>
 #include <painter.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 using namespace KIGFX;
 

common/view/view_overlay.cpp

@@ -30,7 +30,7 @@
 #include <gal/graphics_abstraction_layer.h>
 #include <painter.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/seg.h>
 
 namespace KIGFX {

common/widgets/layer_box_selector.cpp

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <bitmaps.h>
 
 #include <wx/dcmemory.h>

eeschema/dialogs/panel_eeschema_color_settings.cpp

@@ -23,7 +23,7 @@
 #include <bitmaps.h>
 #include <eeschema_settings.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <lib_polyline.h>
 #include <page_info.h>
 #include <panel_eeschema_color_settings.h>

eeschema/dialogs/panel_eeschema_color_settings.h

@@ -24,7 +24,7 @@
 
 #include <gal/color4d.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialogs/panel_color_settings.h>
 
 class COLOR_SETTINGS;

eeschema/eeschema_settings.cpp

@@ -25,7 +25,7 @@
 
 #include <dialogs/dialog_bom_cfg_lexer.h>
 #include <eeschema_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <symbol_editor_settings.h>
 #include <macros.h>
 #include <pgm_base.h>

eeschema/general.h

@@ -26,7 +26,7 @@
 #define _GENERAL_H_
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 using KIGFX::COLOR4D;
 

eeschema/sch_draw_panel.cpp

@@ -38,7 +38,7 @@
 #include <eda_draw_frame.h>
 #include <gal/definitions.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>

eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h

@@ -28,7 +28,7 @@
 
 #include <sch_plugins/cadstar/cadstar_sch_archive_parser.h>
 
-#include <layers_id_colors_and_visibility.h> // SCH_LAYER_ID
+#include <layer_ids.h> // SCH_LAYER_ID
 #include <plotter.h>                         // PLOT_DASH_TYPE
 #include <pin_type.h>                        // ELECTRICAL_PINTYPE
 #include <sch_io_mgr.h>

eeschema/sch_screen.h

@@ -38,7 +38,7 @@
 #include <core/typeinfo.h>
 #include <kiid.h>
 #include <kiway_holder.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <marker_base.h>
 #include <page_info.h>
 #include <template_fieldnames.h>

eeschema/sch_symbol.h

@@ -29,7 +29,7 @@
 
 #include <eda_item.h>
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <lib_id.h>
 #include <widgets/msgpanel.h>
 

eeschema/sch_view.cpp

@@ -32,7 +32,7 @@
 #include <view/view_rtree.h>
 #include <view/wx_view_controls.h>
 #include <drawing_sheet/ds_proxy_view_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <sch_screen.h>
 #include <schematic.h>
 #include <sch_base_frame.h>

eeschema/sch_view.h

@@ -24,7 +24,7 @@
 #ifndef SCH_VIEW_H_
 #define SCH_VIEW_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 #include <view/view.h>
 

eeschema/tools/ee_actions.cpp

@@ -24,7 +24,7 @@
 
 #include <bitmaps.h>
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <sch_line_wire_bus_tool.h>
 #include <tools/ee_actions.h>
 #include <tool/tool_action.h>

eeschema/tools/sch_line_wire_bus_tool.cpp

@@ -39,7 +39,7 @@
 #include <eda_item.h>
 #include <bitmaps.h>
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <math/vector2d.h>
 #include <advanced_config.h>
 #include <tool/actions.h>

gerbview/dialogs/dialog_layers_select_to_pcb.cpp

@@ -34,7 +34,7 @@
 #include <gerbview_id.h>
 #include <gerbview_settings.h>
 #include <kiface_i.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <dialogs/dialog_layers_select_to_pcb.h>
 

gerbview/export_to_pcbnew.h

@@ -24,7 +24,7 @@
 
 #include <convert_to_biu.h>
 #include <geometry/shape_poly_set.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 
 struct EXPORT_VIA

gerbview/gerber_draw_item.h

@@ -30,7 +30,7 @@
 #define GERBER_DRAW_ITEM_H
 
 #include <eda_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gr_basic.h>
 #include <gbr_netlist_metadata.h>
 #include <dcode.h>

gerbview/gerbview_frame.h

@@ -25,7 +25,7 @@
 #include <filehistory.h>
 #include <config_params.h>
 #include <eda_draw_frame.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gerbview.h>
 #include <convert_to_biu.h>
 #include <gbr_layout.h>

gerbview/gerbview_painter.h

@@ -21,7 +21,7 @@
 #ifndef __GERBVIEW_PAINTER_H
 #define __GERBVIEW_PAINTER_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <painter.h>
 
 #include <dcode.h>

gerbview/gerbview_settings.cpp

@@ -22,7 +22,7 @@
 */
 
 #include <gerbview_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/json_settings_internals.h>

gerbview/widgets/layer_widget.h

@@ -40,7 +40,7 @@
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/color4d.h>
 #include <widgets/color_swatch.h>
 #include <widgets/indicator_icon.h>

include/board_item.h

@@ -30,7 +30,7 @@
 #include <eda_units.h>
 #include <convert_to_biu.h>
 #include <gr_basic.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/geometry_utils.h>
 
 class BOARD;

include/board_printout.h

@@ -34,7 +34,7 @@
 #define BOARD_PRINTOUT_H
 
 #include <wx/print.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <eda_rect.h>
 #include <printout.h>
 

include/eda_base_frame.h

@@ -35,7 +35,7 @@
 #include <vector>
 
 #include <wx/aui/aui.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <frame_type.h>
 #include <hotkeys_basic.h>
 #include <kiway_holder.h>

include/layer_ids.h

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
  * Copyright (C) 2010 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2007-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2007-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,13 +23,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file layers_id_colors_and_visibility.h
- * @brief Board layer functions and definitions.
- */
-
-#ifndef LAYERS_ID_AND_VISIBILITY_H_
-#define LAYERS_ID_AND_VISIBILITY_H_
+#ifndef LAYER_IDS_H
+#define LAYER_IDS_H
 
 #include <set>
 #include <vector>
@@ -1003,4 +998,4 @@ inline bool IsNetCopperLayer( LAYER_NUM aLayer )
 
 PCB_LAYER_ID ToLAYER_ID( int aLayer );
 
-#endif // LAYERS_ID_AND_VISIBILITY_H_
+#endif // LAYER_IDS_H

include/origin_viewitem.h

@@ -29,7 +29,7 @@
 
 #include <math/box2.h>
 #include <view/view.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/color4d.h>
 #include <eda_item.h>
 

include/painter.h

@@ -36,7 +36,7 @@
 
 #include <gal/color4d.h>
 #include <render_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <memory>
 
 namespace KIGFX

include/preview_items/arc_assistant.h

@@ -26,7 +26,7 @@
 
 #include <eda_item.h>
 #include <preview_items/arc_geom_manager.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 namespace KIGFX
 {

include/preview_items/simple_overlay_item.h

@@ -26,7 +26,7 @@
 
 #include <eda_item.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <gal/color4d.h>
 
 namespace KIGFX

include/preview_items/two_point_assistant.h

@@ -26,7 +26,7 @@
 
 #include <eda_item.h>
 #include <preview_items/two_point_geom_manager.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 namespace KIGFX
 {

include/project/board_project_settings.h

@@ -21,7 +21,7 @@
 #ifndef KICAD_BOARD_PROJECT_SETTINGS_H
 #define KICAD_BOARD_PROJECT_SETTINGS_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <settings/parameters.h>
 
 // Can be removed by refactoring PARAM_LAYER_PRESET

include/project/project_local_settings.h

@@ -22,7 +22,7 @@
 #ifndef KICAD_PROJECT_LOCAL_SETTINGS_H
 #define KICAD_PROJECT_LOCAL_SETTINGS_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <project/board_project_settings.h>
 #include <settings/json_settings.h>
 #include <wildcards_and_files_ext.h>

include/render_settings.h

@@ -28,7 +28,7 @@
 #include <set>
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <memory>
 
 #include <wx/dc.h>

include/settings/color_settings.h

@@ -104,7 +104,7 @@ private:
 
     /**
      * Map of all layer colors.
-     * The key needs to be a valid layer ID, see layers_id_colors_and_visibility.h
+     * The key needs to be a valid layer ID, see layer_ids.h
      */
     std::unordered_map<int, COLOR4D> m_colors;
 

include/tool/edit_points.h

@@ -28,7 +28,7 @@
 #define EDIT_POINTS_H_
 
 #include <eda_item.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 #include <list>
 #include <deque>

include/widgets/layer_box_selector.h

@@ -27,7 +27,7 @@
 
 #include <wx/bmpcbox.h>
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 using KIGFX::COLOR4D;
 

pcbnew/autorouter/ar_matrix.h

@@ -30,7 +30,7 @@
 #define __AR_MATRIX_H
 
 #include <eda_rect.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class PCB_SHAPE;
 class PAD;

pcbnew/board.h

@@ -28,7 +28,7 @@
 #include <board_item_container.h>
 #include <common.h> // Needed for stl hash extensions
 #include <convert_drawsegment_list_to_polygon.h> // for OUTLINE_ERROR_HANDLER
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <netinfo.h>
 #include <pcb_item_containers.h>
 #include <pcb_plot_params.h>

pcbnew/board_design_settings.cpp

@@ -23,7 +23,7 @@
 
 #include <pcb_dimension.h>
 #include <pcb_track.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <kiface_i.h>
 #include <pad.h>
 #include <board_design_settings.h>

pcbnew/board_stackup_manager/board_stackup.cpp

@@ -23,7 +23,7 @@
 #include <convert_to_biu.h>
 #include <base_units.h>
 #include <kicad_string.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <board_design_settings.h>
 #include <board.h>
 #include <i18n_utility.h>       // For _HKI definition

pcbnew/board_stackup_manager/board_stackup.h

@@ -28,7 +28,7 @@
 
 #include <vector>
 #include <wx/string.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD;
 class BOARD_DESIGN_SETTINGS;

pcbnew/board_stackup_manager/stackup_predefined_prms.cpp

@@ -30,7 +30,7 @@
 #include "board_stackup.h"
 #include <convert_to_biu.h>
 #include <core/arraydim.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <board_design_settings.h>
 #include <i18n_utility.h>       // _HKI definition
 #include <macros.h>

pcbnew/board_stackup_manager/stackup_predefined_prms.h

@@ -34,7 +34,7 @@
 #include <wx/arrstr.h>
 #include <wx/colour.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <i18n_utility.h>       // For _HKI definition
 
 // Keyword used in file to identify the dielectric layer type

pcbnew/collectors.h

@@ -33,7 +33,7 @@
 
 
 #include <collector.h>
-#include <layers_id_colors_and_visibility.h>              // LAYER_COUNT, layer defs
+#include <layer_ids.h>              // LAYER_COUNT, layer defs
 #include <view/view.h>
 #include <board_item.h>
 

pcbnew/dialogs/dialog_board_reannotate.h

@@ -29,7 +29,7 @@
 #include <board.h>
 #include <footprint.h>
 #include <dialogs/dialog_board_reannotate_base.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <pcb_base_frame.h>
 #include <pcb_edit_frame.h>

pcbnew/dialogs/dialog_imported_layers.cpp

@@ -19,7 +19,7 @@
  */
 
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialog_imported_layers.h>
 
 #include <wx/msgdlg.h>

pcbnew/dialogs/dialog_plot.cpp

@@ -32,7 +32,7 @@
 #include <gerber_jobfile_writer.h>
 #include <reporter.h>
 #include <wildcards_and_files_ext.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <locale_io.h>
 #include <bitmaps.h>
 #include <board.h>

pcbnew/dialogs/dialog_track_via_properties.h

@@ -25,7 +25,7 @@
 #include <dialogs/dialog_track_via_properties_base.h>
 #include <widgets/unit_binder.h>
 #include <core/optional.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class PCB_SELECTION;
 class COMMIT;

pcbnew/dialogs/panel_fp_editor_color_settings.cpp

@@ -24,7 +24,7 @@
 #include <footprint_edit_frame.h>
 #include <footprint_editor_settings.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <panel_fp_editor_color_settings.h>
 #include <settings/settings_manager.h>
 

pcbnew/dialogs/panel_fp_editor_color_settings.h

@@ -22,7 +22,7 @@
 #define PANEL_FP_EDITOR_COLOR_SETTINGS_H
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialogs/panel_color_settings.h>
 
 class COLOR_SETTINGS;

pcbnew/dialogs/panel_pcbnew_color_settings.cpp

@@ -22,7 +22,7 @@
 
 #include <board.h>
 #include <gal/gal_display_options.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <panel_pcbnew_color_settings.h>
 #include <pcbnew_settings.h>
 #include <pcb_edit_frame.h>

pcbnew/dialogs/panel_pcbnew_color_settings.h

@@ -22,7 +22,7 @@
 #define PANEL_PCBNEW_COLOR_SETTINGS_H_
 
 #include <gal/color4d.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <dialogs/panel_color_settings.h>
 
 class COLOR_SETTINGS;

pcbnew/drc/drc_rule.h

@@ -27,7 +27,7 @@
 #include <core/typeinfo.h>
 #include <core/optional.h>
 #include <core/minoptmax.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <netclass.h>
 #include <libeval_compiler/libeval_compiler.h>
 #include <wx/intl.h>

pcbnew/drc/drc_rule_condition.h

@@ -25,7 +25,7 @@
 #define DRC_RULE_CONDITION_H
 
 #include <core/typeinfo.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD_ITEM;
 class PCB_EXPR_UCODE;

pcbnew/drc/drc_rule_parser.h

@@ -26,7 +26,7 @@
 
 #include <core/typeinfo.h>
 #include <netclass.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <drc/drc_rule.h>
 #include <drc_rules_lexer.h>
 

pcbnew/exporters/gerber_placefile_writer.h

@@ -26,7 +26,7 @@
 #ifndef PLACEFILE_GERBER_WRITER_H
 #define PLACEFILE_GERBER_WRITER_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <wx/gdicmn.h>
 
 class BOARD;

pcbnew/footprint.h

@@ -31,7 +31,7 @@
 #include <board_item.h>
 #include <collectors.h>
 #include <convert_to_biu.h>
-#include <layers_id_colors_and_visibility.h> // ALL_LAYERS definition.
+#include <layer_ids.h> // ALL_LAYERS definition.
 #include <lib_id.h>
 #include <list>
 

pcbnew/footprint_editor_settings.cpp

@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <footprint_editor_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pgm_base.h>
 #include <settings/common_settings.h>
 #include <settings/json_settings_internals.h>

pcbnew/import_gfx/graphics_importer_pcbnew.h

@@ -29,7 +29,7 @@
 
 #include "graphics_importer.h"
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD_ITEM;
 class BOARD;

pcbnew/pcb_display_options.cpp

@@ -28,7 +28,7 @@
 #include <pcbnew.h>
 #include <pad.h>
 #include <board_design_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_display_options.h>
 #include <eda_text.h>
 

pcbnew/pcb_draw_panel_gal.h

@@ -28,7 +28,7 @@
 #define PCB_DRAW_PANEL_GAL_H_
 
 #include <class_draw_panel_gal.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_view.h>
 
 class DS_PROXY_VIEW_ITEM;

pcbnew/pcb_layer_box_selector.cpp

@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 #include <pcb_edit_frame.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <settings/color_settings.h>
 
 #include <board.h>

pcbnew/pcb_marker.cpp

@@ -29,7 +29,7 @@
 #include <board.h>
 #include <board_design_settings.h>
 #include <pcb_marker.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
 #include <geometry/shape_null.h>

pcbnew/pcb_painter.cpp

@@ -41,7 +41,7 @@
 #include <advanced_config.h>
 #include <core/arraydim.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_painter.h>
 #include <pcb_display_options.h>
 #include <project/net_settings.h>

pcbnew/pcb_plot_params.cpp

@@ -23,7 +23,7 @@
 
 #include <board_design_settings.h>
 #include <convert_to_biu.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <macros.h>
 #include <math/util.h> // for KiROUND
 #include <pcb_plot_params.h>

pcbnew/pcb_plot_params.h

@@ -25,7 +25,7 @@
 
 #include <outline_mode.h>
 #include <plotter.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class COLOR_SETTINGS;
 class PCB_PLOT_PARAMS_PARSER;

pcbnew/pcb_screen.cpp

@@ -25,7 +25,7 @@
  */
 
 #include <pcb_screen.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 
 PCB_SCREEN::PCB_SCREEN( const wxSize& aPageSizeIU ) :

pcbnew/pcb_view.h

@@ -25,7 +25,7 @@
 #ifndef __PCB_VIEW_H
 #define __PCB_VIEW_H
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <view/view.h>
 #include <board_item.h>
 

pcbnew/pcbnew_settings.cpp

@@ -25,7 +25,7 @@
 
 #include <common.h>
 #include <footprint_editor_settings.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcbnew_settings.h>
 #include <pgm_base.h>
 #include <router/pns_routing_settings.h>

pcbnew/pcbplot.h

@@ -29,7 +29,7 @@
 #ifndef PCBPLOT_H_
 #define PCBPLOT_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pad_shapes.h>
 #include <pcb_plot_params.h>
 #include <settings/color_settings.h>

pcbnew/plot_brditems_plotter.cpp

@@ -46,7 +46,7 @@
 #include <gal/color4d.h>                      // for COLOR4D, operator!=
 #include <gbr_metadata.h>
 #include <gbr_netlist_metadata.h>             // for GBR_NETLIST_METADATA
-#include <layers_id_colors_and_visibility.h>  // for LSET, IsCopperLayer
+#include <layer_ids.h>  // for LSET, IsCopperLayer
 #include <pad_shapes.h>                       // for PAD_ATTRIB::NPTH
 #include <pcbplot.h>
 #include <pcb_plot_params.h>                  // for PCB_PLOT_PARAMS, PCB_PL...

pcbnew/plotcontroller.h

@@ -31,7 +31,7 @@
 #define PLOTCONTROLLER_H_
 
 #include <pcb_plot_params.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class PLOTTER;
 class BOARD;

pcbnew/plugins/altium/altium_pcb.h

@@ -25,7 +25,7 @@
 #define ALTIUM_PCB_H
 
 #include <functional>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <vector>
 
 #include <altium_parser_pcb.h>

pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.h

@@ -29,7 +29,7 @@
 
 
 #include <io_mgr.h>
-#include <layers_id_colors_and_visibility.h> // PCB_LAYER_ID
+#include <layer_ids.h> // PCB_LAYER_ID
 #include <plugins/common/plugin_common_layer_mapping.h>
 
 

pcbnew/plugins/common/plugin_common_layer_mapping.h

@@ -26,7 +26,7 @@
 #include <map>
 
 #include <io_mgr.h>
-#include <layers_id_colors_and_visibility.h> // PCB_LAYER_ID
+#include <layer_ids.h> // PCB_LAYER_ID
 
 /**
  * @brief Describes an imported layer and how it could be mapped to KiCad Layers

pcbnew/plugins/eagle/eagle_plugin.h

@@ -27,7 +27,7 @@
 
 #include <convert_to_biu.h>
 #include <io_mgr.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <plugins/eagle/eagle_parser.h>
 #include <plugins/common/plugin_common_layer_mapping.h>
 

pcbnew/plugins/kicad/kicad_plugin.h

@@ -27,7 +27,7 @@
 
 #include <io_mgr.h>
 #include <string>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class BOARD;
 class BOARD_ITEM;

pcbnew/plugins/kicad/pcb_parser.h

@@ -33,7 +33,7 @@
 #include <convert_to_biu.h>                      // IU_PER_MM
 #include <core/wx_stl_compat.h>
 #include <hashtables.h>
-#include <layers_id_colors_and_visibility.h>     // PCB_LAYER_ID
+#include <layer_ids.h>     // PCB_LAYER_ID
 #include <pcb_lexer.h>
 #include <kiid.h>
 

pcbnew/plugins/legacy/legacy_plugin.h

@@ -27,7 +27,7 @@
 
 #include <io_mgr.h>
 #include <string>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <memory>
 
 

pcbnew/plugins/pcad/pcb_callbacks.h

@@ -30,7 +30,7 @@
 #ifndef PCB_CALLBACKS_H_
 #define PCB_CALLBACKS_H_
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 
 class wxString;
 

pcbnew/plugins/pcad/pcb_component.h

@@ -31,7 +31,7 @@
 #include <pcad/pcb_callbacks.h>
 
 #include <kiid.h>
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <wx/object.h>
 
 class BOARD;

pcbnew/python/swig/board.i

@@ -42,7 +42,7 @@ file near the top; only class BOARD functions go in board.i.
 HANDLE_EXCEPTIONS(BOARD::TracksInNetBetweenPoints)
 
 
-%include layers_id_colors_and_visibility.i
+%include layer_ids.i
 %include board_item.i
 %include board_item_container.i
 %include board_connected_item.i

pcbnew/python/swig/layer_ids.i

@@ -27,7 +27,7 @@
  */
 
 /**
- * @file layers_id_colors_and_visibility.i
+ * @file layer_ids.i
  * @brief layers IDs, draw layers IDs, layers set and templates
  * these IDs are used as physical layers or draw layers (for colors, visibility...)
  */
@@ -37,7 +37,7 @@
 %ignore GAL_SET::set(int, bool);
 %ignore GAL_SET::set(int);
 
-%include layers_id_colors_and_visibility.h
+%include layer_ids.h
 
 // Extend LSET by 2 methods to add or remove layers from the layer list
 // Mainly used to add or remove layers of a pad layer list
@@ -64,6 +64,6 @@
     %}
 }
 %{
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcbnew_scripting_helpers.h>
 %}

pcbnew/ratsnest/ratsnest_view_item.cpp

@@ -34,7 +34,7 @@
 #include <pcb_painter.h>
 #include <ratsnest/ratsnest_data.h>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <pcb_base_frame.h>
 
 #include <memory>

pcbnew/router/pns_index.h

@@ -27,7 +27,7 @@
 #include <map>
 #include <unordered_set>
 
-#include <layers_id_colors_and_visibility.h>
+#include <layer_ids.h>
 #include <geometry/shape_index.h>
 
 #include "pns_item.h"