Changed: Support more values for fromString with a boolean

This commit is contained in:
kervala 2016-02-02 11:32:20 +01:00
parent e5c726d8f5
commit 945901ad28

View file

@ -246,27 +246,38 @@ inline bool fromString(const std::string &str, bool &val)
{ {
if (str.length() == 1) if (str.length() == 1)
{ {
if (str[0] == '1') const char c = str[0];
switch(c)
{ {
case '1':
case 't':
case 'T':
case 'y':
case 'Y':
val = true; val = true;
} break;
else if (str[0] == '0')
{ case '0':
case 'f':
case 'F':
case 'n':
case 'N':
val = false; val = false;
} break;
else
{ default:
val = false; val = false;
return false; return false;
} }
} }
else else
{ {
if (str == "true") if (str == "true" || str == "yes")
{ {
val = true; val = true;
} }
else if (str == "false") else if (str == "false" || str == "no")
{ {
val = false; val = false;
} }