Codechange: Include table/strings.h in files that use StringIDs.

Be consistent with how and where the file is incldued.

src/ai/ai_gui.cpp

@@ -21,6 +21,7 @@
 #include "ai_config.hpp"
 #include "ai_info.hpp"
 #include "../script/script_gui.h"
+
 #include "table/strings.h"
 
 #include "../safeguards.h"

src/ai/ai_instance.cpp

@@ -10,6 +10,8 @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../error.h"
+#include "../company_base.h"
+#include "../company_func.h"
 
 #include "../script/squirrel_class.hpp"
 
@@ -22,15 +24,14 @@
 #include "ai_info.hpp"
 #include "ai_instance.hpp"
 
+#include "table/strings.h"
+
 /* Manually include the Text glue. */
 #include "../script/api/template/template_text.hpp.sq"
 
 /* Convert all AI related classes to Squirrel data. */
 #include "../script/api/ai/ai_includes.hpp"
 
-#include "../company_base.h"
-#include "../company_func.h"
-
 #include "../safeguards.h"
 
 AIInstance::AIInstance() :

src/airport.cpp

@@ -9,6 +9,7 @@
 
 #include "stdafx.h"
 #include "station_base.h"
+
 #include "table/strings.h"
 #include "table/airport_movement.h"
 #include "table/airporttile_ids.h"

src/airport_gui.cpp

@@ -38,6 +38,8 @@
 
 #include "widgets/airport_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/autoreplace_gui.cpp

@@ -33,6 +33,8 @@
 
 #include "widgets/autoreplace_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 static bool EngineNumberSorter(const GUIEngineListItem &a, const GUIEngineListItem &b)

src/cheat_gui.cpp

@@ -39,6 +39,7 @@
 #include "widgets/cheat_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 

src/company_gui.cpp

@@ -49,6 +49,8 @@
 
 #include "widgets/company_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/console_cmds.cpp

@@ -41,13 +41,14 @@
 #include "road.h"
 #include "rail.h"
 #include "game/game.hpp"
-#include "table/strings.h"
 #include "3rdparty/fmt/chrono.h"
 #include "company_cmd.h"
 #include "misc_cmd.h"
 
 #include <sstream>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /* scriptfile handling */

src/date_gui.cpp

@@ -19,6 +19,8 @@
 
 #include "widgets/date_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/driver.cpp

@@ -16,10 +16,11 @@
 #include "strings_func.h"
 #include "video/video_driver.hpp"
 #include "string_func.h"
-#include "table/strings.h"
 #include "fileio_func.h"
 #include <sstream>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 std::string _ini_videodriver;        ///< The video driver a stored in the configuration file.

src/dropdown.cpp

@@ -20,6 +20,8 @@
 
 #include "widgets/dropdown_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 std::unique_ptr<DropDownListItem> MakeDropDownListDividerItem()

src/framerate_gui.cpp

@@ -13,7 +13,6 @@
 #include "newgrf_sound.h"
 #include "window_gui.h"
 #include "window_func.h"
-#include "table/sprites.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "console_func.h"
@@ -31,6 +30,8 @@
 #include <atomic>
 #include <mutex>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 static std::mutex _sound_perf_lock;

src/game/game_gui.cpp

@@ -25,7 +25,8 @@
 #include "game_info.hpp"
 #include "../script/script_gui.h"
 #include "../script_config.hpp"
-#include "../table/strings.h"
+
+#include "table/strings.h"
 
 #include "../safeguards.h"
 

src/game/game_instance.cpp

@@ -21,6 +21,8 @@
 #include "game_text.hpp"
 #include "game.hpp"
 
+#include "table/strings.h"
+
 /* Convert all Game related classes to Squirrel data. */
 #include "../script/api/game/game_includes.hpp"
 

src/genworld.cpp

@@ -43,6 +43,8 @@
 #include "thread.h"
 #include "tgp.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/genworld_gui.cpp

@@ -37,6 +37,8 @@
 
 #include "widgets/genworld_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/group_gui.cpp

@@ -34,6 +34,7 @@
 #include "widgets/group_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 

src/help_gui.cpp

@@ -20,6 +20,8 @@
 #include "widgets/help_widget.h"
 #include "widgets/misc_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 static const std::string README_FILENAME = "README.md";

src/highscore.cpp

@@ -15,9 +15,10 @@
 #include "fileio_func.h"
 #include "string_func.h"
 #include "strings_func.h"
-#include "table/strings.h"
 #include "debug.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 HighScoresTable _highscore_table; ///< Table with all the high scores.

src/highscore_gui.cpp

@@ -9,7 +9,6 @@
 
 #include "stdafx.h"
 #include "highscore.h"
-#include "table/strings.h"
 #include "gfx_func.h"
 #include "table/sprites.h"
 #include "window_gui.h"
@@ -27,6 +26,8 @@
 
 #include "widgets/highscore_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 struct EndGameHighScoreBaseWindow : Window {

