newer standards prefer nullptr over NULL - this is most of them but there are others too

This commit is contained in:
DarthArgus
2016-02-11 15:16:14 -06:00
parent a7f2d0ea6a
commit 3e4cc36e7e
937 changed files with 14983 additions and 14983 deletions
@@ -298,7 +298,7 @@ int const ExpertiseManager::getNumExpertiseTiers()
* exist.
*
* @return - skill object for expertise at grid location.
* returns NULL if none found
* returns nullptr if none found
*/
SkillObject const * ExpertiseManager::getExpertiseSkillAt(int tree, int tier, int grid, int rank)
{
@@ -335,7 +335,7 @@ void LevelManager::updateLevelDataWithSkill(LevelData &levelData, std::string co
//======================================================================
// Find the level corresponding to the xp value and
// returns null if not found
// returns nullptr if not found
LevelRecord const * LevelManagerNamespace::getLevelRecord(int xp)
{
LevelRecordsIterator itr = ms_levelRecords.begin();
@@ -365,7 +365,7 @@ LevelRecord const * LevelManagerNamespace::getLevelRecord(int xp)
WARNING(true, ("getLevelRecord: Couldn't find level for xp value[%d]\n", xp));
return NULL;
return nullptr;
}
//======================================================================
@@ -18,7 +18,7 @@
#include <unordered_map>
#include <string>
SkillManager *SkillManager::ms_instance = NULL;
SkillManager *SkillManager::ms_instance = nullptr;
const std::string &SkillManager::cms_skillsDatatableName = "datatables/skill/skills.iff";
//-----------------------------------------------------------------
@@ -92,7 +92,7 @@ void SkillManager::remove()
{
DEBUG_FATAL (!ms_instance, ("SkillManager not installed"));
delete ms_instance;
ms_instance = NULL;
ms_instance = nullptr;
}
//----------------------------------------------------------------------
@@ -170,7 +170,7 @@ const SkillObject * SkillManager::loadSkill(const std::string & skillName)
uint32 SkillManager::getDefaultXpLimit(const std::string & experienceType)
{
if (m_xpLimitMap != NULL)
if (m_xpLimitMap != nullptr)
{
XpLimitMap::const_iterator result = m_xpLimitMap->find(experienceType);
if (result != m_xpLimitMap->end())
@@ -183,13 +183,13 @@ uint32 SkillManager::getDefaultXpLimit(const std::string & experienceType)
void SkillManager::initXpLimits()
{
if (m_xpLimitTable == NULL)
if (m_xpLimitTable == nullptr)
{
WARNING(true, ("SkillManager::initXpLimits, m_xpLimitTable not initialized"));
return;
}
if (m_xpLimitMap == NULL)
if (m_xpLimitMap == nullptr)
{
WARNING(true, ("SkillManager::initXpLimits, m_xpLimitMap not initialized"));
return;