[Commits] [wesnoth/wesnoth] 0ca4e6: Convert uses of boost functional to standard libra...

GitHub noreply at github.com
Sun Apr 3 15:21:38 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 0ca4e6c9432a9956e43008c25ec1ce1aa56323b3
      https://github.com/wesnoth/wesnoth/commit/0ca4e6c9432a9956e43008c25ec1ce1aa56323b3
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M src/ai/composite/ai.cpp
    M src/ai/composite/aspect.hpp
    M src/ai/composite/property_handler.hpp
    M src/ai/default/recruitment.cpp
    M src/ai/default/stage_rca.cpp
    M src/campaign_server/campaign_server.cpp
    M src/campaign_server/campaign_server.hpp
    M src/config.cpp
    M src/construct_dialog.cpp
    M src/display.cpp
    M src/display.hpp
    M src/editor/controller/editor_controller.cpp
    M src/game_events/manager.hpp
    M src/game_initialization/mp_options.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_initialization/multiplayer_configure.cpp
    M src/game_initialization/multiplayer_connect.cpp
    M src/game_initialization/multiplayer_create.cpp
    M src/game_initialization/multiplayer_lobby.cpp
    M src/game_initialization/multiplayer_wait.cpp
    M src/game_state.cpp
    M src/gui/auxiliary/field.hpp
    M src/gui/core/event/dispatcher.hpp
    M src/gui/core/event/distributor.cpp
    M src/gui/core/register_widget.hpp
    M src/gui/core/timer.cpp
    M src/gui/core/timer.hpp
    M src/gui/core/window_builder.cpp
    M src/gui/core/window_builder.hpp
    M src/gui/dialogs/addon/connect.cpp
    M src/gui/dialogs/addon/description.cpp
    M src/gui/dialogs/addon/filter_options.cpp
    M src/gui/dialogs/addon/list.cpp
    M src/gui/dialogs/advanced_graphics_options.cpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/campaign_settings.cpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/dialogs/core_selection.cpp
    M src/gui/dialogs/debug_clock.cpp
    M src/gui/dialogs/dialog.cpp
    M src/gui/dialogs/dialog.hpp
    M src/gui/dialogs/drop_down_list.cpp
    M src/gui/dialogs/editor/custom_tod.cpp
    M src/gui/dialogs/editor/edit_label.cpp
    M src/gui/dialogs/editor/edit_side.cpp
    M src/gui/dialogs/editor/generate_map.cpp
    M src/gui/dialogs/editor/resize_map.cpp
    M src/gui/dialogs/formula_debugger.cpp
    M src/gui/dialogs/game_cache_options.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/game_version.cpp
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/dialogs/helper.hpp
    M src/gui/dialogs/label_settings.cpp
    M src/gui/dialogs/loadscreen.cpp
    M src/gui/dialogs/loadscreen.hpp
    M src/gui/dialogs/lobby/lobby.cpp
    M src/gui/dialogs/lobby/lobby.hpp
    M src/gui/dialogs/lobby/player_info.cpp
    M src/gui/dialogs/lua_interpreter.cpp
    M src/gui/dialogs/multiplayer/mp_alerts_options.cpp
    M src/gui/dialogs/multiplayer/mp_change_control.cpp
    M src/gui/dialogs/multiplayer/mp_connect.cpp
    M src/gui/dialogs/multiplayer/mp_create_game.cpp
    M src/gui/dialogs/multiplayer/synced_choice_wait.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/preferences_dialog.hpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/select_orb_colors.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_recruit.cpp
    M src/gui/dialogs/wml_error.cpp
    M src/gui/widgets/button.cpp
    M src/gui/widgets/combobox.cpp
    M src/gui/widgets/combobox.hpp
    M src/gui/widgets/control.cpp
    M src/gui/widgets/drawing.cpp
    M src/gui/widgets/generator.cpp
    M src/gui/widgets/generator.hpp
    M src/gui/widgets/generator_private.hpp
    M src/gui/widgets/group.hpp
    M src/gui/widgets/horizontal_scrollbar.cpp
    M src/gui/widgets/image.cpp
    M src/gui/widgets/label.cpp
    M src/gui/widgets/list.cpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/listbox.hpp
    M src/gui/widgets/matrix.cpp
    M src/gui/widgets/minimap.cpp
    M src/gui/widgets/multi_page.cpp
    M src/gui/widgets/pane.cpp
    M src/gui/widgets/pane.hpp
    M src/gui/widgets/panel.cpp
    M src/gui/widgets/password_box.cpp
    M src/gui/widgets/progress_bar.cpp
    M src/gui/widgets/repeating_button.cpp
    M src/gui/widgets/scroll_label.cpp
    M src/gui/widgets/scrollbar.cpp
    M src/gui/widgets/scrollbar.hpp
    M src/gui/widgets/scrollbar_container.cpp
    M src/gui/widgets/scrollbar_panel.cpp
    M src/gui/widgets/selectable.hpp
    M src/gui/widgets/settings.cpp
    M src/gui/widgets/settings.hpp
    M src/gui/widgets/slider.cpp
    M src/gui/widgets/slider.hpp
    M src/gui/widgets/spacer.cpp
    M src/gui/widgets/stacked_widget.cpp
    M src/gui/widgets/text.cpp
    M src/gui/widgets/text.hpp
    M src/gui/widgets/text_box.cpp
    M src/gui/widgets/toggle_button.cpp
    M src/gui/widgets/toggle_button.hpp
    M src/gui/widgets/toggle_panel.cpp
    M src/gui/widgets/toggle_panel.hpp
    M src/gui/widgets/tree_view.cpp
    M src/gui/widgets/tree_view.hpp
    M src/gui/widgets/tree_view_node.cpp
    M src/gui/widgets/tree_view_node.hpp
    M src/gui/widgets/unit_preview_pane.cpp
    M src/gui/widgets/vertical_scrollbar.cpp
    M src/gui/widgets/window.cpp
    M src/gui/widgets/window.hpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_item.cpp
    M src/image.cpp
    M src/network_asio.cpp
    M src/play_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn_network_adapter.cpp
    M src/playturn_network_adapter.hpp
    M src/quit_confirmation.hpp
    M src/random_new_synced.cpp
    M src/random_new_synced.hpp
    M src/recall_list_manager.cpp
    M src/replay_controller.cpp
    M src/replay_controller.hpp
    M src/scripting/application_lua_kernel.cpp
    M src/scripting/application_lua_kernel.hpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_cpp_function.cpp
    M src/scripting/lua_cpp_function.hpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/lua_kernel_base.hpp
    M src/scripting/mapgen_lua_kernel.cpp
    M src/scripting/plugins/context.cpp
    M src/scripting/plugins/context.hpp
    M src/scripting/plugins/manager.cpp
    M src/server/ban.cpp
    M src/server/player_network.hpp
    M src/server/server.cpp
    M src/server/server.hpp
    M src/synced_commands.hpp
    M src/synced_context.hpp
    M src/tests/create_images.cpp
    M src/tests/gui/fire_event.cpp
    M src/tests/gui/test_drop_target.cpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/test_config_cache.cpp
    M src/tests/test_map_location.cpp
    M src/tests/test_sdl_utils.cpp
    M src/tests/test_sdl_utils.hpp
    M src/tests/test_unit_map.cpp
    M src/tod_manager.cpp
    M src/units/unit.cpp
    R src/utils/boost_function_guarded.hpp
    A src/utils/functional.hpp
    M src/wesmage/filter.cpp
    M src/wesnoth.cpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/side_actions.cpp
    M src/whiteboard/utility.cpp
    M src/whiteboard/utility.hpp
    M src/widgets/drop_target.cpp
    M src/xBRZ/xbrz.cpp

  Log Message:
  -----------
  Convert uses of boost functional to standard library variants

This commit converts the following function calls:

* boost::bind                          -> std::bind
* boost::function and boost::functionN -> std::function
* boost::ref and boost::cref           -> std::ref and std::cref
* boost::bad_function_call             -> std::bad_function_call

In the process, it was discovered that std::bind has trouble with overloaded
functions. There were two such cases in the code:

* gui2::twindow had an ancient unused overload to draw(). The overload was removed.
* gui2::trepeating_button was binding tdispatcher::fire. This case was converted
  to a lambda.





More information about the Commits mailing list