src/music/extmidi.cpp

@@ -24,6 +24,8 @@
 #include <signal.h>
 #include <sys/stat.h>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 #ifndef EXTERNAL_PLAYER

src/music/midifile.cpp

@@ -18,6 +18,8 @@
 #include "../console_func.h"
 #include "../console_internal.h"
 
+#include "table/strings.h"
+
 /* SMF reader based on description at: http://www.somascape.org/midi/tech/mfile.html */
 
 

src/network/core/network_game_info.cpp

@@ -27,6 +27,8 @@
 #include "../network_internal.h"
 #include "packet.h"
 
+#include "table/strings.h"
+
 #include "../../safeguards.h"
 
 

src/network/core/tcp_content.cpp

@@ -18,6 +18,8 @@
 #include "../../fios.h"
 #include "tcp_content.h"
 
+#include "table/strings.h"
+
 #include "../../safeguards.h"
 
 /**

src/network/core/tcp_listen.h

@@ -16,6 +16,7 @@
 #include "../network.h"
 #include "../../core/pool_type.hpp"
 #include "../../debug.h"
+
 #include "table/strings.h"
 
 /**

src/network/network.cpp

@@ -44,6 +44,8 @@
 #include <sstream>
 #include <iomanip>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 #ifdef DEBUG_DUMP_COMMANDS

src/network/network_admin.cpp

@@ -23,6 +23,8 @@
 #include "../rev.h"
 #include "../game/game.hpp"
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 

src/network/network_gui.cpp

@@ -40,14 +40,13 @@
 #include "../timer/timer_window.h"
 #include "../timer/timer_game_calendar.h"
 #include "../textfile_gui.h"
+#include "../stringfilter_type.h"
 
 #include "../widgets/network_widget.h"
 
 #include "table/strings.h"
 #include "../table/sprites.h"
 
-#include "../stringfilter_type.h"
-
 #ifdef __EMSCRIPTEN__
 #	include <emscripten.h>
 #endif

src/network/network_server.cpp

@@ -37,6 +37,8 @@
 #include <mutex>
 #include <condition_variable>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 

src/network/network_udp.cpp

@@ -26,6 +26,7 @@
 #include "../rev.h"
 #include "../newgrf_text.h"
 #include "../strings_func.h"
+
 #include "table/strings.h"
 
 #include "core/udp.h"

src/newgrf_airport.cpp

@@ -17,6 +17,8 @@
 #include "newgrf_class_func.h"
 #include "town.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /**

src/newgrf_airporttiles.cpp

@@ -18,9 +18,10 @@
 #include "landscape.h"
 #include "company_base.h"
 #include "town.h"
+#include "newgrf_animation_base.h"
+
 #include "table/strings.h"
 #include "table/airporttiles.h"
-#include "newgrf_animation_base.h"
 
 #include "safeguards.h"
 

src/newgrf_gui.cpp

@@ -36,6 +36,7 @@
 #include "widgets/misc_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 

src/newgrf_object.cpp

@@ -24,6 +24,8 @@
 #include "water.h"
 #include "newgrf_animation_base.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /** The override manager for our objects. */

src/newgrf_roadstop.cpp

@@ -26,6 +26,8 @@
 #include "newgrf_animation_base.h"
 #include "newgrf_sound.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 template <>

src/newgrf_station.cpp

@@ -26,6 +26,8 @@
 #include "newgrf_class_func.h"
 #include "timer/timer_game_calendar.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/openttd.cpp

@@ -81,6 +81,8 @@
 
 #include <system_error>
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 #ifdef __EMSCRIPTEN__

src/order_backup.cpp

@@ -20,6 +20,8 @@
 #include "group_cmd.h"
 #include "vehicle_func.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 OrderBackupPool _order_backup_pool("BackupOrder");

src/order_gui.cpp

@@ -37,6 +37,8 @@
 
 #include "widgets/order_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/picker_gui.cpp

@@ -32,6 +32,7 @@
 #include "widgets/picker_widget.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include <charconv>
 

src/rail_gui.cpp

@@ -48,6 +48,8 @@
 
 #include "widgets/rail_widget.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/saveload/afterload.cpp

@@ -71,6 +71,8 @@
 
 #include <signal.h>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = CompanyID::Invalid());

src/saveload/oldloader.cpp

@@ -13,12 +13,10 @@
 #include "../string_func.h"
 #include "../settings_type.h"
 #include "../fileio_func.h"
-
-#include "table/strings.h"
-
 #include "saveload_internal.h"
 #include "oldloader.h"
 
+#include "table/strings.h"
 
 #include "../safeguards.h"
 

src/saveload/saveload.cpp

@@ -45,6 +45,8 @@
 #include "../strings_type.h"
 #include "../newgrf_railtype.h"
 #include "../newgrf_roadtype.h"
+#include "saveload_internal.h"
+#include "saveload_filter.h"
 
 #include <atomic>
 #ifdef __EMSCRIPTEN__
