From d086f288cd8dcc4949981a6fc99a530429e5e705 Mon Sep 17 00:00:00 2001 From: PeterN Date: Mon, 29 May 2023 14:29:00 +0100 Subject: [PATCH] Codechange: Remove duplicated includes. (#10888) These are now included by stdafx.h so don't need to be included again. --- src/graph_gui.cpp | 1 - src/mixer.cpp | 1 - src/music/extmidi.cpp | 1 - src/os/macosx/crashlog_osx.cpp | 1 - src/os/os2/os2.cpp | 1 - src/os/os2/os2_main.cpp | 1 - src/os/unix/crashlog_unix.cpp | 1 - src/os/unix/unix.cpp | 1 - src/os/windows/win32.cpp | 1 - src/script/api/script_industry.cpp | 1 - src/story_gui.cpp | 2 -- src/tgp.cpp | 1 - src/vehicle_gui_base.h | 2 -- src/video/opengl.cpp | 1 - 14 files changed, 16 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index b9284ef949..c145befc88 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -29,7 +29,6 @@ #include "table/strings.h" #include "table/sprites.h" -#include #include "safeguards.h" diff --git a/src/mixer.cpp b/src/mixer.cpp index b862353383..95f1c30f9d 100644 --- a/src/mixer.cpp +++ b/src/mixer.cpp @@ -8,7 +8,6 @@ /** @file mixer.cpp Mixing of sound samples. */ #include "stdafx.h" -#include #include #include #include "core/math_func.hpp" diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp index cf19f17cff..69dd259d8a 100644 --- a/src/music/extmidi.cpp +++ b/src/music/extmidi.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include "../safeguards.h" diff --git a/src/os/macosx/crashlog_osx.cpp b/src/os/macosx/crashlog_osx.cpp index f5149493e0..8c9c0ebcaf 100644 --- a/src/os/macosx/crashlog_osx.cpp +++ b/src/os/macosx/crashlog_osx.cpp @@ -15,7 +15,6 @@ #include "../../video/video_driver.hpp" #include "macos.h" -#include #include #include #include diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp index be62ab466a..235478ff27 100644 --- a/src/os/os2/os2.cpp +++ b/src/os/os2/os2.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #ifndef __INNOTEK_LIBC__ # include diff --git a/src/os/os2/os2_main.cpp b/src/os/os2/os2_main.cpp index a411a07151..9f903e3868 100644 --- a/src/os/os2/os2_main.cpp +++ b/src/os/os2/os2_main.cpp @@ -12,7 +12,6 @@ #include "../../core/random_func.hpp" #include "../../string_func.h" -#include #include #include "../../safeguards.h" diff --git a/src/os/unix/crashlog_unix.cpp b/src/os/unix/crashlog_unix.cpp index dcfe273435..ed46f771e7 100644 --- a/src/os/unix/crashlog_unix.cpp +++ b/src/os/unix/crashlog_unix.cpp @@ -13,7 +13,6 @@ #include "../../gamelog.h" #include "../../saveload/saveload.h" -#include #include #include diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp index edacf2feaf..8fa259454b 100644 --- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -108,7 +108,6 @@ bool FiosIsHiddenFile(const struct dirent *ent) #ifdef WITH_ICONV #include -#include #include "../../debug.h" #include "../../string_func.h" diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index 07987cb14d..affa3c9dc9 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -23,7 +23,6 @@ #include "../../fios.h" #include "../../core/alloc_func.hpp" #include "../../string_func.h" -#include #include #include "../../language.h" #include "../../thread.h" diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp index 7b76af2cda..dfb28638df 100644 --- a/src/script/api/script_industry.cpp +++ b/src/script/api/script_industry.cpp @@ -22,7 +22,6 @@ #include "../../industry_cmd.h" #include "../../timer/timer_game_calendar.h" #include "table/strings.h" -#include #include "../../safeguards.h" diff --git a/src/story_gui.cpp b/src/story_gui.cpp index b96ef35e4c..e804b40c40 100644 --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -31,8 +31,6 @@ #include "table/strings.h" #include "table/sprites.h" -#include - #include "safeguards.h" static CursorID TranslateStoryPageButtonCursor(StoryPageButtonCursor cursor); diff --git a/src/tgp.cpp b/src/tgp.cpp index 15a8da57ed..92255f1781 100644 --- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -8,7 +8,6 @@ /** @file tgp.cpp OTTD Perlin Noise Landscape Generator, aka TerraGenesis Perlin */ #include "stdafx.h" -#include #include "clear_map.h" #include "void_map.h" #include "genworld.h" diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h index 86c722bfd6..8ebaae2f49 100644 --- a/src/vehicle_gui_base.h +++ b/src/vehicle_gui_base.h @@ -19,8 +19,6 @@ #include "window_gui.h" #include "widgets/dropdown_type.h" -#include - typedef GUIList GUIVehicleList; struct GUIVehicleGroup { diff --git a/src/video/opengl.cpp b/src/video/opengl.cpp index c5e82425c3..9c13361498 100644 --- a/src/video/opengl.cpp +++ b/src/video/opengl.cpp @@ -36,7 +36,6 @@ #include "../debug.h" #include "../blitter/factory.hpp" #include "../zoom_func.h" -#include #include "../table/opengl_shader.h" #include "../table/sprites.h"