From b734f7bf0e550c89eade5b54369cfdf8e1815744 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Sat, 19 May 2012 08:46:12 +0000 Subject: [PATCH] Made the id for a tooltip and helptip mandatory. The change was already planned for 1.9.7. --- changelog | 1 + src/gui/auxiliary/window_builder.cpp | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/changelog b/changelog index 41f4c17fd53..6d4923e5750 100644 --- a/changelog +++ b/changelog @@ -165,6 +165,7 @@ Version 1.11.0-svn: * Added: A character limit width constrain for a text * Stop showing a unit's potential moves before moving in a move & attack, rather than after (more consistent with regular movement) + * Changed: Made the id for a tooltip and helptip mandatory. * Whiteboard: * Fixed bug #19626: segfaults on window resize * Fixed bug #19369: Using planning mode can cause losing ability to move my units diff --git a/src/gui/auxiliary/window_builder.cpp b/src/gui/auxiliary/window_builder.cpp index 786ebff0225..8c61cff4e0c 100644 --- a/src/gui/auxiliary/window_builder.cpp +++ b/src/gui/auxiliary/window_builder.cpp @@ -272,8 +272,8 @@ twindow_builder::tresolution::tresolution(const config& cfg) : click_dismiss(cfg["click_dismiss"].to_bool()), definition(cfg["definition"]), linked_groups(), - tooltip(cfg.child_or_empty("tooltip")), /** @todo will be mandatory soon. */ - helptip(cfg.child_or_empty("helptip")), /** @todo will be mandatory soon. */ + tooltip(cfg.child_or_empty("tooltip")), + helptip(cfg.child_or_empty("helptip")), grid(0) { /*WIKI @@ -423,14 +423,6 @@ twindow_builder::tresolution::tresolution(const config& cfg) : twindow_builder::tresolution::ttip::ttip(const config& cfg) : id(cfg["id"]) { - /** @todo Remove for 1.9.7. */ - if(id.empty()) { - lg::wml_error << "Window builder: parsing resolution tip with empty " - << "'id' field. Will become mandatory in 1.9.7.\n"; - id = "tooltip_large"; - return; - } - VALIDATE(!id.empty() , missing_mandatory_wml_key("[window][resolution][tip]", "id")); }