Cleaned up text rendering-related includes

src/display.cpp

@@ -21,7 +21,7 @@
 #include "cursor.hpp"
 #include "display.hpp"
 #include "fake_unit_manager.hpp"
-#include "font/standard_colors.hpp"
+#include "font/sdl_ttf.hpp"
 #include "font/text.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"

src/display.hpp

@@ -50,7 +50,6 @@ namespace wb {
 
 #include "animated.hpp"
 #include "display_context.hpp"
-#include "font/sdl_ttf.hpp"
 #include "font/standard_colors.hpp"
 #include "image.hpp" //only needed for enums (!)
 #include "key.hpp"

src/editor/editor_display.cpp

@@ -15,6 +15,7 @@
 
 #include "editor/controller/editor_controller.hpp"
 #include "editor/editor_display.hpp"
+#include "lexical_cast.hpp"
 #include "reports.hpp"
 #include "team.hpp"
 #include "terrain/builder.hpp"

src/editor/palette/tristate_button.cpp

@@ -16,13 +16,9 @@
 
 #include "editor/palette/tristate_button.hpp"
 
-#include "font/constants.hpp"
-#include "font/sdl_ttf.hpp"
-#include "font/standard_colors.hpp"
 #include "game_config.hpp"
 #include "image.hpp"
 #include "log.hpp"
-#include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
 #include "sound.hpp"
 #include "video.hpp"

src/floating_label.cpp

@@ -15,8 +15,6 @@
 #include "floating_label.hpp"
 
 #include "display.hpp"
-#include "font/sdl_ttf.hpp"
-#include "font/standard_colors.hpp"
 #include "font/text.hpp"
 #include "log.hpp"
 #include "video.hpp"

src/preferences/game.cpp

@@ -18,6 +18,7 @@
 #include "game_display.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"
+#include "lexical_cast.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "serialization/string_utils.hpp"

src/replay.cpp

@@ -27,6 +27,7 @@
 #include "game_display.hpp"
 #include "preferences/game.hpp"
 #include "game_data.hpp"
+#include "lexical_cast.hpp"
 #include "log.hpp"
 #include "map/label.hpp"
 #include "map/location.hpp"

src/reports.cpp

@@ -21,7 +21,6 @@
 #include "gettext.hpp"
 #include "language.hpp"
 #include "map/map.hpp"
-#include "font/marked-up_text.hpp"
 #include "mouse_events.hpp"
 #include "reports.hpp"
 #include "color.hpp"

src/team.cpp

@@ -21,9 +21,9 @@
 
 #include "ai/manager.hpp"
 #include "color.hpp"
-#include "font/text_formatting.hpp"
 #include "game_data.hpp"
 #include "game_events/pump.hpp"
+#include "lexical_cast.hpp"
 #include "map/map.hpp"
 #include "play_controller.hpp"
 #include "preferences/game.hpp"

src/theme.cpp

@@ -16,7 +16,6 @@
 
 #include "theme.hpp"
 
-#include "font/sdl_ttf.hpp"
 #include "gettext.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_item.hpp"

src/tooltips.cpp

@@ -15,11 +15,9 @@
 #include "tooltips.hpp"
 
 #include "floating_label.hpp"
-#include "font/sdl_ttf.hpp"
 #include "font/standard_colors.hpp"
 #include "game_display.hpp"
 #include "help/help.hpp"
-#include "font/marked-up_text.hpp"
 #include "video.hpp"
 
 #include <SDL_rect.h> // Travis doesn't like this, although it works on my machine -> '#include <SDL_sound.h>

src/video.cpp

@@ -16,6 +16,7 @@
 
 #include "display.hpp"
 #include "floating_label.hpp"
+#include "font/sdl_ttf.hpp"
 #include "image.hpp"
 #include "log.hpp"
 #include "preferences/general.hpp"

src/widgets/button.cpp

@@ -18,7 +18,6 @@
 
 #include "filesystem.hpp"
 #include "font/sdl_ttf.hpp"
-#include "font/text.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
 #include "image.hpp"

src/widgets/menu_style.cpp

@@ -17,8 +17,9 @@
 
 #include "widgets/menu.hpp"
 
-#include "font/sdl_ttf.hpp"
+#include "font/constants.hpp"
 #include "image.hpp"
+#include "lexical_cast.hpp"
 #include "sdl/utils.hpp"
 #include "video.hpp"