@@ -53,9 +55,6 @@
 
 #include "table/strings.h"
 
-#include "saveload_internal.h"
-#include "saveload_filter.h"
-
 #include "../safeguards.h"
 
 extern const SaveLoadVersion SAVEGAME_VERSION = (SaveLoadVersion)(SL_MAX_VERSION - 1); ///< Current savegame version of OpenTTD.

src/saveload/waypoint_sl.cpp

@@ -15,11 +15,10 @@
 #include "../town.h"
 #include "../newgrf.h"
 #include "../timer/timer_game_calendar.h"
+#include "saveload_internal.h"
 
 #include "table/strings.h"
 
-#include "saveload_internal.h"
-
 #include "../safeguards.h"
 
 using OldWaypointID = uint16_t;

src/script/api/script_basestation.cpp

@@ -16,6 +16,7 @@
 #include "../../station_cmd.h"
 #include "../../waypoint_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_bridge.cpp

@@ -17,6 +17,7 @@
 #include "../../road_cmd.h"
 #include "../../tunnelbridge_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_cargo.cpp

@@ -13,6 +13,7 @@
 #include "../../core/bitmath_func.hpp"
 #include "../../strings_func.h"
 #include "../../settings_type.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_company.cpp

@@ -24,6 +24,7 @@
 #include "../../misc_cmd.h"
 #include "../../object_cmd.h"
 #include "../../settings_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_engine.cpp

@@ -19,6 +19,7 @@
 #include "../../articulated_vehicles.h"
 #include "../../engine_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_event_types.cpp

@@ -19,6 +19,7 @@
 #include "../../economy_cmd.h"
 #include "../../engine_cmd.h"
 #include "../../3rdparty/nlohmann/json.hpp"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_group.cpp

@@ -19,6 +19,7 @@
 #include "../../autoreplace_cmd.h"
 #include "../../group_cmd.h"
 #include "../../settings_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_industry.cpp

@@ -21,6 +21,7 @@
 #include "../../newgrf_industries.h"
 #include "../../industry_cmd.h"
 #include "../../timer/timer_game_calendar.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_sign.cpp

@@ -9,7 +9,6 @@
 
 #include "../../stdafx.h"
 #include "script_sign.hpp"
-#include "table/strings.h"
 #include "../script_instance.hpp"
 #include "../../signs_base.h"
 #include "../../string_func.h"
@@ -17,6 +16,8 @@
 #include "../../tile_map.h"
 #include "../../signs_cmd.h"
 
+#include "table/strings.h"
+
 #include "../../safeguards.h"
 
 /* static */ bool ScriptSign::IsValidSign(SignID sign_id)

src/script/api/script_town.cpp

@@ -18,6 +18,7 @@
 #include "../../station_base.h"
 #include "../../landscape.h"
 #include "../../town_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_vehicle.cpp

@@ -24,6 +24,7 @@
 #include "../../roadveh_cmd.h"
 #include "../../train_cmd.h"
 #include "../../vehicle_cmd.h"
+
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/script_config.cpp

@@ -16,6 +16,8 @@
 #include "../string_func.h"
 #include <charconv>
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 void ScriptConfig::Change(std::optional<std::string> name, int version, bool force_exact_match)

src/script/script_gui.cpp

@@ -38,6 +38,7 @@
 #include "../game/game_config.hpp"
 #include "../game/game_info.hpp"
 #include "../game/game_instance.hpp"
+
 #include "table/strings.h"
 
 #include "../safeguards.h"

src/settingentry_gui.cpp

@@ -17,6 +17,7 @@
 #include "strings_func.h"
 
 #include "table/sprites.h"
+#include "table/strings.h"
 
 #include "safeguards.h"
 

src/settings_gui.cpp

@@ -52,6 +52,8 @@
 #include "sound_func.h"
 #include "settingentry_gui.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/spriteloader/grf.cpp

@@ -12,7 +12,6 @@
 #include "../debug.h"
 #include "../settings_type.h"
 #include "../strings_func.h"
-#include "table/strings.h"
 #include "../error.h"
 #include "../core/math_func.hpp"
 #include "../core/alloc_type.hpp"
@@ -20,6 +19,8 @@
 #include "../spritecache.h"
 #include "grf.hpp"
 
+#include "table/strings.h"
+
 #include "../safeguards.h"
 
 extern const uint8_t _palmap_w2d[];

src/toolbar_gui.cpp

@@ -67,6 +67,8 @@
 #include "network/network_gui.h"
 #include "network/network_func.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/vehicle_gui.cpp

@@ -46,6 +46,8 @@
 #include "hotkeys.h"
 #include "group_cmd.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 

src/window.cpp

@@ -39,6 +39,8 @@
 #include "timer/timer.h"
 #include "timer/timer_window.h"
 
+#include "table/strings.h"
+
 #include "safeguards.h"
 
 /** Values for _settings_client.gui.auto_scrolling */