From d6cded53803de692eebc6dd41e9648f3399c9f7d Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 4 Oct 2009 17:16:41 +0000 Subject: (svn r17693) -Cleanup: remove some unneeded includes --- src/ai/ai_core.cpp | 1 - src/ai/ai_gui.cpp | 2 -- src/ai/ai_instance.cpp | 3 --- src/ai/ai_scanner.cpp | 3 --- src/ai/api/ai_abstractlist.cpp | 1 - src/ai/api/ai_airport.cpp | 2 -- src/ai/api/ai_basestation.cpp | 2 -- src/ai/api/ai_bridge.cpp | 1 - src/ai/api/ai_bridgelist.cpp | 1 - src/ai/api/ai_cargolist.cpp | 1 - src/ai/api/ai_company.cpp | 2 -- src/ai/api/ai_depotlist.cpp | 1 - src/ai/api/ai_event_types.cpp | 1 - src/ai/api/ai_group.cpp | 1 - src/ai/api/ai_industry.cpp | 1 - src/ai/api/ai_industrylist.cpp | 1 - src/ai/api/ai_industrytype.cpp | 1 - src/ai/api/ai_industrytypelist.cpp | 1 - src/ai/api/ai_object.cpp | 1 - src/ai/api/ai_order.cpp | 2 -- src/ai/api/ai_road.cpp | 2 -- src/ai/api/ai_sign.cpp | 1 - src/ai/api/ai_station.cpp | 4 ---- src/ai/api/ai_subsidy.cpp | 2 -- src/ai/api/ai_subsidylist.cpp | 1 - src/ai/api/ai_tile.cpp | 1 - src/ai/api/ai_tilelist.cpp | 2 -- src/ai/api/ai_town.cpp | 2 -- src/ai/api/ai_tunnel.cpp | 2 -- src/ai/api/ai_vehiclelist.cpp | 2 -- src/ai/api/ai_waypoint.cpp | 5 ----- src/ai/api/ai_waypointlist.cpp | 1 - 32 files changed, 54 deletions(-) (limited to 'src/ai') diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp index 298a8e3c0..a8e96085b 100644 --- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -15,7 +15,6 @@ #include "../company_func.h" #include "../debug.h" #include "../network/network.h" -#include "../settings_type.h" #include "../window_func.h" #include "../command_func.h" #include "ai.hpp" diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index c1139bbcf..b4808061b 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -20,9 +20,7 @@ #include "../gfx_func.h" #include "../command_func.h" #include "../network/network.h" -#include "../string_func.h" #include "../textbuf_gui.h" -#include "../settings_type.h" #include "../settings_func.h" #include "../network/network_content.h" diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp index 1405f6226..d55ca085d 100644 --- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -11,7 +11,6 @@ #include "../stdafx.h" #include "../debug.h" -#include "../settings_type.h" #include "../vehicle_base.h" #include "../saveload/saveload.h" #include "../gui.h" @@ -21,11 +20,9 @@ #include "../script/squirrel.hpp" #include "../script/squirrel_helper.hpp" #include "../script/squirrel_class.hpp" -#include "../script/squirrel_std.hpp" #define DEFINE_SCRIPT_FILES -#include "ai_info.hpp" #include "ai_config.hpp" #include "ai_storage.hpp" #include "ai_instance.hpp" diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp index 1d865fbfc..7467f773a 100644 --- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -11,12 +11,9 @@ #include "../stdafx.h" #include "../debug.h" -#include "../string_func.h" #include "../fileio_func.h" -#include "../fios.h" #include "../network/network.h" #include "../core/random_func.hpp" -#include #include #include "../script/squirrel.hpp" diff --git a/src/ai/api/ai_abstractlist.cpp b/src/ai/api/ai_abstractlist.cpp index 6647b725e..6194558eb 100644 --- a/src/ai/api/ai_abstractlist.cpp +++ b/src/ai/api/ai_abstractlist.cpp @@ -12,7 +12,6 @@ #include #include "ai_abstractlist.hpp" #include "../../debug.h" -#include "../../core/alloc_func.hpp" #include "../../script/squirrel.hpp" /** diff --git a/src/ai/api/ai_airport.cpp b/src/ai/api/ai_airport.cpp index d3a5f90b6..27870cb3a 100644 --- a/src/ai/api/ai_airport.cpp +++ b/src/ai/api/ai_airport.cpp @@ -13,9 +13,7 @@ #include "ai_station.hpp" #include "../../station_base.h" #include "../../company_func.h" -#include "../../command_type.h" #include "../../town.h" -#include "../../economy_func.h" /* static */ bool AIAirport::IsValidAirportType(AirportType type) { diff --git a/src/ai/api/ai_basestation.cpp b/src/ai/api/ai_basestation.cpp index e6c7fb6b4..137829cf8 100644 --- a/src/ai/api/ai_basestation.cpp +++ b/src/ai/api/ai_basestation.cpp @@ -10,13 +10,11 @@ /** @file ai_basestation.cpp Implementation of AIBaseStation. */ #include "ai_basestation.hpp" -#include "../../base_station_base.h" #include "../../station_base.h" #include "../../command_func.h" #include "../../string_func.h" #include "../../strings_func.h" #include "../../company_func.h" -#include "../../core/alloc_func.hpp" #include "table/strings.h" /* static */ bool AIBaseStation::IsValidBaseStation(StationID station_id) diff --git a/src/ai/api/ai_bridge.cpp b/src/ai/api/ai_bridge.cpp index d62924a53..4fb9e1778 100644 --- a/src/ai/api/ai_bridge.cpp +++ b/src/ai/api/ai_bridge.cpp @@ -16,7 +16,6 @@ #include "../../strings_func.h" #include "../../core/alloc_func.hpp" #include "../../economy_func.h" -#include "../../settings_type.h" #include "../../date_func.h" /* static */ bool AIBridge::IsValidBridge(BridgeID bridge_id) diff --git a/src/ai/api/ai_bridgelist.cpp b/src/ai/api/ai_bridgelist.cpp index 75e2d42c2..82d857d07 100644 --- a/src/ai/api/ai_bridgelist.cpp +++ b/src/ai/api/ai_bridgelist.cpp @@ -12,7 +12,6 @@ #include "ai_bridgelist.hpp" #include "ai_bridge.hpp" #include "../../bridge.h" -#include "../../date_func.h" AIBridgeList::AIBridgeList() { diff --git a/src/ai/api/ai_cargolist.cpp b/src/ai/api/ai_cargolist.cpp index 9546bb578..d04af550f 100644 --- a/src/ai/api/ai_cargolist.cpp +++ b/src/ai/api/ai_cargolist.cpp @@ -12,7 +12,6 @@ #include "ai_cargolist.hpp" #include "ai_industry.hpp" #include "../../cargotype.h" -#include "../../tile_type.h" #include "../../industry.h" AICargoList::AICargoList() diff --git a/src/ai/api/ai_company.cpp b/src/ai/api/ai_company.cpp index cf85a3644..f6fe91878 100644 --- a/src/ai/api/ai_company.cpp +++ b/src/ai/api/ai_company.cpp @@ -11,7 +11,6 @@ #include "ai_company.hpp" #include "ai_error.hpp" -#include "ai_log.hpp" #include "../../command_func.h" #include "../../company_func.h" #include "../../company_base.h" @@ -19,7 +18,6 @@ #include "../../economy_func.h" #include "../../strings_func.h" #include "../../tile_map.h" -#include "../../core/alloc_func.hpp" #include "../../string_func.h" #include "../../settings_func.h" #include "table/strings.h" diff --git a/src/ai/api/ai_depotlist.cpp b/src/ai/api/ai_depotlist.cpp index 4c926c00c..558b6c31d 100644 --- a/src/ai/api/ai_depotlist.cpp +++ b/src/ai/api/ai_depotlist.cpp @@ -10,7 +10,6 @@ /** @file ai_depotlist.cpp Implementation of AIDepotList and friends. */ #include "ai_depotlist.hpp" -#include "../../tile_map.h" #include "../../company_func.h" #include "../../depot_base.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp index 5500d15cb..2c2b8cb91 100644 --- a/src/ai/api/ai_event_types.cpp +++ b/src/ai/api/ai_event_types.cpp @@ -14,7 +14,6 @@ #include "../../command_type.h" #include "../../strings_func.h" #include "../../settings_type.h" -#include "../../rail.h" #include "../../engine_base.h" #include "../../articulated_vehicles.h" #include "table/strings.h" diff --git a/src/ai/api/ai_group.cpp b/src/ai/api/ai_group.cpp index cebb7f334..c9d3795cb 100644 --- a/src/ai/api/ai_group.cpp +++ b/src/ai/api/ai_group.cpp @@ -16,7 +16,6 @@ #include "../../group.h" #include "../../string_func.h" #include "../../strings_func.h" -#include "../../core/alloc_func.hpp" #include "../../command_func.h" #include "../../autoreplace_func.h" #include "../../settings_func.h" diff --git a/src/ai/api/ai_industry.cpp b/src/ai/api/ai_industry.cpp index 2002374e6..7a5489470 100644 --- a/src/ai/api/ai_industry.cpp +++ b/src/ai/api/ai_industry.cpp @@ -12,7 +12,6 @@ #include "ai_industry.hpp" #include "ai_cargo.hpp" #include "ai_map.hpp" -#include "../../tile_type.h" #include "../../industry.h" #include "../../strings_func.h" #include "../../station_base.h" diff --git a/src/ai/api/ai_industrylist.cpp b/src/ai/api/ai_industrylist.cpp index e8af79c5d..323012fcc 100644 --- a/src/ai/api/ai_industrylist.cpp +++ b/src/ai/api/ai_industrylist.cpp @@ -10,7 +10,6 @@ /** @file ai_industrylist.cpp Implementation of AIIndustryList and friends. */ #include "ai_industrylist.hpp" -#include "../../tile_type.h" #include "../../industry.h" AIIndustryList::AIIndustryList() diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp index ce19235c8..1f2084565 100644 --- a/src/ai/api/ai_industrytype.cpp +++ b/src/ai/api/ai_industrytype.cpp @@ -12,7 +12,6 @@ #include "ai_industrytype.hpp" #include "ai_map.hpp" #include "../../command_type.h" -#include "../../settings_type.h" #include "../../strings_func.h" #include "../../industry.h" diff --git a/src/ai/api/ai_industrytypelist.cpp b/src/ai/api/ai_industrytypelist.cpp index e31fbe2aa..d5c3fe56a 100644 --- a/src/ai/api/ai_industrytypelist.cpp +++ b/src/ai/api/ai_industrytypelist.cpp @@ -10,7 +10,6 @@ /** @file ai_industrytypelist.cpp Implementation of AIIndustryTypeList. */ #include "ai_industrytypelist.hpp" -#include "../../tile_type.h" #include "../../industry.h" AIIndustryTypeList::AIIndustryTypeList() diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp index 45012c20c..e30f0c388 100644 --- a/src/ai/api/ai_object.cpp +++ b/src/ai/api/ai_object.cpp @@ -14,7 +14,6 @@ #include "../../script/squirrel.hpp" #include "../../company_base.h" -#include "ai_log.hpp" #include "table/strings.h" #include "../ai.hpp" #include "../ai_storage.hpp" diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp index 1e18333fa..5ecdb27a6 100644 --- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -9,9 +9,7 @@ /** @file ai_order.cpp Implementation of AIOrder. */ -#include "ai_order.hpp" #include "ai_vehicle.hpp" -#include "ai_log.hpp" #include "../ai_instance.hpp" #include "../../debug.h" #include "../../vehicle_base.h" diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp index b8f4706b0..c43eb64ec 100644 --- a/src/ai/api/ai_road.cpp +++ b/src/ai/api/ai_road.cpp @@ -9,13 +9,11 @@ /** @file ai_road.cpp Implementation of AIRoad. */ -#include "ai_road.hpp" #include "ai_map.hpp" #include "ai_station.hpp" #include "ai_cargo.hpp" #include "../../station_base.h" #include "../../command_type.h" -#include "../../settings_type.h" #include "../../company_func.h" #include "../../script/squirrel_helper_type.hpp" diff --git a/src/ai/api/ai_sign.cpp b/src/ai/api/ai_sign.cpp index 90603859d..ce36b1848 100644 --- a/src/ai/api/ai_sign.cpp +++ b/src/ai/api/ai_sign.cpp @@ -10,7 +10,6 @@ /** @file ai_sign.cpp Implementation of AISign. */ #include "ai_sign.hpp" -#include "ai_log.hpp" #include "table/strings.h" #include "../ai_instance.hpp" #include "../../command_func.h" diff --git a/src/ai/api/ai_station.cpp b/src/ai/api/ai_station.cpp index ce9dc62a8..670355dff 100644 --- a/src/ai/api/ai_station.cpp +++ b/src/ai/api/ai_station.cpp @@ -13,15 +13,11 @@ #include "ai_cargo.hpp" #include "ai_map.hpp" #include "ai_town.hpp" -#include "../../command_func.h" #include "../../debug.h" #include "../../station_base.h" #include "../../roadstop_base.h" -#include "../../string_func.h" -#include "../../strings_func.h" #include "../../company_func.h" #include "../../town.h" -#include "table/strings.h" /* static */ bool AIStation::IsValidStation(StationID station_id) { diff --git a/src/ai/api/ai_subsidy.cpp b/src/ai/api/ai_subsidy.cpp index 5b4f0f980..3d1edbb9b 100644 --- a/src/ai/api/ai_subsidy.cpp +++ b/src/ai/api/ai_subsidy.cpp @@ -11,10 +11,8 @@ #include "ai_subsidy.hpp" #include "ai_date.hpp" -#include "ai_log.hpp" #include "../../subsidy_base.h" #include "../../station_base.h" -#include "../../cargotype.h" /* static */ bool AISubsidy::IsValidSubsidy(SubsidyID subsidy_id) { diff --git a/src/ai/api/ai_subsidylist.cpp b/src/ai/api/ai_subsidylist.cpp index 9bad869f7..25a11f2d6 100644 --- a/src/ai/api/ai_subsidylist.cpp +++ b/src/ai/api/ai_subsidylist.cpp @@ -10,7 +10,6 @@ /** @file ai_subsidylist.cpp Implementation of AISubsidyList. */ #include "ai_subsidylist.hpp" -#include "ai_subsidy.hpp" #include "../../subsidy_base.h" AISubsidyList::AISubsidyList() diff --git a/src/ai/api/ai_tile.cpp b/src/ai/api/ai_tile.cpp index 35eed526b..b7e41d7fa 100644 --- a/src/ai/api/ai_tile.cpp +++ b/src/ai/api/ai_tile.cpp @@ -12,7 +12,6 @@ #include "ai_tile.hpp" #include "ai_map.hpp" #include "ai_town.hpp" -#include "ai_log.hpp" #include "../../station_func.h" #include "../../company_func.h" #include "../../road_map.h" diff --git a/src/ai/api/ai_tilelist.cpp b/src/ai/api/ai_tilelist.cpp index d77dcd827..22ce7968d 100644 --- a/src/ai/api/ai_tilelist.cpp +++ b/src/ai/api/ai_tilelist.cpp @@ -11,10 +11,8 @@ #include "ai_tilelist.hpp" #include "ai_industry.hpp" -#include "../../tile_map.h" #include "../../industry.h" #include "../../station_base.h" -#include "../../settings_type.h" void AITileList::FixRectangleSpan(TileIndex &t1, TileIndex &t2) { diff --git a/src/ai/api/ai_town.cpp b/src/ai/api/ai_town.cpp index 78144b998..7f8dc3090 100644 --- a/src/ai/api/ai_town.cpp +++ b/src/ai/api/ai_town.cpp @@ -13,10 +13,8 @@ #include "ai_map.hpp" #include "ai_cargo.hpp" #include "ai_error.hpp" -#include "../../command_type.h" #include "../../town.h" #include "../../strings_func.h" -#include "../../core/alloc_func.hpp" #include "../../company_func.h" #include "../../station_base.h" #include "table/strings.h" diff --git a/src/ai/api/ai_tunnel.cpp b/src/ai/api/ai_tunnel.cpp index 3cd5cf0c5..71b700e9b 100644 --- a/src/ai/api/ai_tunnel.cpp +++ b/src/ai/api/ai_tunnel.cpp @@ -14,8 +14,6 @@ #include "../ai_instance.hpp" #include "../../tunnel_map.h" #include "../../command_func.h" -#include "../../tunnelbridge.h" -#include "../../road_func.h" /* static */ bool AITunnel::IsTunnelTile(TileIndex tile) { diff --git a/src/ai/api/ai_vehiclelist.cpp b/src/ai/api/ai_vehiclelist.cpp index 61cbc9198..616c8cc12 100644 --- a/src/ai/api/ai_vehiclelist.cpp +++ b/src/ai/api/ai_vehiclelist.cpp @@ -13,9 +13,7 @@ #include "ai_group.hpp" #include "ai_map.hpp" #include "ai_station.hpp" -#include "ai_vehicle.hpp" #include "../../company_func.h" -#include "../../depot_base.h" #include "../../depot_map.h" #include "../../vehicle_base.h" diff --git a/src/ai/api/ai_waypoint.cpp b/src/ai/api/ai_waypoint.cpp index 5eeb7143a..8f7eadf50 100644 --- a/src/ai/api/ai_waypoint.cpp +++ b/src/ai/api/ai_waypoint.cpp @@ -11,13 +11,8 @@ #include "ai_waypoint.hpp" #include "ai_rail.hpp" -#include "../../command_func.h" -#include "../../string_func.h" -#include "../../strings_func.h" #include "../../company_func.h" #include "../../waypoint_base.h" -#include "../../core/alloc_func.hpp" -#include "table/strings.h" /* static */ bool AIWaypoint::IsValidWaypoint(StationID waypoint_id) { diff --git a/src/ai/api/ai_waypointlist.cpp b/src/ai/api/ai_waypointlist.cpp index c75f4340d..13087df81 100644 --- a/src/ai/api/ai_waypointlist.cpp +++ b/src/ai/api/ai_waypointlist.cpp @@ -11,7 +11,6 @@ #include "ai_waypointlist.hpp" #include "ai_vehicle.hpp" -#include "ai_waypoint.hpp" #include "../../company_func.h" #include "../../vehicle_base.h" #include "../../waypoint_base.h" -- cgit v1.2.3-54-g00ecf