Cleaned up inclusions of display.hpp

src/construct_dialog.cpp

@@ -18,8 +18,8 @@
 #include "construct_dialog.hpp"
 
 #include "config_assign.hpp"
-#include "display.hpp"
 #include "formula_string_utils.hpp"
+#include "game_config.hpp"
 #include "gettext.hpp"
 #include "sound.hpp"
 #include "log.hpp"
@@ -27,6 +27,7 @@
 #include "scripting/plugins/context.hpp"
 #include "scripting/plugins/manager.hpp"
 #include "sdl/utils.hpp"
+#include "sdl/rect.hpp"
 
 #include <boost/bind.hpp>
 

src/events.cpp

@@ -22,7 +22,6 @@
 #include "quit_confirmation.hpp"
 #include "preferences.hpp"
 #include "video.hpp"
-#include "display.hpp"
 #if defined _WIN32
 #include "desktop/windows_tray_notification.hpp"
 #endif

src/gui/dialogs/editor_generate_map.cpp

@@ -15,7 +15,6 @@
 
 #include "gui/dialogs/editor_generate_map.hpp"
 
-#include "display.hpp"
 #include "gui/auxiliary/find_widget.tpp"
 #include "gui/dialogs/helper.hpp"
 

src/gui/dialogs/unit_attack.cpp

@@ -29,7 +29,6 @@
 #endif
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "display.hpp"
 #include "game_config.hpp"
 #include "gettext.hpp"
 #include "help/help.hpp"

src/gui/dialogs/unit_attack.hpp

@@ -17,7 +17,6 @@
 
 #include "actions/attack.hpp"
 #include "gui/dialogs/dialog.hpp"
-#include "display.hpp"
 #include "unit_map.hpp"
 
 namespace gui2

src/gui/dialogs/unit_create.cpp

@@ -33,7 +33,6 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/unit_preview_pane.hpp"
 #include "gui/widgets/window.hpp"
-#include "display.hpp"
 #include "marked-up_text.hpp"
 #include "help/help.hpp"
 #include "game_config.hpp"

src/hotkey/hotkey_preferences_display.cpp

@@ -22,9 +22,9 @@
 #include "hotkey/hotkey_item.hpp"
 
 #include "construct_dialog.hpp"
-#include "display.hpp"
 #include "gettext.hpp"
 #include "marked-up_text.hpp"
+#include "sdl/rect.hpp"
 
 namespace hotkey {
 

src/reports.cpp

@@ -18,7 +18,6 @@
 #include "attack_prediction.hpp"
 //#include "editor/editor_controller.hpp"
 //#include "editor/palette/terrain_palettes.hpp"
-#include "display.hpp"
 #include "font.hpp"
 #include "game_preferences.hpp"
 #include "gettext.hpp"

src/show_dialog.cpp

@@ -19,15 +19,15 @@
 #include "show_dialog.hpp"
 
 #include "construct_dialog.hpp"
-#include "display.hpp"
 #include "floating_label.hpp"
+#include "image.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/event/handler.hpp"
 #include "help/help.hpp"
 #include "hotkey/command_executor.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
-
+#include "sdl/rect.hpp"
 
 static lg::log_domain log_display("display");
 #define ERR_DP LOG_STREAM(err, log_display)

src/storyscreen/controller.cpp

@@ -26,7 +26,6 @@
 #include "asserts.hpp"
 #include "variable.hpp"
 
-#include "display.hpp"
 #include "game_events/action_wml.hpp"
 #include "game_events/conditional_wml.hpp"
 #include "game_data.hpp"

src/storyscreen/render.cpp

@@ -25,12 +25,13 @@
 #include "storyscreen/part.hpp"
 #include "storyscreen/render.hpp"
 
-#include "display.hpp"
 #include "image.hpp"
 #include "language.hpp"
+#include "sdl/rect.hpp"
 #include "sound.hpp"
 #include "text.hpp"
 #include "video.hpp"
+#include "widgets/button.hpp"
 
 #include <boost/foreach.hpp>
 

src/tests/utils/game_config_manager.cpp

@@ -19,7 +19,6 @@
 
 #include "config.hpp"
 #include "config_cache.hpp"
-#include "display.hpp"
 #include "filesystem.hpp"
 #include "font.hpp"
 #include "game_config.hpp"