Remove painter.h from eda_text.h

common/eda_draw_frame.cpp

@@ -36,6 +36,7 @@
 #include <msgpanel.h>
 #include <page_info.h>
 #include <pgm_base.h>
+#include <render_settings.h>
 #include <settings/app_settings.h>
 #include <settings/color_settings.h>
 #include <settings/common_settings.h>

common/eda_text.cpp

@@ -46,6 +46,7 @@
 #include <kicad_string.h>     // for UnescapeString
 #include <math/util.h>          // for KiROUND
 #include <math/vector2d.h>    // for VECTOR2D
+#include <render_settings.h>
 #include <trigo.h>            // for RotatePoint
 
 #include <geometry/shape.h>

common/page_layout/ws_draw_item.cpp

@@ -58,6 +58,7 @@
 #include <layers_id_colors_and_visibility.h>
 #include <gr_basic.h>
 #include <trigo.h>
+#include <render_settings.h>
 
 // ============================ BASE CLASS ==============================
 

common/plotters/DXF_plotter.cpp

@@ -33,6 +33,7 @@
 #include <macros.h>
 #include <kicad_string.h>
 #include <convert_basic_shapes_to_polygon.h>
+#include <render_settings.h>
 #include <trigo.h>
 
 /**

common/plotters/GERBER_plotter.cpp

@@ -29,6 +29,7 @@
 #include <kicad_string.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <math/util.h>      // for KiROUND
+#include <render_settings.h>
 #include <trigo.h>
 
 #include <build_version.h>

common/plotters/PDF_plotter.cpp

@@ -33,6 +33,7 @@
 #include <wx/zstream.h>
 #include <wx/mstream.h>
 #include <math/util.h>      // for KiROUND
+#include <render_settings.h>
 
 #include <algorithm>
 

common/plotters/PS_plotter.cpp

@@ -32,6 +32,7 @@
 #include <eda_item.h>
 #include <convert_basic_shapes_to_polygon.h>
 #include <math/util.h>      // for KiROUND
+#include <render_settings.h>
 #include <trigo.h>
 
 #include "plotters_pslike.h"

common/plotters/SVG_plotter.cpp

@@ -102,6 +102,7 @@
 
 #include <cstdint>
 #include <wx/mstream.h>
+#include <render_settings.h>
 
 #include "plotters_pslike.h"
 

common/tool/edit_points.cpp

@@ -24,6 +24,7 @@
 
 #include <gal/graphics_abstraction_layer.h>
 #include <gal/color4d.h>
+#include <painter.h>
 #include <math/util.h>      // for KiROUND
 #include "tool/edit_points.h"
 

include/eda_text.h

@@ -27,12 +27,17 @@
 
 #include <common.h>                 // wxStringSplit
 #include <eda_rect.h>
-#include "painter.h"
 
 class SHAPE_COMPOUND;
 class SHAPE_POLY_SET;
 class wxFindReplaceData;
 
+namespace KIGFX
+{
+    class RENDER_SETTINGS;
+    class COLOR4D;
+}
+
 using KIGFX::RENDER_SETTINGS;
 using KIGFX::COLOR4D;
 

include/painter.h

@@ -35,9 +35,6 @@
 #include <layers_id_colors_and_visibility.h>
 #include <memory>
 
-class EDA_ITEM;
-class COLOR_SETTINGS;
-
 namespace KIGFX
 {
 class GAL;

include/plotter.h

@@ -36,6 +36,7 @@
 #include <math/box2.h>
 #include <gr_text.h>
 #include <page_info.h>
+#include <gal/color4d.h>
 #include <eda_item.h>       // FILL_T
 
 class COLOR_SETTINGS;
@@ -43,6 +44,13 @@ class SHAPE_POLY_SET;
 class SHAPE_LINE_CHAIN;
 class GBR_NETLIST_METADATA;
 
+namespace KIGFX
+{
+    class RENDER_SETTINGS;
+}
+
+using KIGFX::RENDER_SETTINGS;
+
 /**
  * Enum PlotFormat
  * is the set of supported output plot formats.  They should be kept in order

include/render_settings.h

@@ -31,7 +31,6 @@
 #include <layers_id_colors_and_visibility.h>
 #include <memory>
 
-class EDA_ITEM;
 class COLOR_SETTINGS;
 
 namespace KIGFX

include/view/view.h

@@ -35,6 +35,8 @@
 
 #include <view/view_overlay.h>
 
+class EDA_ITEM;
+
 namespace KIGFX
 {
 class PAINTER;

pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp

@@ -19,6 +19,7 @@
 
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
+#include <painter.h>
 #include <view/view.h>
 
 #include "panel_pl_editor_color_settings.h"

pagelayout_editor/pl_editor_frame.cpp

@@ -36,6 +36,7 @@
 #include <view/view.h>
 #include <confirm.h>
 #include <kiplatform/app.h>
+#include <painter.h>
 #include <tool/selection.h>
 #include <tool/action_toolbar.h>
 #include <tool/editor_conditions.h>

pcbnew/cross-probing.cpp

@@ -40,8 +40,10 @@
 #include <kiway_express.h>
 #include <netlist_reader/pcb_netlist.h>
 #include <netlist_reader/board_netlist_updater.h>
+#include <painter.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
+#include <render_settings.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_actions.h>
 #include <tools/selection_tool.h>