Moved marked-up_text.*pp to font/

projectfiles/CodeBlocks/wesnoth.cbp

@@ -339,6 +339,8 @@
 		<Unit filename="../../src/font/font_description.hpp" />
 		<Unit filename="../../src/font/font_id.hpp" />
 		<Unit filename="../../src/font/font_options.hpp" />
+		<Unit filename="../../src/font/marked-up_text.cpp" />
+		<Unit filename="../../src/font/marked-up_text.hpp" />
 		<Unit filename="../../src/font/pango/escape.hpp" />
 		<Unit filename="../../src/font/pango/font.hpp" />
 		<Unit filename="../../src/font/pango/hyperlink.hpp" />
@@ -862,8 +864,6 @@
 		<Unit filename="../../src/map/location.hpp" />
 		<Unit filename="../../src/map/map.cpp" />
 		<Unit filename="../../src/map/map.hpp" />
-		<Unit filename="../../src/marked-up_text.cpp" />
-		<Unit filename="../../src/marked-up_text.hpp" />
 		<Unit filename="../../src/md5.cpp" />
 		<Unit filename="../../src/md5.hpp" />
 		<Unit filename="../../src/menu_events.cpp" />

src/CMakeLists.txt

@@ -987,6 +987,7 @@ set(libwesnoth-game_STAT_SRC
 	floating_label.cpp
 	font/constants.cpp
 	font/font_config.cpp
+	font/marked-up_text.cpp
 	font/sdl_ttf.cpp
 	font/text.cpp
 	font/text_cache.cpp
@@ -1012,7 +1013,6 @@ set(libwesnoth-game_STAT_SRC
 	lobby_preferences.cpp
 	utils/make_enum.cpp
 	map/label.cpp
-	marked-up_text.cpp
 	minimap.cpp
 	pathfind/astarsearch.cpp
 	pathutils.cpp

src/SConscript

@@ -92,6 +92,7 @@ libwesnoth_sources = Split("""
     floating_label.cpp
     font/constants.cpp
     font/font_config.cpp
+    font/marked-up_text.cpp
     font/sdl_ttf.cpp
     font/text.cpp
     font/text_cache.cpp
@@ -116,7 +117,6 @@ libwesnoth_sources = Split("""
     key.cpp
     language.cpp
     map/label.cpp
-    marked-up_text.cpp
     minimap.cpp
     pathfind/astarsearch.cpp
     pathutils.cpp

src/addon/manager.cpp

@@ -31,7 +31,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "serialization/parser.hpp"
 #include "version.hpp"
 #include "wml_separators.hpp"

src/addon/manager_ui.cpp

@@ -36,7 +36,7 @@
 #include "help/help_button.hpp"
 #include "image.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "wml_separators.hpp"
 #include "wml_exception.hpp"
 

src/addon/state.cpp

@@ -17,7 +17,7 @@
 
 #include "addon/manager.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 
 static lg::log_domain log_addons_client("addons-client");
 #define LOG_AC  LOG_STREAM(info, log_addons_client)

src/attack_prediction_display.cpp

@@ -21,7 +21,7 @@
 #include "game_board.hpp"
 #include "game_display.hpp"
 #include "language.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "resources.hpp"
 #include "units/unit.hpp"
 #include "units/abilities.hpp"

src/config_cache.cpp

@@ -19,7 +19,7 @@
 #include "gettext.hpp"
 #include "game_config.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "utils/sha1.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/parser.hpp"

src/construct_dialog.cpp

@@ -23,7 +23,7 @@
 #include "gettext.hpp"
 #include "sound.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "scripting/plugins/context.hpp"
 #include "scripting/plugins/manager.hpp"
 #include "sdl/utils.hpp"

src/display.cpp

@@ -28,7 +28,7 @@
 #include "hotkey/command_executor.hpp"
 #include "language.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "map/map.hpp"
 #include "map/label.hpp"
 #include "minimap.hpp"

src/display_chat_manager.cpp

@@ -21,7 +21,7 @@
 #include "game_board.hpp" // <-- only needed for is_observer()
 #include "game_preferences.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "mp_ui_alerts.hpp"
 #include "serialization/string_utils.hpp"
 

src/editor/palette/location_palette.cpp

@@ -17,7 +17,7 @@
 #include "location_palette.hpp"
 
 #include "gettext.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "tooltips.hpp"
 
 #include "editor/toolkit/editor_toolkit.hpp"

src/editor/palette/tristate_button.cpp

@@ -23,7 +23,7 @@
 #include "game_config.hpp"
 #include "image.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "serialization/string_utils.hpp"
 #include "sound.hpp"
 #include "video.hpp"

src/font/sdl_ttf.cpp

@@ -22,7 +22,7 @@
 #include "filesystem.hpp"
 #include "game_config.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "preferences.hpp"
 #include "tooltips.hpp"
 

src/game_display.cpp

@@ -34,7 +34,7 @@
 #include "log.hpp"
 #include "map/map.hpp"
 #include "map/label.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "reports.hpp"
 #include "resources.hpp"
 #include "tod_manager.hpp"

src/game_initialization/create_engine.cpp

@@ -27,7 +27,7 @@
 #include "generators/map_create.hpp"
 #include "map/exception.hpp"
 #include "map/map.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "minimap.hpp"
 #include "saved_game.hpp"
 #include "wml_separators.hpp"

src/game_initialization/multiplayer_lobby.cpp

@@ -26,7 +26,7 @@
 #include "lobby_preferences.hpp"
 #include "map/exception.hpp"
 #include "map/map.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "minimap.hpp"
 #include "multiplayer_lobby.hpp"
 #include "gettext.hpp"

src/game_initialization/multiplayer_ui.cpp

@@ -24,7 +24,7 @@
 #include "gui/dialogs/loadscreen.hpp"
 #include "lobby_preferences.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "menu_events.hpp"
 #include "multiplayer.hpp"
 #include "multiplayer_ui.hpp"

src/game_initialization/multiplayer_wait.cpp

@@ -24,7 +24,7 @@
 #include "gui/widgets/window.hpp"
 #include "image.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "mp_game_utils.hpp"
 #include "multiplayer_wait.hpp"
 #include "statistics.hpp"

src/generators/default_map_generator.cpp

@@ -23,7 +23,7 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "seed_rng.hpp"
 
 static lg::log_domain log_engine("engine");

src/gui/dialogs/addon/list.cpp

@@ -46,7 +46,7 @@
 #include "gui/dialogs/addon/filter_options.hpp"
 #include "serialization/string_utils.hpp"
 #include "formula/string_utils.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "preferences.hpp"
 #include "strftime.hpp"
 #include "video.hpp"

src/gui/dialogs/end_credits.cpp

@@ -26,7 +26,7 @@
 #include "gui/widgets/scroll_label.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 
 #include "utils/functional.hpp"
 

src/gui/dialogs/game_stats.cpp

@@ -35,7 +35,7 @@
 #include "formatter.hpp"
 #include "game_board.hpp"
 #include "game_classification.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "map/map.hpp"
 #include "play_controller.hpp"
 #include "resources.hpp"

src/gui/dialogs/unit_attack.cpp

@@ -36,7 +36,7 @@
 #include "gettext.hpp"
 #include "help/help.hpp"
 #include "language.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "resources.hpp"
 #include "team.hpp"
 #include "units/unit.hpp"

src/gui/dialogs/unit_create.cpp

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

src/gui/dialogs/unit_recruit.cpp

@@ -29,7 +29,7 @@
 #include "gui/widgets/window.hpp"
 #include "gettext.hpp"
 #include "help/help.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "play_controller.hpp"
 #include "resources.hpp"
 #include "team.hpp"

src/gui/widgets/chatbox.cpp

@@ -32,7 +32,7 @@
 #include "formatter.hpp"
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "wesnothd_connection.hpp"
 #include "config_assign.hpp"
 #include "game_preferences.hpp"

src/gui/widgets/control.cpp

@@ -23,7 +23,7 @@
 #include "gui/dialogs/tip.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "formatter.hpp"
 #include "gettext.hpp"

src/gui/widgets/unit_preview_pane.cpp

@@ -31,7 +31,7 @@
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "help/help.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "play_controller.hpp"
 #include "resources.hpp"
 #include "team.hpp"

src/help/help_impl.cpp

@@ -27,7 +27,7 @@
 #include "log.hpp"                      // for LOG_STREAM, logger, etc
 #include "utils/make_enum.hpp"                // for operator<<
 #include "map/map.hpp"                      // for gamemap
-#include "marked-up_text.hpp"           // for is_cjk_char, word_wrap_text
+#include "font/marked-up_text.hpp"           // for is_cjk_char, word_wrap_text
 #include "units/race.hpp"                     // for unit_race, etc
 #include "resources.hpp"                // for tod_manager, config_manager
 #include "sdl/utils.hpp"                // for surface

src/hotkey/hotkey_preferences_display.cpp

@@ -23,7 +23,7 @@
 
 #include "construct_dialog.hpp"
 #include "gettext.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
 
 namespace hotkey {

src/intro.cpp

@@ -24,7 +24,7 @@
 
 #include "video.hpp"
 #include "gettext.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
 #include "font/sdl_ttf.hpp"
 

src/menu_events.cpp

@@ -63,7 +63,7 @@
 #include "map/map.hpp"
 #include "map/label.hpp"
 #include "map_command_handler.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "menu_events.hpp"
 #include "mouse_events.hpp"
 #include "play_controller.hpp"

src/mouse_events.cpp

@@ -34,7 +34,7 @@
 #include "language.hpp"                 // for string_table, symbol_table
 #include "log.hpp"                      // for LOG_STREAM, logger, etc
 #include "map/map.hpp"                      // for gamemap
-#include "marked-up_text.hpp"           // for color2markup, BOLD_TEXT, etc
+#include "font/marked-up_text.hpp"           // for color2markup, BOLD_TEXT, etc
 #include "pathfind/teleport.hpp"        // for get_teleport_locations, etc
 #include "play_controller.hpp"		// for playing_side, set_button_state
 #include "replay_helper.hpp"

src/playsingle_controller.cpp

@@ -36,7 +36,7 @@
 #include "log.hpp"
 #include "map/label.hpp"
 #include "map/map.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "playturn.hpp"
 #include "random_new_deterministic.hpp"
 #include "replay_helper.hpp"

src/reports.cpp

@@ -25,7 +25,7 @@
 #include "gettext.hpp"
 #include "language.hpp"
 #include "map/map.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "mouse_events.hpp"
 #include "reports.hpp"
 #include "strftime.hpp"

src/show_dialog.cpp

@@ -27,7 +27,7 @@
 #include "help/help.hpp"
 #include "hotkey/command_executor.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
 
 static lg::log_domain log_display("display");

src/statistics_dialog.cpp

@@ -14,7 +14,7 @@
 */
 
 #include "gettext.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "statistics_dialog.hpp"
 #include "units/types.hpp"
 #include "wml_separators.hpp"

src/tooltips.cpp

@@ -19,7 +19,7 @@
 #include "font/sdl_ttf.hpp"
 #include "game_display.hpp"
 #include "help/help.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "resources.hpp"
 #include "video.hpp"
 

src/widgets/button.cpp

@@ -25,7 +25,7 @@
 #include "game_errors.hpp"
 #include "image.hpp"
 #include "log.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
 #include "serialization/string_utils.hpp"
 #include "sound.hpp"

src/widgets/label.cpp

@@ -18,7 +18,7 @@
 
 #include "font/text.hpp"
 #include "widgets/label.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "video.hpp"
 
 namespace gui {

src/widgets/menu.cpp

@@ -22,7 +22,7 @@
 #include "font/sdl_ttf.hpp"
 #include "language.hpp"
 #include "image.hpp"
-#include "marked-up_text.hpp"
+#include "font/marked-up_text.hpp"
 #include "sdl/rect.hpp"
 #include "sound.hpp"
 #include "video.hpp"