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:
@@ -139,7 +139,7 @@ UIString::~UIString()
|
||||
|
||||
bool UIString::empty()
|
||||
{
|
||||
return m_core.get() == NULL;
|
||||
return m_core.get() == nullptr;
|
||||
}
|
||||
|
||||
bool UIString::compare(const UIString &uiString)
|
||||
@@ -149,19 +149,19 @@ bool UIString::compare(const UIString &uiString)
|
||||
|
||||
bool UIString::needsUpdating()
|
||||
{
|
||||
if (m_core != NULL) return m_core->needsUpdating();
|
||||
if (m_core != nullptr) return m_core->needsUpdating();
|
||||
else return false;
|
||||
}
|
||||
|
||||
void UIString::setUpdated()
|
||||
{
|
||||
if (m_core != NULL) m_core->setUpdated();
|
||||
if (m_core != nullptr) m_core->setUpdated();
|
||||
}
|
||||
|
||||
wstring &UIString::getString()
|
||||
{
|
||||
static wstring blank(L"");
|
||||
if (m_core != NULL) return m_core->getString();
|
||||
if (m_core != nullptr) return m_core->getString();
|
||||
else return blank;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user