From 53845bc024230dec47742e1e3f613e2b204463e3 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 31 Oct 2023 02:07:29 +0000 Subject: [PATCH] Codechange: Move includes to correct place. Some other source file inadvertently included things via smallmap_gui.h --- src/linkgraph/linkgraph_gui.cpp | 2 ++ src/settings_table.cpp | 2 ++ src/smallmap_gui.cpp | 7 ++++++- src/smallmap_gui.h | 13 ++++--------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp index 18337ffa18..e94ba9786c 100644 --- a/src/linkgraph/linkgraph_gui.cpp +++ b/src/linkgraph/linkgraph_gui.cpp @@ -19,6 +19,8 @@ #include "../smallmap_gui.h" #include "../core/geometry_func.hpp" #include "../widgets/link_graph_legend_widget.h" +#include "../strings_func.h" +#include "linkgraph_gui.h" #include "table/strings.h" diff --git a/src/settings_table.cpp b/src/settings_table.cpp index f81bb0721e..e0aed793b2 100644 --- a/src/settings_table.cpp +++ b/src/settings_table.cpp @@ -46,6 +46,8 @@ #include "vehicle_func.h" #include "viewport_func.h" #include "void_map.h" +#include "station_func.h" +#include "station_base.h" #include "table/strings.h" #include "table/settings.h" diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp index c4333ad616..e2ec46f9d8 100644 --- a/src/smallmap_gui.cpp +++ b/src/smallmap_gui.cpp @@ -23,7 +23,12 @@ #include "window_func.h" #include "company_base.h" #include "zoom_func.h" - +#include "strings_func.h" +#include "blitter/factory.hpp" +#include "linkgraph/linkgraph_gui.h" +#include "widgets/smallmap_widget.h" +#include "timer/timer.h" +#include "timer/timer_window.h" #include "smallmap_gui.h" #include "table/strings.h" diff --git a/src/smallmap_gui.h b/src/smallmap_gui.h index 9285f00d97..8eb6906e31 100644 --- a/src/smallmap_gui.h +++ b/src/smallmap_gui.h @@ -10,15 +10,10 @@ #ifndef SMALLMAP_GUI_H #define SMALLMAP_GUI_H -#include "industry_type.h" -#include "company_base.h" -#include "window_gui.h" -#include "strings_func.h" -#include "blitter/factory.hpp" -#include "linkgraph/linkgraph_gui.h" -#include "widgets/smallmap_widget.h" -#include "timer/timer.h" -#include "timer/timer_window.h" +#include "core/geometry_type.hpp" +#include "station_type.h" +#include "tile_type.h" +#include "window_type.h" /* set up the cargos to be displayed in the smallmap's route legend */ void BuildLinkStatsLegend();