Cleaned up a couple dozen unnecessary forward declarations

src/actions/create.hpp

@@ -20,10 +20,8 @@
 
 #pragma once
 
-class config;
 class team;
 class unit_type;
-class vconfig;
 
 #include "unit_creator.hpp"
 

src/ai/actions.hpp

@@ -32,7 +32,6 @@ struct plain_route;
 class unit;
 class unit_type;
 class team;
-class gamemap;
 
 namespace ai {
 

src/ai/game_info.hpp

@@ -26,12 +26,6 @@ namespace pathfind {
 #include <map>
 #include <memory>
 
-class game_display;
-class gamemap;
-class unit_map;
-class team;
-class tod_manager;
-
 /**
  * info is structure which holds references to all the important objects
  * that an AI might need access to, in order to make and implement its

src/countdown_clock.hpp

@@ -16,7 +16,6 @@
 #include <SDL_timer.h>
 
 class team;
-struct mp_game_settings;
 class countdown_clock : public events::pump_monitor
 {
 public:

src/editor/editor_common.hpp

@@ -34,7 +34,6 @@ extern lg::log_domain log_editor;
 #define SCOPE_ED log_scope2(log_editor, __func__)
 
 class display;
-class gamemap;
 
 namespace editor {
 

src/floating_textbox.hpp

@@ -22,8 +22,6 @@
 #include <set>
 
 class game_display;
-class team;
-class unit_map;
 
 namespace gui{
 

src/game_display.hpp

@@ -19,7 +19,6 @@
 class config;
 class tod_manager;
 class team;
-class unit_map;
 class game_board;
 
 #include "chat_events.hpp"

src/game_events/action_wml.hpp

@@ -29,7 +29,6 @@
 #include <string>
 
 class  config;
-struct map_location;
 class  vconfig;
 
 namespace t_translation {

src/game_events/manager.hpp

@@ -22,11 +22,8 @@
 #include <set>
 #include <string>
 
-class game_lua_kernel;
 class filter_context;
-class game_display;
 class game_data;
-class unit_map;
 
 namespace game_events
 {

src/game_events/pump.hpp

@@ -36,9 +36,6 @@
 #include <sstream>
 #include <string>
 
-class game_display;
-class vconfig;
-
 namespace lg
 {
 class logger;

src/gui/dialogs/addon/connect.hpp

@@ -16,8 +16,6 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 
-class display;
-
 namespace gui2
 {
 namespace dialogs

src/gui/dialogs/addon/manager.hpp

@@ -25,7 +25,6 @@
 
 namespace gui2
 {
-class listbox;
 class text_box_base;
 class text_box;
 class pane;

src/gui/dialogs/attack_predictions.hpp

@@ -22,7 +22,6 @@ class battle_context;
 
 struct battle_context_unit_stats;
 struct combatant;
-struct map_location;
 
 namespace gui2
 {

src/gui/dialogs/editor/custom_tod.hpp

@@ -21,11 +21,7 @@
 
 namespace gui2
 {
-
-class label;
-class image;
 class slider;
-class text_box;
 
 namespace dialogs
 {

src/gui/dialogs/editor/edit_side.hpp

@@ -22,8 +22,6 @@
 namespace gui2
 {
 
-class toggle_button;
-
 namespace dialogs
 {
 

src/gui/dialogs/editor/generate_map.hpp

@@ -21,14 +21,10 @@
 #include <memory>
 
 class map_generator;
-class display;
 
 namespace gui2
 {
 
-class label;
-class text_box;
-
 namespace dialogs
 {
 

src/gui/dialogs/editor/generator_settings.hpp

@@ -20,7 +20,6 @@ namespace gui2
 {
 
 class label;
-class slider;
 
 namespace dialogs
 {

src/gui/dialogs/end_credits.hpp

@@ -18,7 +18,6 @@
 #include <SDL_keycode.h>
 #include <vector>
 
-class config;
 class display;
 
 namespace gui2

src/gui/dialogs/game_load.hpp

@@ -25,8 +25,6 @@
 
 namespace gui2
 {
-
-class listbox;
 class text_box_base;
 
 namespace dialogs

src/gui/dialogs/log_settings.hpp

@@ -19,8 +19,6 @@
 
 namespace gui2
 {
-class label;
-class toggle_button;
 namespace dialogs
 {
 

src/gui/dialogs/multiplayer/lobby.hpp

@@ -22,8 +22,6 @@
 #include "game_initialization/multiplayer.hpp"
 #include "quit_confirmation.hpp"
 
-class display;
-
 #ifdef GUI2_EXPERIMENTAL_LISTBOX
 #include "gui/widgets/list.hpp"
 #endif

src/gui/dialogs/multiplayer/mp_alerts_options.hpp

@@ -18,7 +18,6 @@
 
 namespace gui2
 {
-class label;
 namespace dialogs
 {
 

src/gui/dialogs/select_orb_colors.hpp

@@ -20,8 +20,6 @@
 namespace gui2
 {
 
-class toggle_button;
-
 namespace dialogs
 {
 

src/gui/dialogs/statistics_dialog.hpp

@@ -21,8 +21,6 @@ class team;
 namespace gui2
 {
 
-class menu_button;
-
 namespace dialogs
 {
 

src/help/help.hpp

@@ -15,7 +15,6 @@
 #pragma once
 
 class config;
-class display;
 class terrain_type;
 class unit;
 class unit_type;

src/menu_events.hpp

@@ -26,7 +26,6 @@ class game_state;
 class gamemap;
 class game_data;
 class game_board;
-class gamemap;
 class play_controller;
 class team;
 class unit_map;

src/minimap.hpp

@@ -21,8 +21,6 @@ class gamemap;
 class surface;
 class team;
 struct map_location;
-class gamemap;
-
 
 namespace image {
 	///function to create the minimap for a given map

src/mouse_events.cpp

@@ -53,11 +53,6 @@
 #include <ostream>     // for operator<<, basic_ostream, etc
 #include <string>      // for string, operator<<, etc
 
-namespace gui
-{
-class slider;
-}
-
 static lg::log_domain log_engine("engine");
 #define ERR_NG LOG_STREAM(err, log_engine)
 #define LOG_NG LOG_STREAM(info, log_engine)

src/playsingle_controller.hpp

@@ -24,8 +24,6 @@
 #include "saved_game.hpp"
 #include "replay_controller.hpp"
 
-class team;
-
 struct reset_gamestate_exception
 {
 	reset_gamestate_exception(std::shared_ptr<config> l, bool s = true) : level(l), start_replay(s) {}

src/preferences/display.hpp

@@ -14,9 +14,6 @@
 
 #pragma once
 
-class config;
-class display;
-
 #include <string>
 
 namespace preferences {

src/preferences/general.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-class display;
-
 #include "config.hpp"
 #include "terrain/translation.hpp"
 #include "utils/make_enum.hpp"

src/replay.hpp

@@ -26,10 +26,7 @@
 #include <map>
 #include <set>
 class replay_recorder_base;
-class game_display;
 class terrain_label;
-class unit_map;
-class play_controller;
 class config;
 struct time_of_day;
 

src/resources.hpp

@@ -18,9 +18,7 @@
 #include <vector>
 
 class game_board;
-class game_config_manager;
 class game_display;
-class gamemap;
 class game_data;
 class filter_context;
 class game_lua_kernel;

src/save_index.hpp

@@ -18,9 +18,6 @@
 #include "config.hpp"
 #include "serialization/compression.hpp"
 
-class config_writer;
-class game_display;
-
 namespace savegame
 {
 /** Filename and modification date for a file list */

src/serialization/tokenizer.hpp

@@ -22,8 +22,6 @@
 #include <istream>
 #include <string>
 
-class config;
-
 struct token
 {
 	token() :

src/show_dialog.hpp

@@ -14,8 +14,6 @@
 
 #pragma once
 
-class config;
-class display;
 class surface;
 
 #include "cursor.hpp"

src/side_filter.hpp

@@ -24,7 +24,6 @@ class config;
 class filter_context;
 class unit;
 class unit_filter;
-class unit_map;
 class team;
 
 //side_filter: a class that implements the Standard Side Filter

src/synced_checkup.hpp

@@ -15,7 +15,6 @@
 #pragma once
 
 class config;
-struct map_location;
 /**
 	A class to check whether the results that were calculated in the replay match the results calculated during the original game.
 	note, that you shouldn't add new checkups to existent user actions or you might break replay compability by bringing the [checkups] tag of older saves in unorder.

src/teambuilder.hpp

@@ -18,7 +18,6 @@
 #include <vector>
 
 class config;
-class gamemap;
 class team;
 class team_builder;
 class game_board;

src/terrain/filter.hpp

@@ -23,8 +23,6 @@ class config;
 class filter_context;
 class unit;
 class unit_filter;
-class unit_map;
-class team;
 
 //terrain_filter: a class that implements the Standard Location Filter
 class terrain_filter : public xy_pred {

src/units/formula_manager.hpp

@@ -19,7 +19,6 @@
 #include<string>
 
 class config;
-struct map_location;
 class unit;
 
 class unit_formula_manager {

src/units/udisplay.hpp

@@ -24,11 +24,9 @@
 #include "units/animation.hpp"
 
 class attack_type;
-class fake_unit_manager;
 class game_board;
 class game_display;
 class unit;
-class vconfig;
 
 /**
  *  Contains a number of free functions which display units

src/units/unit.hpp

@@ -27,7 +27,6 @@
 
 class display;
 class display_context;
-class gamemap;
 class team;
 class unit_animation_component;
 class unit_formula_manager;

src/whiteboard/typedefs.hpp

@@ -35,7 +35,6 @@ static lg::log_domain log_whiteboard("whiteboard");
 class arrow;
 class config;
 class fake_unit_manager;
-class game_board;
 struct map_location; //not used in the typedefs, saves a few forward declarations
 class unit;
 class unit_map; //not used in the typedefs, saves a few forward declarations