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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/game-server/skillmanager.cpp b/src/game-server/skillmanager.cpp
index dd9ee512..99c03f0e 100644
--- a/src/game-server/skillmanager.cpp
+++ b/src/game-server/skillmanager.cpp
@@ -21,7 +21,7 @@
 #include "game-server/skillmanager.hpp"
 
 #include "common/resourcemanager.hpp"
-#include "utils/string.hpp"   // for the toupper function
+#include "utils/string.hpp"   // for the toUpper function
 #include "utils/logger.h"
 #include "utils/xml.hpp"
 
@@ -88,7 +88,7 @@ void SkillManager::reload()
             {
                 std::string name = XML::getProperty(skillnode, "name",
                                                     std::string());
-                name = utils::toupper(name);
+                name = utils::toUpper(name);
                 int id = XML::getProperty(skillnode, "id", 0);
                 if (id && !name.empty())
                 {
@@ -199,11 +199,11 @@ int SkillManager::getIdFromString(const std::string &name)
     }
 
     // Convert to upper case for easier finding
-    SkillMap::iterator i = skillMap.find(utils::toupper(name));
+    SkillMap::iterator i = skillMap.find(utils::toUpper(name));
     if (i == skillMap.end())
     {
         LOG_WARN("SkillManager: No weapon-type name corresponding to "
-                 << utils::toupper(name) << " into " << skillReferenceFile);
+                 << utils::toUpper(name) << " into " << skillReferenceFile);
         return 0;
     }
     else