More include cleanups

Cleaned up unnecessary inclusions of:
* event.hpp
* exceptions.hpp
* formatter.hpp
* hash.hpp
* image.hpp
* sound.hpp
* team.hpp
* tstring.hpp
* wml_exception.hpp

src/addon/manager.cpp

@@ -16,7 +16,6 @@
 #include "addon/manager.hpp"
 #include "addon/manager_ui.hpp"
 #include "filesystem.hpp"
-#include "formatter.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/addon/connect.hpp"

src/ai/composite/goal.cpp

@@ -33,7 +33,6 @@
 #include "units/unit.hpp"
 #include "units/map.hpp"
 #include "units/filter.hpp"
-#include "wml_exception.hpp"
 
 #include <set>
 #include <sstream>

src/ai/configuration.cpp

@@ -24,7 +24,6 @@
 #include "log.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
-#include "wml_exception.hpp"
 
 #include <vector>
 #include <deque>

src/ai/default/recruitment.cpp

@@ -42,7 +42,6 @@
 #include "units/types.hpp"
 #include "units/unit.hpp"
 #include "variable.hpp"
-#include "wml_exception.hpp"
 
 #include <cmath>
 

src/chat_events.cpp

@@ -13,7 +13,6 @@
 
 #include "chat_events.hpp"
 
-#include "formatter.hpp"
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "log.hpp"

src/config.hpp

@@ -48,7 +48,6 @@
 
 #include "config_attribute_value.hpp"
 #include "exceptions.hpp"
-#include "tstring.hpp"
 
 #ifdef HAVE_CXX14
 #	ifdef __clang__ // Check this first, because clang also defines __GNUC__

src/config_attribute_value.hpp

@@ -46,7 +46,6 @@
 #include <boost/variant/variant.hpp>
 #include <boost/range/iterator_range.hpp>
 
-#include "exceptions.hpp"
 #include "tstring.hpp"
 
 #ifdef HAVE_CXX14

src/deprecation.cpp

@@ -16,7 +16,6 @@
 #include "log.hpp"
 #include "gettext.hpp"
 #include "formula/string_utils.hpp"
-#include "tstring.hpp"
 #include "game_config.hpp"
 #include "version.hpp"
 #include "preferences/general.hpp"

src/editor/map/map_context.cpp

@@ -29,7 +29,6 @@
 #include "team.hpp"
 #include "terrain/type_data.hpp"
 #include "units/unit.hpp"
-#include "wml_exception.hpp"
 
 #include <boost/regex.hpp>
 

src/game_display.cpp

@@ -38,7 +38,6 @@
 #include "resources.hpp"
 #include "tod_manager.hpp"
 #include "color.hpp"
-#include "sound.hpp"
 #include "synced_context.hpp"
 #include "terrain/type_data.hpp"
 #include "units/unit.hpp"

src/game_events/action_wml.cpp

@@ -50,7 +50,6 @@
 #include "resources.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "side_filter.hpp"
-#include "sound.hpp"
 #include "soundsource.hpp"
 #include "synced_context.hpp"
 #include "synced_user_choice.hpp"

src/game_initialization/create_engine.cpp

@@ -20,8 +20,6 @@
 #include "preferences/game.hpp"
 #include "generators/map_create.hpp"
 #include "gui/dialogs/campaign_difficulty.hpp"
-#include "hash.hpp"
-#include "image.hpp"
 #include "log.hpp"
 #include "map/exception.hpp"
 #include "map/map.hpp"

src/game_initialization/lobby_info.cpp

@@ -21,7 +21,6 @@
 #include "mp_ui_alerts.hpp"
 #include "preferences/game.hpp"
 #include "wesnothd_connection.hpp"
-#include "wml_exception.hpp"
 
 #include <iterator>
 

src/gui/auxiliary/field.hpp

@@ -28,7 +28,6 @@
 #include "gui/widgets/selectable_item.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
