From e1d003f488f14d840cea0d9e35abcb1e7554cc1c Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 21 Mar 2016 04:04:51 +1100 Subject: [PATCH] Cleaned up inclusions of unit_types.hpp --- src/ai/akihara/recruitment.cpp | 2 +- src/ai/formula/function_table.cpp | 1 - src/editor/action/action_unit.hpp | 2 -- src/fake_unit_ptr.cpp | 1 - src/fake_unit_ptr.hpp | 1 - src/game_events/conditional_wml.cpp | 1 - src/gui/dialogs/unit_attack.cpp | 1 - src/gui/dialogs/unit_create.hpp | 2 +- src/gui/dialogs/unit_recruit.hpp | 3 ++- src/gui/widgets/unit_preview_pane.cpp | 1 + src/gui/widgets/unit_preview_pane.hpp | 3 ++- src/mouse_events.cpp | 1 - src/play_controller.cpp | 1 - src/tests/gui/test_save_dialog.cpp | 2 -- 14 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/ai/akihara/recruitment.cpp b/src/ai/akihara/recruitment.cpp index 13502b457138..8f2294e62be0 100644 --- a/src/ai/akihara/recruitment.cpp +++ b/src/ai/akihara/recruitment.cpp @@ -31,7 +31,7 @@ #include "unit.hpp" #include "unit_display.hpp" #include "unit_map.hpp" -#include "unit_types.hpp" +//#include "unit_types.hpp" used in the below commented-out code #include "ai/composite/rca.hpp" #include "ai/default/ai.hpp" diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp index 30de45d8afa7..90ebb0c77ee1 100644 --- a/src/ai/formula/function_table.cpp +++ b/src/ai/formula/function_table.cpp @@ -36,7 +36,6 @@ #include "terrain_filter.hpp" #include "unit.hpp" #include "pathfind/pathfind.hpp" -#include "unit_types.hpp" #include diff --git a/src/editor/action/action_unit.hpp b/src/editor/action/action_unit.hpp index b7cbf7805a67..a09ff467def1 100644 --- a/src/editor/action/action_unit.hpp +++ b/src/editor/action/action_unit.hpp @@ -28,10 +28,8 @@ #include "editor/action/action.hpp" -#include "unit_types.hpp" #include "unit.hpp" - namespace editor { diff --git a/src/fake_unit_ptr.cpp b/src/fake_unit_ptr.cpp index e2bd720bc5f3..f64f66c7d5fd 100644 --- a/src/fake_unit_ptr.cpp +++ b/src/fake_unit_ptr.cpp @@ -17,7 +17,6 @@ #include "fake_unit_manager.hpp" #include "unit.hpp" #include "unit_ptr.hpp" -#include "unit_types.hpp" #include diff --git a/src/fake_unit_ptr.hpp b/src/fake_unit_ptr.hpp index 85d38e143f0d..e68970b4280c 100644 --- a/src/fake_unit_ptr.hpp +++ b/src/fake_unit_ptr.hpp @@ -16,7 +16,6 @@ #define INCL_FAKE_UNIT_HPP_ #include "unit_ptr.hpp" -#include "unit_types.hpp" class fake_unit_manager; diff --git a/src/game_events/conditional_wml.cpp b/src/game_events/conditional_wml.cpp index f3a6bf8d20ba..4afecc501630 100644 --- a/src/game_events/conditional_wml.cpp +++ b/src/game_events/conditional_wml.cpp @@ -33,7 +33,6 @@ #include "unit.hpp" #include "unit_filter.hpp" #include "unit_map.hpp" -#include "unit_types.hpp" #include "util.hpp" #include "variable.hpp" diff --git a/src/gui/dialogs/unit_attack.cpp b/src/gui/dialogs/unit_attack.cpp index 2a59da471063..1ebd1b1ba808 100644 --- a/src/gui/dialogs/unit_attack.cpp +++ b/src/gui/dialogs/unit_attack.cpp @@ -37,7 +37,6 @@ #include "resources.hpp" #include "team.hpp" #include "unit.hpp" -#include "unit_types.hpp" #include "utils/foreach.hpp" diff --git a/src/gui/dialogs/unit_create.hpp b/src/gui/dialogs/unit_create.hpp index f6b33ee3a31d..9fe6404bc1cf 100644 --- a/src/gui/dialogs/unit_create.hpp +++ b/src/gui/dialogs/unit_create.hpp @@ -19,12 +19,12 @@ #include "gui/widgets/group.hpp" #include "gui/widgets/text.hpp" #include "race.hpp" -#include "unit_types.hpp" #include #include class display; +class unit_type; namespace gui2 { diff --git a/src/gui/dialogs/unit_recruit.hpp b/src/gui/dialogs/unit_recruit.hpp index 6067b4761e74..aaacf57948dd 100644 --- a/src/gui/dialogs/unit_recruit.hpp +++ b/src/gui/dialogs/unit_recruit.hpp @@ -16,7 +16,8 @@ #include "gui/dialogs/dialog.hpp" #include "team.hpp" -#include "unit_types.hpp" + +class unit_type; namespace gui2 { diff --git a/src/gui/widgets/unit_preview_pane.cpp b/src/gui/widgets/unit_preview_pane.cpp index 8fe4fdd4906c..e9087a51f85b 100644 --- a/src/gui/widgets/unit_preview_pane.cpp +++ b/src/gui/widgets/unit_preview_pane.cpp @@ -34,6 +34,7 @@ #include "play_controller.hpp" #include "resources.hpp" #include "team.hpp" +#include "unit_types.hpp" #include "utils/foreach.hpp" diff --git a/src/gui/widgets/unit_preview_pane.hpp b/src/gui/widgets/unit_preview_pane.hpp index 5e6a813935c5..2ac9e0c01cf1 100644 --- a/src/gui/widgets/unit_preview_pane.hpp +++ b/src/gui/widgets/unit_preview_pane.hpp @@ -16,10 +16,11 @@ #include "gui/auxiliary/widget_definition/unit_preview_pane.hpp" #include "gui/widgets/container.hpp" -#include "unit_types.hpp" #include +class unit_type; + namespace gui2 { diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp index 69c8449a9b0f..bca20be6c507 100644 --- a/src/mouse_events.cpp +++ b/src/mouse_events.cpp @@ -49,7 +49,6 @@ #include "unit.hpp" // for unit, intrusive_ptr_add_ref #include "unit_animation_component.hpp" #include "unit_ptr.hpp" // for unit_const_ptr -#include "unit_types.hpp" // for attack_type #include "whiteboard/manager.hpp" // for manager, etc #include "whiteboard/typedefs.hpp" // for whiteboard_lock #include "wml_separators.hpp" // for COLUMN_SEPARATOR, etc diff --git a/src/play_controller.cpp b/src/play_controller.cpp index b72cbbb4b7e5..d41bae644568 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -61,7 +61,6 @@ #include "tooltips.hpp" #include "unit.hpp" #include "unit_id.hpp" -#include "unit_types.hpp" #include "whiteboard/manager.hpp" #include "wml_exception.hpp" diff --git a/src/tests/gui/test_save_dialog.cpp b/src/tests/gui/test_save_dialog.cpp index 4d0b6181f195..5e6c4d69a7fe 100644 --- a/src/tests/gui/test_save_dialog.cpp +++ b/src/tests/gui/test_save_dialog.cpp @@ -23,8 +23,6 @@ #include "key.hpp" #include "filesystem.hpp" #include "savegame.hpp" -#include "unit_types.hpp" -// #include