diff --git a/telldus-core/common/Strings.cpp b/telldus-core/common/Strings.cpp index ff786ae8..83c1384f 100644 --- a/telldus-core/common/Strings.cpp +++ b/telldus-core/common/Strings.cpp @@ -45,11 +45,11 @@ std::wstring TelldusCore::charToWstring(const char *value) { char *outString = (char*)new wchar_t[utf8Length+1]; memset(outString, 0, sizeof(wchar_t)*(utf8Length+1)); -#ifdef _FREEBSD +#ifdef _FREEBSD const char *inPointer = inString; -#else - char *inPointer = inString; -#endif +#else + char *inPointer = inString; +#endif char *outPointer = outString; iconv_t convDesc = iconv_open(WCHAR_T_ENCODING, "UTF-8"); @@ -96,6 +96,12 @@ std::wstring TelldusCore::intToWstring(int value) { return st.str(); } +std::string TelldusCore::intToString(int value) { + std::stringstream st; + st << value; + return st.str(); +} + int TelldusCore::wideToInteger(const std::wstring &input){ std::wstringstream inputstream; inputstream << input; @@ -132,11 +138,11 @@ std::string TelldusCore::wideToString(const std::wstring &input) { char *outString = new char[outbytesLeft]; memset(outString, 0, sizeof(char)*(outbytesLeft)); -#ifdef _FREEBSD +#ifdef _FREEBSD const char *inPointer = inString; -#else - char *inPointer = inString; -#endif +#else + char *inPointer = inString; +#endif char *outPointer = outString; iconv_t convDesc = iconv_open("UTF-8", WCHAR_T_ENCODING); diff --git a/telldus-core/common/Strings.h b/telldus-core/common/Strings.h index 211c74a2..aca16060 100644 --- a/telldus-core/common/Strings.h +++ b/telldus-core/common/Strings.h @@ -7,9 +7,10 @@ namespace TelldusCore { std::wstring charToWstring(const char *value); int charToInteger(const char *value); std::wstring charUnsignedToWstring(const unsigned char value); - + bool comparei(std::wstring stringA, std::wstring stringB); std::wstring intToWstring(int value); + std::string intToString(int value); std::string wideToString(const std::wstring &input); int wideToInteger(const std::wstring &input);