From 4d342447eaac115b8399c551002332f19519cbc9 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 21 Mar 2016 21:43:52 +1100 Subject: [PATCH] Cleaned up inclusions of team.hpp --- src/actions/undo_move_action.cpp | 1 - src/actions/undo_update_shroud_action.cpp | 1 - src/ai/akihara/recruitment.hpp | 3 ++- src/ai/composite/goal.cpp | 1 - src/ai/configuration.cpp | 1 - src/ai/testing/ca_testing_move_to_targets.cpp | 1 - src/gui/dialogs/chat_log.cpp | 1 - src/gui/dialogs/unit_recruit.hpp | 2 +- src/persist_var.cpp | 1 - src/teambuilder.hpp | 2 +- src/tod_manager.cpp | 1 - src/whiteboard/action.cpp | 1 - src/whiteboard/suppose_dead.cpp | 1 - 13 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/actions/undo_move_action.cpp b/src/actions/undo_move_action.cpp index 2d7305a7cb4c..263ce3d8b911 100644 --- a/src/actions/undo_move_action.cpp +++ b/src/actions/undo_move_action.cpp @@ -2,7 +2,6 @@ #include "move.hpp" #include "resources.hpp" -#include "team.hpp" #include "replay.hpp" #include "units/map.hpp" #include "units/animation_component.hpp" diff --git a/src/actions/undo_update_shroud_action.cpp b/src/actions/undo_update_shroud_action.cpp index 10b458d36d69..6e2f06378267 100644 --- a/src/actions/undo_update_shroud_action.cpp +++ b/src/actions/undo_update_shroud_action.cpp @@ -1,6 +1,5 @@ #include "undo_update_shroud_action.hpp" #include "resources.hpp" -#include "team.hpp" #include "replay.hpp" namespace actions diff --git a/src/ai/akihara/recruitment.hpp b/src/ai/akihara/recruitment.hpp index c44d29042de0..a4dac585b33d 100644 --- a/src/ai/akihara/recruitment.hpp +++ b/src/ai/akihara/recruitment.hpp @@ -21,7 +21,8 @@ #define AI_AKIHARA_RECRUITMENT_HPP_INCLUDED #include "ai/composite/rca.hpp" -#include "team.hpp" + +class team; #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/composite/goal.cpp b/src/ai/composite/goal.cpp index 451d63902dc7..25069e4ab4cc 100644 --- a/src/ai/composite/goal.cpp +++ b/src/ai/composite/goal.cpp @@ -30,7 +30,6 @@ #include "map/location.hpp" #include "resources.hpp" #include "scripting/game_lua_kernel.hpp" -#include "team.hpp" #include "terrain/filter.hpp" #include "units/unit.hpp" #include "units/map.hpp" diff --git a/src/ai/configuration.cpp b/src/ai/configuration.cpp index 32e5d6663535..28a268378a90 100644 --- a/src/ai/configuration.cpp +++ b/src/ai/configuration.cpp @@ -24,7 +24,6 @@ #include "log.hpp" #include "serialization/parser.hpp" #include "serialization/preprocessor.hpp" -#include "team.hpp" #include "wml_exception.hpp" #include diff --git a/src/ai/testing/ca_testing_move_to_targets.cpp b/src/ai/testing/ca_testing_move_to_targets.cpp index 16617afa184c..bf4a4c39f352 100644 --- a/src/ai/testing/ca_testing_move_to_targets.cpp +++ b/src/ai/testing/ca_testing_move_to_targets.cpp @@ -25,7 +25,6 @@ #include "log.hpp" #include "map/map.hpp" #include "resources.hpp" -#include "team.hpp" #include "units/unit.hpp" #include "terrain/filter.hpp" #include "pathfind/pathfind.hpp" diff --git a/src/gui/dialogs/chat_log.cpp b/src/gui/dialogs/chat_log.cpp index 86ca2e4dcfbe..3429833db5c0 100644 --- a/src/gui/dialogs/chat_log.cpp +++ b/src/gui/dialogs/chat_log.cpp @@ -35,7 +35,6 @@ #include "game_preferences.hpp" #include "log.hpp" #include "resources.hpp" -#include "team.hpp" #include "replay.hpp" #include "gettext.hpp" diff --git a/src/gui/dialogs/unit_recruit.hpp b/src/gui/dialogs/unit_recruit.hpp index aaacf57948dd..32af288e1d74 100644 --- a/src/gui/dialogs/unit_recruit.hpp +++ b/src/gui/dialogs/unit_recruit.hpp @@ -15,9 +15,9 @@ #define GUI_DIALOGS_UNIT_RECRUIT_HPP_INCLUDED #include "gui/dialogs/dialog.hpp" -#include "team.hpp" class unit_type; +class team; namespace gui2 { diff --git a/src/persist_var.cpp b/src/persist_var.cpp index fcc3ef5cd156..a014546cddd0 100644 --- a/src/persist_var.cpp +++ b/src/persist_var.cpp @@ -23,7 +23,6 @@ #include "play_controller.hpp" #include "synced_user_choice.hpp" #include "resources.hpp" -#include "team.hpp" #include "util.hpp" #include "variable.hpp" diff --git a/src/teambuilder.hpp b/src/teambuilder.hpp index 256a83fca18c..7dcf59d9cac4 100644 --- a/src/teambuilder.hpp +++ b/src/teambuilder.hpp @@ -17,12 +17,12 @@ #ifndef TEAMBUILDER_HPP_INCLUDED #define TEAMBUILDER_HPP_INCLUDED -#include "team.hpp" #include #include class config; class gamemap; +class team; class team_builder; class game_board; typedef boost::shared_ptr team_builder_ptr; diff --git a/src/tod_manager.cpp b/src/tod_manager.cpp index 299040cc53e3..6a984fe97d54 100644 --- a/src/tod_manager.cpp +++ b/src/tod_manager.cpp @@ -26,7 +26,6 @@ #include "units/abilities.hpp" #include "wml_exception.hpp" #include "resources.hpp" -#include "team.hpp" #include "network.hpp" #include "config_assign.hpp" diff --git a/src/whiteboard/action.cpp b/src/whiteboard/action.cpp index 993f834e40cd..38b6941346ee 100644 --- a/src/whiteboard/action.cpp +++ b/src/whiteboard/action.cpp @@ -26,7 +26,6 @@ #include "config.hpp" #include "game_board.hpp" #include "resources.hpp" -#include "team.hpp" #include "units/unit.hpp" namespace wb { diff --git a/src/whiteboard/suppose_dead.cpp b/src/whiteboard/suppose_dead.cpp index e2efe8338548..158d4b911b9d 100644 --- a/src/whiteboard/suppose_dead.cpp +++ b/src/whiteboard/suppose_dead.cpp @@ -31,7 +31,6 @@ #include "play_controller.hpp" #include "replay.hpp" #include "resources.hpp" -#include "team.hpp" #include "units/unit.hpp" #include "units/udisplay.hpp" #include "units/map.hpp"