Cleaned up various util includes

src/buffered_istream.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "utils/general.hpp"
-
 #include <cstdio>
 #include <sstream>
 

src/color_range.cpp

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

src/desktop/paths.cpp

@@ -21,7 +21,6 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "preferences/general.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 
 #if !defined(_WIN32) && !defined(__APPLE__)

src/editor/palette/tristate_button.cpp

@@ -24,7 +24,6 @@
 #include "log.hpp"
 #include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
-#include "serialization/string_utils.hpp"
 #include "sound.hpp"
 #include "video.hpp"
 

src/game_events/handlers.cpp

@@ -20,11 +20,9 @@
 
 #include "game_events/handlers.hpp"
 
-#include "formula/string_utils.hpp"
 #include "game_data.hpp"
 #include "log.hpp"
 #include "scripting/game_lua_kernel.hpp"
-#include "serialization/string_utils.hpp"
 #include "sound.hpp"
 #include "variable.hpp"
 

src/game_initialization/lobby_data.cpp

@@ -27,7 +27,6 @@
 #include "map/map.hpp"
 #include "map/exception.hpp"
 #include "terrain/type_data.hpp"
-#include "utils/general.hpp"
 #include "wml_exception.hpp"
 #include "version.hpp"
 

src/game_initialization/lobby_info.cpp

@@ -14,7 +14,6 @@
 
 #include "game_initialization/lobby_info.hpp"
 
-#include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map/exception.hpp"

src/generators/map_create.cpp

@@ -18,7 +18,6 @@
 #include "generators/default_map_generator.hpp"
 #include "generators/lua_map_generator.hpp"
 #include "log.hpp"
-#include "serialization/string_utils.hpp"
 
 #include <cassert>
 #include <sstream>

src/gui/auxiliary/filter.hpp

@@ -21,7 +21,6 @@
 
 #include "gui/widgets/text_box.hpp"
 #include "lexical_cast.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 
 namespace gui2

src/gui/core/linked_group_definition.cpp

@@ -15,7 +15,6 @@
 #include "linked_group_definition.hpp"
 
 #include "formula/string_utils.hpp"
-#include "serialization/string_utils.hpp"
 #include "wml_exception.hpp"
 
 namespace gui2

src/gui/dialogs/campaign_selection.cpp

@@ -35,7 +35,6 @@
 #include "gui/widgets/window.hpp"
 #include "lexical_cast.hpp"
 #include "preferences/game.hpp"
-#include "serialization/string_utils.hpp"
 
 #include "utils/functional.hpp"
 #include "utils/irdya_datetime.hpp"

src/gui/dialogs/core_selection.cpp

@@ -28,7 +28,6 @@
 #include "gui/widgets/scroll_label.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "serialization/string_utils.hpp"
 
 #include "utils/functional.hpp"
 

src/gui/dialogs/game_version.cpp

@@ -21,7 +21,6 @@
 #include "desktop/open.hpp"
 #include "desktop/version.hpp"
 #include "filesystem.hpp"
-#include "formula/string_utils.hpp"
 #include "game_config.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
@@ -41,7 +40,7 @@
 #ifdef _WIN32
 #include "log_windows.hpp"
 #endif
-#include "serialization/string_utils.hpp"
+#include "formula/string_utils.hpp"
 
 #include "gettext.hpp"
 

src/gui/dialogs/multiplayer/mp_alerts_options.cpp

@@ -27,7 +27,6 @@
 
 #include "mp_ui_alerts.hpp"
 #include "preferences/general.hpp"
-#include "formula/string_utils.hpp"
 
 #include "utils/functional.hpp"
 

src/gui/dialogs/unit_recall.cpp

@@ -43,9 +43,8 @@
 #include "units/types.hpp"
 #include "units/unit.hpp"
 #include "units/ptr.hpp"
-#include "utils/general.hpp"
-
 #include "utils/functional.hpp"
+
 #include <boost/dynamic_bitset.hpp>
 
 static lg::log_domain log_display("display");

src/gui/widgets/addon_list.cpp

@@ -19,7 +19,6 @@
 #include "color.hpp"
 #include "font/text_formatting.hpp"
 #include "formatter.hpp"
-#include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/core/event/dispatcher.hpp"

src/gui/widgets/password_box.cpp

@@ -21,7 +21,6 @@
 #include "gui/core/log.hpp"
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 
 #include "desktop/clipboard.hpp"

