Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -13,18 +13,18 @@ uint8_t *mallocAndCreateUTF8ArrayFromString(int iID)
|
||||
if( (cd = l10n_get_converter( L10N_UTF16, L10N_UTF8 )) == -1 )
|
||||
{
|
||||
app.DebugPrintf("l10n_get_converter: no such converter\n");
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
l10n_convert_str( cd, wchString, &src_len, NULL, &dst_len );
|
||||
uint8_t *strUtf8=(uint8_t *)malloc(dst_len);
|
||||
l10n_convert_str( cd, wchString, &src_len, nullptr, &dst_len );
|
||||
uint8_t *strUtf8=static_cast<uint8_t *>(malloc(dst_len));
|
||||
memset(strUtf8,0,dst_len);
|
||||
|
||||
result = l10n_convert_str( cd, wchString, &src_len, strUtf8, &dst_len );
|
||||
if( result != ConversionOK )
|
||||
{
|
||||
app.DebugPrintf("l10n_convert: conversion error : 0x%x\n", result);
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return strUtf8;
|
||||
|
||||
Reference in New Issue
Block a user