0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed forlorn case insensitive WML handling

Browse source
This commit is contained in:
Gunter Labes 2009-05-24 09:55:36 +00:00
parent a8848e1fc2
commit 171914d875
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/help.cpp
View file

@ -570,9 +570,6 @@ static std::vector<std::string> split_in_width(const std::string &s, const int f
static std::string remove_first_space(const std::string& text);
/// Return a lowercase copy of s.
static std::string to_lower(const std::string &s);
/// Prepend all chars with meaning inside attributes with a backslash.
static std::string escape(const std::string &s);
@ -2576,9 +2573,8 @@ void help_text_area::add_item(const item &itm)
}
help_text_area::ALIGNMENT help_text_area::str_to_align(const std::string &s)
help_text_area::ALIGNMENT help_text_area::str_to_align(const std::string &cmp_str)
{
const std::string cmp_str = to_lower(s);
if (cmp_str == "left") {
return LEFT;
} else if (cmp_str == "middle") {
@ -2589,7 +2585,7 @@ help_text_area::ALIGNMENT help_text_area::str_to_align(const std::string &s)
return HERE;
}
std::stringstream msg;
msg << "Invalid alignment string: '" << s << "'";
msg << "Invalid alignment string: '" << cmp_str << "'";
throw parse_error(msg.str());
}
@ -3020,9 +3016,8 @@ std::string convert_to_wml(const std::string &element_name, const std::string &c
return ss.str();
}
SDL_Color string_to_color(const std::string &s)
SDL_Color string_to_color(const std::string &cmp_str)
{
const std::string cmp_str = to_lower(s);
if (cmp_str == "green") {
return font::GOOD_COLOUR;
}
@ -3065,14 +3060,6 @@ std::string remove_first_space(const std::string& text)
return text;
}
std::string to_lower(const std::string &s)
{
std::string lower_string;
lower_string.resize(s.size());
std::transform(s.begin(), s.end(), lower_string.begin(), tolower);
return lower_string;
}
std::string escape(const std::string &s)
{
std::string res = s;