diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-30 22:59:18 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-30 22:59:18 +0200 |
commit | 5e637ca0288ddd631ec33e1d620cd4a73bcdc2be (patch) | |
tree | b26b0e9572f101744aba712133e646fb93ed58d2 /src/common/stringutils.cpp | |
parent | d8a0c8d32e160e7ae86bb5b85ead8e5f71b1fd01 (diff) | |
download | colobot-5e637ca0288ddd631ec33e1d620cd4a73bcdc2be.tar.gz colobot-5e637ca0288ddd631ec33e1d620cd4a73bcdc2be.tar.bz2 colobot-5e637ca0288ddd631ec33e1d620cd4a73bcdc2be.zip |
Switched to new style casts
- rewrote old C-style casts to new ..._cast<>
- corrected some dangerous casts
- added -Wold-style-cast to compile flags
Diffstat (limited to 'src/common/stringutils.cpp')
-rw-r--r-- | src/common/stringutils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/stringutils.cpp b/src/common/stringutils.cpp index 9a7aa61..585bb46 100644 --- a/src/common/stringutils.cpp +++ b/src/common/stringutils.cpp @@ -36,7 +36,7 @@ std::string StrUtils::UnicodeCharToUtf8(unsigned int ch) std::string result; if (ch < 0x0080) { - result += (char)(ch); + result += static_cast<char>(ch); } else if (ch < 0x0800) { @@ -61,7 +61,7 @@ std::string StrUtils::UnicodeStringToUtf8(const std::wstring &str) { std::string result; for (unsigned int i = 0; i < str.size(); ++i) - result += StrUtils::UnicodeCharToUtf8((unsigned int)str[i]); + result += StrUtils::UnicodeCharToUtf8(static_cast<unsigned int>(str[i])); return result; } @@ -75,7 +75,7 @@ unsigned int StrUtils::Utf8CharToUnicode(const std::string &ch) if ((ch[0] & 0x80) == 0) { if (ch.size() == 1) - result = (unsigned int)ch[0]; + result = static_cast<unsigned int>(ch[0]); } else if ((ch[0] & 0xC0) == 0xC0) { @@ -111,7 +111,7 @@ std::wstring StrUtils::Utf8StringToUnicode(const std::string &str) break; std::string ch = str.substr(pos, len); - result += (wchar_t)(StrUtils::Utf8CharToUnicode(ch)); + result += static_cast<wchar_t>(StrUtils::Utf8CharToUnicode(ch)); pos += len; } return result; |