The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

clang-modernize -use-nullptr

Browse Source 
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
This commit is contained in:
Tillmann Karras
2014-03-09 21:14:26 +01:00
parent f28116b7da
commit d802d39281
292 changed files with 1526 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DiscIO/NANDContentLoader.cpp
View File

@ -157,7 +157,7 @@ CNANDContentLoader::CNANDContentLoader(const std::string& _rName)
, m_IosVersion(0x09)
, m_BootIndex(-1)
, m_TIKSize(0)
, m_TIK(NULL)
, m_TIK(nullptr)
{
m_Valid = Initialize(_rName);
}
@ -172,7 +172,7 @@ CNANDContentLoader::~CNANDContentLoader()
if (m_TIK)
{
delete []m_TIK;
m_TIK = NULL;
m_TIK = nullptr;
}
}
@ -185,7 +185,7 @@ const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const
return &Content;
}
}
return NULL;
return nullptr;
}
bool CNANDContentLoader::Initialize(const std::string& _rName)
@ -194,8 +194,8 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
return false;
m_Path = _rName;
WiiWAD Wad(_rName);
u8* pDataApp = NULL;
u8* pTMD = NULL;
u8* pDataApp = nullptr;
u8* pTMD = nullptr;
u8 DecryptTitleKey[16];
u8 IV[16];
if (Wad.IsValid())
@ -272,7 +272,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
continue;
}
rContent.m_pData = NULL;
rContent.m_pData = nullptr;
if (rContent.m_Type & 0x8000) // shared app
{