src/gui/widgets/slider.cpp

@@ -25,7 +25,7 @@
 #include "gui/widgets/window.hpp"
 #include "sdl/rect.hpp"
 #include "sound.hpp"
-#include "utils/math.hpp"
+#include "utils/general.hpp"
 #include "gettext.hpp"
 #include "wml_exception.hpp"
 

src/gui/widgets/text_box_base.cpp

@@ -19,7 +19,6 @@
 #include "desktop/clipboard.hpp"
 #include "gui/core/log.hpp"
 #include "gui/core/timer.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 
 #include "utils/functional.hpp"

src/mouse_events.cpp

@@ -35,7 +35,6 @@
 #include "play_controller.hpp"               // for playing_side, set_button_state
 #include "replay_helper.hpp"
 #include "scripting/game_lua_kernel.hpp"
-#include "serialization/string_utils.hpp" // for unicode_em_dash
 #include "sound.hpp"
 #include "synced_context.hpp"
 #include "team.hpp" // for team

src/preferences/editor.cpp

@@ -16,7 +16,6 @@
 #include "config.hpp"
 #include "preferences/game.hpp"
 #include "lexical_cast.hpp"
-#include "serialization/string_utils.hpp"
 
 namespace preferences {
 

src/preferences/lobby.cpp

@@ -14,7 +14,6 @@
 
 #include "preferences/lobby.hpp"
 #include "preferences/game.hpp"
-#include "serialization/string_utils.hpp"
 
 namespace preferences {
 

src/sdl/utils.cpp

@@ -20,8 +20,6 @@
 #include "sdl/utils.hpp"
 #include "sdl/rect.hpp"
 #include "color.hpp"
-
-#include "serialization/string_utils.hpp"
 #include "xBRZ/xbrz.hpp"
 
 #include <algorithm>

src/serialization/tokenizer.cpp

@@ -15,9 +15,9 @@
 
 /** @file */
 
-#include "wesconfig.h"
+#include "global.hpp"
 #include "serialization/tokenizer.hpp"
-
+#include "wesconfig.h"
 
 tokenizer::tokenizer(std::istream& in) :
 	current_(EOF),

src/server/player.cpp

@@ -14,7 +14,6 @@
 
 #include "server/player.hpp"
 #include "lexical_cast.hpp"
-#include "serialization/string_utils.hpp"
 
 wesnothd::player::player(const std::string& n, simple_wml::node& cfg,
                          bool registered, const size_t max_messages,

src/server/user_handler.cpp

@@ -15,9 +15,9 @@
 #include "server/user_handler.hpp"
 #include "config.hpp"
 #include "random.hpp"
-#include "serialization/string_utils.hpp"
 
 #include <ctime>
+#include <sstream>
 
 bool user_handler::send_mail(const std::string& to_user,
 		const std::string& /*subject*/, const std::string& /*message*/) {

src/soundsource.cpp

@@ -15,7 +15,6 @@
 #include "display.hpp"
 #include "log.hpp"
 #include "random.hpp"
-#include "serialization/string_utils.hpp"
 #include "sound.hpp"
 #include "soundsource.hpp"
 

src/terrain/terrain.hpp

@@ -16,7 +16,6 @@
 
 #include "config.hpp"
 #include "terrain/translation.hpp"
-#include "utils/general.hpp"
 #include "utils/math.hpp"
 
 class terrain_type

src/units/formula_manager.cpp

@@ -17,7 +17,6 @@
 #include "formula/callable_objects.hpp"
 #include "config.hpp"
 #include "formula/formula.hpp"
-#include "formula/string_utils.hpp"
 #include "map/location.hpp"
 #include "log.hpp"
 

src/units/types.hpp

@@ -20,7 +20,6 @@
 #include "movetype.hpp"
 #include "units/race.hpp"
 #include "units/attack_type.hpp"
-#include "utils/math.hpp"
 #include "game_errors.hpp"
 
 #include <array>

src/wesnoth.cpp

@@ -45,7 +45,6 @@
 #include "serialization/binary_or_text.hpp" // for config_writer
 #include "serialization/parser.hpp"         // for read
 #include "serialization/preprocessor.hpp"   // for preproc_define, etc
-#include "serialization/string_utils.hpp"
 #include "serialization/unicode_cast.hpp"
 #include "serialization/validator.hpp" // for strict_validation_enabled
 #include "sound.hpp"                   // for commit_music_changes, etc