Cleaned up unnecessary inclusion of formula/string_utils.hpp

These were either not needed, or serialization/string_utils.hpp was desired instead.

src/addon/manager.cpp

@@ -30,7 +30,7 @@
 #include "log.hpp"
 #include "serialization/parser.hpp"
 #include "version.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 #include "addon/client.hpp"
 
 #include <boost/algorithm/string.hpp>

src/editor/map/editor_map.cpp

@@ -15,7 +15,6 @@
 
 #include "editor/action/action_base.hpp"
 #include "editor/map/editor_map.hpp"
-#include "formula/string_utils.hpp"
 
 #include "display.hpp"
 #include "formula/string_utils.hpp"

src/editor/palette/terrain_palettes.cpp

@@ -21,7 +21,7 @@
 #include "editor/palette/terrain_palettes.hpp"
 
 #include "gettext.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 
 namespace {
 	static t_translation::terrain_code fg_terrain;

src/game_initialization/create_engine.cpp

@@ -15,7 +15,6 @@
 #include "game_initialization/create_engine.hpp"
 
 #include "filesystem.hpp"
-#include "formula/string_utils.hpp"
 #include "game_config_manager.hpp"
 #include "preferences/credentials.hpp"
 #include "preferences/game.hpp"
@@ -32,6 +31,7 @@
 
 #include "serialization/preprocessor.hpp"
 #include "serialization/parser.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <sstream>
 #include <cctype>

src/game_initialization/depcheck.cpp

@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "utils/general.hpp"

src/generators/default_map_generator_job.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "generators/default_map_generator_job.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 #include "game_config_manager.hpp"
 #include "gettext.hpp"
 #include "language.hpp"

src/gui/dialogs/network_transmission.cpp

@@ -16,7 +16,6 @@
 
 #include "gui/dialogs/network_transmission.hpp"
 
-#include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/widgets/button.hpp"

src/minimap.cpp

@@ -18,7 +18,6 @@
 
 #include "color.hpp"
 #include "display.hpp"
-#include "formula/string_utils.hpp"
 #include "game_board.hpp"
 #include "gettext.hpp"
 #include "image.hpp"

src/mp_game_settings.cpp

@@ -20,7 +20,7 @@
 
 #include "log.hpp"
 #include "mp_game_settings.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)

src/playmp_controller.cpp

@@ -29,7 +29,7 @@
 #include "resources.hpp"
 #include "savegame.hpp"
 #include "sound.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 #include "whiteboard/manager.hpp"
 #include "countdown_clock.hpp"
 #include "synced_context.hpp"

src/save_index.cpp

@@ -18,7 +18,6 @@
 #include "config.hpp"
 #include "filesystem.hpp"
 #include "format_time_summary.hpp"
-#include "formula/string_utils.hpp"
 #include "game_end_exceptions.hpp"
 #include "game_errors.hpp"
 #include "gettext.hpp"

src/team.cpp

@@ -22,7 +22,6 @@
 #include "ai/manager.hpp"
 #include "color.hpp"
 #include "font/text_formatting.hpp"
-#include "formula/string_utils.hpp"
 #include "game_data.hpp"
 #include "game_events/pump.hpp"
 #include "map/map.hpp"

src/teambuilder.cpp

@@ -24,7 +24,7 @@
 #include "resources.hpp"
 #include "gettext.hpp"
 #include "game_errors.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <deque>
 #include <vector>

src/tod_manager.cpp

@@ -15,7 +15,7 @@
 #include "tod_manager.hpp"
 
 #include "display_context.hpp"
-#include "formula/string_utils.hpp"
+#include "serialization/string_utils.hpp"
 #include "game_data.hpp"
 #include "gettext.hpp"
 #include "log.hpp"