From 83ee4f60877619f8f18ddc14721d8ca44a15b742 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sat, 19 Mar 2016 18:50:18 +1100 Subject: [PATCH] Convert most includes to src/-relative This excludes includes that need backtrack path specifiers in order to resolve name clashes. --- src/actions/attack.cpp | 60 +++++++++---------- src/actions/attack.hpp | 4 +- src/actions/create.cpp | 52 ++++++++-------- src/actions/create.hpp | 4 +- src/actions/heal.cpp | 24 ++++---- src/actions/move.cpp | 38 ++++++------ src/actions/move.hpp | 2 +- src/actions/shroud_clearing_action.cpp | 14 ++--- src/actions/shroud_clearing_action.hpp | 4 +- src/actions/undo.cpp | 44 +++++++------- src/actions/undo.hpp | 4 +- src/actions/undo_action.hpp | 6 +- src/actions/undo_dismiss_action.cpp | 6 +- src/actions/undo_dismiss_action.hpp | 4 +- src/actions/undo_move_action.cpp | 20 +++---- src/actions/undo_move_action.hpp | 4 +- src/actions/undo_recall_action.cpp | 14 ++--- src/actions/undo_recall_action.hpp | 4 +- src/actions/undo_recruit_action.cpp | 14 ++--- src/actions/undo_recruit_action.hpp | 4 +- src/actions/undo_update_shroud_action.cpp | 6 +- src/actions/undo_update_shroud_action.hpp | 4 +- src/actions/unit_creator.cpp | 36 +++++------ src/actions/unit_creator.hpp | 2 +- src/actions/vision.cpp | 24 ++++---- src/actions/vision.hpp | 2 +- src/ai/actions.cpp | 32 +++++----- src/ai/actions.hpp | 4 +- src/ai/akihara/recruitment.cpp | 26 ++++---- src/ai/akihara/recruitment.hpp | 4 +- src/ai/composite/ai.cpp | 6 +- src/ai/composite/ai.hpp | 2 +- src/ai/composite/aspect.cpp | 4 +- src/ai/composite/aspect.hpp | 8 +-- src/ai/composite/component.cpp | 8 +-- src/ai/composite/contexts.hpp | 2 +- src/ai/composite/engine.cpp | 2 +- src/ai/composite/engine.hpp | 2 +- src/ai/composite/engine_default.cpp | 2 +- src/ai/composite/engine_fai.cpp | 12 ++-- src/ai/composite/engine_lua.cpp | 20 +++---- src/ai/composite/rca.cpp | 2 +- src/ai/composite/stage.cpp | 8 +-- src/ai/composite/value_translator.hpp | 12 ++-- src/ai/configuration.cpp | 10 ++-- src/ai/configuration.hpp | 2 +- src/ai/contexts.hpp | 10 ++-- src/ai/default/ai.cpp | 34 +++++------ src/ai/default/ai.hpp | 4 +- src/ai/default/attack.cpp | 20 +++---- src/ai/default/contexts.cpp | 16 ++--- src/ai/default/contexts.hpp | 2 +- src/ai/formula/ai.cpp | 50 ++++++++-------- src/ai/formula/callable_objects.cpp | 6 +- src/ai/formula/callable_objects.hpp | 10 ++-- src/ai/formula/candidates.cpp | 4 +- src/ai/formula/function_table.cpp | 26 ++++---- src/ai/formula/stage_side_formulas.cpp | 6 +- src/ai/formula/stage_side_formulas.hpp | 4 +- src/ai/formula/stage_unit_formulas.cpp | 12 ++-- src/ai/formula/stage_unit_formulas.hpp | 2 +- src/ai/game_info.hpp | 2 +- src/ai/gamestate_observer.hpp | 2 +- src/ai/interface.hpp | 4 +- src/ai/lua/core.cpp | 32 +++++----- src/ai/lua/lua_object.hpp | 18 +++--- src/ai/lua/unit_advancements_aspect.cpp | 14 ++--- src/ai/lua/unit_advancements_aspect.hpp | 2 +- src/ai/manager.cpp | 14 ++--- src/ai/manager.hpp | 4 +- src/ai/recruitment/recruitment.cpp | 44 +++++++------- src/ai/recruitment/recruitment.hpp | 6 +- src/ai/registry.cpp | 4 +- src/ai/simulated_actions.cpp | 22 +++---- src/ai/testing.cpp | 16 ++--- src/ai/testing.hpp | 2 +- src/ai/testing/aspect_attacks.cpp | 22 +++---- src/ai/testing/aspect_attacks.hpp | 4 +- src/ai/testing/ca.cpp | 30 +++++----- src/ai/testing/ca.hpp | 4 +- src/ai/testing/ca_global_fallback.cpp | 26 ++++---- src/ai/testing/ca_global_fallback.hpp | 4 +- src/ai/testing/ca_testing_move_to_targets.cpp | 20 +++---- src/ai/testing/ca_testing_move_to_targets.hpp | 4 +- src/ai/testing/ca_testing_recruitment.cpp | 28 ++++----- src/ai/testing/ca_testing_recruitment.hpp | 4 +- src/ai/testing/stage_fallback.cpp | 8 +-- src/ai/testing/stage_fallback.hpp | 4 +- src/ai/testing/stage_rca.cpp | 12 ++-- src/ai/testing/stage_rca.hpp | 4 +- src/ai/testing/stage_sf_with_rca.cpp | 30 +++++----- src/ai/testing/stage_sf_with_rca.hpp | 4 +- src/editor/action/action.hpp | 2 +- src/editor/action/action_base.hpp | 2 +- src/editor/action/action_item.hpp | 4 +- src/editor/action/action_label.hpp | 4 +- src/editor/action/action_unit.cpp | 4 +- src/editor/action/action_unit.hpp | 4 +- src/editor/action/mouse/mouse_action.cpp | 2 +- src/editor/action/mouse/mouse_action_item.cpp | 4 +- .../action/mouse/mouse_action_map_label.cpp | 6 +- .../action/mouse/mouse_action_map_label.hpp | 2 +- .../action/mouse/mouse_action_select.cpp | 4 +- src/editor/action/mouse/mouse_action_unit.cpp | 4 +- .../action/mouse/mouse_action_village.cpp | 4 +- src/editor/controller/editor_controller.cpp | 14 ++--- src/editor/controller/editor_controller.hpp | 6 +- src/editor/editor_common.hpp | 4 +- src/editor/editor_display.hpp | 2 +- src/editor/editor_main.cpp | 4 +- src/editor/map/editor_map.cpp | 12 ++-- src/editor/map/editor_map.hpp | 4 +- src/editor/map/map_context.hpp | 2 +- src/editor/palette/editor_palettes.hpp | 2 +- src/editor/palette/item_palette.cpp | 2 +- src/editor/palette/terrain_palettes.cpp | 4 +- src/editor/palette/unit_palette.cpp | 4 +- src/editor/palette/unit_palette.hpp | 2 +- src/editor/toolkit/brush.hpp | 2 +- src/game_events/entity_location.cpp | 8 +-- src/game_events/entity_location.hpp | 4 +- src/game_events/handlers.cpp | 18 +++--- src/game_events/handlers.hpp | 4 +- src/game_events/menu_item.cpp | 24 ++++---- src/game_events/menu_item.hpp | 6 +- src/game_events/pump.cpp | 30 +++++----- src/game_events/wmi_container.cpp | 10 ++-- src/game_events/wmi_container.hpp | 2 +- src/gui/auxiliary/canvas.cpp | 4 +- src/gui/auxiliary/formula.hpp | 2 +- src/gui/auxiliary/log.hpp | 2 +- src/gui/dialogs/chat_log.cpp | 10 ++-- src/gui/dialogs/chat_log.hpp | 2 +- src/gui/dialogs/formula_debugger.cpp | 2 +- src/gui/dialogs/gamestate_inspector.cpp | 14 ++--- src/gui/dialogs/gamestate_inspector.hpp | 2 +- src/gui/dialogs/mp_create_game.cpp | 2 +- src/gui/dialogs/synced_choice_wait.cpp | 4 +- src/gui/dialogs/synced_choice_wait.hpp | 4 +- src/gui/widgets/control.hpp | 2 +- src/gui/widgets/image.cpp | 2 +- src/gui/widgets/minimap.cpp | 2 +- src/gui/widgets/text.hpp | 2 +- src/lua/ldo.cpp | 2 +- src/sdl/shader.cpp | 2 +- src/server/forum_user_handler.cpp | 2 +- src/server/game.cpp | 8 +-- src/server/game.hpp | 6 +- src/server/input_stream.cpp | 2 +- src/server/metrics.cpp | 2 +- src/server/player.cpp | 2 +- src/server/player_network.cpp | 2 +- src/server/player_network.hpp | 4 +- src/server/room.cpp | 2 +- src/server/room.hpp | 2 +- src/server/room_manager.cpp | 12 ++-- src/server/server.cpp | 28 ++++----- src/server/server.hpp | 2 +- src/server/simple_wml.cpp | 2 +- src/server/user_handler.cpp | 2 +- src/server/user_handler.hpp | 4 +- src/tests/test_lua.cpp | 2 +- src/tools/cutter.cpp | 2 +- src/tools/dummy_video.cpp | 4 +- src/tools/exploder.cpp | 2 +- src/tools/exploder_cutter.hpp | 4 +- src/tools/exploder_utils.hpp | 2 +- src/whiteboard/action.hpp | 2 +- src/whiteboard/manager.hpp | 2 +- src/whiteboard/move.hpp | 2 +- src/whiteboard/typedefs.hpp | 4 +- src/widgets/button.hpp | 2 +- src/widgets/file_menu.hpp | 2 +- src/widgets/label.hpp | 2 +- src/widgets/scrollpane.hpp | 2 +- src/widgets/slider.hpp | 2 +- src/widgets/textbox.hpp | 2 +- src/widgets/widget.hpp | 4 +- 178 files changed, 784 insertions(+), 784 deletions(-) diff --git a/src/actions/attack.cpp b/src/actions/attack.cpp index e59fba7f96a0..f867ba583585 100644 --- a/src/actions/attack.cpp +++ b/src/actions/attack.cpp @@ -21,37 +21,37 @@ #include "vision.hpp" -#include "../ai/lua/unit_advancements_aspect.hpp" -#include "../attack_prediction.hpp" -#include "../config_assign.hpp" -#include "../dialogs.hpp" -#include "../game_config.hpp" -#include "../game_display.hpp" +#include "ai/lua/unit_advancements_aspect.hpp" +#include "attack_prediction.hpp" +#include "config_assign.hpp" +#include "dialogs.hpp" +#include "game_config.hpp" +#include "game_display.hpp" #include "game_events/manager.hpp" -#include "../game_events/pump.hpp" -#include "../game_preferences.hpp" -#include "../game_data.hpp" -#include "../gettext.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../mouse_handler_base.hpp" -#include "../play_controller.hpp" -#include "../random_new.hpp" -#include "../replay.hpp" -#include "../resources.hpp" -#include "../statistics.hpp" -#include "../synced_checkup.hpp" -#include "../synced_user_choice.hpp" -#include "../team.hpp" -#include "../tod_manager.hpp" -#include "../unit.hpp" -#include "../unit_abilities.hpp" -#include "../unit_animation_component.hpp" -#include "../unit_display.hpp" -#include "../unit_helper.hpp" -#include "../unit_map.hpp" -#include "../whiteboard/manager.hpp" -#include "../wml_exception.hpp" +#include "game_events/pump.hpp" +#include "game_preferences.hpp" +#include "game_data.hpp" +#include "gettext.hpp" +#include "log.hpp" +#include "map.hpp" +#include "mouse_handler_base.hpp" +#include "play_controller.hpp" +#include "random_new.hpp" +#include "replay.hpp" +#include "resources.hpp" +#include "statistics.hpp" +#include "synced_checkup.hpp" +#include "synced_user_choice.hpp" +#include "team.hpp" +#include "tod_manager.hpp" +#include "unit.hpp" +#include "unit_abilities.hpp" +#include "unit_animation_component.hpp" +#include "unit_display.hpp" +#include "unit_helper.hpp" +#include "unit_map.hpp" +#include "whiteboard/manager.hpp" +#include "wml_exception.hpp" #include diff --git a/src/actions/attack.hpp b/src/actions/attack.hpp index 6e149ee71b9d..6702ec301f07 100644 --- a/src/actions/attack.hpp +++ b/src/actions/attack.hpp @@ -29,8 +29,8 @@ class unit; class unit_map; class gamemap; -#include "../unit_types.hpp" -#include "../ai/lua/unit_advancements_aspect.hpp" +#include "unit_types.hpp" +#include "ai/lua/unit_advancements_aspect.hpp" #include diff --git a/src/actions/create.cpp b/src/actions/create.cpp index 66da4f516d94..f9420a747288 100644 --- a/src/actions/create.cpp +++ b/src/actions/create.cpp @@ -23,33 +23,33 @@ #include "undo.hpp" #include "vision.hpp" -#include "../config.hpp" -#include "../config_assign.hpp" -#include "../filter_context.hpp" -#include "../game_board.hpp" -#include "../game_display.hpp" -#include "../game_events/manager.hpp" -#include "../game_events/pump.hpp" +#include "config.hpp" +#include "config_assign.hpp" +#include "filter_context.hpp" +#include "game_board.hpp" +#include "game_display.hpp" +#include "game_events/manager.hpp" +#include "game_events/pump.hpp" #include "game_state.hpp" -#include "../game_preferences.hpp" -#include "../game_data.hpp" -#include "../gettext.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../pathfind/pathfind.hpp" -#include "../recall_list_manager.hpp" -#include "../replay.hpp" -#include "../replay_helper.hpp" -#include "../resources.hpp" -#include "../statistics.hpp" -#include "../synced_checkup.hpp" -#include "../synced_context.hpp" -#include "../team.hpp" -#include "../unit.hpp" -#include "../unit_display.hpp" -#include "../unit_filter.hpp" -#include "../variable.hpp" -#include "../whiteboard/manager.hpp" +#include "game_preferences.hpp" +#include "game_data.hpp" +#include "gettext.hpp" +#include "log.hpp" +#include "map.hpp" +#include "pathfind/pathfind.hpp" +#include "recall_list_manager.hpp" +#include "replay.hpp" +#include "replay_helper.hpp" +#include "resources.hpp" +#include "statistics.hpp" +#include "synced_checkup.hpp" +#include "synced_context.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_display.hpp" +#include "unit_filter.hpp" +#include "variable.hpp" +#include "whiteboard/manager.hpp" #include #include diff --git a/src/actions/create.hpp b/src/actions/create.hpp index 15b2f2d951f5..5e2bcdacc74c 100644 --- a/src/actions/create.hpp +++ b/src/actions/create.hpp @@ -28,8 +28,8 @@ class vconfig; #include "unit_creator.hpp" -#include "../map_location.hpp" -#include "../unit_ptr.hpp" +#include "map_location.hpp" +#include "unit_ptr.hpp" #include diff --git a/src/actions/heal.cpp b/src/actions/heal.cpp index c58538c43f51..5cef34114048 100644 --- a/src/actions/heal.cpp +++ b/src/actions/heal.cpp @@ -19,18 +19,18 @@ #include "heal.hpp" -#include "../game_board.hpp" -#include "../game_display.hpp" -#include "../gettext.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../play_controller.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../unit.hpp" -#include "../unit_abilities.hpp" -#include "../unit_display.hpp" -#include "../unit_map.hpp" +#include "game_board.hpp" +#include "game_display.hpp" +#include "gettext.hpp" +#include "log.hpp" +#include "map.hpp" +#include "play_controller.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_abilities.hpp" +#include "unit_display.hpp" +#include "unit_map.hpp" #include #include diff --git a/src/actions/move.cpp b/src/actions/move.cpp index 5babf6714212..0c5138996ee0 100644 --- a/src/actions/move.cpp +++ b/src/actions/move.cpp @@ -22,29 +22,29 @@ #include "undo.hpp" #include "vision.hpp" -#include "../config_assign.hpp" -#include "../game_display.hpp" +#include "config_assign.hpp" +#include "game_display.hpp" #include "game_events/manager.hpp" #include "game_events/pump.hpp" -#include "../game_preferences.hpp" -#include "../gettext.hpp" +#include "game_preferences.hpp" +#include "gettext.hpp" #include "hotkey/hotkey_item.hpp" #include "hotkey/hotkey_command.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../mouse_handler_base.hpp" -#include "../pathfind/pathfind.hpp" -#include "../replay.hpp" -#include "../replay_helper.hpp" -#include "../synced_context.hpp" -#include "../play_controller.hpp" -#include "../resources.hpp" -#include "../unit_display.hpp" -#include "../formula_string_utils.hpp" -#include "../team.hpp" -#include "../unit.hpp" -#include "../unit_animation_component.hpp" -#include "../whiteboard/manager.hpp" +#include "log.hpp" +#include "map.hpp" +#include "mouse_handler_base.hpp" +#include "pathfind/pathfind.hpp" +#include "replay.hpp" +#include "replay_helper.hpp" +#include "synced_context.hpp" +#include "play_controller.hpp" +#include "resources.hpp" +#include "unit_display.hpp" +#include "formula_string_utils.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_animation_component.hpp" +#include "whiteboard/manager.hpp" #include #include diff --git a/src/actions/move.hpp b/src/actions/move.hpp index dacd3d8d5a7b..78c8752c3a2c 100644 --- a/src/actions/move.hpp +++ b/src/actions/move.hpp @@ -24,7 +24,7 @@ struct map_location; class replay; class unit; -#include "../unit_map.hpp" +#include "unit_map.hpp" #include diff --git a/src/actions/shroud_clearing_action.cpp b/src/actions/shroud_clearing_action.cpp index 6b595489bbb2..4bdc020a99fb 100644 --- a/src/actions/shroud_clearing_action.cpp +++ b/src/actions/shroud_clearing_action.cpp @@ -1,13 +1,13 @@ #include "shroud_clearing_action.hpp" #include "move.hpp" //get_village -#include "../resources.hpp" -#include "../team.hpp" -#include "../log.hpp" -#include "../unit_display.hpp" -#include "../game_board.hpp" -#include "../map.hpp" -#include "../play_controller.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "log.hpp" +#include "unit_display.hpp" +#include "game_board.hpp" +#include "map.hpp" +#include "play_controller.hpp" namespace actions { void shroud_clearing_action::return_village() diff --git a/src/actions/shroud_clearing_action.hpp b/src/actions/shroud_clearing_action.hpp index 26ab75b4290a..1bbc2aa4e295 100644 --- a/src/actions/shroud_clearing_action.hpp +++ b/src/actions/shroud_clearing_action.hpp @@ -1,8 +1,8 @@ #pragma once #include "vision.hpp" -#include "../map_location.hpp" -#include "../unit_ptr.hpp" +#include "map_location.hpp" +#include "unit_ptr.hpp" #include #include diff --git a/src/actions/undo.cpp b/src/actions/undo.cpp index 3b9be31752c0..05c72a2703cd 100644 --- a/src/actions/undo.cpp +++ b/src/actions/undo.cpp @@ -20,28 +20,28 @@ #include "undo.hpp" #include "global.hpp" -#include "../game_board.hpp" // for game_board -#include "../game_display.hpp" // for game_display -#include "../log.hpp" // for LOG_STREAM, logger, etc -#include "../map.hpp" // for gamemap -#include "../map_location.hpp" // for map_location, operator<<, etc -#include "../mouse_handler_base.hpp" // for command_disabler -#include "../recall_list_manager.hpp" // for recall_list_manager -#include "../replay.hpp" // for recorder, replay -#include "../replay_helper.hpp" // for replay_helper -#include "../resources.hpp" // for screen, teams, units, etc -#include "../statistics.hpp" // for un_recall_unit, etc -#include "../synced_context.hpp" // for set_scontext_synced -#include "../team.hpp" // for team -#include "../unit.hpp" // for unit -#include "../unit_animation_component.hpp" -#include "../unit_display.hpp" // for move_unit -#include "../unit_id.hpp" -#include "../unit_map.hpp" // for unit_map, etc -#include "../unit_ptr.hpp" // for unit_const_ptr, unit_ptr -#include "../unit_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 "game_board.hpp" // for game_board +#include "game_display.hpp" // for game_display +#include "log.hpp" // for LOG_STREAM, logger, etc +#include "map.hpp" // for gamemap +#include "map_location.hpp" // for map_location, operator<<, etc +#include "mouse_handler_base.hpp" // for command_disabler +#include "recall_list_manager.hpp" // for recall_list_manager +#include "replay.hpp" // for recorder, replay +#include "replay_helper.hpp" // for replay_helper +#include "resources.hpp" // for screen, teams, units, etc +#include "statistics.hpp" // for un_recall_unit, etc +#include "synced_context.hpp" // for set_scontext_synced +#include "team.hpp" // for team +#include "unit.hpp" // for unit +#include "unit_animation_component.hpp" +#include "unit_display.hpp" // for move_unit +#include "unit_id.hpp" +#include "unit_map.hpp" // for unit_map, etc +#include "unit_ptr.hpp" // for unit_const_ptr, unit_ptr +#include "unit_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 "create.hpp" // for find_recall_location, etc #include "move.hpp" // for get_village diff --git a/src/actions/undo.hpp b/src/actions/undo.hpp index b2828084ebfc..ef4501f32120 100644 --- a/src/actions/undo.hpp +++ b/src/actions/undo.hpp @@ -21,8 +21,8 @@ #define ACTIONS_UNDO_H_INCLUDED #include "vision.hpp" -#include "../map_location.hpp" -#include "../unit_ptr.hpp" +#include "map_location.hpp" +#include "unit_ptr.hpp" #include "undo_action.hpp" #include diff --git a/src/actions/undo_action.hpp b/src/actions/undo_action.hpp index bf3d6c86d1e9..ec6ccc83db42 100644 --- a/src/actions/undo_action.hpp +++ b/src/actions/undo_action.hpp @@ -1,9 +1,9 @@ #pragma once #include "vision.hpp" -#include "../map_location.hpp" -#include "../unit_ptr.hpp" -#include "../synced_context.hpp" +#include "map_location.hpp" +#include "unit_ptr.hpp" +#include "synced_context.hpp" #include #include diff --git a/src/actions/undo_dismiss_action.cpp b/src/actions/undo_dismiss_action.cpp index e853aaa47372..d5cc93a91332 100644 --- a/src/actions/undo_dismiss_action.cpp +++ b/src/actions/undo_dismiss_action.cpp @@ -1,7 +1,7 @@ #include "undo_dismiss_action.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../replay.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "replay.hpp" namespace actions { diff --git a/src/actions/undo_dismiss_action.hpp b/src/actions/undo_dismiss_action.hpp index b53f9631c630..4b81e55a87e7 100644 --- a/src/actions/undo_dismiss_action.hpp +++ b/src/actions/undo_dismiss_action.hpp @@ -1,8 +1,8 @@ #pragma once #include "undo_action.hpp" -#include "../unit_ptr.hpp" -#include "../unit.hpp" +#include "unit_ptr.hpp" +#include "unit.hpp" namespace actions { diff --git a/src/actions/undo_move_action.cpp b/src/actions/undo_move_action.cpp index 0215adbc41ec..0402d240d244 100644 --- a/src/actions/undo_move_action.cpp +++ b/src/actions/undo_move_action.cpp @@ -1,16 +1,16 @@ #include "undo_move_action.hpp" #include "move.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../replay.hpp" -#include "../unit_map.hpp" -#include "../unit_animation_component.hpp" -#include "../log.hpp" -#include "../game_display.hpp" -#include "../unit_display.hpp" -#include "../game_board.hpp" -#include "../map.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "replay.hpp" +#include "unit_map.hpp" +#include "unit_animation_component.hpp" +#include "log.hpp" +#include "game_display.hpp" +#include "unit_display.hpp" +#include "game_board.hpp" +#include "map.hpp" static lg::log_domain log_engine("engine"); #define ERR_NG LOG_STREAM(err, log_engine) diff --git a/src/actions/undo_move_action.hpp b/src/actions/undo_move_action.hpp index c7420fa7eb54..d67b2d6c1065 100644 --- a/src/actions/undo_move_action.hpp +++ b/src/actions/undo_move_action.hpp @@ -2,8 +2,8 @@ #include "undo_action.hpp" #include "shroud_clearing_action.hpp" -#include "../unit_ptr.hpp" -#include "../unit.hpp" +#include "unit_ptr.hpp" +#include "unit.hpp" namespace actions { diff --git a/src/actions/undo_recall_action.cpp b/src/actions/undo_recall_action.cpp index 6a8a5a978fbb..a1f6c01e6f75 100644 --- a/src/actions/undo_recall_action.cpp +++ b/src/actions/undo_recall_action.cpp @@ -2,13 +2,13 @@ #include "create.hpp" #include "gui/dialogs/transient_message.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../replay.hpp" -#include "../unit_map.hpp" -#include "../statistics.hpp" -#include "../log.hpp" -#include "../game_display.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "replay.hpp" +#include "unit_map.hpp" +#include "statistics.hpp" +#include "log.hpp" +#include "game_display.hpp" static lg::log_domain log_engine("engine"); #define ERR_NG LOG_STREAM(err, log_engine) diff --git a/src/actions/undo_recall_action.hpp b/src/actions/undo_recall_action.hpp index 8b41c511f6cd..c2681fd77dd0 100644 --- a/src/actions/undo_recall_action.hpp +++ b/src/actions/undo_recall_action.hpp @@ -2,8 +2,8 @@ #include "undo_action.hpp" #include "shroud_clearing_action.hpp" -#include "../unit_ptr.hpp" -#include "../unit.hpp" +#include "unit_ptr.hpp" +#include "unit.hpp" namespace actions { diff --git a/src/actions/undo_recruit_action.cpp b/src/actions/undo_recruit_action.cpp index 6c5959f91177..b0379f7e078e 100644 --- a/src/actions/undo_recruit_action.cpp +++ b/src/actions/undo_recruit_action.cpp @@ -2,13 +2,13 @@ #include "create.hpp" #include "gui/dialogs/transient_message.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../replay.hpp" -#include "../unit_map.hpp" -#include "../statistics.hpp" -#include "../log.hpp" -#include "../game_display.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "replay.hpp" +#include "unit_map.hpp" +#include "statistics.hpp" +#include "log.hpp" +#include "game_display.hpp" static lg::log_domain log_engine("engine"); #define ERR_NG LOG_STREAM(err, log_engine) diff --git a/src/actions/undo_recruit_action.hpp b/src/actions/undo_recruit_action.hpp index cdac45a3a8e8..fcf8fcb24041 100644 --- a/src/actions/undo_recruit_action.hpp +++ b/src/actions/undo_recruit_action.hpp @@ -2,8 +2,8 @@ #include "undo_action.hpp" #include "shroud_clearing_action.hpp" -#include "../unit_ptr.hpp" -#include "../unit.hpp" +#include "unit_ptr.hpp" +#include "unit.hpp" namespace actions { diff --git a/src/actions/undo_update_shroud_action.cpp b/src/actions/undo_update_shroud_action.cpp index afd05798df01..10b458d36d69 100644 --- a/src/actions/undo_update_shroud_action.cpp +++ b/src/actions/undo_update_shroud_action.cpp @@ -1,7 +1,7 @@ #include "undo_update_shroud_action.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../replay.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "replay.hpp" namespace actions { diff --git a/src/actions/undo_update_shroud_action.hpp b/src/actions/undo_update_shroud_action.hpp index 3b9e3a3436db..07631ea4f796 100644 --- a/src/actions/undo_update_shroud_action.hpp +++ b/src/actions/undo_update_shroud_action.hpp @@ -1,8 +1,8 @@ #pragma once #include "undo_action.hpp" -#include "../unit_ptr.hpp" -#include "../unit.hpp" +#include "unit_ptr.hpp" +#include "unit.hpp" namespace actions { diff --git a/src/actions/unit_creator.cpp b/src/actions/unit_creator.cpp index 5621e3356c5c..a38726fb3557 100644 --- a/src/actions/unit_creator.cpp +++ b/src/actions/unit_creator.cpp @@ -21,24 +21,24 @@ #include "move.hpp" //for actions::get_village -#include "../config.hpp" -#include "../filter_context.hpp" -#include "../game_board.hpp" -#include "../game_events/manager.hpp" -#include "../game_events/pump.hpp" -#include "../game_preferences.hpp" -#include "../game_data.hpp" // for resources::gamedata conversion variable_set -#include "../gettext.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../pathfind/pathfind.hpp" -#include "../resources.hpp" // for resources::screen, resources::gamedata -#include "../team.hpp" //for team -#include "../unit.hpp" // for unit -#include "../unit_display.hpp" // for unit_display -#include "../variable.hpp" // for vconfig - -#include "../game_display.hpp" // for resources::screen +#include "config.hpp" +#include "filter_context.hpp" +#include "game_board.hpp" +#include "game_events/manager.hpp" +#include "game_events/pump.hpp" +#include "game_preferences.hpp" +#include "game_data.hpp" // for resources::gamedata conversion variable_set +#include "gettext.hpp" +#include "log.hpp" +#include "map.hpp" +#include "pathfind/pathfind.hpp" +#include "resources.hpp" // for resources::screen, resources::gamedata +#include "team.hpp" //for team +#include "unit.hpp" // for unit +#include "unit_display.hpp" // for unit_display +#include "variable.hpp" // for vconfig + +#include "game_display.hpp" // for resources::screen #include #include diff --git a/src/actions/unit_creator.hpp b/src/actions/unit_creator.hpp index 389d0122c729..7228e91b5e8c 100644 --- a/src/actions/unit_creator.hpp +++ b/src/actions/unit_creator.hpp @@ -26,7 +26,7 @@ class vconfig; class game_board; class unit; -#include "../map_location.hpp" +#include "map_location.hpp" class unit_creator { diff --git a/src/actions/vision.cpp b/src/actions/vision.cpp index c02f867afce3..d9a9c1f46ac8 100644 --- a/src/actions/vision.cpp +++ b/src/actions/vision.cpp @@ -21,19 +21,19 @@ #include "move.hpp" -#include "../config.hpp" -#include "../game_display.hpp" +#include "config.hpp" +#include "game_display.hpp" #include "game_events/manager.hpp" -#include "../game_events/pump.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../map_label.hpp" -#include "../map_location.hpp" -#include "../pathfind/pathfind.hpp" -#include "../play_controller.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../unit.hpp" +#include "game_events/pump.hpp" +#include "log.hpp" +#include "map.hpp" +#include "map_label.hpp" +#include "map_location.hpp" +#include "pathfind/pathfind.hpp" +#include "play_controller.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" #include diff --git a/src/actions/vision.hpp b/src/actions/vision.hpp index 574e0cd98e16..52c0a6319550 100644 --- a/src/actions/vision.hpp +++ b/src/actions/vision.hpp @@ -20,7 +20,7 @@ #ifndef ACTIONS_VISION_H_INCLUDED #define ACTIONS_VISION_H_INCLUDED -#include "../movetype.hpp" +#include "movetype.hpp" struct map_location; class team; diff --git a/src/ai/actions.cpp b/src/ai/actions.cpp index 75c84458c820..8047b850342c 100644 --- a/src/ai/actions.cpp +++ b/src/ai/actions.cpp @@ -36,22 +36,22 @@ #include "manager.hpp" #include "simulated_actions.hpp" -#include "../actions/attack.hpp" -#include "../actions/create.hpp" -#include "../attack_prediction.hpp" -#include "../game_preferences.hpp" -#include "../log.hpp" -#include "../mouse_handler_base.hpp" -#include "../pathfind/teleport.hpp" -#include "../play_controller.hpp" -#include "../playsingle_controller.hpp" -#include "../recall_list_manager.hpp" -#include "../replay_helper.hpp" -#include "../resources.hpp" -#include "../synced_context.hpp" -#include "../team.hpp" -#include "../unit.hpp" -#include "../unit_ptr.hpp" +#include "actions/attack.hpp" +#include "actions/create.hpp" +#include "attack_prediction.hpp" +#include "game_preferences.hpp" +#include "log.hpp" +#include "mouse_handler_base.hpp" +#include "pathfind/teleport.hpp" +#include "play_controller.hpp" +#include "playsingle_controller.hpp" +#include "recall_list_manager.hpp" +#include "replay_helper.hpp" +#include "resources.hpp" +#include "synced_context.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_ptr.hpp" namespace ai { diff --git a/src/ai/actions.hpp b/src/ai/actions.hpp index 0d66d079b0b6..39db21418f96 100644 --- a/src/ai/actions.hpp +++ b/src/ai/actions.hpp @@ -22,9 +22,9 @@ #include "game_info.hpp" -#include "../actions/move.hpp" +#include "actions/move.hpp" #include "lua/unit_advancements_aspect.hpp" -#include "../unit_ptr.hpp" +#include "unit_ptr.hpp" namespace pathfind { struct plain_route; diff --git a/src/ai/akihara/recruitment.cpp b/src/ai/akihara/recruitment.cpp index 512cba1f9e57..13502b457138 100644 --- a/src/ai/akihara/recruitment.cpp +++ b/src/ai/akihara/recruitment.cpp @@ -21,19 +21,19 @@ #include #include -#include "../../actions/attack.hpp" -#include "../../attack_prediction.hpp" -#include "../../game_board.hpp" -#include "../../resources.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" -#include "../../unit_display.hpp" -#include "../../unit_map.hpp" -#include "../../unit_types.hpp" -#include "../composite/rca.hpp" -#include "../default/ai.hpp" +#include "actions/attack.hpp" +#include "attack_prediction.hpp" +#include "game_board.hpp" +#include "resources.hpp" +#include "log.hpp" +#include "map.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_display.hpp" +#include "unit_map.hpp" +#include "unit_types.hpp" +#include "ai/composite/rca.hpp" +#include "ai/default/ai.hpp" #include "recruitment.hpp" diff --git a/src/ai/akihara/recruitment.hpp b/src/ai/akihara/recruitment.hpp index 39401a597d8e..c44d29042de0 100644 --- a/src/ai/akihara/recruitment.hpp +++ b/src/ai/akihara/recruitment.hpp @@ -20,8 +20,8 @@ #ifndef AI_AKIHARA_RECRUITMENT_HPP_INCLUDED #define AI_AKIHARA_RECRUITMENT_HPP_INCLUDED -#include "../composite/rca.hpp" -#include "../../team.hpp" +#include "ai/composite/rca.hpp" +#include "team.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/composite/ai.cpp b/src/ai/composite/ai.cpp index 77090ee0648d..7ff5310d28e4 100644 --- a/src/ai/composite/ai.cpp +++ b/src/ai/composite/ai.cpp @@ -24,9 +24,9 @@ #include "goal.hpp" #include "property_handler.hpp" #include "stage.hpp" -#include "../manager.hpp" -#include "../../actions/attack.hpp" -#include "../../log.hpp" +#include "ai/manager.hpp" +#include "actions/attack.hpp" +#include "log.hpp" #include #include "utils/boost_function_guarded.hpp" diff --git a/src/ai/composite/ai.hpp b/src/ai/composite/ai.hpp index 7482e283fc30..3f9b37cfba4e 100644 --- a/src/ai/composite/ai.hpp +++ b/src/ai/composite/ai.hpp @@ -21,7 +21,7 @@ #define AI_COMPOSITE_AI_HPP_INCLUDED #include "contexts.hpp" -#include "../interface.hpp" +#include "ai/interface.hpp" #include "component.hpp" #ifdef _MSC_VER diff --git a/src/ai/composite/aspect.cpp b/src/ai/composite/aspect.cpp index 5deef7ffea67..14073ab63e2a 100644 --- a/src/ai/composite/aspect.cpp +++ b/src/ai/composite/aspect.cpp @@ -17,8 +17,8 @@ */ #include "aspect.hpp" -#include "../manager.hpp" -#include "../../log.hpp" +#include "ai/manager.hpp" +#include "log.hpp" namespace ai { diff --git a/src/ai/composite/aspect.hpp b/src/ai/composite/aspect.hpp index 0f933816a94e..b46f7b95a00c 100644 --- a/src/ai/composite/aspect.hpp +++ b/src/ai/composite/aspect.hpp @@ -21,11 +21,11 @@ #include "property_handler.hpp" #include "value_translator.hpp" -#include "../lua/lua_object.hpp" -#include "../lua/core.hpp" -#include "../../scripting/game_lua_kernel.hpp" +#include "ai/lua/lua_object.hpp" +#include "ai/lua/core.hpp" +#include "scripting/game_lua_kernel.hpp" -#include "../../log.hpp" +#include "log.hpp" #include #include diff --git a/src/ai/composite/component.cpp b/src/ai/composite/component.cpp index d55378de99a3..bc3a167c7495 100644 --- a/src/ai/composite/component.cpp +++ b/src/ai/composite/component.cpp @@ -20,11 +20,11 @@ #include "component.hpp" #include "engine.hpp" #include "property_handler.hpp" -#include "../../config.hpp" -#include "../../log.hpp" -#include "../../unit.hpp" +#include "config.hpp" +#include "log.hpp" +#include "unit.hpp" -#include "../formula/ai.hpp" +#include "ai/formula/ai.hpp" #include #include diff --git a/src/ai/composite/contexts.hpp b/src/ai/composite/contexts.hpp index 5e69ec647679..a66ce33937d1 100644 --- a/src/ai/composite/contexts.hpp +++ b/src/ai/composite/contexts.hpp @@ -21,7 +21,7 @@ #ifndef AI_COMPOSITE_CONTEXTS_HPP_INCLUDED #define AI_COMPOSITE_CONTEXTS_HPP_INCLUDED -#include "../default/contexts.hpp" +#include "ai/default/contexts.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/composite/engine.cpp b/src/ai/composite/engine.cpp index 782e4fbf6125..ffca8c34655a 100644 --- a/src/ai/composite/engine.cpp +++ b/src/ai/composite/engine.cpp @@ -20,7 +20,7 @@ #include "engine.hpp" #include "contexts.hpp" -#include "../../log.hpp" +#include "log.hpp" namespace ai { diff --git a/src/ai/composite/engine.hpp b/src/ai/composite/engine.hpp index 54d1513ea7d6..0557e70251b3 100644 --- a/src/ai/composite/engine.hpp +++ b/src/ai/composite/engine.hpp @@ -22,7 +22,7 @@ #define AI_COMPOSITE_ENGINE_HPP_INCLUDED #include "component.hpp" -#include "../contexts.hpp" +#include "ai/contexts.hpp" #include #include diff --git a/src/ai/composite/engine_default.cpp b/src/ai/composite/engine_default.cpp index a7a79d0c6422..20083837636f 100644 --- a/src/ai/composite/engine_default.cpp +++ b/src/ai/composite/engine_default.cpp @@ -23,7 +23,7 @@ #include "engine_default.hpp" #include "rca.hpp" #include "stage.hpp" -#include "../../log.hpp" +#include "log.hpp" namespace ai { diff --git a/src/ai/composite/engine_fai.cpp b/src/ai/composite/engine_fai.cpp index 32f65c23652b..840f81b60383 100644 --- a/src/ai/composite/engine_fai.cpp +++ b/src/ai/composite/engine_fai.cpp @@ -20,12 +20,12 @@ #include "ai.hpp" #include "engine_fai.hpp" #include "rca.hpp" -#include "../formula/ai.hpp" -#include "../formula/candidates.hpp" -#include "../formula/stage_side_formulas.hpp" -#include "../formula/stage_unit_formulas.hpp" -#include "../../log.hpp" -#include "../../unit.hpp" +#include "ai/formula/ai.hpp" +#include "ai/formula/candidates.hpp" +#include "ai/formula/stage_side_formulas.hpp" +#include "ai/formula/stage_unit_formulas.hpp" +#include "log.hpp" +#include "unit.hpp" namespace ai { diff --git a/src/ai/composite/engine_lua.cpp b/src/ai/composite/engine_lua.cpp index 90fa09ca1659..f56c3b14210c 100644 --- a/src/ai/composite/engine_lua.cpp +++ b/src/ai/composite/engine_lua.cpp @@ -24,16 +24,16 @@ #include "stage.hpp" #include "aspect.hpp" -#include "../gamestate_observer.hpp" - -#include "../../log.hpp" -#include "../../resources.hpp" -#include "../lua/core.hpp" -#include "../lua/lua_object.hpp" -#include "../../scripting/game_lua_kernel.hpp" -#include "../../util.hpp" -#include "../../unit.hpp" -#include "../../unit_map.hpp" +#include "ai/gamestate_observer.hpp" + +#include "log.hpp" +#include "resources.hpp" +#include "ai/lua/core.hpp" +#include "ai/lua/lua_object.hpp" +#include "scripting/game_lua_kernel.hpp" +#include "util.hpp" +#include "unit.hpp" +#include "unit_map.hpp" namespace ai { diff --git a/src/ai/composite/rca.cpp b/src/ai/composite/rca.cpp index 239d132d4da9..eacd44b35b37 100644 --- a/src/ai/composite/rca.cpp +++ b/src/ai/composite/rca.cpp @@ -20,7 +20,7 @@ #include "ai.hpp" #include "engine.hpp" #include "rca.hpp" -#include "../../log.hpp" +#include "log.hpp" namespace ai { diff --git a/src/ai/composite/stage.cpp b/src/ai/composite/stage.cpp index 24d3dd026e4a..1c9d89a918fb 100644 --- a/src/ai/composite/stage.cpp +++ b/src/ai/composite/stage.cpp @@ -20,10 +20,10 @@ #include "ai.hpp" #include "engine.hpp" #include "stage.hpp" -#include "../contexts.hpp" -#include "../../log.hpp" -#include "../../resources.hpp" -#include "../../tod_manager.hpp" +#include "ai/contexts.hpp" +#include "log.hpp" +#include "resources.hpp" +#include "tod_manager.hpp" #include #include diff --git a/src/ai/composite/value_translator.hpp b/src/ai/composite/value_translator.hpp index 99eec2d589c1..f033a2fc6504 100644 --- a/src/ai/composite/value_translator.hpp +++ b/src/ai/composite/value_translator.hpp @@ -22,12 +22,12 @@ #include "engine.hpp" #include "stage.hpp" -#include "../manager.hpp" -#include "../../terrain_filter.hpp" -#include "../../util.hpp" -#include "../../serialization/string_utils.hpp" -#include "../../resources.hpp" -#include "../lua/unit_advancements_aspect.hpp" +#include "ai/manager.hpp" +#include "terrain_filter.hpp" +#include "util.hpp" +#include "serialization/string_utils.hpp" +#include "resources.hpp" +#include "ai/lua/unit_advancements_aspect.hpp" namespace ai { diff --git a/src/ai/configuration.cpp b/src/ai/configuration.cpp index e2202992f537..67265e92f342 100644 --- a/src/ai/configuration.cpp +++ b/src/ai/configuration.cpp @@ -20,11 +20,11 @@ #include "configuration.hpp" -#include "../filesystem.hpp" -#include "../log.hpp" -#include "../serialization/parser.hpp" -#include "../serialization/preprocessor.hpp" -#include "../team.hpp" +#include "filesystem.hpp" +#include "log.hpp" +#include "serialization/parser.hpp" +#include "serialization/preprocessor.hpp" +#include "team.hpp" #include "wml_exception.hpp" #include diff --git a/src/ai/configuration.hpp b/src/ai/configuration.hpp index dbca6610b33b..005124752b8c 100644 --- a/src/ai/configuration.hpp +++ b/src/ai/configuration.hpp @@ -20,7 +20,7 @@ #ifndef AI_CONFIGURATION_HPP_INCLUDED #define AI_CONFIGURATION_HPP_INCLUDED -#include "../config.hpp" +#include "config.hpp" #include "game_info.hpp" namespace ai { diff --git a/src/ai/contexts.hpp b/src/ai/contexts.hpp index babf56f26806..74093b8acccc 100644 --- a/src/ai/contexts.hpp +++ b/src/ai/contexts.hpp @@ -25,11 +25,11 @@ #include "global.hpp" -#include "../config.hpp" // for config -#include "../game_errors.hpp" -#include "../generic_event.hpp" // for observer -#include "../unit_ptr.hpp" // for unit_ptr -#include "../map_location.hpp" // for map_location +#include "config.hpp" // for config +#include "game_errors.hpp" +#include "generic_event.hpp" // for observer +#include "unit_ptr.hpp" // for unit_ptr +#include "map_location.hpp" // for map_location #include // for map, map<>::value_compare #include // for set diff --git a/src/ai/default/ai.cpp b/src/ai/default/ai.cpp index aa4a7da3075c..a2f0afc446a5 100644 --- a/src/ai/default/ai.cpp +++ b/src/ai/default/ai.cpp @@ -19,25 +19,25 @@ #include "ai.hpp" -#include "../actions.hpp" -#include "../manager.hpp" -#include "../formula/ai.hpp" +#include "ai/actions.hpp" +#include "ai/manager.hpp" +#include "ai/formula/ai.hpp" -#include "../../array.hpp" -#include "../../game_board.hpp" +#include "array.hpp" +#include "game_board.hpp" #include "game_events/manager.hpp" -#include "../../game_events/pump.hpp" -#include "../../game_classification.hpp" -#include "../../log.hpp" -#include "../../mouse_handler_base.hpp" -#include "../../recall_list_manager.hpp" -#include "../../resources.hpp" -#include "../../terrain_filter.hpp" -#include "../../unit.hpp" -#include "../../unit_display.hpp" -#include "../../wml_exception.hpp" - -#include "../../pathfind/pathfind.hpp" +#include "game_events/pump.hpp" +#include "game_classification.hpp" +#include "log.hpp" +#include "mouse_handler_base.hpp" +#include "recall_list_manager.hpp" +#include "resources.hpp" +#include "terrain_filter.hpp" +#include "unit.hpp" +#include "unit_display.hpp" +#include "wml_exception.hpp" + +#include "pathfind/pathfind.hpp" #include diff --git a/src/ai/default/ai.hpp b/src/ai/default/ai.hpp index 5fc11c927716..42e78eeeb1e0 100644 --- a/src/ai/default/ai.hpp +++ b/src/ai/default/ai.hpp @@ -17,8 +17,8 @@ #ifndef AI_DEFAULT_AI_HPP_INCLUDED #define AI_DEFAULT_AI_HPP_INCLUDED -#include "../interface.hpp" -#include "../composite/stage.hpp" +#include "ai/interface.hpp" +#include "ai/composite/stage.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/default/attack.cpp b/src/ai/default/attack.cpp index 4d3c9d390d9b..ce231d4cc391 100644 --- a/src/ai/default/attack.cpp +++ b/src/ai/default/attack.cpp @@ -17,18 +17,18 @@ * Calculate & analyze attacks of the default ai */ -#include "../../global.hpp" +#include "global.hpp" #include "ai.hpp" -#include "../manager.hpp" - -#include "../../actions/attack.hpp" -#include "../../attack_prediction.hpp" -#include "../../game_config.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" +#include "ai/manager.hpp" + +#include "actions/attack.hpp" +#include "attack_prediction.hpp" +#include "game_config.hpp" +#include "log.hpp" +#include "map.hpp" +#include "team.hpp" +#include "unit.hpp" static lg::log_domain log_ai("ai/attack"); #define LOG_AI LOG_STREAM(info, log_ai) diff --git a/src/ai/default/contexts.cpp b/src/ai/default/contexts.cpp index 859cdcb5687b..56ad4a30d436 100644 --- a/src/ai/default/contexts.cpp +++ b/src/ai/default/contexts.cpp @@ -20,14 +20,14 @@ #include "contexts.hpp" -#include "../../game_board.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" -#include "../composite/goal.hpp" -#include "../../pathfind/pathfind.hpp" +#include "game_board.hpp" +#include "log.hpp" +#include "map.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "ai/composite/goal.hpp" +#include "pathfind/pathfind.hpp" static lg::log_domain log_ai("ai/general"); #define DBG_AI LOG_STREAM(debug, log_ai) diff --git a/src/ai/default/contexts.hpp b/src/ai/default/contexts.hpp index 96a8d4fd581f..061e857f47ad 100644 --- a/src/ai/default/contexts.hpp +++ b/src/ai/default/contexts.hpp @@ -20,7 +20,7 @@ #ifndef AI_DEFAULT_CONTEXTS_HPP_INCLUDED #define AI_DEFAULT_CONTEXTS_HPP_INCLUDED -#include "../contexts.hpp" +#include "ai/contexts.hpp" #include "formula_callable.hpp" #ifdef _MSC_VER diff --git a/src/ai/formula/ai.cpp b/src/ai/formula/ai.cpp index 9b9406d55929..baa2785ad0b6 100644 --- a/src/ai/formula/ai.cpp +++ b/src/ai/formula/ai.cpp @@ -20,31 +20,31 @@ #include "ai.hpp" #include "global.hpp" -#include "../../callable_objects.hpp" // for unit_callable, etc -#include "../../chat_events.hpp" // for chat_handler, etc -#include "../../display_chat_manager.hpp" -#include "../../formula_function.hpp" // for formula_expression -#include "../../game_board.hpp" // for game_board -#include "../../game_display.hpp" // for game_display -#include "../../log.hpp" // for LOG_STREAM, logger, etc -#include "../../map.hpp" // for gamemap -#include "../../menu_events.hpp" -#include "../../pathfind/pathfind.hpp" // for plain_route, etc -#include "../../pathfind/teleport.hpp" // for get_teleport_locations, etc -#include "../../recall_list_manager.hpp" // for recall_list_manager -#include "../../resources.hpp" // for gameboard, teams, units, etc -#include "../../serialization/string_utils.hpp" // for split -#include "../../team.hpp" // for team -#include "../../terrain_filter.hpp" // for terrain_filter -#include "../../time_of_day.hpp" // for time_of_day -#include "../../tod_manager.hpp" // for tod_manager -#include "../../tstring.hpp" // for t_string, operator+ -#include "../../unit.hpp" // for unit -#include "../../unit_formula_manager.hpp" // for unit_formula_manager -#include "../../unit_ptr.hpp" // for unit_ptr -#include "../../unit_types.hpp" -#include "../../formula.hpp" // for formula_error, formula, etc -#include "../../map_location.hpp" // for map_location, etc +#include "callable_objects.hpp" // for unit_callable, etc +#include "chat_events.hpp" // for chat_handler, etc +#include "display_chat_manager.hpp" +#include "formula_function.hpp" // for formula_expression +#include "game_board.hpp" // for game_board +#include "game_display.hpp" // for game_display +#include "log.hpp" // for LOG_STREAM, logger, etc +#include "map.hpp" // for gamemap +#include "menu_events.hpp" +#include "pathfind/pathfind.hpp" // for plain_route, etc +#include "pathfind/teleport.hpp" // for get_teleport_locations, etc +#include "recall_list_manager.hpp" // for recall_list_manager +#include "resources.hpp" // for gameboard, teams, units, etc +#include "serialization/string_utils.hpp" // for split +#include "team.hpp" // for team +#include "terrain_filter.hpp" // for terrain_filter +#include "time_of_day.hpp" // for time_of_day +#include "tod_manager.hpp" // for tod_manager +#include "tstring.hpp" // for t_string, operator+ +#include "unit.hpp" // for unit +#include "unit_formula_manager.hpp" // for unit_formula_manager +#include "unit_ptr.hpp" // for unit_ptr +#include "unit_types.hpp" +#include "formula.hpp" // for formula_error, formula, etc +#include "map_location.hpp" // for map_location, etc #include "ai/actions.hpp" // for recall_result, etc #include "ai/manager.hpp" // for manager #include "ai/composite/contexts.hpp" diff --git a/src/ai/formula/callable_objects.cpp b/src/ai/formula/callable_objects.cpp index ef408816cc80..85e809477ecc 100644 --- a/src/ai/formula/callable_objects.cpp +++ b/src/ai/formula/callable_objects.cpp @@ -13,10 +13,10 @@ */ #include "ai.hpp" -#include "../../attack_prediction.hpp" -#include "../../game_board.hpp" +#include "attack_prediction.hpp" +#include "game_board.hpp" #include "callable_objects.hpp" -#include "../../resources.hpp" +#include "resources.hpp" namespace game_logic { diff --git a/src/ai/formula/callable_objects.hpp b/src/ai/formula/callable_objects.hpp index 36e5db7922a2..98362d30676a 100644 --- a/src/ai/formula/callable_objects.hpp +++ b/src/ai/formula/callable_objects.hpp @@ -15,11 +15,11 @@ #ifndef FORMULA_AI_CALLABLE_OBJECTS_HPP_INCLUDED #define FORMULA_AI_CALLABLE_OBJECTS_HPP_INCLUDED -#include "../game_info.hpp" -#include "../../actions/attack.hpp" -#include "../../callable_objects.hpp" -#include "../../formula.hpp" -#include "../../formula_callable.hpp" +#include "ai/game_info.hpp" +#include "actions/attack.hpp" +#include "../../callable_objects.hpp" // We want the file in src/ +#include "formula.hpp" +#include "formula_callable.hpp" namespace ai { class formula_ai; diff --git a/src/ai/formula/candidates.cpp b/src/ai/formula/candidates.cpp index 610140f0e1c4..ec1e52d5daa0 100644 --- a/src/ai/formula/candidates.cpp +++ b/src/ai/formula/candidates.cpp @@ -19,8 +19,8 @@ #include "ai.hpp" #include "candidates.hpp" -#include "../../log.hpp" -#include "../../resources.hpp" +#include "log.hpp" +#include "resources.hpp" #include diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp index 720e68369ff8..30de45d8afa7 100644 --- a/src/ai/formula/function_table.cpp +++ b/src/ai/formula/function_table.cpp @@ -24,19 +24,19 @@ #include "ai/default/contexts.hpp" -#include "../../attack_prediction.hpp" -#include "../../filesystem.hpp" -#include "../../game_board.hpp" -#include "../../display.hpp" -#include "../../log.hpp" -#include "../../map_label.hpp" -#include "../../pathfind/teleport.hpp" -#include "../../replay.hpp" -#include "../../resources.hpp" -#include "../../terrain_filter.hpp" -#include "../../unit.hpp" -#include "../../pathfind/pathfind.hpp" -#include "../../unit_types.hpp" +#include "attack_prediction.hpp" +#include "filesystem.hpp" +#include "game_board.hpp" +#include "display.hpp" +#include "log.hpp" +#include "map_label.hpp" +#include "pathfind/teleport.hpp" +#include "replay.hpp" +#include "resources.hpp" +#include "terrain_filter.hpp" +#include "unit.hpp" +#include "pathfind/pathfind.hpp" +#include "unit_types.hpp" #include diff --git a/src/ai/formula/stage_side_formulas.cpp b/src/ai/formula/stage_side_formulas.cpp index bd3b0ab0fd97..56747c767584 100644 --- a/src/ai/formula/stage_side_formulas.cpp +++ b/src/ai/formula/stage_side_formulas.cpp @@ -21,9 +21,9 @@ #include "stage_side_formulas.hpp" #include "ai.hpp" -#include "../../formula.hpp" -#include "../../formula_function.hpp" -#include "../../log.hpp" +#include "formula.hpp" +#include "formula_function.hpp" +#include "log.hpp" #include static lg::log_domain log_ai("ai/stage/side_formulas"); diff --git a/src/ai/formula/stage_side_formulas.hpp b/src/ai/formula/stage_side_formulas.hpp index 1af0955ac0b3..dcff8854940d 100644 --- a/src/ai/formula/stage_side_formulas.hpp +++ b/src/ai/formula/stage_side_formulas.hpp @@ -21,8 +21,8 @@ #ifndef AI_FORMULA_STAGE_SIDE_FORMULAS_HPP_INCLUDED #define AI_FORMULA_STAGE_SIDE_FORMULAS_HPP_INCLUDED -#include "../composite/stage.hpp" -#include "../../formula_fwd.hpp" +#include "ai/composite/stage.hpp" +#include "formula_fwd.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/formula/stage_unit_formulas.cpp b/src/ai/formula/stage_unit_formulas.cpp index df423a7051b3..4cac8f0ea1f3 100644 --- a/src/ai/formula/stage_unit_formulas.cpp +++ b/src/ai/formula/stage_unit_formulas.cpp @@ -21,12 +21,12 @@ #include "stage_unit_formulas.hpp" #include "ai.hpp" -#include "../../formula.hpp" -#include "../../formula_function.hpp" -#include "../../log.hpp" -#include "../../resources.hpp" -#include "../../unit.hpp" -#include "../../unit_formula_manager.hpp" +#include "formula.hpp" +#include "formula_function.hpp" +#include "log.hpp" +#include "resources.hpp" +#include "unit.hpp" +#include "unit_formula_manager.hpp" #include static lg::log_domain log_formula_ai("ai/stage/unit_formulas"); diff --git a/src/ai/formula/stage_unit_formulas.hpp b/src/ai/formula/stage_unit_formulas.hpp index 28e2bf8ac2d2..4e4789d6b788 100644 --- a/src/ai/formula/stage_unit_formulas.hpp +++ b/src/ai/formula/stage_unit_formulas.hpp @@ -21,7 +21,7 @@ #ifndef AI_FORMULA_STAGE_UNIT_FORMULAS_HPP_INCLUDED #define AI_FORMULA_STAGE_UNIT_FORMULAS_HPP_INCLUDED -#include "../composite/stage.hpp" +#include "ai/composite/stage.hpp" #ifdef _MSC_VER diff --git a/src/ai/game_info.hpp b/src/ai/game_info.hpp index 8ec75393171d..154225188c88 100644 --- a/src/ai/game_info.hpp +++ b/src/ai/game_info.hpp @@ -21,7 +21,7 @@ #define AI_GAME_INFO_HPP_INCLUDED #include -#include "../map_location.hpp" +#include "map_location.hpp" namespace pathfind { struct paths; } diff --git a/src/ai/gamestate_observer.hpp b/src/ai/gamestate_observer.hpp index 9f1994c96dc5..1173b2583efc 100644 --- a/src/ai/gamestate_observer.hpp +++ b/src/ai/gamestate_observer.hpp @@ -20,7 +20,7 @@ #ifndef AI_GAMESTATE_OBSERVER_HPP_INCLUDED #define AI_GAMESTATE_OBSERVER_HPP_INCLUDED -#include "../generic_event.hpp" +#include "generic_event.hpp" namespace ai { diff --git a/src/ai/interface.hpp b/src/ai/interface.hpp index 619cd8474181..0e2c876c6e5a 100644 --- a/src/ai/interface.hpp +++ b/src/ai/interface.hpp @@ -25,8 +25,8 @@ #include // for map, map<>::value_compare #include // for string, basic_string, etc #include // for make_pair, pair -#include "../savegame_config.hpp" // for savegame_config -#include "../config.hpp" // for config +#include "savegame_config.hpp" // for savegame_config +#include "config.hpp" // for config #include "ai/game_info.hpp" // for ai_ptr, side_number namespace ai { class ai_context; } diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index 7dbaa36e06c5..68d771afc950 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -22,24 +22,24 @@ #include #include "core.hpp" -#include "../../scripting/game_lua_kernel.hpp" -#include "../../scripting/lua_api.hpp" -#include "../../scripting/push_check.hpp" +#include "scripting/game_lua_kernel.hpp" +#include "scripting/lua_api.hpp" +#include "scripting/push_check.hpp" #include "lua_object.hpp" // (Nephro) -#include "../../attack_prediction.hpp" -#include "../../game_display.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../pathfind/pathfind.hpp" -#include "../../play_controller.hpp" -#include "../../resources.hpp" -#include "../../terrain_translation.hpp" -#include "../../terrain_filter.hpp" -#include "../../unit.hpp" -#include "../actions.hpp" -#include "../composite/engine_lua.hpp" -#include "../composite/contexts.hpp" +#include "attack_prediction.hpp" +#include "game_display.hpp" +#include "log.hpp" +#include "map.hpp" +#include "pathfind/pathfind.hpp" +#include "play_controller.hpp" +#include "resources.hpp" +#include "terrain_translation.hpp" +#include "terrain_filter.hpp" +#include "unit.hpp" +#include "ai/actions.hpp" +#include "ai/composite/engine_lua.hpp" +#include "ai/composite/contexts.hpp" #include "lua/lualib.h" #include "lua/lauxlib.h" diff --git a/src/ai/lua/lua_object.hpp b/src/ai/lua/lua_object.hpp index 5f32602e3d5b..759e2f756e5f 100644 --- a/src/ai/lua/lua_object.hpp +++ b/src/ai/lua/lua_object.hpp @@ -21,15 +21,15 @@ #ifndef LUA_OBJECT_HPP_INCLUDED #define LUA_OBJECT_HPP_INCLUDED -#include "../../config.hpp" -#include "../../lua/lua.h" -#include "../../map_location.hpp" -#include "../../resources.hpp" -#include "../../scripting/lua_api.hpp" -#include "../../scripting/lua_common.hpp" -#include "../../terrain_filter.hpp" -#include "../../variable.hpp" -#include "../default/contexts.hpp" +#include "config.hpp" +#include "lua/lua.h" +#include "map_location.hpp" +#include "resources.hpp" +#include "scripting/lua_api.hpp" +#include "scripting/lua_common.hpp" +#include "terrain_filter.hpp" +#include "variable.hpp" +#include "ai/default/contexts.hpp" #include "unit_advancements_aspect.hpp" #include diff --git a/src/ai/lua/unit_advancements_aspect.cpp b/src/ai/lua/unit_advancements_aspect.cpp index 1efd97de80f5..9da5ef46f7bc 100644 --- a/src/ai/lua/unit_advancements_aspect.cpp +++ b/src/ai/lua/unit_advancements_aspect.cpp @@ -15,13 +15,13 @@ #include "unit_advancements_aspect.hpp" #include "global.hpp" -#include "../../log.hpp" // for LOG_STREAM, logger, etc -#include "../../lua/lauxlib.h" // for luaL_ref, LUA_REFNIL -#include "../../lua/lua.h" // for lua_isstring, etc -#include "../../map_location.hpp" // for map_location -#include "../../serialization/string_utils.hpp" // for split -#include "../../unit.hpp" -#include "../../unit_map.hpp" // for unit_map::const_iterator, etc +#include "log.hpp" // for LOG_STREAM, logger, etc +#include "lua/lauxlib.h" // for luaL_ref, LUA_REFNIL +#include "lua/lua.h" // for lua_isstring, etc +#include "map_location.hpp" // for map_location +#include "serialization/string_utils.hpp" // for split +#include "unit.hpp" +#include "unit_map.hpp" // for unit_map::const_iterator, etc #include // for NULL #include // for operator<<, basic_ostream, etc diff --git a/src/ai/lua/unit_advancements_aspect.hpp b/src/ai/lua/unit_advancements_aspect.hpp index 11946752a363..94da131cf7f0 100644 --- a/src/ai/lua/unit_advancements_aspect.hpp +++ b/src/ai/lua/unit_advancements_aspect.hpp @@ -18,7 +18,7 @@ #include #include -#include "../../unit_map.hpp" +#include "unit_map.hpp" struct lua_State; diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp index 1fd2ca69f783..d97328705b0a 100644 --- a/src/ai/manager.cpp +++ b/src/ai/manager.cpp @@ -19,14 +19,14 @@ #include "manager.hpp" -#include "../config.hpp" // for config, etc +#include "config.hpp" // for config, etc #include "game_events/manager.hpp" -#include "../game_events/pump.hpp" -#include "../generic_event.hpp" // for generic_event, etc -#include "../log.hpp" -#include "../map_location.hpp" // for map_location -#include "../resources.hpp" -#include "../serialization/string_utils.hpp" +#include "game_events/pump.hpp" +#include "generic_event.hpp" // for generic_event, etc +#include "log.hpp" +#include "map_location.hpp" // for map_location +#include "resources.hpp" +#include "serialization/string_utils.hpp" #include "composite/ai.hpp" // for ai_composite #include "composite/component.hpp" // for component_manager diff --git a/src/ai/manager.hpp b/src/ai/manager.hpp index ee33a7788552..b71cc70e20d4 100644 --- a/src/ai/manager.hpp +++ b/src/ai/manager.hpp @@ -22,8 +22,8 @@ #ifndef AI_MANAGER_HPP_INCLUDED #define AI_MANAGER_HPP_INCLUDED -#include "../config.hpp" // for config, etc -#include "../global.hpp" +#include "config.hpp" // for config, etc +#include "global.hpp" #include "game_info.hpp" // for side_number, ai_ptr #include // for shared_ptr diff --git a/src/ai/recruitment/recruitment.cpp b/src/ai/recruitment/recruitment.cpp index 13f75ae6823a..ed38d6259555 100644 --- a/src/ai/recruitment/recruitment.cpp +++ b/src/ai/recruitment/recruitment.cpp @@ -20,28 +20,28 @@ #include "recruitment.hpp" -#include "../actions.hpp" -#include "../composite/rca.hpp" -#include "../manager.hpp" -#include "../../actions/attack.hpp" -#include "../../attack_prediction.hpp" -#include "../../filter_context.hpp" -#include "../../game_board.hpp" -#include "../../game_display.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../map_label.hpp" -#include "../../pathfind/pathfind.hpp" -#include "../../pathutils.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../tod_manager.hpp" -#include "../../unit_filter.hpp" -#include "../../unit_map.hpp" -#include "../../unit_types.hpp" -#include "../../util.hpp" -#include "../../variable.hpp" -#include "../../wml_exception.hpp" +#include "ai/actions.hpp" +#include "ai/composite/rca.hpp" +#include "ai/manager.hpp" +#include "actions/attack.hpp" +#include "attack_prediction.hpp" +#include "filter_context.hpp" +#include "game_board.hpp" +#include "game_display.hpp" +#include "log.hpp" +#include "map.hpp" +#include "map_label.hpp" +#include "pathfind/pathfind.hpp" +#include "pathutils.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "tod_manager.hpp" +#include "unit_filter.hpp" +#include "unit_map.hpp" +#include "unit_types.hpp" +#include "util.hpp" +#include "variable.hpp" +#include "wml_exception.hpp" #include #include diff --git a/src/ai/recruitment/recruitment.hpp b/src/ai/recruitment/recruitment.hpp index 53e7a4a1f6ef..41234afd6213 100644 --- a/src/ai/recruitment/recruitment.hpp +++ b/src/ai/recruitment/recruitment.hpp @@ -21,9 +21,9 @@ #ifndef AI_DEFAULT_RECRUITMENT_HPP_INCLUDED #define AI_DEFAULT_RECRUITMENT_HPP_INCLUDED -#include "../composite/rca.hpp" -#include "../../unit.hpp" -#include "../../unit_map.hpp" +#include "ai/composite/rca.hpp" +#include "unit.hpp" +#include "unit_map.hpp" #include #include diff --git a/src/ai/registry.cpp b/src/ai/registry.cpp index 97b12637e550..b9d66e2cc341 100644 --- a/src/ai/registry.cpp +++ b/src/ai/registry.cpp @@ -20,8 +20,8 @@ #include "registry.hpp" #include "global.hpp" -#include "../config.hpp" // for config, operator<< -#include "../terrain_filter.hpp" // for terrain_filter +#include "config.hpp" // for config, operator<< +#include "terrain_filter.hpp" // for terrain_filter #include "ai/composite/engine.hpp" // for register_engine_factory #include "ai/composite/stage.hpp" // for ministage, idle_stage, etc #include "ai/composite/rca.hpp" diff --git a/src/ai/simulated_actions.cpp b/src/ai/simulated_actions.cpp index a1ac8dd3ac57..d04f3d4d605c 100644 --- a/src/ai/simulated_actions.cpp +++ b/src/ai/simulated_actions.cpp @@ -19,17 +19,17 @@ #include "simulated_actions.hpp" -#include "../game_board.hpp" -#include "../game_config.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../recall_list_manager.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../unit.hpp" -#include "../unit_helper.hpp" -#include "../unit_ptr.hpp" -#include "../unit_types.hpp" +#include "game_board.hpp" +#include "game_config.hpp" +#include "log.hpp" +#include "map.hpp" +#include "recall_list_manager.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_helper.hpp" +#include "unit_ptr.hpp" +#include "unit_types.hpp" namespace ai { diff --git a/src/ai/testing.cpp b/src/ai/testing.cpp index 82932e0359c6..59115d2034f7 100644 --- a/src/ai/testing.cpp +++ b/src/ai/testing.cpp @@ -18,14 +18,14 @@ */ #include "manager.hpp" #include "testing.hpp" -#include "../log.hpp" -#include "../game_board.hpp" -#include "../replay.hpp" -#include "../util.hpp" -#include "../resources.hpp" -#include "../team.hpp" -#include "../unit.hpp" -#include "../tod_manager.hpp" +#include "log.hpp" +#include "game_board.hpp" +#include "replay.hpp" +#include "util.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "tod_manager.hpp" static lg::log_domain log_ai_testing("ai/testing"); #define DBG_AI_TESTING LOG_STREAM(debug, log_ai_testing) diff --git a/src/ai/testing.hpp b/src/ai/testing.hpp index 7781c16aad4c..89965845e63a 100644 --- a/src/ai/testing.hpp +++ b/src/ai/testing.hpp @@ -20,7 +20,7 @@ #ifndef AI_TESTING_HPP_INCLUDED #define AI_TESTING_HPP_INCLUDED -#include "../global.hpp" +#include "global.hpp" #include diff --git a/src/ai/testing/aspect_attacks.cpp b/src/ai/testing/aspect_attacks.cpp index 0373520b4c15..5027f90f41fe 100644 --- a/src/ai/testing/aspect_attacks.cpp +++ b/src/ai/testing/aspect_attacks.cpp @@ -19,17 +19,17 @@ #include "aspect_attacks.hpp" -#include "../manager.hpp" -#include "../../actions/attack.hpp" -#include "../../game_board.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../team.hpp" -#include "../../tod_manager.hpp" -#include "../../resources.hpp" -#include "../../unit.hpp" -#include "../../pathfind/pathfind.hpp" -#include "../../unit_filter.hpp" +#include "ai/manager.hpp" +#include "actions/attack.hpp" +#include "game_board.hpp" +#include "log.hpp" +#include "map.hpp" +#include "team.hpp" +#include "tod_manager.hpp" +#include "resources.hpp" +#include "unit.hpp" +#include "pathfind/pathfind.hpp" +#include "unit_filter.hpp" namespace ai { diff --git a/src/ai/testing/aspect_attacks.hpp b/src/ai/testing/aspect_attacks.hpp index dac2b4146905..d6dfe708af36 100644 --- a/src/ai/testing/aspect_attacks.hpp +++ b/src/ai/testing/aspect_attacks.hpp @@ -20,8 +20,8 @@ #ifndef AI_TESTING_ASPECT_ATTACKS_HPP_INCLUDED #define AI_TESTING_ASPECT_ATTACKS_HPP_INCLUDED -#include "../composite/aspect.hpp" -#include "../interface.hpp" +#include "ai/composite/aspect.hpp" +#include "ai/interface.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/testing/ca.cpp b/src/ai/testing/ca.cpp index 5a69897a30c4..8775bb574001 100644 --- a/src/ai/testing/ca.cpp +++ b/src/ai/testing/ca.cpp @@ -18,21 +18,21 @@ */ #include "ca.hpp" -#include "../actions.hpp" -#include "../manager.hpp" -#include "../composite/engine.hpp" -#include "../composite/rca.hpp" -#include "../composite/stage.hpp" -#include "../../game_board.hpp" -#include "../../game_classification.hpp" -#include "../../game_data.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" -#include "../../pathfind/pathfind.hpp" -#include "../../pathfind/teleport.hpp" +#include "ai/actions.hpp" +#include "ai/manager.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/rca.hpp" +#include "ai/composite/stage.hpp" +#include "game_board.hpp" +#include "game_classification.hpp" +#include "game_data.hpp" +#include "log.hpp" +#include "map.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "pathfind/pathfind.hpp" +#include "pathfind/teleport.hpp" #include diff --git a/src/ai/testing/ca.hpp b/src/ai/testing/ca.hpp index 8e44783abff8..46f4a2b3b6a7 100644 --- a/src/ai/testing/ca.hpp +++ b/src/ai/testing/ca.hpp @@ -21,9 +21,9 @@ #ifndef AI_TESTING_CA_HPP_INCLUDED #define AI_TESTING_CA_HPP_INCLUDED -#include "../../unit_map.hpp" +#include "unit_map.hpp" -#include "../composite/rca.hpp" +#include "ai/composite/rca.hpp" #ifdef _MSC_VER diff --git a/src/ai/testing/ca_global_fallback.cpp b/src/ai/testing/ca_global_fallback.cpp index 89e364c96c20..2c581cf3a96b 100644 --- a/src/ai/testing/ca_global_fallback.cpp +++ b/src/ai/testing/ca_global_fallback.cpp @@ -19,19 +19,19 @@ #include "ca_global_fallback.hpp" -#include "../composite/ai.hpp" - -#include "../../game_display.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../map_label.hpp" -#include "../../replay.hpp" -#include "../../resources.hpp" -#include "../../sdl/utils.hpp" -#include "../../team.hpp" -#include "../../terrain_filter.hpp" -#include "../../tod_manager.hpp" -#include "../../unit.hpp" +#include "ai/composite/ai.hpp" + +#include "game_display.hpp" +#include "log.hpp" +#include "map.hpp" +#include "map_label.hpp" +#include "replay.hpp" +#include "resources.hpp" +#include "sdl/utils.hpp" +#include "team.hpp" +#include "terrain_filter.hpp" +#include "tod_manager.hpp" +#include "unit.hpp" #include diff --git a/src/ai/testing/ca_global_fallback.hpp b/src/ai/testing/ca_global_fallback.hpp index fa4a6851b399..6b358b3b25f0 100644 --- a/src/ai/testing/ca_global_fallback.hpp +++ b/src/ai/testing/ca_global_fallback.hpp @@ -20,9 +20,9 @@ #ifndef AI_TESTING_CA_TESTING_GLOBAL_FALLBACK_HPP_INCLUDED #define AI_TESTING_CA_TESTING_GLOBAL_FALLBACK_HPP_INCLUDED -#include "../composite/rca.hpp" +#include "ai/composite/rca.hpp" -#include "../../unit_map.hpp" +#include "unit_map.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/testing/ca_testing_move_to_targets.cpp b/src/ai/testing/ca_testing_move_to_targets.cpp index e9407c35b68b..23698cacef10 100644 --- a/src/ai/testing/ca_testing_move_to_targets.cpp +++ b/src/ai/testing/ca_testing_move_to_targets.cpp @@ -19,16 +19,16 @@ #include "ca_testing_move_to_targets.hpp" -#include "../composite/ai.hpp" -#include "../actions.hpp" -#include "../../game_board.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" -#include "../../terrain_filter.hpp" -#include "../../pathfind/pathfind.hpp" +#include "ai/composite/ai.hpp" +#include "ai/actions.hpp" +#include "game_board.hpp" +#include "log.hpp" +#include "map.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "terrain_filter.hpp" +#include "pathfind/pathfind.hpp" #include diff --git a/src/ai/testing/ca_testing_move_to_targets.hpp b/src/ai/testing/ca_testing_move_to_targets.hpp index 2b512f1da017..a45e82c9e8e4 100644 --- a/src/ai/testing/ca_testing_move_to_targets.hpp +++ b/src/ai/testing/ca_testing_move_to_targets.hpp @@ -20,9 +20,9 @@ #ifndef AI_TESTING_CA_TESTING_MOVE_TO_TARGETS_HPP_INCLUDED #define AI_TESTING_CA_TESTING_MOVE_TO_TARGETS_HPP_INCLUDED -#include "../composite/rca.hpp" +#include "ai/composite/rca.hpp" -#include "../../unit_map.hpp" +#include "unit_map.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/testing/ca_testing_recruitment.cpp b/src/ai/testing/ca_testing_recruitment.cpp index be4d882eb995..375c605e961a 100644 --- a/src/ai/testing/ca_testing_recruitment.cpp +++ b/src/ai/testing/ca_testing_recruitment.cpp @@ -18,20 +18,20 @@ */ #include "ca_testing_recruitment.hpp" -#include "../actions.hpp" -#include "../manager.hpp" -#include "../composite/engine.hpp" -#include "../composite/rca.hpp" -#include "../composite/stage.hpp" -#include "../../game_board.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" -#include "../../unit_types.hpp" -#include "../../wml_exception.hpp" -#include "../../pathfind/pathfind.hpp" +#include "ai/actions.hpp" +#include "ai/manager.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/rca.hpp" +#include "ai/composite/stage.hpp" +#include "game_board.hpp" +#include "log.hpp" +#include "map.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_types.hpp" +#include "wml_exception.hpp" +#include "pathfind/pathfind.hpp" #include diff --git a/src/ai/testing/ca_testing_recruitment.hpp b/src/ai/testing/ca_testing_recruitment.hpp index b1b547a6b642..6622f007bc15 100644 --- a/src/ai/testing/ca_testing_recruitment.hpp +++ b/src/ai/testing/ca_testing_recruitment.hpp @@ -20,9 +20,9 @@ #ifndef AI_TESTING_CA_TESTING_RECRUITMENT_HPP_INCLUDED #define AI_TESTING_CA_TESTING_RECRUITMENT_HPP_INCLUDED -#include "../composite/rca.hpp" +#include "ai/composite/rca.hpp" -#include "../../unit_map.hpp" +#include "unit_map.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/testing/stage_fallback.cpp b/src/ai/testing/stage_fallback.cpp index 433403016fe0..81544de294a0 100644 --- a/src/ai/testing/stage_fallback.cpp +++ b/src/ai/testing/stage_fallback.cpp @@ -19,10 +19,10 @@ #include "stage_fallback.hpp" -#include "../configuration.hpp" -#include "../manager.hpp" -#include "../composite/ai.hpp" -#include "../../log.hpp" +#include "ai/configuration.hpp" +#include "ai/manager.hpp" +#include "ai/composite/ai.hpp" +#include "log.hpp" namespace ai { diff --git a/src/ai/testing/stage_fallback.hpp b/src/ai/testing/stage_fallback.hpp index 0d81bc7ca4dd..0fd9fdfcbeaa 100644 --- a/src/ai/testing/stage_fallback.hpp +++ b/src/ai/testing/stage_fallback.hpp @@ -20,8 +20,8 @@ #ifndef AI_TESTING_STAGE_FALLBACK_HPP_INCLUDED #define AI_TESTING_STAGE_FALLBACK_HPP_INCLUDED -#include "../composite/stage.hpp" -#include "../interface.hpp" +#include "ai/composite/stage.hpp" +#include "ai/interface.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/testing/stage_rca.cpp b/src/ai/testing/stage_rca.cpp index 1675aa34d888..915286d45678 100644 --- a/src/ai/testing/stage_rca.cpp +++ b/src/ai/testing/stage_rca.cpp @@ -19,12 +19,12 @@ #include "stage_rca.hpp" -#include "../manager.hpp" -#include "../composite/ai.hpp" -#include "../composite/engine.hpp" -#include "../composite/property_handler.hpp" -#include "../gamestate_observer.hpp" -#include "../../log.hpp" +#include "ai/manager.hpp" +#include "ai/composite/ai.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/property_handler.hpp" +#include "ai/gamestate_observer.hpp" +#include "log.hpp" #include #include diff --git a/src/ai/testing/stage_rca.hpp b/src/ai/testing/stage_rca.hpp index 1d6ff869d154..35dd24bab861 100644 --- a/src/ai/testing/stage_rca.hpp +++ b/src/ai/testing/stage_rca.hpp @@ -20,8 +20,8 @@ #ifndef AI_TESTING_STAGE_RCA_HPP_INCLUDED #define AI_TESTING_STAGE_RCA_HPP_INCLUDED -#include "../composite/rca.hpp" -#include "../composite/stage.hpp" +#include "ai/composite/rca.hpp" +#include "ai/composite/stage.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/testing/stage_sf_with_rca.cpp b/src/ai/testing/stage_sf_with_rca.cpp index 28e5afce1143..aa35bf1be020 100644 --- a/src/ai/testing/stage_sf_with_rca.cpp +++ b/src/ai/testing/stage_sf_with_rca.cpp @@ -20,21 +20,21 @@ #include "stage_sf_with_rca.hpp" -#include "../manager.hpp" -#include "../composite/ai.hpp" -#include "../composite/engine.hpp" -#include "../composite/property_handler.hpp" -#include "../gamestate_observer.hpp" -#include "../../actions/attack.hpp" -#include "../../actions/heal.hpp" -#include "../../config.hpp" -#include "../../game_board.hpp" -#include "../../log.hpp" -#include "../../map.hpp" -#include "../../resources.hpp" -#include "../../tod_manager.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" +#include "ai/manager.hpp" +#include "ai/composite/ai.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/property_handler.hpp" +#include "ai/gamestate_observer.hpp" +#include "actions/attack.hpp" +#include "actions/heal.hpp" +#include "config.hpp" +#include "game_board.hpp" +#include "log.hpp" +#include "map.hpp" +#include "resources.hpp" +#include "tod_manager.hpp" +#include "team.hpp" +#include "unit.hpp" #include #include "SDL.h" diff --git a/src/ai/testing/stage_sf_with_rca.hpp b/src/ai/testing/stage_sf_with_rca.hpp index ba7b354f1918..379be443b70b 100644 --- a/src/ai/testing/stage_sf_with_rca.hpp +++ b/src/ai/testing/stage_sf_with_rca.hpp @@ -22,9 +22,9 @@ #define AI_TESTING_STAGE_SF_WITH_RCA_HPP_INCLUDED #include "stage_rca.hpp" -#include "../composite/stage.hpp" +#include "ai/composite/stage.hpp" -#include "../../unit_map.hpp" +#include "unit_map.hpp" #include diff --git a/src/editor/action/action.hpp b/src/editor/action/action.hpp index 22042edb5a78..606c59a85ca7 100644 --- a/src/editor/action/action.hpp +++ b/src/editor/action/action.hpp @@ -27,7 +27,7 @@ #define EDITOR_ACTION_HPP #include "editor/action/action_base.hpp" -#include "../map/map_fragment.hpp" +#include "editor/map/map_fragment.hpp" namespace editor { diff --git a/src/editor/action/action_base.hpp b/src/editor/action/action_base.hpp index 2a19766cd8cd..f5e4d7e0214b 100644 --- a/src/editor/action/action_base.hpp +++ b/src/editor/action/action_base.hpp @@ -27,7 +27,7 @@ #ifndef EDITOR_ACTION_BASE_HPP_INCLUDED #define EDITOR_ACTION_BASE_HPP_INCLUDED -#include "../editor_common.hpp" +#include "editor/editor_common.hpp" namespace editor { diff --git a/src/editor/action/action_item.hpp b/src/editor/action/action_item.hpp index e056845579f5..2e3cf5a634a4 100644 --- a/src/editor/action/action_item.hpp +++ b/src/editor/action/action_item.hpp @@ -29,8 +29,8 @@ #include "editor/action/action.hpp" #include "overlay.hpp" -//#include "../../item_types.hpp" -//#include "../../item.hpp" +//#include "item_types.hpp" +//#include "item.hpp" namespace editor { diff --git a/src/editor/action/action_label.hpp b/src/editor/action/action_label.hpp index 199011f12dde..965c751c240e 100644 --- a/src/editor/action/action_label.hpp +++ b/src/editor/action/action_label.hpp @@ -28,8 +28,8 @@ #include "editor/action/action.hpp" -#include "../../map.hpp" -#include "../../map_label.hpp" +#include "map.hpp" +#include "map_label.hpp" namespace editor { diff --git a/src/editor/action/action_unit.cpp b/src/editor/action/action_unit.cpp index 935c4458329a..1092b03776ee 100644 --- a/src/editor/action/action_unit.cpp +++ b/src/editor/action/action_unit.cpp @@ -24,8 +24,8 @@ #include "editor/map/map_context.hpp" -#include "../../unit.hpp" -#include "../../unit_animation_component.hpp" +#include "unit.hpp" +#include "unit_animation_component.hpp" #include diff --git a/src/editor/action/action_unit.hpp b/src/editor/action/action_unit.hpp index 1c76f089e980..b7cbf7805a67 100644 --- a/src/editor/action/action_unit.hpp +++ b/src/editor/action/action_unit.hpp @@ -28,8 +28,8 @@ #include "editor/action/action.hpp" -#include "../../unit_types.hpp" -#include "../../unit.hpp" +#include "unit_types.hpp" +#include "unit.hpp" namespace editor { diff --git a/src/editor/action/mouse/mouse_action.cpp b/src/editor/action/mouse/mouse_action.cpp index 93faba002566..0b34db7e3c38 100644 --- a/src/editor/action/mouse/mouse_action.cpp +++ b/src/editor/action/mouse/mouse_action.cpp @@ -15,7 +15,7 @@ #include "editor/action/action.hpp" #include "editor/toolkit/brush.hpp" -#include "../../editor_display.hpp" +#include "editor/editor_display.hpp" #include "mouse_action.hpp" #include "gettext.hpp" diff --git a/src/editor/action/mouse/mouse_action_item.cpp b/src/editor/action/mouse/mouse_action_item.cpp index 0a9dc5ca8254..dd707b792855 100644 --- a/src/editor/action/mouse/mouse_action_item.cpp +++ b/src/editor/action/mouse/mouse_action_item.cpp @@ -15,9 +15,9 @@ #define GETTEXT_DOMAIN "wesnoth-editor" #include "mouse_action_item.hpp" -#include "../action_item.hpp" +#include "editor/action/action_item.hpp" -#include "../../editor_display.hpp" +#include "editor/editor_display.hpp" //#include "gui/dialogs/item_create.hpp" #include "tooltips.hpp" #include "gettext.hpp" diff --git a/src/editor/action/mouse/mouse_action_map_label.cpp b/src/editor/action/mouse/mouse_action_map_label.cpp index bdd0b560c86c..9f1685d34843 100644 --- a/src/editor/action/mouse/mouse_action_map_label.cpp +++ b/src/editor/action/mouse/mouse_action_map_label.cpp @@ -14,10 +14,10 @@ #define GETTEXT_DOMAIN "wesnoth-editor" #include "mouse_action_map_label.hpp" -#include "../action_label.hpp" +#include "editor/action/action_label.hpp" -#include "../../editor_display.hpp" -#include "../../map/context_manager.hpp" +#include "editor/editor_display.hpp" +#include "editor/map/context_manager.hpp" #include diff --git a/src/editor/action/mouse/mouse_action_map_label.hpp b/src/editor/action/mouse/mouse_action_map_label.hpp index 082d4329976f..62df2d007d13 100644 --- a/src/editor/action/mouse/mouse_action_map_label.hpp +++ b/src/editor/action/mouse/mouse_action_map_label.hpp @@ -17,7 +17,7 @@ #include "mouse_action.hpp" #include "editor/palette/empty_palette.hpp" -#include "../../../map_label.hpp" +#include "map_label.hpp" class CKey; diff --git a/src/editor/action/mouse/mouse_action_select.cpp b/src/editor/action/mouse/mouse_action_select.cpp index e06f6beaad78..265376185bb0 100644 --- a/src/editor/action/mouse/mouse_action_select.cpp +++ b/src/editor/action/mouse/mouse_action_select.cpp @@ -13,9 +13,9 @@ */ #include "mouse_action_select.hpp" -#include "../action_select.hpp" +#include "editor/action/action_select.hpp" -#include "../../editor_display.hpp" +#include "editor/editor_display.hpp" namespace editor { diff --git a/src/editor/action/mouse/mouse_action_unit.cpp b/src/editor/action/mouse/mouse_action_unit.cpp index 45231f1683eb..fc0176930197 100644 --- a/src/editor/action/mouse/mouse_action_unit.cpp +++ b/src/editor/action/mouse/mouse_action_unit.cpp @@ -15,9 +15,9 @@ #define GETTEXT_DOMAIN "wesnoth-editor" #include "mouse_action_unit.hpp" -#include "../action_unit.hpp" +#include "editor/action/action_unit.hpp" -#include "../../editor_display.hpp" +#include "editor/editor_display.hpp" #include "gui/dialogs/unit_create.hpp" #include "tooltips.hpp" #include "gettext.hpp" diff --git a/src/editor/action/mouse/mouse_action_village.cpp b/src/editor/action/mouse/mouse_action_village.cpp index 6eaeed71a8f2..55c5816bc0d6 100644 --- a/src/editor/action/mouse/mouse_action_village.cpp +++ b/src/editor/action/mouse/mouse_action_village.cpp @@ -13,9 +13,9 @@ */ #include "mouse_action_village.hpp" -#include "../action_village.hpp" +#include "editor/action/action_village.hpp" -#include "../../editor_display.hpp" +#include "editor/editor_display.hpp" namespace editor { diff --git a/src/editor/controller/editor_controller.cpp b/src/editor/controller/editor_controller.cpp index 826a63ad4bad..99f59cf64032 100644 --- a/src/editor/controller/editor_controller.cpp +++ b/src/editor/controller/editor_controller.cpp @@ -41,13 +41,13 @@ #include "reports.hpp" #include "desktop/clipboard.hpp" -#include "../../game_preferences.hpp" -#include "../../gettext.hpp" -#include "../../leader_scroll_dialog.hpp" -#include "../../preferences_display.hpp" -#include "../../sound.hpp" -#include "../../unit.hpp" -#include "../../unit_animation_component.hpp" +#include "game_preferences.hpp" +#include "gettext.hpp" +#include "leader_scroll_dialog.hpp" +#include "preferences_display.hpp" +#include "sound.hpp" +#include "unit.hpp" +#include "unit_animation_component.hpp" #include "quit_confirmation.hpp" diff --git a/src/editor/controller/editor_controller.hpp b/src/editor/controller/editor_controller.hpp index 175a1c4e7ba3..848b8064ed4f 100644 --- a/src/editor/controller/editor_controller.hpp +++ b/src/editor/controller/editor_controller.hpp @@ -22,11 +22,11 @@ #include "editor/map/map_fragment.hpp" #include "editor/toolkit/editor_toolkit.hpp" -#include "../../controller_base.hpp" +#include "controller_base.hpp" #include "help/help.hpp" #include "hotkey/command_executor.hpp" -#include "../../mouse_handler_base.hpp" -#include "../../tooltips.hpp" +#include "mouse_handler_base.hpp" +#include "tooltips.hpp" #include "sound_music_track.hpp" diff --git a/src/editor/editor_common.hpp b/src/editor/editor_common.hpp index 76edf01a1542..255f4453e1fb 100644 --- a/src/editor/editor_common.hpp +++ b/src/editor/editor_common.hpp @@ -21,8 +21,8 @@ #ifndef EDITOR_EDITOR_COMMON_HPP_INCLUDED #define EDITOR_EDITOR_COMMON_HPP_INCLUDED -#include "../exceptions.hpp" -#include "../log.hpp" +#include "exceptions.hpp" +#include "log.hpp" extern lg::log_domain log_editor; #define DBG_ED LOG_STREAM_INDENT(debug, log_editor) diff --git a/src/editor/editor_display.hpp b/src/editor/editor_display.hpp index eb1c57f88355..084201979567 100644 --- a/src/editor/editor_display.hpp +++ b/src/editor/editor_display.hpp @@ -16,7 +16,7 @@ #define EDITOR_EDITOR_DISPLAY_HPP_INCLUDED #include "map/editor_map.hpp" -#include "../display.hpp" +#include "display.hpp" namespace editor { diff --git a/src/editor/editor_main.cpp b/src/editor/editor_main.cpp index b859567a8601..690a90654feb 100644 --- a/src/editor/editor_main.cpp +++ b/src/editor/editor_main.cpp @@ -15,8 +15,8 @@ #include "controller/editor_controller.hpp" -#include "../gettext.hpp" -#include "../filesystem.hpp" +#include "gettext.hpp" +#include "filesystem.hpp" #include "editor/action/action_base.hpp" #include diff --git a/src/editor/map/editor_map.cpp b/src/editor/map/editor_map.cpp index da102d068f59..24350ccbdf83 100644 --- a/src/editor/map/editor_map.cpp +++ b/src/editor/map/editor_map.cpp @@ -13,15 +13,15 @@ */ #define GETTEXT_DOMAIN "wesnoth-editor" -#include "../action/action_base.hpp" +#include "editor/action/action_base.hpp" #include "editor_map.hpp" #include "formula_string_utils.hpp" -#include "../../display.hpp" -#include "../../gettext.hpp" -#include "../../map_exception.hpp" -#include "../../map_label.hpp" -#include "../../wml_exception.hpp" +#include "display.hpp" +#include "gettext.hpp" +#include "map_exception.hpp" +#include "map_label.hpp" +#include "wml_exception.hpp" #include "terrain_type_data.hpp" diff --git a/src/editor/map/editor_map.hpp b/src/editor/map/editor_map.hpp index a2b4b7039ca3..7eafd242829e 100644 --- a/src/editor/map/editor_map.hpp +++ b/src/editor/map/editor_map.hpp @@ -15,9 +15,9 @@ #ifndef EDITOR_EDITOR_MAP_HPP_INCLUDED #define EDITOR_EDITOR_MAP_HPP_INCLUDED -#include "../editor_common.hpp" +#include "editor/editor_common.hpp" -#include "../../map.hpp" +#include "map.hpp" #include diff --git a/src/editor/map/map_context.hpp b/src/editor/map/map_context.hpp index b665b20eabd0..8c4452fa0a30 100644 --- a/src/editor/map/map_context.hpp +++ b/src/editor/map/map_context.hpp @@ -23,7 +23,7 @@ #include "tod_manager.hpp" #include "unit_map.hpp" #include "overlay.hpp" -#include "../../display_context.hpp" +#include "display_context.hpp" #include #include diff --git a/src/editor/palette/editor_palettes.hpp b/src/editor/palette/editor_palettes.hpp index a0d874965186..0a5f4deaf95b 100644 --- a/src/editor/palette/editor_palettes.hpp +++ b/src/editor/palette/editor_palettes.hpp @@ -15,7 +15,7 @@ #ifndef EDITOR_PALETTES_H_INCLUDED #define EDITOR_PALETTES_H_INCLUDED -#include "../editor_display.hpp" +#include "editor/editor_display.hpp" #include "common_palette.hpp" #include "tristate_button.hpp" diff --git a/src/editor/palette/item_palette.cpp b/src/editor/palette/item_palette.cpp index 4c9be5d13bb7..5e3f6461d571 100644 --- a/src/editor/palette/item_palette.cpp +++ b/src/editor/palette/item_palette.cpp @@ -19,7 +19,7 @@ #define GETTEXT_DOMAIN "wesnoth-editor" #include "item_palette.hpp" -#include "../../gettext.hpp" +#include "gettext.hpp" #include #include diff --git a/src/editor/palette/terrain_palettes.cpp b/src/editor/palette/terrain_palettes.cpp index ae14d698f7c4..c83ff1a1d014 100644 --- a/src/editor/palette/terrain_palettes.cpp +++ b/src/editor/palette/terrain_palettes.cpp @@ -20,8 +20,8 @@ #include "terrain_palettes.hpp" -#include "../../gettext.hpp" -#include "../../formula_string_utils.hpp" +#include "gettext.hpp" +#include "formula_string_utils.hpp" #include diff --git a/src/editor/palette/unit_palette.cpp b/src/editor/palette/unit_palette.cpp index c1244f8a5b8f..aaa06610fdbd 100644 --- a/src/editor/palette/unit_palette.cpp +++ b/src/editor/palette/unit_palette.cpp @@ -20,9 +20,9 @@ #include "unit_palette.hpp" -#include "../../gettext.hpp" +#include "gettext.hpp" -#include "../../unit_types.hpp" +#include "unit_types.hpp" #include diff --git a/src/editor/palette/unit_palette.hpp b/src/editor/palette/unit_palette.hpp index b443c186a1ca..b1f28f24683b 100644 --- a/src/editor/palette/unit_palette.hpp +++ b/src/editor/palette/unit_palette.hpp @@ -21,7 +21,7 @@ #include "editor_palettes.hpp" -#include "../../unit_types.hpp" +#include "unit_types.hpp" namespace editor { diff --git a/src/editor/toolkit/brush.hpp b/src/editor/toolkit/brush.hpp index 905900d56ecd..9342e1d39cf9 100644 --- a/src/editor/toolkit/brush.hpp +++ b/src/editor/toolkit/brush.hpp @@ -15,7 +15,7 @@ #ifndef EDITOR_BRUSH_HPP_INCLUDED #define EDITOR_BRUSH_HPP_INCLUDED -#include "../map/editor_map.hpp" +#include "editor/map/editor_map.hpp" namespace editor { diff --git a/src/game_events/entity_location.cpp b/src/game_events/entity_location.cpp index 59d9026b3796..1ef944a7f4c1 100644 --- a/src/game_events/entity_location.cpp +++ b/src/game_events/entity_location.cpp @@ -20,10 +20,10 @@ #include "global.hpp" #include "entity_location.hpp" -#include "../resources.hpp" -#include "../unit.hpp" -#include "../unit_filter.hpp" -#include "../variable.hpp" +#include "resources.hpp" +#include "unit.hpp" +#include "unit_filter.hpp" +#include "variable.hpp" // This file is in the game_events namespace. diff --git a/src/game_events/entity_location.hpp b/src/game_events/entity_location.hpp index 1918c1614eba..c7ade83ff38d 100644 --- a/src/game_events/entity_location.hpp +++ b/src/game_events/entity_location.hpp @@ -20,8 +20,8 @@ #ifndef GAME_EVENTS_ENTITY_LOCATION_H_INCLUDED #define GAME_EVENTS_ENTITY_LOCATION_H_INCLUDED -#include "../map_location.hpp" -#include "../unit_map.hpp" +#include "map_location.hpp" +#include "unit_map.hpp" class unit; class vconfig; diff --git a/src/game_events/handlers.cpp b/src/game_events/handlers.cpp index 9de0cd54edf1..de661c4d1f01 100644 --- a/src/game_events/handlers.cpp +++ b/src/game_events/handlers.cpp @@ -18,21 +18,21 @@ * (Typically, handlers are defined by [event] tags.) */ -#include "../global.hpp" +#include "global.hpp" #include "handlers.hpp" #include "manager.hpp" #include "manager_impl.hpp" #include "menu_item.hpp" #include "pump.hpp" -#include "../formula_string_utils.hpp" -#include "../game_data.hpp" -#include "../log.hpp" -#include "../reports.hpp" -#include "../scripting/game_lua_kernel.hpp" -#include "../serialization/string_utils.hpp" -#include "../soundsource.hpp" -#include "../util.hpp" +#include "formula_string_utils.hpp" +#include "game_data.hpp" +#include "log.hpp" +#include "reports.hpp" +#include "scripting/game_lua_kernel.hpp" +#include "serialization/string_utils.hpp" +#include "soundsource.hpp" +#include "util.hpp" #include #include diff --git a/src/game_events/handlers.hpp b/src/game_events/handlers.hpp index ab6b07de7a6c..945d2a9ed666 100644 --- a/src/game_events/handlers.hpp +++ b/src/game_events/handlers.hpp @@ -24,8 +24,8 @@ #ifndef GAME_EVENTS_HANDLERS_H_INCLUDED #define GAME_EVENTS_HANDLERS_H_INCLUDED -#include "../config.hpp" -#include "../utils/smart_list.hpp" +#include "config.hpp" +#include "utils/smart_list.hpp" #include #include diff --git a/src/game_events/menu_item.cpp b/src/game_events/menu_item.cpp index f878960e21ca..a150c1963a88 100644 --- a/src/game_events/menu_item.cpp +++ b/src/game_events/menu_item.cpp @@ -19,27 +19,27 @@ #include "menu_item.hpp" -#include "../global.hpp" +#include "global.hpp" #include "conditional_wml.hpp" #include "handlers.hpp" #include "manager.hpp" #include "pump.hpp" -#include "../actions/undo.hpp" -#include "../game_config.hpp" -#include "../game_data.hpp" -#include "../log.hpp" -#include "../mouse_handler_base.hpp" +#include "actions/undo.hpp" +#include "game_config.hpp" +#include "game_data.hpp" +#include "log.hpp" +#include "mouse_handler_base.hpp" #include "hotkey/hotkey_command.hpp" #include "hotkey_handler.hpp" #include "play_controller.hpp" -#include "../preferences.hpp" -#include "../replay.hpp" -#include "../replay_helper.hpp" -#include "../resources.hpp" -#include "../synced_context.hpp" -#include "../terrain_filter.hpp" +#include "preferences.hpp" +#include "replay.hpp" +#include "replay_helper.hpp" +#include "resources.hpp" +#include "synced_context.hpp" +#include "terrain_filter.hpp" static lg::log_domain log_engine("engine"); #define ERR_NG LOG_STREAM(err, log_engine) diff --git a/src/game_events/menu_item.hpp b/src/game_events/menu_item.hpp index da6161748f23..da81363da1db 100644 --- a/src/game_events/menu_item.hpp +++ b/src/game_events/menu_item.hpp @@ -20,9 +20,9 @@ #ifndef GAME_EVENTS_MENU_ITEM_HPP_INCLUDED #define GAME_EVENTS_MENU_ITEM_HPP_INCLUDED -#include "../config.hpp" -#include "../tstring.hpp" -#include "../variable.hpp" +#include "config.hpp" +#include "tstring.hpp" +#include "variable.hpp" class filter_context; class game_data; diff --git a/src/game_events/pump.cpp b/src/game_events/pump.cpp index 9bd13d0f0c93..c3e270db43c1 100644 --- a/src/game_events/pump.cpp +++ b/src/game_events/pump.cpp @@ -18,26 +18,26 @@ * as well as tracking the context for event firing. */ -#include "../global.hpp" +#include "global.hpp" #include "pump.hpp" #include "conditional_wml.hpp" #include "handlers.hpp" #include "manager.hpp" -#include "../display_chat_manager.hpp" -#include "../game_config.hpp" -#include "../game_display.hpp" -#include "../game_data.hpp" -#include "../gettext.hpp" -#include "../log.hpp" -#include "../play_controller.hpp" -#include "../scripting/game_lua_kernel.hpp" -#include "../side_filter.hpp" -#include "../unit.hpp" -#include "../unit_map.hpp" -#include "../whiteboard/manager.hpp" -#include "../variable.hpp" -#include "../resources.hpp" +#include "display_chat_manager.hpp" +#include "game_config.hpp" +#include "game_display.hpp" +#include "game_data.hpp" +#include "gettext.hpp" +#include "log.hpp" +#include "play_controller.hpp" +#include "scripting/game_lua_kernel.hpp" +#include "side_filter.hpp" +#include "unit.hpp" +#include "unit_map.hpp" +#include "whiteboard/manager.hpp" +#include "variable.hpp" +#include "resources.hpp" #include #include diff --git a/src/game_events/wmi_container.cpp b/src/game_events/wmi_container.cpp index 56a9768fccc5..99b094b2eee3 100644 --- a/src/game_events/wmi_container.cpp +++ b/src/game_events/wmi_container.cpp @@ -17,17 +17,17 @@ * Definitions for a container for wml_menu_item. */ -#include "../global.hpp" +#include "global.hpp" #include "wmi_container.hpp" #include "handlers.hpp" #include "menu_item.hpp" #include "resources.hpp" #include "play_controller.hpp" -#include "../config.hpp" -#include "../game_data.hpp" -#include "../log.hpp" -#include "../map_location.hpp" +#include "config.hpp" +#include "game_data.hpp" +#include "log.hpp" +#include "map_location.hpp" #include diff --git a/src/game_events/wmi_container.hpp b/src/game_events/wmi_container.hpp index 41d27b3b6c11..be73cec6fe6b 100644 --- a/src/game_events/wmi_container.hpp +++ b/src/game_events/wmi_container.hpp @@ -20,7 +20,7 @@ #ifndef GAME_EVENTS_WMI_CONTAINER_HPP_INCLUDED #define GAME_EVENTS_WMI_CONTAINER_HPP_INCLUDED -#include "../utils/iterator.hpp" +#include "utils/iterator.hpp" #include diff --git a/src/gui/auxiliary/canvas.cpp b/src/gui/auxiliary/canvas.cpp index b07eaa164712..5244f3cfb487 100644 --- a/src/gui/auxiliary/canvas.cpp +++ b/src/gui/auxiliary/canvas.cpp @@ -22,14 +22,14 @@ #include "gui/auxiliary/canvas.hpp" #include "config.hpp" -#include "../../image.hpp" +#include "image.hpp" #include "formatter.hpp" #include "gettext.hpp" #include "gui/auxiliary/formula.hpp" #include "gui/auxiliary/log.hpp" #include "gui/widgets/helper.hpp" #include "sdl/rect.hpp" -#include "../../text.hpp" +#include "text.hpp" #include "utils/foreach.tpp" #include "video.hpp" #include "wml_exception.hpp" diff --git a/src/gui/auxiliary/formula.hpp b/src/gui/auxiliary/formula.hpp index 08f5656f5dac..6c7c13b67e21 100644 --- a/src/gui/auxiliary/formula.hpp +++ b/src/gui/auxiliary/formula.hpp @@ -17,7 +17,7 @@ #include "formula_callable.hpp" #include "formula_function.hpp" -#include "../../formula.hpp" +#include "formula.hpp" #include "gui/auxiliary/log.hpp" #include "gui/widgets/helper.hpp" #include "serialization/string_utils.hpp" diff --git a/src/gui/auxiliary/log.hpp b/src/gui/auxiliary/log.hpp index 56a8d1dcbfd8..fefe86720f3a 100644 --- a/src/gui/auxiliary/log.hpp +++ b/src/gui/auxiliary/log.hpp @@ -20,7 +20,7 @@ #ifndef GUI_AUXILIARY_LOG_HPP_INCLUDED #define GUI_AUXILIARY_LOG_HPP_INCLUDED -#include "../../log.hpp" +#include "../../log.hpp" // We want the file in src/ namespace gui2 { diff --git a/src/gui/dialogs/chat_log.cpp b/src/gui/dialogs/chat_log.cpp index 02dcc6e7ccb5..8a7e8b673bb0 100644 --- a/src/gui/dialogs/chat_log.cpp +++ b/src/gui/dialogs/chat_log.cpp @@ -32,11 +32,11 @@ #include "desktop/clipboard.hpp" #include "serialization/unicode.hpp" -#include "../../game_preferences.hpp" -#include "../../log.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../replay.hpp" +#include "game_preferences.hpp" +#include "log.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "replay.hpp" #include "gettext.hpp" #include diff --git a/src/gui/dialogs/chat_log.hpp b/src/gui/dialogs/chat_log.hpp index 86f8684151c7..f79deee5ae61 100644 --- a/src/gui/dialogs/chat_log.hpp +++ b/src/gui/dialogs/chat_log.hpp @@ -16,7 +16,7 @@ #define GUI_DIALOGS_CHAT_LOG_HPP_INCLUDED #include "gui/dialogs/dialog.hpp" -#include "../../variable.hpp" +#include "variable.hpp" #include diff --git a/src/gui/dialogs/formula_debugger.cpp b/src/gui/dialogs/formula_debugger.cpp index 65c05d4e2623..bc8b0fc4eb94 100644 --- a/src/gui/dialogs/formula_debugger.cpp +++ b/src/gui/dialogs/formula_debugger.cpp @@ -21,7 +21,7 @@ #include "gui/widgets/button.hpp" #include "gui/widgets/settings.hpp" #include "gui/widgets/window.hpp" -#include "../../formula_debugger.hpp" +#include "../../formula_debugger.hpp" // We want the file in src/ #include "utils/foreach.tpp" #include diff --git a/src/gui/dialogs/gamestate_inspector.cpp b/src/gui/dialogs/gamestate_inspector.cpp index a6a4d4bb66ac..91db78dc0e3b 100644 --- a/src/gui/dialogs/gamestate_inspector.cpp +++ b/src/gui/dialogs/gamestate_inspector.cpp @@ -33,13 +33,13 @@ #include "serialization/parser.hpp" // for write() #include "utils/foreach.tpp" -#include "../../game_data.hpp" -#include "../../recall_list_manager.hpp" -#include "../../resources.hpp" -#include "../../team.hpp" -#include "../../unit.hpp" -#include "../../unit_map.hpp" -#include "../../ai/manager.hpp" +#include "game_data.hpp" +#include "recall_list_manager.hpp" +#include "resources.hpp" +#include "team.hpp" +#include "unit.hpp" +#include "unit_map.hpp" +#include "ai/manager.hpp" #include #include diff --git a/src/gui/dialogs/gamestate_inspector.hpp b/src/gui/dialogs/gamestate_inspector.hpp index decb51494b89..041a1c01da90 100644 --- a/src/gui/dialogs/gamestate_inspector.hpp +++ b/src/gui/dialogs/gamestate_inspector.hpp @@ -16,7 +16,7 @@ #define GUI_DIALOGS_GAMESTATE_INSPECTOR_HPP_INCLUDED #include "gui/dialogs/dialog.hpp" -#include "../../variable.hpp" +#include "variable.hpp" #include diff --git a/src/gui/dialogs/mp_create_game.cpp b/src/gui/dialogs/mp_create_game.cpp index bf78d370a1aa..a911706b3d8b 100644 --- a/src/gui/dialogs/mp_create_game.cpp +++ b/src/gui/dialogs/mp_create_game.cpp @@ -31,7 +31,7 @@ #endif #include "gui/widgets/minimap.hpp" #include "gui/widgets/settings.hpp" -#include "../../settings.hpp" +#include "settings.hpp" #include "utils/foreach.tpp" #ifdef GUI2_EXPERIMENTAL_LISTBOX diff --git a/src/gui/dialogs/synced_choice_wait.cpp b/src/gui/dialogs/synced_choice_wait.cpp index b36558d5401a..a3186d0438ac 100644 --- a/src/gui/dialogs/synced_choice_wait.cpp +++ b/src/gui/dialogs/synced_choice_wait.cpp @@ -22,8 +22,8 @@ #include "quit_confirmation.hpp" #include "message.hpp" -#include "../../game_end_exceptions.hpp" -#include "../../gettext.hpp" +#include "game_end_exceptions.hpp" +#include "gettext.hpp" #include diff --git a/src/gui/dialogs/synced_choice_wait.hpp b/src/gui/dialogs/synced_choice_wait.hpp index 93400dca0c50..2e5a5bd0141f 100644 --- a/src/gui/dialogs/synced_choice_wait.hpp +++ b/src/gui/dialogs/synced_choice_wait.hpp @@ -16,8 +16,8 @@ #define GUI_DIALOGS_THEME_LIST_HPP_INCLUDED #include "gui/dialogs/dialog.hpp" -#include "../../synced_user_choice.hpp" -#include "../../generic_event.hpp" +#include "synced_user_choice.hpp" +#include "generic_event.hpp" namespace gui2 { class tlabel; diff --git a/src/gui/widgets/control.hpp b/src/gui/widgets/control.hpp index 874ac5a2fb04..aaedfc27c82b 100644 --- a/src/gui/widgets/control.hpp +++ b/src/gui/widgets/control.hpp @@ -17,7 +17,7 @@ #include "gui/auxiliary/widget_definition.hpp" #include "gui/widgets/widget.hpp" -#include "../../text.hpp" +#include "../../text.hpp" // We want the file in src/ typedef std::map string_map; diff --git a/src/gui/widgets/image.cpp b/src/gui/widgets/image.cpp index b08b48c5bc8f..89d654a2d025 100644 --- a/src/gui/widgets/image.cpp +++ b/src/gui/widgets/image.cpp @@ -16,7 +16,7 @@ #include "gui/widgets/image.hpp" -#include "../../image.hpp" +#include "../../image.hpp" // We want the file in src/ #include "gui/auxiliary/widget_definition/image.hpp" #include "gui/auxiliary/window_builder/image.hpp" #include "gui/auxiliary/log.hpp" diff --git a/src/gui/widgets/minimap.cpp b/src/gui/widgets/minimap.cpp index 2ead4f0454a1..dd3640e376e7 100644 --- a/src/gui/widgets/minimap.cpp +++ b/src/gui/widgets/minimap.cpp @@ -24,7 +24,7 @@ #include "map.hpp" #include "map_exception.hpp" #include "terrain_type_data.hpp" -#include "../../minimap.hpp" +#include "../../minimap.hpp" // We want the file in src/ #include #include diff --git a/src/gui/widgets/text.hpp b/src/gui/widgets/text.hpp index fdefa528ad55..80e30b46a091 100644 --- a/src/gui/widgets/text.hpp +++ b/src/gui/widgets/text.hpp @@ -17,7 +17,7 @@ //#include "gui/auxiliary/event/dispatcher.hpp" #include "gui/widgets/control.hpp" -#include "../../text.hpp" +#include "../../text.hpp" // We want the file in src/ #include diff --git a/src/lua/ldo.cpp b/src/lua/ldo.cpp index 71629c3bcc67..2d3bc96ad63d 100644 --- a/src/lua/ldo.cpp +++ b/src/lua/ldo.cpp @@ -11,7 +11,7 @@ #define ldo_c #define LUA_CORE -#include "../lua_jailbreak_exception.hpp" +#include "lua_jailbreak_exception.hpp" #include #if !defined(__cplusplus) #error "Exception support requires a C++ compiler." diff --git a/src/sdl/shader.cpp b/src/sdl/shader.cpp index 8fd6d0d85adb..8ec61b938d24 100644 --- a/src/sdl/shader.cpp +++ b/src/sdl/shader.cpp @@ -15,7 +15,7 @@ #include "shader.hpp" #include #include "image.hpp" -#include "../image.hpp" +#include "../image.hpp" // We want the file in src/ #ifdef SDL_GPU namespace sdl diff --git a/src/server/forum_user_handler.cpp b/src/server/forum_user_handler.cpp index 70fb781f7996..0a5a155ad91d 100644 --- a/src/server/forum_user_handler.cpp +++ b/src/server/forum_user_handler.cpp @@ -15,7 +15,7 @@ #ifdef HAVE_MYSQLPP #include "forum_user_handler.hpp" -#include "../hash.hpp" +#include "hash.hpp" #include "log.hpp" #include "config.hpp" diff --git a/src/server/game.cpp b/src/server/game.cpp index 36a764354e1c..5f4e645b431e 100644 --- a/src/server/game.cpp +++ b/src/server/game.cpp @@ -12,11 +12,11 @@ See the COPYING file for more details. */ -#include "../global.hpp" +#include "global.hpp" -#include "../filesystem.hpp" -#include "../game_config.hpp" // game_config::observer_team_name -#include "../log.hpp" +#include "filesystem.hpp" +#include "game_config.hpp" // game_config::observer_team_name +#include "log.hpp" #include "game.hpp" #include "player_network.hpp" diff --git a/src/server/game.hpp b/src/server/game.hpp index 801e1ac2984c..0b45115ddb11 100644 --- a/src/server/game.hpp +++ b/src/server/game.hpp @@ -15,7 +15,7 @@ #ifndef GAME_HPP_INCLUDED #define GAME_HPP_INCLUDED -#include "../network.hpp" +#include "network.hpp" #include "player.hpp" #include "simple_wml.hpp" @@ -23,8 +23,8 @@ #include #include -#include "../mt_rng.hpp" -#include "../make_enum.hpp" +#include "mt_rng.hpp" +#include "make_enum.hpp" #include //class player; diff --git a/src/server/input_stream.cpp b/src/server/input_stream.cpp index 5cd132213158..02ce35a231a3 100644 --- a/src/server/input_stream.cpp +++ b/src/server/input_stream.cpp @@ -12,7 +12,7 @@ See the COPYING file for more details. */ -#include "../global.hpp" +#include "global.hpp" #include "input_stream.hpp" diff --git a/src/server/metrics.cpp b/src/server/metrics.cpp index a962305b6efe..e4571bb54124 100644 --- a/src/server/metrics.cpp +++ b/src/server/metrics.cpp @@ -17,7 +17,7 @@ * Various server-statistics. */ -#include "../global.hpp" +#include "global.hpp" #include "metrics.hpp" diff --git a/src/server/player.cpp b/src/server/player.cpp index bca81f794add..7d3cf5464864 100644 --- a/src/server/player.cpp +++ b/src/server/player.cpp @@ -12,7 +12,7 @@ See the COPYING file for more details. */ -#include "../global.hpp" +#include "global.hpp" #include "player.hpp" #include "serialization/string_utils.hpp" diff --git a/src/server/player_network.cpp b/src/server/player_network.cpp index f45029c9dbed..fcc63c2c2148 100644 --- a/src/server/player_network.cpp +++ b/src/server/player_network.cpp @@ -14,7 +14,7 @@ */ #include "player_network.hpp" -#include "../log.hpp" +#include "log.hpp" #include "serialization/unicode.hpp" lg::log_domain log_config_pn("config"); diff --git a/src/server/player_network.hpp b/src/server/player_network.hpp index da3326c1d038..8a268806153a 100644 --- a/src/server/player_network.hpp +++ b/src/server/player_network.hpp @@ -16,12 +16,12 @@ #ifndef SERVER_PLAYER_NETWORK_HPP_INCLUDED #define SERVER_PLAYER_NETWORK_HPP_INCLUDED -#include "../network.hpp" +#include "network.hpp" #include "player.hpp" #include "simple_wml.hpp" #include "utils/boost_function_guarded.hpp" -#include "../log.hpp" +#include "log.hpp" extern lg::log_domain log_config_pn; namespace wesnothd { diff --git a/src/server/room.cpp b/src/server/room.cpp index 39e751ccf361..958888c39389 100644 --- a/src/server/room.cpp +++ b/src/server/room.cpp @@ -16,7 +16,7 @@ #include "game.hpp" #include "player_network.hpp" #include "room.hpp" -#include "../log.hpp" +#include "log.hpp" #include "serialization/string_utils.hpp" #include "util.hpp" diff --git a/src/server/room.hpp b/src/server/room.hpp index d385edba2774..02e0fc5942c2 100644 --- a/src/server/room.hpp +++ b/src/server/room.hpp @@ -15,7 +15,7 @@ #ifndef SERVER_ROOM_HPP_INCLUDED #define SERVER_ROOM_HPP_INCLUDED -#include "../network.hpp" +#include "network.hpp" #include "player.hpp" #include "simple_wml.hpp" diff --git a/src/server/room_manager.cpp b/src/server/room_manager.cpp index 9b7354b8b7a2..7387fca84c95 100644 --- a/src/server/room_manager.cpp +++ b/src/server/room_manager.cpp @@ -15,12 +15,12 @@ #include "player_network.hpp" #include "room_manager.hpp" -#include "../serialization/parser.hpp" -#include "../serialization/binary_or_text.hpp" -#include "../serialization/string_utils.hpp" -#include "../util.hpp" -#include "../filesystem.hpp" -#include "../log.hpp" +#include "serialization/parser.hpp" +#include "serialization/binary_or_text.hpp" +#include "serialization/string_utils.hpp" +#include "util.hpp" +#include "filesystem.hpp" +#include "log.hpp" #include diff --git a/src/server/server.cpp b/src/server/server.cpp index 2fee3a436feb..c2de436f6abc 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -19,20 +19,20 @@ #include "server.hpp" -#include "../global.hpp" - -#include "../config.hpp" -#include "../game_config.hpp" -#include "../log.hpp" -#include "../map.hpp" // gamemap::MAX_PLAYERS -#include "../network.hpp" -#include "../filesystem.hpp" -#include "../multiplayer_error_codes.hpp" -#include "../serialization/parser.hpp" -#include "../serialization/preprocessor.hpp" -#include "../serialization/string_utils.hpp" -#include "../serialization/unicode.hpp" -#include "../util.hpp" +#include "global.hpp" + +#include "config.hpp" +#include "game_config.hpp" +#include "log.hpp" +#include "map.hpp" // gamemap::MAX_PLAYERS +#include "network.hpp" +#include "filesystem.hpp" +#include "multiplayer_error_codes.hpp" +#include "serialization/parser.hpp" +#include "serialization/preprocessor.hpp" +#include "serialization/string_utils.hpp" +#include "serialization/unicode.hpp" +#include "util.hpp" #include "game.hpp" #include "input_stream.hpp" diff --git a/src/server/server.hpp b/src/server/server.hpp index 513168f8f4d7..cc476ba37180 100644 --- a/src/server/server.hpp +++ b/src/server/server.hpp @@ -19,7 +19,7 @@ #include "user_handler.hpp" #include "input_stream.hpp" #include "metrics.hpp" -#include "../network.hpp" +#include "network.hpp" #include "ban.hpp" #include "player.hpp" #include "room_manager.hpp" diff --git a/src/server/simple_wml.cpp b/src/server/simple_wml.cpp index 51dc673bf168..28087f9d677b 100644 --- a/src/server/simple_wml.cpp +++ b/src/server/simple_wml.cpp @@ -25,7 +25,7 @@ #include "simple_wml.hpp" -#include "../log.hpp" +#include "log.hpp" static lg::log_domain log_config("config"); #define ERR_SWML LOG_STREAM(err, log_config) diff --git a/src/server/user_handler.cpp b/src/server/user_handler.cpp index cc1102b20a12..3ed360979728 100644 --- a/src/server/user_handler.cpp +++ b/src/server/user_handler.cpp @@ -13,7 +13,7 @@ */ #include "user_handler.hpp" -#include "../config.hpp" +#include "config.hpp" #include "serialization/string_utils.hpp" #include diff --git a/src/server/user_handler.hpp b/src/server/user_handler.hpp index 2aeefbcf6046..8aaafdee8b8d 100644 --- a/src/server/user_handler.hpp +++ b/src/server/user_handler.hpp @@ -17,8 +17,8 @@ class config; -#include "../exceptions.hpp" -#include "../global.hpp" +#include "exceptions.hpp" +#include "global.hpp" #include diff --git a/src/tests/test_lua.cpp b/src/tests/test_lua.cpp index 56fa8b2e8cc4..6b06e9e1622c 100644 --- a/src/tests/test_lua.cpp +++ b/src/tests/test_lua.cpp @@ -14,7 +14,7 @@ #define GETTEXT_DOMAIN "wesnoth-test" #include -#include "../scripting/lua_kernel_base.hpp" +#include "scripting/lua_kernel_base.hpp" #include "lua/lualib.h" #include "lua/lauxlib.h" diff --git a/src/tools/cutter.cpp b/src/tools/cutter.cpp index 20a03e4d7c37..084c86de38ae 100644 --- a/src/tools/cutter.cpp +++ b/src/tools/cutter.cpp @@ -17,7 +17,7 @@ * Standalone-Utility for images / tiles */ -#include "../game_config.hpp" +#include "game_config.hpp" #include "exploder_composer.hpp" #include "SDL_image.h" diff --git a/src/tools/dummy_video.cpp b/src/tools/dummy_video.cpp index 563f07aee53b..370a5ccd9fac 100644 --- a/src/tools/dummy_video.cpp +++ b/src/tools/dummy_video.cpp @@ -14,8 +14,8 @@ /** @file */ -#include "../video.hpp" -#include "../sdl/utils.hpp" +#include "video.hpp" +#include "sdl/utils.hpp" static surface dummy_screen_surface(NULL); diff --git a/src/tools/exploder.cpp b/src/tools/exploder.cpp index 0226b8d782be..d7642e41abd8 100644 --- a/src/tools/exploder.cpp +++ b/src/tools/exploder.cpp @@ -12,7 +12,7 @@ See the COPYING file for more details. */ -#include "../game_config.hpp" +#include "game_config.hpp" #include "exploder_composer.hpp" #include diff --git a/src/tools/exploder_cutter.hpp b/src/tools/exploder_cutter.hpp index 3878bf0bd1dc..ef97aaa1d7ec 100644 --- a/src/tools/exploder_cutter.hpp +++ b/src/tools/exploder_cutter.hpp @@ -15,8 +15,8 @@ #ifndef EXPLODER_CUTTER_HPP_INCLUDED #define EXPLODER_CUTTER_HPP_INCLUDED -#include "../sdl/utils.hpp" -#include "../config.hpp" +#include "sdl/utils.hpp" +#include "config.hpp" #include "exploder_utils.hpp" class cutter diff --git a/src/tools/exploder_utils.hpp b/src/tools/exploder_utils.hpp index 303bece84f06..749cad5a0e02 100644 --- a/src/tools/exploder_utils.hpp +++ b/src/tools/exploder_utils.hpp @@ -15,7 +15,7 @@ #ifndef EXPLODER_UTILS_HPP_INCLUDED #define EXPLODER_UTILS_HPP_INCLUDED -#include "../sdl/utils.hpp" +#include "sdl/utils.hpp" #include struct exploder_failure diff --git a/src/whiteboard/action.hpp b/src/whiteboard/action.hpp index 2d82a9089b29..7203da12d0a0 100644 --- a/src/whiteboard/action.hpp +++ b/src/whiteboard/action.hpp @@ -21,7 +21,7 @@ #include "typedefs.hpp" #include "map_location.hpp" -#include "../game_errors.hpp" +#include "game_errors.hpp" namespace wb { diff --git a/src/whiteboard/manager.hpp b/src/whiteboard/manager.hpp index d99166a8380f..9afdbf51f8d6 100644 --- a/src/whiteboard/manager.hpp +++ b/src/whiteboard/manager.hpp @@ -21,7 +21,7 @@ #include "side_actions.hpp" -#include "../unit_map.hpp" +#include "unit_map.hpp" #include diff --git a/src/whiteboard/move.hpp b/src/whiteboard/move.hpp index 45527d95b205..2f9e0008551a 100644 --- a/src/whiteboard/move.hpp +++ b/src/whiteboard/move.hpp @@ -20,7 +20,7 @@ #define WB_MOVE_HPP_ #include "action.hpp" -#include "../game_errors.hpp" +#include "game_errors.hpp" struct temporary_unit_mover; diff --git a/src/whiteboard/typedefs.hpp b/src/whiteboard/typedefs.hpp index 8f44a6d7f0b0..2a8b4d91aa80 100644 --- a/src/whiteboard/typedefs.hpp +++ b/src/whiteboard/typedefs.hpp @@ -37,8 +37,8 @@ static lg::log_domain log_whiteboard("whiteboard"); #include #include -#include "../fake_unit_ptr.hpp" -#include "../unit_ptr.hpp" +#include "fake_unit_ptr.hpp" +#include "unit_ptr.hpp" class arrow; class config; diff --git a/src/widgets/button.hpp b/src/widgets/button.hpp index eda399f2de80..a43fa80f2929 100644 --- a/src/widgets/button.hpp +++ b/src/widgets/button.hpp @@ -16,7 +16,7 @@ #include "widget.hpp" -#include "../exceptions.hpp" +#include "exceptions.hpp" #ifdef SDL_GPU #include "sdl/image.hpp" diff --git a/src/widgets/file_menu.hpp b/src/widgets/file_menu.hpp index 31106d90f602..edaf7bef9ece 100644 --- a/src/widgets/file_menu.hpp +++ b/src/widgets/file_menu.hpp @@ -15,7 +15,7 @@ #ifndef FILE_MENU_H_INCLUDED #define FILE_MENU_H_INCLUDED -#include "../construct_dialog.hpp" +#include "construct_dialog.hpp" namespace gui { diff --git a/src/widgets/label.hpp b/src/widgets/label.hpp index 99a26d2057f4..6f3424c278c8 100644 --- a/src/widgets/label.hpp +++ b/src/widgets/label.hpp @@ -15,7 +15,7 @@ #ifndef LABEL_HPP_INCLUDED #define LABEL_HPP_INCLUDED -#include "../font.hpp" +#include "font.hpp" #include "widget.hpp" #include #include "sdl/image.hpp" diff --git a/src/widgets/scrollpane.hpp b/src/widgets/scrollpane.hpp index 2e9f7dc97b35..7d7111a2e165 100644 --- a/src/widgets/scrollpane.hpp +++ b/src/widgets/scrollpane.hpp @@ -21,7 +21,7 @@ #include #include "SDL.h" -#include "../sdl/utils.hpp" +#include "sdl/utils.hpp" #include "scrollarea.hpp" namespace gui { diff --git a/src/widgets/slider.hpp b/src/widgets/slider.hpp index 4b463f2fcffd..94c1137fb88a 100644 --- a/src/widgets/slider.hpp +++ b/src/widgets/slider.hpp @@ -16,7 +16,7 @@ #include "SDL.h" -#include "../sdl/utils.hpp" +#include "sdl/utils.hpp" #include "widget.hpp" diff --git a/src/widgets/textbox.hpp b/src/widgets/textbox.hpp index 5d60d7cad87c..75ece932c0aa 100644 --- a/src/widgets/textbox.hpp +++ b/src/widgets/textbox.hpp @@ -15,7 +15,7 @@ #ifndef TEXTBOX_HPP_INCLUDED #define TEXTBOX_HPP_INCLUDED -#include "../serialization/unicode.hpp" +#include "serialization/unicode.hpp" #include "font.hpp" #include "scrollarea.hpp" diff --git a/src/widgets/widget.hpp b/src/widgets/widget.hpp index c0a45ca9c231..6249dfcaa3c8 100644 --- a/src/widgets/widget.hpp +++ b/src/widgets/widget.hpp @@ -15,8 +15,8 @@ #ifndef WIDGET_HPP_INCLUDED #define WIDGET_HPP_INCLUDED -#include "../events.hpp" -#include "../sdl/utils.hpp" +#include "events.hpp" +#include "sdl/utils.hpp" #include "video.hpp" class CVideo;