immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indent style fix

master
Piotr Dziwinski 2015-08-06 14:26:41 +02:00
parent 61ec101b11
commit 2906451d06
2 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
src/common/stringutils.cpp
View File

@ -63,126 +63,126 @@ std::string StrUtils::Format(const char *fmt, ...)
std::string StrUtils::Replace(const std::string &str, const std::string &oldStr, const std::string &newStr)
{
std::string result = str;
std::size_t pos = 0;
while ((pos = str.find(oldStr, pos)) != std::string::npos)
{
result.replace(pos, oldStr.length(), newStr);
pos += newStr.length();
}
return result;
std::string result = str;
std::size_t pos = 0;
while ((pos = str.find(oldStr, pos)) != std::string::npos)
{
result.replace(pos, oldStr.length(), newStr);
pos += newStr.length();
}
return result;
}
std::string StrUtils::UnicodeCharToUtf8(unsigned int ch)
{
std::string result;
if (ch < 0x0080)
{
result += static_cast<char>(ch);
}
else if (ch < 0x0800)
{
char ch1 = 0xC0 | ((ch & 0x07C0) >> 6);
char ch2 = 0x80 | (ch & 0x3F);
result += ch1;
result += ch2;
}
else
{
char ch1 = 0xE0 | ((ch & 0xF000) >> 12);
char ch2 = 0x80 | ((ch & 0x07C0) >> 6);
char ch3 = 0x80 | (ch & 0x3F);
result += ch1;
result += ch2;
result += ch3;
}
return result;
std::string result;
if (ch < 0x0080)
{
result += static_cast<char>(ch);
}
else if (ch < 0x0800)
{
char ch1 = 0xC0 | ((ch & 0x07C0) >> 6);
char ch2 = 0x80 | (ch & 0x3F);
result += ch1;
result += ch2;
}
else
{
char ch1 = 0xE0 | ((ch & 0xF000) >> 12);
char ch2 = 0x80 | ((ch & 0x07C0) >> 6);
char ch3 = 0x80 | (ch & 0x3F);
result += ch1;
result += ch2;
result += ch3;
}
return result;
}
std::string StrUtils::UnicodeStringToUtf8(const std::wstring &str)
{
std::string result;
for (unsigned int i = 0; i < str.size(); ++i)
result += StrUtils::UnicodeCharToUtf8(static_cast<unsigned int>(str[i]));
std::string result;
for (unsigned int i = 0; i < str.size(); ++i)
result += StrUtils::UnicodeCharToUtf8(static_cast<unsigned int>(str[i]));
return result;
return result;
}
unsigned int StrUtils::Utf8CharToUnicode(const std::string &ch)
{
if (ch.empty())
return 0;
if (ch.empty())
return 0;
unsigned int result = 0;
if ((ch[0] & 0x80) == 0)
{
if (ch.size() == 1)
result = static_cast<unsigned int>(ch[0]);
}
else if ((ch[0] & 0xC0) == 0xC0)
{
if (ch.size() == 2)
unsigned int result = 0;
if ((ch[0] & 0x80) == 0)
{
unsigned int ch1 = (ch[0] & 0x1F) << 6;
unsigned int ch2 = (ch[1] & 0x3F);
result = ch1 | ch2;
if (ch.size() == 1)
result = static_cast<unsigned int>(ch[0]);
}
}
else
{
if (ch.size() == 3)
else if ((ch[0] & 0xC0) == 0xC0)
{
unsigned int ch1 = (ch[0] & 0xF0) << 12;
unsigned int ch2 = (ch[1] & 0xC0) << 6;
unsigned int ch3 = (ch[2] & 0xC0);
result = ch1 | ch2 | ch3;
if (ch.size() == 2)
{
unsigned int ch1 = (ch[0] & 0x1F) << 6;
unsigned int ch2 = (ch[1] & 0x3F);
result = ch1 | ch2;
}
}
else
{
if (ch.size() == 3)
{
unsigned int ch1 = (ch[0] & 0xF0) << 12;
unsigned int ch2 = (ch[1] & 0xC0) << 6;
unsigned int ch3 = (ch[2] & 0xC0);
result = ch1 | ch2 | ch3;
}
}
}
return result;
return result;
}
std::wstring StrUtils::Utf8StringToUnicode(const std::string &str)
{
std::wstring result;
unsigned int pos = 0;
while (pos < str.size())
{
int len = StrUtils::Utf8CharSizeAt(str, pos);
if (len == 0)
break;
std::wstring result;
unsigned int pos = 0;
while (pos < str.size())
{
int len = StrUtils::Utf8CharSizeAt(str, pos);
if (len == 0)
break;
std::string ch = str.substr(pos, len);
result += static_cast<wchar_t>(StrUtils::Utf8CharToUnicode(ch));
pos += len;
}
return result;
std::string ch = str.substr(pos, len);
result += static_cast<wchar_t>(StrUtils::Utf8CharToUnicode(ch));
pos += len;
}
return result;
}
int StrUtils::Utf8CharSizeAt(const std::string &str, unsigned int pos)
{
if (pos >= str.size())
if (pos >= str.size())
return 0;
if ((str[pos] & 0x80) == 0)
return 1;
else if ((str[pos] & 0xC0) == 0xC0)
return 2;
else
return 3;
return 0;
if ((str[pos] & 0x80) == 0)
return 1;
else if ((str[pos] & 0xC0) == 0xC0)
return 2;
else
return 3;
return 0;
}
std::size_t StrUtils::Utf8StringLength(const std::string &str)
{
std::size_t result = 0;
unsigned int i = 0;
while (i < str.size())
{
i += Utf8CharSizeAt(str, i);
++result;
}
return result;
std::size_t result = 0;
unsigned int i = 0;
while (i < str.size())
{
i += Utf8CharSizeAt(str, i);
++result;
}
return result;
}

24
src/common/stringutils.h
View File

@ -37,11 +37,11 @@ namespace StrUtils
template<class T>
std::string ToString(T value, bool *ok = nullptr)
{
std::ostringstream s;
s << value;
if (ok != nullptr)
*ok = !s.fail();
return s.str();
std::ostringstream s;
s << value;
if (ok != nullptr)
*ok = !s.fail();
return s.str();
}
//! Converts a value to string
@ -50,13 +50,13 @@ std::string ToString(T value, bool *ok = nullptr)
template<class T>
T FromString(const std::string &str, bool *ok = nullptr)
{
std::istringstream s;
s.str(str);
T value;
s >> value;
if (ok != nullptr)
*ok = !s.fail();
return value;
std::istringstream s;
s.str(str);
T value;
s >> value;
if (ok != nullptr)
*ok = !s.fail();
return value;
}
//! Replacement for sprintf()