mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Use named casts instead of old-style casts

Browse Source 
Change prepared with clang-tidy and google-readability-casting check
This commit is contained in:
Michał Janiszewski
2020-04-22 17:09:29 +02:00
committed by GitHub
parent cfd94d4fa5
commit 2323cc1596
114 changed files with 604 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/core/String.cpp
View File

@@ -82,7 +82,7 @@ namespace String
// UTF-32 is the default on most POSIX systems; Windows uses UTF-16.
// Unfortunately, we'll have to help the compiler here.
# if U_SIZEOF_WCHAR_T == 4
icu::UnicodeString str = icu::UnicodeString::fromUTF32((const UChar32*)src.data(), src.length());
icu::UnicodeString str = icu::UnicodeString::fromUTF32(reinterpret_cast<const UChar32*>(src.data()), src.length());
# elif U_SIZEOF_WCHAR_T == 2
std::wstring wstr = std::wstring(src);
icu::UnicodeString str = icu::UnicodeString((const wchar_t*)wstr.c_str());
@@ -112,11 +112,11 @@ namespace String
// UTF-32 is the default on most POSIX systems; Windows uses UTF-16.
// Unfortunately, we'll have to help the compiler here.
# if U_SIZEOF_WCHAR_T == 4
size_t length = (size_t)str.length();
size_t length = static_cast<size_t>(str.length());
std::wstring result(length, '\0');
UErrorCode status = U_ZERO_ERROR;
str.toUTF32((UChar32*)&result[0], str.length(), status);
str.toUTF32(reinterpret_cast<UChar32*>(&result[0]), str.length(), status);
# elif U_SIZEOF_WCHAR_T == 2
const char16_t* buffer = str.getBuffer();
@@ -228,7 +228,7 @@ namespace String
{
if (*ch == match)
{
return (size_t)(ch - str);
return static_cast<size_t>(ch - str);
}
}
return SIZE_MAX;
@@ -336,7 +336,7 @@ namespace String
return nullptr;
}
size_t requiredSize = (size_t)len + 1;
size_t requiredSize = static_cast<size_t>(len) + 1;
if (requiredSize > bufferSize)
{
// Try again with bigger buffer
@@ -454,12 +454,13 @@ namespace String
utf8* SkipBOM(utf8* buffer)
{
return (utf8*)SkipBOM((const utf8*)buffer);
return const_cast<utf8*>(SkipBOM((const utf8*)buffer));
}
const utf8* SkipBOM(const utf8* buffer)
{
if ((uint8_t)buffer[0] == 0xEF && (uint8_t)buffer[1] == 0xBB && (uint8_t)buffer[2] == 0xBF)
if (static_cast<uint8_t>(buffer[0]) == 0xEF && static_cast<uint8_t>(buffer[1]) == 0xBB
&& static_cast<uint8_t>(buffer[2]) == 0xBF)
{
return buffer + 3;
}
@@ -489,7 +490,7 @@ namespace String
bool IsWhiteSpace(codepoint_t codepoint)
{
// 0x3000 is the 'ideographic space', a 'fullwidth' character used in CJK languages.
return iswspace((wchar_t)codepoint) || codepoint == 0x3000;
return iswspace(static_cast<wchar_t>(codepoint)) || codepoint == 0x3000;
}
utf8* Trim(utf8* str)
@@ -649,7 +650,8 @@ namespace String
// Convert the lot.
char* buffer_target = &buffer[0];
ucnv_fromUnicode(conv, &buffer_target, buffer_limit, (const UChar**)&source, source_limit, nullptr, true, &status);
ucnv_fromUnicode(
conv, &buffer_target, buffer_limit, static_cast<const UChar**>(&source), source_limit, nullptr, true, &status);
if (U_FAILURE(status))
{