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:
@@ -21,7 +21,7 @@ static bool TryParseBoolean(const wstring &text, bool defaultValue)
|
||||
|
||||
Settings::Settings(File *file)
|
||||
{
|
||||
if (file != NULL)
|
||||
if (file != nullptr)
|
||||
{
|
||||
filePath = file->getPath();
|
||||
}
|
||||
@@ -40,9 +40,9 @@ Settings::Settings(File *file)
|
||||
line.erase(line.size() - 1);
|
||||
|
||||
if (line.size() >= 3 &&
|
||||
(unsigned char)line[0] == 0xEF &&
|
||||
(unsigned char)line[1] == 0xBB &&
|
||||
(unsigned char)line[2] == 0xBF)
|
||||
static_cast<unsigned char>(line[0]) == 0xEF &&
|
||||
static_cast<unsigned char>(line[1]) == 0xBB &&
|
||||
static_cast<unsigned char>(line[2]) == 0xBF)
|
||||
{
|
||||
line.erase(0, 3);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user