Cleaned up util.hpp includes

src/actions/undo.cpp

@@ -38,7 +38,6 @@
 #include "units/map.hpp"              // for unit_map, etc
 #include "units/ptr.hpp"      // for unit_const_ptr, unit_ptr
 #include "units/types.hpp"               // for unit_type, unit_type_data, etc
-#include "util.hpp"                     // for bad_lexical_cast (ptr only), etc
 #include "whiteboard/manager.hpp"    // for manager
 
 #include "actions/create.hpp"                   // for find_recall_location, etc

src/ai/composite/aspect.hpp

@@ -26,7 +26,6 @@
 #include "scripting/game_lua_kernel.hpp"
 
 #include "log.hpp"
-#include "util.hpp"
 
 #include "utils/functional.hpp"
 

src/ai/composite/value_translator.hpp

@@ -25,7 +25,6 @@
 #include "ai/manager.hpp"
 #include "terrain/filter.hpp"
 #include "lexical_cast.hpp"
-#include "util.hpp"
 #include "serialization/string_utils.hpp"
 #include "resources.hpp"
 #include "ai/lua/aspect_advancements.hpp"

src/ai/default/recruitment.cpp

@@ -39,7 +39,6 @@
 #include "units/filter.hpp"
 #include "units/map.hpp"
 #include "units/types.hpp"
-#include "util.hpp"
 #include "variable.hpp"
 #include "wml_exception.hpp"
 #include "config_assign.hpp"

src/ai/lua/engine_lua.cpp

@@ -32,7 +32,6 @@
 #include "ai/lua/lua_object.hpp"
 #include "game_board.hpp"
 #include "scripting/game_lua_kernel.hpp"
-#include "util.hpp"
 #include "units/unit.hpp"
 #include "units/map.hpp"
 

src/ai/manager.cpp

@@ -40,8 +40,6 @@
 #include "game_config.hpp"              // for debug
 #include "ai/lua/aspect_advancements.hpp"
 #include "ai/registry.hpp"                 // for init
-#include "util.hpp"                     // for lexical_cast
-
 
 #include <algorithm>                    // for min
 #include <cassert>                     // for assert

src/ai/testing.cpp

@@ -21,7 +21,6 @@
 #include "log.hpp"
 #include "game_board.hpp"
 #include "replay.hpp"
-#include "util.hpp"
 #include "resources.hpp"
 #include "team.hpp"
 #include "units/unit.hpp"

src/attack_prediction.cpp

@@ -42,7 +42,6 @@
 #include "game_config.hpp"
 #include "preferences.hpp"
 #include "random_new.hpp"
-#include "util.hpp"
 #include <array>
 #include <cmath>
 #include <numeric>

src/campaign_server/campaign_server.cpp

@@ -34,7 +34,6 @@
 #include "campaign_server/blacklist.hpp"
 #include "campaign_server/control.hpp"
 #include "version.hpp"
-#include "util.hpp"
 #include "hash.hpp"
 
 #include <csignal>

src/color_range.cpp

@@ -23,7 +23,6 @@
 #include "game_config.hpp"
 #include "map/map.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 
 #include <iomanip>
 #include <unordered_set>

src/config.cpp

@@ -24,7 +24,6 @@
 
 #include "lexical_cast.hpp"
 #include "log.hpp"
-#include "util.hpp"
 #include "utils/const_clone.hpp"
 
 #include <cstdlib>

src/editor/action/action.cpp

@@ -21,7 +21,6 @@
 #include "editor/action/action.hpp"
 #include "editor/map/map_context.hpp"
 #include "gettext.hpp"
-#include "util.hpp"
 
 #include "resources.hpp"
 

src/editor/map/map_fragment.cpp

@@ -15,8 +15,6 @@
 
 #include "editor/map/map_fragment.hpp"
 
