From f59551d6ad8bb601db6bb29a80f37cb272e14166 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Wed, 14 Oct 2020 07:29:36 -0400 Subject: [PATCH] Remove painter.h from eda_text.h --- common/eda_draw_frame.cpp | 1 + common/eda_text.cpp | 1 + common/page_layout/ws_draw_item.cpp | 1 + common/plotters/DXF_plotter.cpp | 1 + common/plotters/GERBER_plotter.cpp | 1 + common/plotters/PDF_plotter.cpp | 1 + common/plotters/PS_plotter.cpp | 1 + common/plotters/SVG_plotter.cpp | 1 + common/tool/edit_points.cpp | 1 + include/eda_text.h | 7 ++++++- include/painter.h | 3 --- include/plotter.h | 8 ++++++++ include/render_settings.h | 1 - include/view/view.h | 2 ++ .../dialogs/panel_pl_editor_color_settings.cpp | 1 + pagelayout_editor/pl_editor_frame.cpp | 1 + pcbnew/cross-probing.cpp | 2 ++ 17 files changed, 29 insertions(+), 5 deletions(-) diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp index f25cc9a65c..3f711ba55e 100644 --- a/common/eda_draw_frame.cpp +++ b/common/eda_draw_frame.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/common/eda_text.cpp b/common/eda_text.cpp index 1cb9082b65..d9faf34fe1 100644 --- a/common/eda_text.cpp +++ b/common/eda_text.cpp @@ -46,6 +46,7 @@ #include // for UnescapeString #include // for KiROUND #include // for VECTOR2D +#include #include // for RotatePoint #include diff --git a/common/page_layout/ws_draw_item.cpp b/common/page_layout/ws_draw_item.cpp index 588341816d..0f9ea86a04 100644 --- a/common/page_layout/ws_draw_item.cpp +++ b/common/page_layout/ws_draw_item.cpp @@ -58,6 +58,7 @@ #include #include #include +#include // ============================ BASE CLASS ============================== diff --git a/common/plotters/DXF_plotter.cpp b/common/plotters/DXF_plotter.cpp index 770d980d70..c1622b4738 100644 --- a/common/plotters/DXF_plotter.cpp +++ b/common/plotters/DXF_plotter.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include /** diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp index 43aba07eb3..080cb5d518 100644 --- a/common/plotters/GERBER_plotter.cpp +++ b/common/plotters/GERBER_plotter.cpp @@ -29,6 +29,7 @@ #include #include #include // for KiROUND +#include #include #include diff --git a/common/plotters/PDF_plotter.cpp b/common/plotters/PDF_plotter.cpp index c0451f8069..e2ca3e9c2a 100644 --- a/common/plotters/PDF_plotter.cpp +++ b/common/plotters/PDF_plotter.cpp @@ -33,6 +33,7 @@ #include #include #include // for KiROUND +#include #include diff --git a/common/plotters/PS_plotter.cpp b/common/plotters/PS_plotter.cpp index 33a27c9b6d..c853b50875 100644 --- a/common/plotters/PS_plotter.cpp +++ b/common/plotters/PS_plotter.cpp @@ -32,6 +32,7 @@ #include #include #include // for KiROUND +#include #include #include "plotters_pslike.h" diff --git a/common/plotters/SVG_plotter.cpp b/common/plotters/SVG_plotter.cpp index 06658c7df8..7bd46a28cc 100644 --- a/common/plotters/SVG_plotter.cpp +++ b/common/plotters/SVG_plotter.cpp @@ -102,6 +102,7 @@ #include #include +#include #include "plotters_pslike.h" diff --git a/common/tool/edit_points.cpp b/common/tool/edit_points.cpp index 985c39fe55..d78535abda 100644 --- a/common/tool/edit_points.cpp +++ b/common/tool/edit_points.cpp @@ -24,6 +24,7 @@ #include #include +#include #include // for KiROUND #include "tool/edit_points.h" diff --git a/include/eda_text.h b/include/eda_text.h index 7ad13b1874..332047e362 100644 --- a/include/eda_text.h +++ b/include/eda_text.h @@ -27,12 +27,17 @@ #include // wxStringSplit #include -#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; diff --git a/include/painter.h b/include/painter.h index 349830d857..e050d69078 100644 --- a/include/painter.h +++ b/include/painter.h @@ -35,9 +35,6 @@ #include #include -class EDA_ITEM; -class COLOR_SETTINGS; - namespace KIGFX { class GAL; diff --git a/include/plotter.h b/include/plotter.h index 282eec7b48..71da40b65f 100644 --- a/include/plotter.h +++ b/include/plotter.h @@ -36,6 +36,7 @@ #include #include #include +#include #include // 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 diff --git a/include/render_settings.h b/include/render_settings.h index e737e5b70f..9405ccdd1c 100644 --- a/include/render_settings.h +++ b/include/render_settings.h @@ -31,7 +31,6 @@ #include #include -class EDA_ITEM; class COLOR_SETTINGS; namespace KIGFX diff --git a/include/view/view.h b/include/view/view.h index 1e11dd1745..bc7b0196cd 100644 --- a/include/view/view.h +++ b/include/view/view.h @@ -35,6 +35,8 @@ #include +class EDA_ITEM; + namespace KIGFX { class PAINTER; diff --git a/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp b/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp index d5c3198c28..3c1f385a5d 100644 --- a/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp +++ b/pagelayout_editor/dialogs/panel_pl_editor_color_settings.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include "panel_pl_editor_color_settings.h" diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index caaa7922ac..da4d852498 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/pcbnew/cross-probing.cpp b/pcbnew/cross-probing.cpp index 2fcb8de783..1af21dbdaf 100644 --- a/pcbnew/cross-probing.cpp +++ b/pcbnew/cross-probing.cpp @@ -40,8 +40,10 @@ #include #include #include +#include #include #include +#include #include #include #include