added toInt() method

thinlizzy · thinlizzy · commit 5bb4158effeb · 2013-07-30T20:03:46.000-07:00
diff --git a/src/NativeString.h b/src/NativeString.h
@@ -28,6 +28,8 @@ class NativeString {
     std::string toUTF8() const;
     std::wstring toUTF16() const;
     
+    int toInt() const;
+    
     bool empty() const;
     NativeString & operator+=(NativeString const & other);
     bool operator==(NativeString const & other) const;
diff --git a/src/win32/NativeString.cpp b/src/win32/NativeString.cpp
@@ -1,5 +1,6 @@
 #include "../NativeString.h"
 #include <iostream>
+#include <sstream>
 #include <windows.h>
 
 namespace die {
@@ -13,7 +14,7 @@ std::wstring utf8_to_ws(char const * text, int size)
     int total = MultiByteToWideChar(CP_UTF8,0,text,size,0,0);
     std::wstring converted(total,L'\0');
     if( MultiByteToWideChar(CP_UTF8,0,text,size,&converted[0],total) == 0 ) {
-        std::cerr << "error converting string\n";
+        std::cerr << "error converting string" << std::endl;
     }
     return converted;
 }
@@ -27,6 +28,7 @@ std::wstring utf8_to_ws(char const * text)
 
 std::wstring utf8_to_ws(std::string const & text)
 {
+    if( text.empty() ) return std::wstring();
     return utf8_to_ws(text.c_str(),text.size());
 }
 
@@ -38,7 +40,7 @@ std::wstring encodedToWs(NativeString::Encoding encoding, std::string const & st
         case NativeString::utf8:
             return utf8_to_ws(strEncoded);
         default:
-            std::cerr << "unsupported encoding\n";
+            std::cerr << "unsupported encoding" << std::endl;
             return std::wstring();
     }
 }
@@ -96,6 +98,20 @@ std::wstring NativeString::toUTF16() const
     return wstr;
 }
 
+template<typename T>
+T lexical_cast(std::wstring const & wstr)
+{
+    T result = T();
+    std::basic_istringstream<wchar_t> iss(wstr);
+    iss >> result;
+    return result;
+}
+
+int NativeString::toInt() const
+{
+    return lexical_cast<int>(wstr);
+}
+
 bool NativeString::empty() const
 {
     return wstr.empty();
