Removed utils/functional.hpp

projectfiles/CodeBlocks-SCons/wesnoth.cbp

@@ -1137,7 +1137,6 @@
 		<Unit filename="../../src/utils/const_clone.hpp" />
 		<Unit filename="../../src/utils/context_free_grammar_generator.cpp" />
 		<Unit filename="../../src/utils/context_free_grammar_generator.hpp" />
-		<Unit filename="../../src/utils/functional.hpp" />
 		<Unit filename="../../src/utils/general.hpp" />
 		<Unit filename="../../src/utils/irdya_datetime.cpp" />
 		<Unit filename="../../src/utils/irdya_datetime.hpp" />

projectfiles/CodeBlocks/tests.cbp

@@ -1220,7 +1220,6 @@
 		<Unit filename="../../src/utils/const_clone.hpp" />
 		<Unit filename="../../src/utils/context_free_grammar_generator.cpp" />
 		<Unit filename="../../src/utils/context_free_grammar_generator.hpp" />
-		<Unit filename="../../src/utils/functional.hpp" />
 		<Unit filename="../../src/utils/general.hpp" />
 		<Unit filename="../../src/utils/irdya_datetime.cpp" />
 		<Unit filename="../../src/utils/irdya_datetime.hpp" />

projectfiles/CodeBlocks/wesnoth.cbp

@@ -1022,7 +1022,7 @@
 		<Unit filename="../../src/scripting/lua_terrainfilter.cpp" />
 		<Unit filename="../../src/scripting/lua_terrainfilter.hpp" />
 		<Unit filename="../../src/scripting/lua_terrainmap.cpp" />
-		<Unit filename="../../src/scripting/lua_terrainmap.hpp" /> 
+		<Unit filename="../../src/scripting/lua_terrainmap.hpp" />
 		<Unit filename="../../src/scripting/lua_unit.cpp" />
 		<Unit filename="../../src/scripting/lua_unit.hpp" />
 		<Unit filename="../../src/scripting/lua_unit_attacks.cpp" />
@@ -1185,7 +1185,6 @@
 		<Unit filename="../../src/utils/const_clone.hpp" />
 		<Unit filename="../../src/utils/context_free_grammar_generator.cpp" />
 		<Unit filename="../../src/utils/context_free_grammar_generator.hpp" />
-		<Unit filename="../../src/utils/functional.hpp" />
 		<Unit filename="../../src/utils/general.hpp" />
 		<Unit filename="../../src/utils/irdya_datetime.cpp" />
 		<Unit filename="../../src/utils/irdya_datetime.hpp" />

projectfiles/VC16/wesnoth.vcxproj

@@ -4132,7 +4132,6 @@
     <ClInclude Include="..\..\src\units\unit.hpp" />
     <ClInclude Include="..\..\src\utils\const_clone.hpp" />
     <ClInclude Include="..\..\src\utils\context_free_grammar_generator.hpp" />
-    <ClInclude Include="..\..\src\utils\functional.hpp" />
     <ClInclude Include="..\..\src\utils\general.hpp" />
     <ClInclude Include="..\..\src\utils\io.hpp" />
     <ClInclude Include="..\..\src\utils\irdya_datetime.hpp" />

projectfiles/VC16/wesnoth.vcxproj.filters

@@ -2483,9 +2483,6 @@
     <ClInclude Include="..\..\src\utils\context_free_grammar_generator.hpp">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\utils\functional.hpp">
-      <Filter>utils</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\utils\general.hpp">
       <Filter>utils</Filter>
     </ClInclude>

src/ai/composite/ai.cpp

@@ -29,7 +29,7 @@
 #include "actions/attack.hpp"
 #include "log.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace ai {
 

src/ai/composite/aspect.hpp

@@ -26,7 +26,7 @@
 
 #include "log.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <boost/range/adaptor/reversed.hpp>
 

src/ai/composite/property_handler.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "utils/functional.hpp"
+#include <functional>
 #include "config.hpp"
 #include "ai/composite/component.hpp"
 

