Changeset 1595 for code/branches/hud/src/util/Convert.h

Timestamp:

Jun 12, 2008, 10:42:15 PM (16 years ago)

Author:

rgrieder

Message:

• removed conversion functions in String.h
• you can use convertToString and convertFromString from Convert.h as shortcuts
• added "true", "false", "on", "off", "yes" and "no" as boolean values to the Converter
• Conversion bool —> string newly gives "true" or "false"
• HUDOverlay can deal with the aspect ratio, e.g. circles stay circles when resizing
• the rest isn't yet finished: svn save

File:

• code/branches/hud/src/util/Convert.h (modified) (4 diffs)

code/branches/hud/src/util/Convert.h

@@ -43 +43 @@
 #include "SubString.h"
 #include "MultiTypeMath.h"
+#include "String.h"
 
 // disable annoying warning about forcing value to boolean
@@ -320 +321 @@
     }
 };
+
+// convert from string Shortcut
+template <class ToType>
+ToType convertFromString(std::string str)
+{
+  return getConvertedValue<std::string, ToType>(str);
+}
 
 
@@ -411 +419 @@
 ////////////////////
 
+// bool to std::string
+template <>
+struct ConverterSpecialized<bool, std::string, _Explicit_>
+{
+    enum { specialized = true };
+    static bool convert(std::string* output, const bool& input)
+    {
+        if (input)
+          *output = "true";
+        else
+          *output = "false";
+        return false;
+    }
+};
+
 // Vector2 to std::string
 template <>
@@ -501 +524 @@
 ////////////////////
 
+// std::string to bool
+template <>
+struct ConverterSpecialized<std::string, bool, _Explicit_>
+{
+    enum { specialized = true };
+    static bool convert(bool* output, const std::string& input)
+    {
+        std::string stripped = getLowercase(removeTrailingWhitespaces(input));
+        if (stripped == "true" || stripped == "on" || stripped == "yes")
+        {
+          *output = true;
+          return true;
+        }
+        else if (stripped == "false" || stripped == "off" || stripped == "no")
+        {
+          *output = false;
+          return true;
+        }
+
+        std::istringstream iss(input);
+        if (iss >> (*output))
+            return true;
+        else
+            return false;
+    }
+};
+
 // std::string to Vector2
 template <>