-#include "util.hpp"
-
 namespace editor {
 
 map_fragment::map_fragment()

src/filesystem_boost.cpp

@@ -45,7 +45,6 @@ using boost::uintmax_t;
 #include "config.hpp"
 #include "game_config.hpp"
 #include "log.hpp"
-#include "util.hpp"
 #include "version.hpp"
 
 static lg::log_domain log_filesystem("filesystem");

src/filesystem_common.cpp

@@ -11,7 +11,6 @@
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
-#include "util.hpp"
 
 static lg::log_domain log_filesystem("filesystem");
 #define LOG_FS LOG_STREAM(info, log_filesystem)

src/font/font_description.hpp

@@ -17,7 +17,6 @@
 
 #include "config.hpp"
 #include "lexical_cast.hpp"
-#include "util.hpp"
 #include "serialization/string_utils.hpp"
 
 #include <boost/optional.hpp>

src/game_classification.cpp

@@ -16,7 +16,6 @@
 #include "game_classification.hpp"
 #include "game_config.hpp"
 #include "config.hpp"
-#include "util.hpp"
 #include "serialization/string_utils.hpp"
 #include "log.hpp"
 

src/game_data.cpp

@@ -22,7 +22,6 @@
 #include "game_data.hpp"
 
 #include "log.hpp" //LOG_STREAM
-#include "util.hpp" //lexical_cast
 #include "variable.hpp" //scoped_wml_variable
 
 static lg::log_domain log_engine("engine");

src/game_events/conditional_wml.cpp

@@ -33,7 +33,6 @@
 #include "units/unit.hpp"
 #include "units/filter.hpp"
 #include "units/map.hpp"
-#include "util.hpp"
 #include "variable.hpp"
 
 static lg::log_domain log_engine("engine");

src/game_events/handlers.cpp

@@ -32,7 +32,6 @@
 #include "scripting/game_lua_kernel.hpp"
 #include "serialization/string_utils.hpp"
 #include "soundsource.hpp"
-#include "util.hpp"
 
 #include <iostream>
 

src/game_events/manager.cpp

@@ -30,7 +30,6 @@
 #include "scripting/game_lua_kernel.hpp"
 #include "serialization/string_utils.hpp"
 #include "soundsource.hpp"
-#include "util.hpp"
 
 #include <iostream>
 

src/game_events/manager_impl.cpp

@@ -26,7 +26,6 @@
 #include "resources.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 
 #include <iostream>
 

src/game_launcher.cpp

@@ -57,7 +57,6 @@
 #include "game_initialization/singleplayer.hpp"             // for sp_create_mode
 #include "statistics.hpp"
 #include "tstring.hpp"                  // for operator==, operator!=
-#include "util.hpp"                     // for lexical_cast_default
 #include "video.hpp"                    // for CVideo
 #include "wesnothd_connection_error.hpp"
 #include "wml_exception.hpp"            // for wml_exception

src/generators/cave_map_generator.cpp

@@ -25,7 +25,6 @@
 #include "map/map.hpp"
 #include "pathfind/pathfind.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 #include "seed_rng.hpp"
 
 static lg::log_domain log_engine("engine");

src/generators/default_map_generator_job.cpp

@@ -29,7 +29,6 @@
 #include "generators/map_generator.hpp" // mapgen_exception
 #include "pathfind/pathfind.hpp"
 #include "pathutils.hpp"
-#include "util.hpp"
 #include "utils/name_generator_factory.hpp"
 #include "seed_rng.hpp"
 #include "wml_exception.hpp"

src/generators/default_map_generator_job.hpp

@@ -23,7 +23,6 @@ class config;
 #include "map/location.hpp"
 #include "serialization/string_utils.hpp"
 #include "terrain/translation.hpp"
-#include "util.hpp"
 #include "utils/name_generator.hpp"
 
 #include <boost/random.hpp>

src/help/help_text_area.cpp

@@ -21,7 +21,6 @@
 #include "log.hpp"                      // for LOG_STREAM, log_domain, etc
 #include "sdl/rect.hpp"                 // for draw_rectangle, etc
 #include "serialization/parser.hpp"     // for read, write
-#include "util.hpp"                     // for lexical_cast, etc
 #include "video.hpp"                    // for CVideo
 
 #include <algorithm>                    // for max, min, find_if

src/lobby_preferences.cpp

@@ -15,7 +15,6 @@
 #include "lobby_preferences.hpp"
 #include "game_preferences.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 
 namespace preferences {
 

src/persist_var.cpp

@@ -22,7 +22,6 @@
 #include "play_controller.hpp"
 #include "synced_user_choice.hpp"
 #include "resources.hpp"
-#include "util.hpp"
 #include "variable.hpp"
 
 #include <cassert>

src/playsingle_controller.cpp

@@ -51,7 +51,6 @@
 #include "statistics.hpp"
 #include "storyscreen/interface.hpp"
 #include "units/unit.hpp"
-#include "util.hpp"
 #include "wesnothd_connection_error.hpp"
 #include "whiteboard/manager.hpp"
 #include "hotkey/hotkey_item.hpp"

src/playturn.cpp

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

src/saved_game.cpp

@@ -56,7 +56,6 @@
 #include "generators/map_create.hpp"
 #include "statistics.hpp"
 #include "serialization/binary_or_text.hpp"
-#include "util.hpp"
 #include "variable_info.hpp"
 #include "formula/string_utils.hpp"
 #include "config.hpp" //Also for variable_set

src/scripting/game_lua_kernel.cpp

@@ -104,7 +104,6 @@
 #include "units/map.hpp"  // for unit_map, etc
 #include "units/ptr.hpp"                 // for unit_const_ptr, unit_ptr
 #include "units/types.hpp"    // for unit_type_data, unit_types, etc
-#include "util.hpp"                     // for lexical_cast
 #include "variable.hpp"                 // for vconfig, etc
 #include "variable_info.hpp"
 #include "wml_exception.hpp"

src/scripting/lua_map_location_ops.cpp

@@ -16,7 +16,6 @@
 #include "scripting/lua_common.hpp"
 
 #include "map/location.hpp"
-#include "util.hpp"
 
 #include <string>
 #include <utility>

src/serialization/preprocessor.cpp

@@ -30,7 +30,6 @@
 #include "serialization/string_utils.hpp"
 #include "serialization/parser.hpp"
 #include "filesystem.hpp"
-#include "util.hpp"
 #include "version.hpp"
 
 #include <stdexcept>

src/serialization/string_utils.cpp

@@ -25,7 +25,6 @@
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
-#include "util.hpp"
 #include <cassert>
 #include <array>
 

src/serialization/unicode.cpp

@@ -25,7 +25,6 @@
 #include "serialization/unicode.hpp"
 
 #include "log.hpp"
-#include "util.hpp"
 
 #include <cassert>
 #include <limits>

src/server/sample_user_handler.cpp

@@ -17,7 +17,6 @@
 #include "config.hpp"
 #include "lexical_cast.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 
 #include <iostream>
 

src/sound.cpp

@@ -21,7 +21,6 @@
 #include "serialization/string_utils.hpp"
 #include "sound.hpp"
 #include "sound_music_track.hpp"
-#include "util.hpp"
 
 #include <SDL_mixer.h>
 #include <SDL.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>

src/sound_music_track.cpp

@@ -19,7 +19,6 @@
 #include "filesystem.hpp"
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 #if !defined(_WIN32) && !defined(__APPLE__)
 #include "vorbis/vorbisfile.h"
 #endif

src/statistics.cpp

@@ -25,7 +25,6 @@
 #include "serialization/binary_or_text.hpp"
 #include "team.hpp" // Needed to get team save_id
 #include "units/unit.hpp"
-#include "util.hpp"
 
 static lg::log_domain log_engine("engine");
 #define DBG_NG LOG_STREAM(debug, log_engine)

src/storyscreen/part.cpp

@@ -29,7 +29,6 @@
 #include "game_events/pump.hpp"
 #include "image.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 #include "variable.hpp"
 
 namespace storyscreen {

src/team.hpp

@@ -20,7 +20,6 @@
 #include "map/location.hpp"
 #include "recall_list_manager.hpp"
 #include "units/ptr.hpp"
-#include "util.hpp"
 #include "config.hpp"
 
 #include <set>

src/terrain/terrain.cpp

@@ -18,7 +18,6 @@
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
 #include "terrain/terrain.hpp"
-#include "util.hpp"
 
 #include <set>
 

src/terrain/translation.cpp

@@ -25,7 +25,6 @@
 #include "log.hpp"
 #include "terrain/translation.hpp"
 #include "serialization/string_utils.hpp"
-#include "util.hpp"
 #include "wml_exception.hpp"
 
 

src/units/attack_type.hpp

@@ -15,7 +15,6 @@
 #define UNIT_ATTACK_TYPE_H_INCLUDED
 
 #include "map/location.hpp"
-#include "util.hpp"
 #include "tstring.hpp"
 #include "config.hpp"
 #include <string>

src/units/types.cpp

@@ -29,7 +29,6 @@
 #include "units/unit.hpp"
 #include "units/abilities.hpp"
 #include "units/animation.hpp"
-#include "util.hpp"
 #include "utils/iterable_pair.hpp"
 
 #include "gui/auxiliary/typed_formula.hpp"