-#include "wml_exception.hpp"
 
 namespace gui2
 {

src/gui/dialogs/editor/custom_tod.cpp

@@ -30,7 +30,6 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/slider.hpp"
 #include "gui/widgets/text_box.hpp"
-#include "image.hpp"
 
 #include "utils/functional.hpp"
 

src/gui/dialogs/game_load.hpp

@@ -18,7 +18,6 @@
 #include "gui/dialogs/transient_message.hpp"
 #include "savegame.hpp"
 #include "save_index.hpp"
-#include "tstring.hpp"
 #include "gettext.hpp"
 
 #include <SDL_keycode.h>

src/gui/dialogs/unit_attack.cpp

@@ -36,7 +36,6 @@
 #include "help/help.hpp"
 #include "language.hpp"
 #include "color.hpp"
-#include "team.hpp"
 #include "units/unit.hpp"
 
 #include "utils/functional.hpp"

src/gui/dialogs/unit_create.cpp

@@ -37,7 +37,6 @@
 #include "game_config.hpp"
 #include "gettext.hpp"
 #include "play_controller.hpp"
-#include "team.hpp"
 #include "units/types.hpp"
 
 #include "utils/functional.hpp"

src/gui/widgets/generator.hpp

@@ -15,7 +15,6 @@
 #pragma once
 
 #include "widget.hpp"
-#include "tstring.hpp"
 
 #include <boost/dynamic_bitset.hpp>
 

src/gui/widgets/toggle_button.cpp

@@ -22,7 +22,6 @@
 #include "gui/core/log.hpp"
 #include "gui/core/window_builder/helper.hpp"
 #include "sound.hpp"
-#include "wml_exception.hpp"
 
 #include "utils/functional.hpp"
 

src/gui/widgets/window.cpp

@@ -56,7 +56,6 @@
 #include "preferences/display.hpp"
 #include "sdl/rect.hpp"
 #include "sdl/surface.hpp"
-#include "tstring.hpp"
 #include "formula/variant.hpp"
 #include "video.hpp"
 #include "wml_exception.hpp"

src/hotkey/command_executor.hpp

@@ -16,7 +16,6 @@
 
 #include "hotkey_command.hpp"
 #include "game_end_exceptions.hpp"
-#include "events.hpp"
 
 class display;
 class CVideo;

src/hotkey/hotkey_handler.cpp

@@ -16,7 +16,6 @@
 
 #include "actions/create.hpp"
 #include "font/standard_colors.hpp"
-#include "formatter.hpp"
 #include "formula/string_utils.hpp"
 #include "game_display.hpp"
 #include "game_errors.hpp"

src/map/map.cpp

@@ -27,7 +27,6 @@
 #include "serialization/string_utils.hpp"
 #include "terrain/terrain.hpp"
 #include "terrain/type_data.hpp"
-#include "wml_exception.hpp"
 
 #include <algorithm>
 #include <sstream>

src/menu_events.cpp

@@ -31,7 +31,6 @@
 #include "color.hpp"
 #include "display_chat_manager.hpp"
 #include "font/standard_colors.hpp"
-#include "formatter.hpp"
 #include "formula/string_utils.hpp"
 #include "game_board.hpp"
 #include "game_config_manager.hpp"
@@ -77,7 +76,6 @@
 #include "savegame.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "scripting/plugins/manager.hpp"
-#include "sound.hpp"
 #include "synced_context.hpp"
 #include "terrain/builder.hpp"
 #include "units/udisplay.hpp"

src/minimap.cpp

@@ -28,7 +28,6 @@
 #include "sdl/surface.hpp"
 #include "team.hpp"
 #include "terrain/type_data.hpp"
-#include "wml_exception.hpp"
 
 static lg::log_domain log_display("display");
 #define DBG_DP LOG_STREAM(debug, log_display)

src/mouse_events.cpp

@@ -39,7 +39,6 @@
 #include "synced_context.hpp"
 #include "team.hpp" // for team
 #include "tod_manager.hpp"
-#include "tstring.hpp" // for t_string
 #include "units/animation_component.hpp"
 #include "units/ptr.hpp"           // for unit_const_ptr
 #include "units/unit.hpp"          // for unit

src/mt_rng.cpp

@@ -15,7 +15,6 @@
 #include "mt_rng.hpp"
 #include "seed_rng.hpp"
 #include "config.hpp"
-#include "formatter.hpp"
 #include "log.hpp"
 #include <sstream>
 #include <iomanip>

src/play_controller.cpp

@@ -61,7 +61,6 @@
 #include "units/unit.hpp"
 #include "units/id.hpp"
 #include "whiteboard/manager.hpp"
-#include "wml_exception.hpp"
 
 #include "utils/functional.hpp"
 

src/playmp_controller.cpp

@@ -28,7 +28,6 @@
 #include "game_initialization/playcampaign.hpp"
 #include "resources.hpp"
 #include "savegame.hpp"
-#include "sound.hpp"
 #include "serialization/string_utils.hpp"
 #include "whiteboard/manager.hpp"
 #include "countdown_clock.hpp"

src/playturn.cpp

@@ -34,7 +34,6 @@
 #include "resources.hpp"                // for gameboard, screen, etc
 #include "serialization/string_utils.hpp"  // for string_map
 #include "team.hpp"                     // for team, team::CONTROLLER::AI, etc
-#include "tstring.hpp"                  // for operator==
 #include "wesnothd_connection_error.hpp"
 #include "whiteboard/manager.hpp"       // for manager
 #include "widgets/button.hpp"           // for button

src/preferences/display.cpp

@@ -23,7 +23,6 @@
 
 #include "display.hpp"
 #include "filesystem.hpp"
-#include "formatter.hpp"
 #include "formula/string_utils.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"

src/scripting/game_lua_kernel.cpp

@@ -55,7 +55,6 @@
 #include "game_events/pump.hpp"         // for queued_event
 #include "preferences/game.hpp"         // for encountered_units
 #include "help/help.hpp"
-#include "image.hpp"                    // for get_image, locator
 #include "log.hpp"                      // for LOG_STREAM, logger, etc
 #include "utils/make_enum.hpp"                // for operator<<
 #include "map/map.hpp"                      // for gamemap

src/scripting/lua_fileops.cpp

@@ -14,7 +14,6 @@
 
 #include "scripting/lua_fileops.hpp"
 
-#include "exceptions.hpp"
 #include "filesystem.hpp"
 #include "game_config.hpp" //for game_config::debug_lua
 #include "game_errors.hpp"

src/scripting/lua_kernel_base.cpp

@@ -14,7 +14,6 @@
 
 #include "scripting/lua_kernel_base.hpp"
 
-#include "exceptions.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
 #include "gui/core/gui_definition.hpp"

src/server/server.cpp

@@ -36,7 +36,6 @@
 #include "server/player.hpp"
 #include "server/simple_wml.hpp"
 #include "server/ban.hpp"
-#include "exceptions.hpp"
 
 #include "server/user_handler.hpp"
 #include "server/sample_user_handler.hpp"

src/storyscreen/controller.hpp

@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include "events.hpp"
 #include "storyscreen/parser.hpp"
 
 #include <memory>
 #include <string>
+#include <vector>
 
 namespace storyscreen
 {

src/tod_manager.cpp

@@ -24,7 +24,6 @@
 #include "random.hpp"
 #include "units/unit.hpp"
 #include "units/abilities.hpp"
-#include "wml_exception.hpp"
 #include "resources.hpp"
 
 #include <algorithm>

src/units/filter.cpp

@@ -29,7 +29,6 @@
 #include "units/formula_manager.hpp"
 #include "units/types.hpp"
 #include "variable.hpp" // needed for vconfig, scoped unit
-#include "wml_exception.hpp" // needed for FAIL
 #include "formula/callable_objects.hpp"
 #include "formula/formula.hpp"
 #include "formula/function_gamestate.hpp"

src/wesnoth.cpp

@@ -49,7 +49,6 @@
 #include "serialization/validator.hpp" // for strict_validation_enabled
 #include "sound.hpp"                   // for commit_music_changes, etc
 #include "statistics.hpp"              // for fresh_stats
-#include "tstring.hpp"                 // for operator==, t_string
 #include "utils/functional.hpp"
 #include "version.hpp"        // for version_info
 #include "video.hpp"          // for CVideo

src/wesnothd_connection.hpp

@@ -35,7 +35,6 @@
 #endif // endif _WIN32
 
 #include "configr_assign.hpp"
-#include "exceptions.hpp"
 #include "wesnothd_connection_error.hpp"
 
 #include <boost/asio.hpp>