src/ai/default/stage_rca.cpp

@@ -27,7 +27,7 @@
 #include "ai/gamestate_observer.hpp"
 #include "log.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace ai {
 

src/config.cpp

@@ -24,7 +24,7 @@
 #include "lexical_cast.hpp"
 #include "log.hpp"
 #include "utils/const_clone.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "deprecation.hpp"
 #include "game_version.hpp"
 #include "serialization/string_utils.hpp"

src/config_attribute_value.cpp

@@ -24,7 +24,7 @@
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
 #include "utils/const_clone.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <cstdlib>
 #include <cstring>

src/display.hpp

@@ -64,7 +64,7 @@ namespace wb {
 
 #include <boost/circular_buffer.hpp>
 
-#include "utils/functional.hpp"
+#include <functional>
 #include <chrono>
 #include <cstdint>
 #include <deque>

src/editor/controller/editor_controller.cpp

@@ -53,7 +53,7 @@
 #include "game_config_manager.hpp"
 #include "quit_confirmation.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace {
 static std::vector<std::string> saved_windows_;

src/game_initialization/multiplayer.cpp

@@ -43,7 +43,7 @@
 #include "resources.hpp"
 #include "replay.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <fstream>
 

src/game_state.cpp

@@ -33,7 +33,7 @@
 #include "whiteboard/manager.hpp"
 #include "gui/dialogs/loading_screen.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 #include <SDL2/SDL_timer.h>
 
 #include <algorithm>

src/gui/core/event/dispatcher.hpp

@@ -16,7 +16,7 @@
 
 #include "gui/core/event/handler.hpp"
 #include "hotkey/hotkey_command.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <SDL2/SDL_events.h>
 

src/gui/core/event/distributor.cpp

@@ -25,7 +25,7 @@
 #include "gui/widgets/text_box_base.hpp"
 #include "sdl/userevent.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/core/static_registry.cpp

@@ -15,7 +15,7 @@
 #include "gui/core/static_registry.hpp"
 
 #include "gui/core/log.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <map>
 #include <set>

src/gui/core/timer.hpp

@@ -29,7 +29,7 @@
 
 #pragma once
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <SDL2/SDL_types.h>
 

src/gui/core/window_builder.cpp

@@ -29,7 +29,7 @@
 #include "gui/widgets/window.hpp"
 #include "wml_exception.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/core/window_builder.hpp

@@ -19,7 +19,7 @@
 #include "gui/widgets/grid.hpp"
 #include "color.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 class config;
 

src/gui/dialogs/addon/connect.cpp

@@ -23,7 +23,7 @@
 #include "gui/widgets/text_box.hpp"
 #include "help/help.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/addon/manager.cpp

@@ -51,7 +51,7 @@
 
 #include "config.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <iomanip>
 #include <sstream>

src/gui/dialogs/campaign_selection.cpp

@@ -32,7 +32,7 @@
 #include "lexical_cast.hpp"
 #include "preferences/game.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 #include "utils/irdya_datetime.hpp"
 
 namespace gui2

src/gui/dialogs/chat_log.cpp

@@ -33,7 +33,7 @@
 #include "replay.hpp"
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 #include "utils/iterable_pair.hpp"
 
 #include <vector>

src/gui/dialogs/core_selection.cpp

@@ -24,7 +24,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/debug_clock.cpp

@@ -24,7 +24,7 @@
 #include "gui/widgets/pane.hpp"
 #include "gui/widgets/progress_bar.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <ctime>
 

src/gui/dialogs/drop_down_menu.cpp

@@ -30,7 +30,7 @@
 #include "gui/widgets/window.hpp"
 
 #include "sdl/rect.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/editor/custom_tod.cpp

@@ -30,7 +30,7 @@
 #include "gui/widgets/slider.hpp"
 #include "gui/widgets/text_box.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/editor/edit_label.cpp

@@ -21,7 +21,7 @@
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/editor/edit_side.cpp

@@ -20,7 +20,7 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/editor/generate_map.cpp

@@ -26,7 +26,7 @@
 #include "generators/map_generator.hpp"
 #include "lexical_cast.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define ERR_ED LOG_STREAM_INDENT(err, editor)
 

src/gui/dialogs/editor/generator_settings.cpp

@@ -22,7 +22,7 @@
 #include "gui/widgets/status_label_helper.hpp"
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/editor/resize_map.cpp

@@ -20,7 +20,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/slider.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/end_credits.cpp

@@ -27,7 +27,7 @@
 #include "gui/widgets/window.hpp"
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <sstream>
 

src/gui/dialogs/formula_debugger.cpp

@@ -24,7 +24,7 @@
 #include "formula/debugger.hpp"
 #include "font/pango/escape.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/game_cache_options.cpp

@@ -29,7 +29,7 @@
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include "gettext.hpp"
 

src/gui/dialogs/game_load.cpp

@@ -42,7 +42,7 @@
 #include "preferences/game.hpp"
 #include "serialization/string_utils.hpp"
 #include "utils/general.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "game_config_view.hpp"
 
 #include <cctype>

src/gui/dialogs/game_stats.cpp

@@ -36,7 +36,7 @@
 #include "units/map.hpp"
 #include "units/unit.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 static lg::log_domain log_display("display");
 #define LOG_DP LOG_STREAM(info, log_display)

src/gui/dialogs/game_version_dialog.cpp

@@ -39,7 +39,7 @@
 
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace
 {

src/gui/dialogs/gamestate_inspector.cpp

@@ -43,7 +43,7 @@
 #include "filter_context.hpp"
 
 #include <vector>
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace
 {

src/gui/dialogs/loading_screen.cpp

@@ -29,7 +29,7 @@
 #include "gui/widgets/window.hpp"
 #include "log.hpp"
 #include "preferences/general.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "video.hpp"
 
 #include <chrono>

src/gui/dialogs/lua_interpreter.cpp

@@ -44,7 +44,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include "utils/functional.hpp"
+#include <functional>
 
 #ifdef HAVE_HISTORY
 #include "filesystem.hpp"

src/gui/dialogs/modal_dialog.hpp

@@ -16,7 +16,7 @@
 
 #include "gui/auxiliary/field-fwd.hpp"
 #include "gui/core/static_registry.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <string>
 #include <vector>

src/gui/dialogs/multiplayer/faction_select.cpp

@@ -32,7 +32,7 @@
 #include "preferences/game.hpp"	// for encountered_units
 #include "units/types.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/multiplayer/lobby.cpp

@@ -50,7 +50,7 @@
 #include "playmp_controller.hpp"
 #include "wesnothd_connection.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 static lg::log_domain log_lobby("lobby");
 #define DBG_LB LOG_STREAM(debug, log_lobby)

src/gui/dialogs/multiplayer/mp_alerts_options.cpp

@@ -28,7 +28,7 @@
 #include "mp_ui_alerts.hpp"
 #include "preferences/general.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include "gettext.hpp"
 

src/gui/dialogs/multiplayer/mp_change_control.cpp

@@ -32,7 +32,7 @@
 #include "menu_events.hpp"
 #include "team.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 static lg::log_domain log_gui("gui/dialogs/mp_change_control");
 #define ERR_GUI LOG_STREAM(err,   log_gui)

src/gui/dialogs/multiplayer/mp_connect.cpp

@@ -27,7 +27,7 @@
 
 #include "log.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <boost/algorithm/string/trim.hpp>
 

src/gui/dialogs/multiplayer/player_info.cpp

@@ -25,7 +25,7 @@
 #include "preferences/game.hpp"
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/multiplayer/synced_choice_wait.cpp

@@ -26,7 +26,7 @@
 #include "gettext.hpp"
 
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/preferences_dialog.cpp

@@ -27,7 +27,7 @@
 #include "preferences/lobby.hpp"
 #include "preferences/general.hpp"
 #include "preferences/display.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "utils/general.hpp"
 #include "video.hpp"
 

src/gui/dialogs/screenshot_notification.cpp

@@ -30,7 +30,7 @@
 #include "gui/widgets/window.hpp"
 #include "picture.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include "gettext.hpp"
 

src/gui/dialogs/select_orb_colors.cpp

@@ -26,7 +26,7 @@
 
 #include "game_config.hpp"
 #include "preferences/general.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/statistics_dialog.cpp

@@ -29,7 +29,7 @@
 #include "gui/widgets/window.hpp"
 #include "team.hpp"
 #include "units/types.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <iomanip>
 #include <iostream>

src/gui/dialogs/title_screen.cpp

@@ -52,7 +52,7 @@
 #include "hotkey/hotkey_command.hpp"
 #include "sdl/surface.hpp"
 #include "sdl/utils.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "video.hpp"
 
 #include <algorithm>

src/gui/dialogs/unit_advance.cpp

@@ -27,7 +27,7 @@
 #include "units/types.hpp"
 #include "help/help.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/unit_attack.cpp

@@ -34,7 +34,7 @@
 #include "color.hpp"
 #include "units/unit.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/unit_create.cpp

@@ -34,7 +34,7 @@
 #include "play_controller.hpp"
 #include "units/types.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 #include <boost/dynamic_bitset.hpp>
 
 static std::string last_chosen_type_id = "";

src/gui/dialogs/unit_list.cpp

@@ -33,7 +33,7 @@
 #include "units/ptr.hpp"
 #include "units/unit.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 static lg::log_domain log_display("display");
 #define LOG_DP LOG_STREAM(info, log_display)

src/gui/dialogs/unit_recall.cpp

@@ -40,7 +40,7 @@
 #include "units/types.hpp"
 #include "units/unit.hpp"
 #include "units/ptr.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "whiteboard/manager.hpp"
 
 #include <boost/dynamic_bitset.hpp>

src/gui/dialogs/unit_recruit.cpp

@@ -33,7 +33,7 @@
 #include "units/types.hpp"
 #include "whiteboard/manager.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/dialogs/wml_error.cpp

@@ -30,7 +30,7 @@
 
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace
 {

src/gui/widgets/button.cpp

@@ -28,7 +28,7 @@
 
 #include "sound.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/drawing.cpp

@@ -22,7 +22,7 @@
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/group.hpp

@@ -18,7 +18,7 @@
 #include "gui/widgets/styled_widget.hpp"
 #include "gui/widgets/selectable_item.hpp"
 #include "gui/widgets/widget.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <map>
 #include <vector>

src/gui/widgets/horizontal_scrollbar.cpp

@@ -24,7 +24,7 @@
 
 #include "wml_exception.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/image.cpp

@@ -24,7 +24,7 @@
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/label.cpp

@@ -29,7 +29,7 @@
 #include "desktop/open.hpp"
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 #include <string>
 #include <sstream>
 

src/gui/widgets/listbox.cpp

@@ -32,7 +32,7 @@
 #include "gui/widgets/widget_helpers.hpp"
 #include "gui/widgets/window.hpp"
 #include "sdl/rect.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "utils/optional_fwd.hpp"
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__

src/gui/widgets/matrix.cpp

@@ -24,7 +24,7 @@
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/menu_button.cpp

@@ -25,7 +25,7 @@
 #include "gui/widgets/window.hpp"
 #include "sound.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/minimap.cpp

@@ -27,7 +27,7 @@
 #include "terrain/type_data.hpp"
 #include "../../minimap.hpp" // We want the file in src/
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <algorithm>
 

src/gui/widgets/multi_page.cpp

@@ -24,7 +24,7 @@
 
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/multimenu_button.cpp

@@ -26,7 +26,7 @@
 #include "sound.hpp"
 
 #include "formula/string_utils.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "gettext.hpp"
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__

src/gui/widgets/pane.cpp

@@ -26,7 +26,7 @@
 #include "lexical_cast.hpp"
 #include "sdl/rect.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER "pane [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/pane.hpp

@@ -18,7 +18,7 @@
 #include "gui/core/window_builder.hpp"
 #include "gui/core/placer.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <list>
 

src/gui/widgets/panel.cpp

@@ -23,7 +23,7 @@
 #include "sdl/rect.hpp"
 #include "wml_exception.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/password_box.cpp

@@ -24,7 +24,7 @@
 #include "serialization/unicode.hpp"
 
 #include "desktop/clipboard.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/progress_bar.cpp

@@ -20,7 +20,7 @@
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/repeating_button.cpp

@@ -23,7 +23,7 @@
 #include "gui/widgets/window.hpp"
 #include "sound.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/scroll_label.cpp

@@ -27,7 +27,7 @@
 #include "gui/widgets/window.hpp"
 #include "gettext.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/scrollbar.cpp

@@ -19,7 +19,7 @@
 #include "gui/core/log.hpp"
 #include "gui/widgets/window.hpp" // Needed for invalidate_layout()
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/scrollbar.hpp

@@ -17,7 +17,7 @@
 #include "gui/core/notifier.hpp"
 #include "gui/widgets/styled_widget.hpp"
 #include "sdl/rect.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/scrollbar_container.cpp

@@ -26,7 +26,7 @@
 #include "sdl/rect.hpp"
 
 #include <algorithm>
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/scrollbar_panel.cpp

@@ -23,7 +23,7 @@
 #include "gettext.hpp"
 #include "wml_exception.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/selectable_item.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "utils/functional.hpp"
+#include <functional>
 #include <cassert>
 
 namespace gui2

src/gui/widgets/slider.cpp

@@ -29,7 +29,7 @@
 #include "gettext.hpp"
 #include "wml_exception.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #if BOOST_VERSION >= 106700
 #include <boost/integer/common_factor_rt.hpp>

src/gui/widgets/slider_base.cpp

@@ -19,7 +19,7 @@
 #include "gui/core/log.hpp"
 #include "gui/widgets/window.hpp" // Needed for invalidate_layout()
 
-#include "utils/functional.hpp"
+#include <functional>
 #include "utils/math.hpp"
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__

src/gui/widgets/slider_base.hpp

@@ -17,7 +17,7 @@
 #include "gui/core/notifier.hpp"
 #include "gui/widgets/styled_widget.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/spacer.cpp

@@ -19,7 +19,7 @@
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/stacked_widget.cpp

@@ -25,7 +25,7 @@
 #include "utils/const_clone.hpp"
 #include "utils/general.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/status_label_helper.hpp

@@ -19,7 +19,7 @@
 #include "gui/widgets/selectable_item.hpp"
 #include "gui/widgets/styled_widget.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/styled_widget.cpp

@@ -29,7 +29,7 @@
 #include "hotkey/hotkey_item.hpp"
 #include "sdl/rect.hpp"
 #include "wml_exception.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <algorithm>
 #include <iomanip>

src/gui/widgets/text_box.cpp

@@ -23,7 +23,7 @@
 #include "gui/widgets/window.hpp"
 #include "preferences/game.hpp"
 #include "serialization/unicode.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/text_box_base.cpp

@@ -22,7 +22,7 @@
 #include "gui/core/timer.hpp"
 #include "serialization/unicode.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #include <limits>
 

src/gui/widgets/text_box_base.hpp

@@ -20,7 +20,7 @@
 
 #include <string>
 
-#include "utils/functional.hpp"
+#include <functional>
 
 namespace gui2
 {

src/gui/widgets/toggle_button.cpp

@@ -23,7 +23,7 @@
 #include "gui/core/window_builder/helper.hpp"
 #include "sound.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/toggle_panel.cpp

@@ -25,7 +25,7 @@
 #include "sound.hpp"
 #include "wml_exception.hpp"
 
-#include "utils/functional.hpp"
+#include <functional>
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/tree_view.cpp

@@ -22,7 +22,7 @@
 #include "gui/core/window_builder/helper.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "utils/functional.hpp"
+#include <functional>
 #include "wml_exception.hpp"
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__