1 files changed, 23 insertions, 23 deletions

diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index 12bd3ada1..34e25f379 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -320,8 +320,8 @@ size_t RateCompareString(const AString & s1, const AString & s2)
 
 	for (size_t i = 0; i < s1Length; i++)
 	{
-		char c1 = (char)toupper(s1[i]);
-		char c2 = (char)toupper(s2[i]);
+		char c1 = static_cast<char>(toupper(s1[i]));
+		char c2 = static_cast<char>(toupper(s2[i]));
 		if (c1 == c2)
 		{
 			++MatchedLetters;
@@ -360,12 +360,12 @@ AString & RawBEToUTF8(const char * a_RawData, size_t a_NumShorts, AString & a_UT
 		int c = GetBEShort(&a_RawData[i * 2]);
 		if (c < 0x80)
 		{
-			a_UTF8.push_back((char)c);
+			a_UTF8.push_back(static_cast<char>(c));
 		}
 		else if (c < 0x800)
 		{
-			a_UTF8.push_back((char)(192 + c / 64));
-			a_UTF8.push_back((char)(128 + c % 64));
+			a_UTF8.push_back(static_cast<char>(192 + c / 64));
+			a_UTF8.push_back(static_cast<char>(128 + c % 64));
 		}
 		else if (c - 0xd800 < 0x800)
 		{
@@ -505,7 +505,7 @@ AString UTF8ToRawBEUTF16(const char * a_UTF8, size_t a_UTF8Length)
 	AString UTF16;
 	UTF16.reserve(a_UTF8Length * 3);
 
-	const unsigned char * source    = (const unsigned char *)a_UTF8;
+	const unsigned char * source    = reinterpret_cast<const unsigned char *>(a_UTF8);
 	const unsigned char * sourceEnd = source + a_UTF8Length;
 	const int halfShift  = 10;  // used for shifting by 10 bits
 	const unsigned int halfBase = 0x0010000UL;
@@ -545,14 +545,14 @@ AString UTF8ToRawBEUTF16(const char * a_UTF8, size_t a_UTF8Length)
 				// UTF-16 surrogate values are illegal in UTF-32
 				ch = ' ';
 			}
-			unsigned short v = htons((unsigned short)ch);
-			UTF16.append((const char *)&v, 2);
+			unsigned short v = htons(static_cast<unsigned short>(ch));
+			UTF16.append(reinterpret_cast<const char *>(&v), 2);
 		}
 		else if (ch > UNI_MAX_UTF16)
 		{
 			// Invalid value, replace with a space
 			unsigned short v = htons(' ');
-			UTF16.append((const char *)&v, 2);
+			UTF16.append(reinterpret_cast<const char *>(&v), 2);
 		}
 		else
 		{
@@ -560,8 +560,8 @@ AString UTF8ToRawBEUTF16(const char * a_UTF8, size_t a_UTF8Length)
 			ch -= halfBase;
 			unsigned short v1 = htons((ch >> halfShift) + UNI_SUR_HIGH_START);
 			unsigned short v2 = htons((ch & halfMask) + UNI_SUR_LOW_START);
-			UTF16.append((const char *)&v1, 2);
-			UTF16.append((const char *)&v2, 2);
+			UTF16.append(reinterpret_cast<const char *>(&v1), 2);
+			UTF16.append(reinterpret_cast<const char *>(&v2), 2);
 		}
 	}
 	return UTF16;
@@ -620,9 +620,9 @@ AString & CreateHexDump(AString & a_Out, const void * a_Data, size_t a_Size, siz
 		}
 		#ifdef _MSC_VER
 		// MSVC provides a "secure" version of sprintf()
-		int Count = sprintf_s(line, sizeof(line), "%08x:", (unsigned)i);
+		int Count = sprintf_s(line, sizeof(line), "%08x:", static_cast<unsigned>(i));
 		#else
-		int Count = sprintf(line, "%08x:", (unsigned)i);
+		int Count = sprintf(line, "%08x:", static_cast<unsigned>(i));
 		#endif
 		// Remove the terminating nullptr / leftover garbage in line, after the sprintf-ed value
 		memset(line + Count, 32, sizeof(line) - static_cast<size_t>(Count));
@@ -870,24 +870,24 @@ AString Base64Encode(const AString & a_Input)
 
 	for (size_t i = 0; i < size_full24; i += 3)
 	{
-		output[output_index++] = BASE64[(unsigned char)a_Input[i] >> 2];
-		output[output_index++] = BASE64[((unsigned char)a_Input[i] << 4 | (unsigned char)a_Input[i + 1] >> 4) & 63];
-		output[output_index++] = BASE64[((unsigned char)a_Input[i + 1] << 2 | (unsigned char)a_Input[i + 2] >> 6) & 63];
-		output[output_index++] = BASE64[(unsigned char)a_Input[i + 2] & 63];
+		output[output_index++] = BASE64[static_cast<unsigned char>(a_Input[i]) >> 2];
+		output[output_index++] = BASE64[(static_cast<unsigned char>(a_Input[i]) << 4 | static_cast<unsigned char>(a_Input[i + 1]) >> 4) & 63];
+		output[output_index++] = BASE64[(static_cast<unsigned char>(a_Input[i + 1]) << 2 | static_cast<unsigned char>(a_Input[i + 2]) >> 6) & 63];
+		output[output_index++] = BASE64[static_cast<unsigned char>(a_Input[i + 2]) & 63];
 	}
 
 	if (size_full24 < a_Input.size())
 	{
-		output[output_index++] = BASE64[(unsigned char)a_Input[size_full24] >> 2];
+		output[output_index++] = BASE64[static_cast<unsigned char>(a_Input[size_full24]) >> 2];
 		if (size_full24 + 1 == a_Input.size())
 		{
-			output[output_index++] = BASE64[((unsigned char)a_Input[size_full24] << 4) & 63];
+			output[output_index++] = BASE64[(static_cast<unsigned char>(a_Input[size_full24]) << 4) & 63];
 			output[output_index++] = '=';
 		}
 		else
 		{
-			output[output_index++] = BASE64[((unsigned char)a_Input[size_full24] << 4 | (unsigned char)a_Input[size_full24 + 1] >> 4) & 63];
-			output[output_index++] = BASE64[((unsigned char)a_Input[size_full24 + 1] << 2) & 63];
+			output[output_index++] = BASE64[(static_cast<unsigned char>(a_Input[size_full24]) << 4 | static_cast<unsigned char>(a_Input[size_full24 + 1]) >> 4) & 63];
+			output[output_index++] = BASE64[(static_cast<unsigned char>(a_Input[size_full24 + 1]) << 2) & 63];
 		}
 
 		output[output_index++] = '=';
@@ -903,7 +903,7 @@ AString Base64Encode(const AString & a_Input)
 
 short GetBEShort(const char * a_Mem)
 {
-	const Byte * Bytes = (const Byte *)a_Mem;
+	const Byte * Bytes = reinterpret_cast<const Byte *>(a_Mem);
 	return static_cast<short>((Bytes[0] << 8) | Bytes[1]);
 }
 
@@ -913,7 +913,7 @@ short GetBEShort(const char * a_Mem)
 
 int GetBEInt(const char * a_Mem)
 {
-	const Byte * Bytes = (const Byte *)a_Mem;
+	const Byte * Bytes = reinterpret_cast<const Byte *>(a_Mem);
 	return (Bytes[0] << 24) | (Bytes[1] << 16) | (Bytes[2] << 8) | Bytes[3];
 }