diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-09-08 22:43:00 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-09-08 22:43:00 +0200 |
| commit | d6d215e2ab53322c769792b4aa53396ecce96422 (patch) | |
| tree | ca1f73f1156f7a3eeccf2430a00d7bcdbd39d149 /src/utils/xml.cpp | |
| parent | de803e103f5317856d4eadf15661ef7516cfc72a (diff) | |
| download | manaserv-d6d215e2ab53322c769792b4aa53396ecce96422.tar.gz manaserv-d6d215e2ab53322c769792b4aa53396ecce96422.tar.bz2 manaserv-d6d215e2ab53322c769792b4aa53396ecce96422.tar.xz manaserv-d6d215e2ab53322c769792b4aa53396ecce96422.zip | |
Centralized stringToBool conversion.
Also moved the trim() function into the utils namespace
where it belongs more, and made some random code cleanups.
Reviewed-by: Thorbjorn.
Diffstat (limited to 'src/utils/xml.cpp')
| -rw-r--r-- | src/utils/xml.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 8bc9ebef..29202274 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -23,6 +23,7 @@ #include "common/resourcemanager.hpp" #include "utils/logger.h" +#include "utils/string.hpp" #include <iostream> #include <fstream> @@ -114,12 +115,7 @@ namespace XML xmlChar *prop = xmlGetProp(node, BAD_CAST name); if (prop) { - if (xmlStrEqual(prop, BAD_CAST "true") - ||xmlStrEqual(prop, BAD_CAST "yes")) - ret = true; - if (xmlStrEqual(prop, BAD_CAST "false") - ||xmlStrEqual(prop, BAD_CAST "no")) - ret = false; + ret = utils::stringToBool((char*) prop, def); xmlFree(prop); } return ret; |