Convert most includes to src/-relative

This excludes includes that need backtrack path specifiers in order to resolve name clashes.
wesnoth · Mar 19, 2016 · 83ee4f6 · 83ee4f6
1 parent c36b96a
commit 83ee4f6
Show file tree

Hide file tree

Showing 178 changed files with 784 additions and 784 deletions.
diff --git 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 <boost/foreach.hpp>
 

diff --git 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 <vector>
 

diff --git 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 <boost/foreach.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git 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 <boost/tuple/tuple.hpp>
 

diff --git 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 <boost/foreach.hpp>
 #include <list>

diff --git 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 <boost/foreach.hpp>
 #include <deque>

diff --git 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 <vector>
 

diff --git 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
@@ -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 <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>

diff --git 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
@@ -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 <boost/noncopyable.hpp>

diff --git 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 <boost/noncopyable.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>

diff --git 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
@@ -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
@@ -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)