clang-modernize -use-nullptr

and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine

23 files changed, 106 insertions, 106 deletions

diff --git a/Source/Core/DiscIO/BannerLoader.cpp b/Source/Core/DiscIO/BannerLoader.cpp
index 49dfb4bb44..81d7ab2149 100644
--- a/Source/Core/DiscIO/BannerLoader.cpp
+++ b/Source/Core/DiscIO/BannerLoader.cpp
@@ -27,7 +27,7 @@ IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVo
 		return new CBannerLoaderGC(_rFileSystem, pVolume);
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 } // namespace
diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp
index 0133e43ae6..5258eb66ab 100644
--- a/Source/Core/DiscIO/BannerLoaderGC.cpp
+++ b/Source/Core/DiscIO/BannerLoaderGC.cpp
@@ -16,7 +16,7 @@
 namespace DiscIO
 {
 CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume* volume)
-	: m_pBannerFile(NULL)
+	: m_pBannerFile(nullptr)
 	, m_IsValid(false)
 	, m_country(volume->GetCountry())
 {
@@ -45,7 +45,7 @@ CBannerLoaderGC::~CBannerLoaderGC()
 	if (m_pBannerFile)
 	{
 		delete [] m_pBannerFile;
-		m_pBannerFile = NULL;
+		m_pBannerFile = nullptr;
 	}
 }
 
diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp
index 3fa9113770..5ca4f5f38e 100644
--- a/Source/Core/DiscIO/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/BannerLoaderWii.cpp
@@ -21,7 +21,7 @@ namespace DiscIO
 {
 
 CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume)
-	: m_pBannerFile(NULL)
+	: m_pBannerFile(nullptr)
 	, m_IsValid(false)
 {
 	char Filename[260];
@@ -94,7 +94,7 @@ CBannerLoaderWii::~CBannerLoaderWii()
 	if (m_pBannerFile)
 	{
 		delete [] m_pBannerFile;
-		m_pBannerFile = NULL;
+		m_pBannerFile = nullptr;
 	}
 }
 
@@ -121,7 +121,7 @@ bool CBannerLoaderWii::GetStringFromComments(const CommentIndex index, std::stri
 		auto const banner = reinterpret_cast<const SWiiBanner*>(m_pBannerFile);
 		auto const src_ptr = banner->m_Comment[index];
 
-		// Trim at first NULL
+		// Trim at first nullptr
 		auto const length = std::find(src_ptr, src_ptr + COMMENT_SIZE, 0x0) - src_ptr;
 
 		std::wstring src;
diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp
index c5f5eec28e..c912dad3c5 100644
--- a/Source/Core/DiscIO/Blob.cpp
+++ b/Source/Core/DiscIO/Blob.cpp
@@ -121,7 +121,7 @@ IBlobReader* CreateBlobReader(const char* filename)
 		return DriveReader::Create(filename);
 
 	if (!File::Exists(filename))
-		return 0;
+		return nullptr;
 
 	if (IsWbfsBlob(filename))
 		return WbfsFileReader::Create(filename);
diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h
index 62c0f10e39..5ceb4c3bcf 100644
--- a/Source/Core/DiscIO/Blob.h
+++ b/Source/Core/DiscIO/Blob.h
@@ -68,8 +68,8 @@ IBlobReader* CreateBlobReader(const char *filename);
 typedef void (*CompressCB)(const char *text, float percent, void* arg);
 
 bool CompressFileToBlob(const char *infile, const char *outfile, u32 sub_type = 0, int sector_size = 16384,
-		CompressCB callback = 0, void *arg = 0);
+		CompressCB callback = nullptr, void *arg = nullptr);
 bool DecompressBlobToFile(const char *infile, const char *outfile,
-		CompressCB callback = 0, void *arg = 0);
+		CompressCB callback = nullptr, void *arg = nullptr);
 
 }  // namespace
diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp
index 7c56cde277..ea0a01eafd 100644
--- a/Source/Core/DiscIO/CISOBlob.cpp
+++ b/Source/Core/DiscIO/CISOBlob.cpp
@@ -37,7 +37,7 @@ CISOFileReader* CISOFileReader::Create(const char* filename)
 		return new CISOFileReader(f.ReleaseHandle());
 	}
 	else
-		return NULL;
+		return nullptr;
 }
 
 u64 CISOFileReader::GetDataSize() const
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
index 94d56b3172..0d7ba59310 100644
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -55,7 +55,7 @@ CompressedBlobReader* CompressedBlobReader::Create(const char* filename)
 	if (IsCompressedBlob(filename))
 		return new CompressedBlobReader(filename);
 	else
-		return 0;
+		return nullptr;
 }
 
 CompressedBlobReader::~CompressedBlobReader()
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp
index 8c64dcd1b0..68a3e9f36f 100644
--- a/Source/Core/DiscIO/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@@ -24,7 +24,7 @@ namespace DiscScrubber
 
 #define CLUSTER_SIZE 0x8000
 
-u8* m_FreeTable = NULL;
+u8* m_FreeTable = nullptr;
 u64 m_FileSize;
 u64 m_BlockCount;
 u32 m_BlockSize;
@@ -32,7 +32,7 @@ int m_BlocksPerCluster;
 bool m_isScrubbing = false;
 
 std::string m_Filename;
-IVolume* m_Disc = NULL;
+IVolume* m_Disc = nullptr;
 
 struct SPartitionHeader
 {
@@ -112,7 +112,7 @@ bool SetupScrub(const char* filename, int block_size)
 	success = ParseDisc();
 	// Done with it; need it closed for the next part
 	delete m_Disc;
-	m_Disc = NULL;
+	m_Disc = nullptr;
 	m_BlockCount = 0;
 
 	// Let's not touch the file if we've failed up to here :p
@@ -146,7 +146,7 @@ void GetNextBlock(File::IOFile& in, u8* buffer)
 void Cleanup()
 {
 	if (m_FreeTable) delete[] m_FreeTable;
-	m_FreeTable = NULL;
+	m_FreeTable = nullptr;
 	m_FileSize = 0;
 	m_BlockCount = 0;
 	m_BlockSize = 0;
diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp
index 819a37971c..6785ee0cf4 100644
--- a/Source/Core/DiscIO/DriveBlob.cpp
+++ b/Source/Core/DiscIO/DriveBlob.cpp
@@ -23,14 +23,14 @@ DriveReader::DriveReader(const char *drive)
 	SectorReader::SetSectorSize(2048);
 	auto const path = UTF8ToTStr(std::string("\\\\.\\") + drive);
 	hDisc = CreateFile(path.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-						NULL, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL);
+						nullptr, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, nullptr);
 	if (hDisc != INVALID_HANDLE_VALUE)
 	{
 		// Do a test read to make sure everything is OK, since it seems you can get
 		// handles to empty drives.
 		DWORD not_used;
 		u8 *buffer = new u8[m_blocksize];
-		if (!ReadFile(hDisc, buffer, m_blocksize, (LPDWORD)&not_used, NULL))
+		if (!ReadFile(hDisc, buffer, m_blocksize, (LPDWORD)&not_used, nullptr))
 		{
 			delete [] buffer;
 			// OK, something is wrong.
@@ -45,8 +45,8 @@ DriveReader::DriveReader(const char *drive)
 		// removal while reading from it.
 		pmrLockCDROM.PreventMediaRemoval = TRUE;
 		DeviceIoControl(hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
-					&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
-					0, &dwNotUsed, NULL);
+					&pmrLockCDROM, sizeof(pmrLockCDROM), nullptr,
+					0, &dwNotUsed, nullptr);
 	#endif
 #else
 	SectorReader::SetSectorSize(2048);
@@ -66,8 +66,8 @@ DriveReader::~DriveReader()
 	// Unlock the disc in the CD-ROM drive.
 	pmrLockCDROM.PreventMediaRemoval = FALSE;
 	DeviceIoControl (hDisc, IOCTL_CDROM_MEDIA_REMOVAL,
-		&pmrLockCDROM, sizeof(pmrLockCDROM), NULL,
-		0, &dwNotUsed, NULL);
+		&pmrLockCDROM, sizeof(pmrLockCDROM), nullptr,
+		0, &dwNotUsed, nullptr);
 #endif
 	if (hDisc != INVALID_HANDLE_VALUE)
 	{
@@ -85,7 +85,7 @@ DriveReader *DriveReader::Create(const char *drive)
 	if (!reader->IsOK())
 	{
 		delete reader;
-		return 0;
+		return nullptr;
 	}
 	return reader;
 }
@@ -99,7 +99,7 @@ void DriveReader::GetBlock(u64 block_num, u8 *out_ptr)
 	LONG off_low = (LONG)offset & 0xFFFFFFFF;
 	LONG off_high = (LONG)(offset >> 32);
 	SetFilePointer(hDisc, off_low, &off_high, FILE_BEGIN);
-	if (!ReadFile(hDisc, lpSector, m_blocksize, (LPDWORD)&NotUsed, NULL))
+	if (!ReadFile(hDisc, lpSector, m_blocksize, (LPDWORD)&NotUsed, nullptr))
 		PanicAlertT("Disc Read Error");
 #else
 	file_.Seek(m_blocksize * block_num, SEEK_SET);
@@ -117,7 +117,7 @@ bool DriveReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *o
 	LONG off_low = (LONG)offset & 0xFFFFFFFF;
 	LONG off_high = (LONG)(offset >> 32);
 	SetFilePointer(hDisc, off_low, &off_high, FILE_BEGIN);
-	if (!ReadFile(hDisc, out_ptr, (DWORD)(m_blocksize * num_blocks), (LPDWORD)&NotUsed, NULL))
+	if (!ReadFile(hDisc, out_ptr, (DWORD)(m_blocksize * num_blocks), (LPDWORD)&NotUsed, nullptr))
 	{
 		PanicAlertT("Disc Read Error");
 		return false;
diff --git a/Source/Core/DiscIO/DriveBlob.h b/Source/Core/DiscIO/DriveBlob.h
index 5b4fe14f5d..ae2b6875f6 100644
--- a/Source/Core/DiscIO/DriveBlob.h
+++ b/Source/Core/DiscIO/DriveBlob.h
@@ -28,7 +28,7 @@ private:
 	bool IsOK() {return hDisc != INVALID_HANDLE_VALUE;}
 #else
 	File::IOFile file_;
-	bool IsOK() {return file_ != 0;}
+	bool IsOK() {return file_ != nullptr;}
 #endif
 	s64 size;
 
diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp
index d97a4b1d7c..bb4d28680d 100644
--- a/Source/Core/DiscIO/FileBlob.cpp
+++ b/Source/Core/DiscIO/FileBlob.cpp
@@ -19,7 +19,7 @@ PlainFileReader* PlainFileReader::Create(const char* filename)
 	if (f)
 		return new PlainFileReader(f.ReleaseHandle());
 	else
-		return NULL;
+		return nullptr;
 }
 
 bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp
index 770d3aac8b..ee24158053 100644
--- a/Source/Core/DiscIO/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/FileHandlerARC.cpp
@@ -18,11 +18,11 @@
 namespace DiscIO
 {
 CARCFile::CARCFile(const std::string& _rFilename)
-	: m_pBuffer(NULL)
+	: m_pBuffer(nullptr)
 	, m_Initialized(false)
 {
 	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
-	if (pReader != NULL)
+	if (pReader != nullptr)
 	{
 		u64 FileSize = pReader->GetDataSize();
 		m_pBuffer = new u8[(u32)FileSize];
@@ -34,11 +34,11 @@ CARCFile::CARCFile(const std::string& _rFilename)
 }
 
 CARCFile::CARCFile(const std::string& _rFilename, u32 offset)
-	: m_pBuffer(NULL)
+	: m_pBuffer(nullptr)
 	, m_Initialized(false)
 {
 	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
-	if (pReader != NULL)
+	if (pReader != nullptr)
 	{
 		u64 FileSize = pReader->GetDataSize() - offset;
 		m_pBuffer = new u8[(u32)FileSize];
@@ -50,7 +50,7 @@ CARCFile::CARCFile(const std::string& _rFilename, u32 offset)
 }
 
 CARCFile::CARCFile(const u8* _pBuffer, size_t _BufferSize)
-	: m_pBuffer(NULL)
+	: m_pBuffer(nullptr)
 	, m_Initialized(false)
 {
 	m_pBuffer = new u8[_BufferSize];
@@ -86,7 +86,7 @@ CARCFile::GetFileSize(const std::string& _rFullPath)
 
 	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
 
-	if (pFileInfo != NULL)
+	if (pFileInfo != nullptr)
 	{
 		return((size_t) pFileInfo->m_FileSize);
 	}
@@ -105,7 +105,7 @@ CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBuffe
 
 	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
 
-	if (pFileInfo == NULL)
+	if (pFileInfo == nullptr)
 	{
 		return(0);
 	}
@@ -130,7 +130,7 @@ CARCFile::ExportFile(const std::string& _rFullPath, const std::string& _rExportF
 
 	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
 
-	if (pFileInfo == NULL)
+	if (pFileInfo == nullptr)
 	{
 		return(false);
 	}
@@ -183,7 +183,7 @@ CARCFile::ParseBuffer()
 			szNameTable += 0xC;
 		}
 
-		BuildFilenames(1, m_FileInfoVector.size(), NULL, szNameTable);
+		BuildFilenames(1, m_FileInfoVector.size(), nullptr, szNameTable);
 	}
 
 	return(true);
@@ -204,7 +204,7 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
 		if (rFileInfo.IsDirectory())
 		{
 			// this is a directory, build up the new szDirectory
-			if (_szDirectory != NULL)
+			if (_szDirectory != nullptr)
 			{
 				sprintf(rFileInfo.m_FullPath, "%s%s/", _szDirectory, &_szNameTable[uOffset]);
 			}
@@ -218,7 +218,7 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
 		else
 		{
 			// this is a filename
-			if (_szDirectory != NULL)
+			if (_szDirectory != nullptr)
 			{
 				sprintf(rFileInfo.m_FullPath, "%s%s", _szDirectory, &_szNameTable[uOffset]);
 			}
@@ -246,6 +246,6 @@ CARCFile::FindFileInfo(std::string _rFullPath) const
 		}
 	}
 
-	return(NULL);
+	return(nullptr);
 }
 } // namespace
diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp
index cc0a345838..e04bc2211e 100644
--- a/Source/Core/DiscIO/FileMonitor.cpp
+++ b/Source/Core/DiscIO/FileMonitor.cpp
@@ -24,8 +24,8 @@
 namespace FileMon
 {
 
-DiscIO::IVolume *OpenISO = NULL;
-DiscIO::IFileSystem *pFileSystem = NULL;
+DiscIO::IVolume *OpenISO = nullptr;
+DiscIO::IFileSystem *pFileSystem = nullptr;
 std::vector<const DiscIO::SFileInfo *> GCFiles;
 std::string ISOFile = "", CurrentFile = "";
 bool FileAccess = true;
@@ -34,7 +34,7 @@ bool FileAccess = true;
 bool IsSoundFile(const std::string& filename)
 {
 	std::string extension;
-	SplitPath(filename, NULL, NULL, &extension);
+	SplitPath(filename, nullptr, nullptr, &extension);
 	std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
 
 	std::unordered_set<std::string> extensions = {
@@ -57,15 +57,15 @@ bool IsSoundFile(const std::string& filename)
 void ReadGC(const std::string& filename)
 {
 	// Should have an actual Shutdown procedure or something
-	if (OpenISO != NULL)
+	if (OpenISO != nullptr)
 	{
 		delete OpenISO;
-		OpenISO = NULL;
+		OpenISO = nullptr;
 	}
-	if (pFileSystem != NULL)
+	if (pFileSystem != nullptr)
 	{
 		delete pFileSystem;
-		pFileSystem = NULL;
+		pFileSystem = nullptr;
 	}
 
 	// GCFiles' pointers are no longer valid after pFileSystem is cleared
@@ -149,16 +149,16 @@ void FindFilename(u64 offset)
 
 void Close()
 {
-	if (OpenISO != NULL)
+	if (OpenISO != nullptr)
 	{
 		delete OpenISO;
-		OpenISO = NULL;
+		OpenISO = nullptr;
 	}
 
-	if (pFileSystem != NULL)
+	if (pFileSystem != nullptr)
 	{
 		delete pFileSystem;
-		pFileSystem = NULL;
+		pFileSystem = nullptr;
 	}
 
 	// GCFiles' pointers are no longer valid after pFileSystem is cleared
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp
index 6b15454256..5b7f53af2b 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/FileSystemGCWii.cpp
@@ -40,7 +40,7 @@ u64 CFileSystemGCWii::GetFileSize(const char* _rFullPath)
 
 	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
 
-	if (pFileInfo != NULL && !pFileInfo->IsDirectory())
+	if (pFileInfo != nullptr && !pFileInfo->IsDirectory())
 		return pFileInfo->m_FileSize;
 
 	return 0;
@@ -60,7 +60,7 @@ const char* CFileSystemGCWii::GetFileName(u64 _Address)
 		}
 	}
 
-	return 0;
+	return nullptr;
 }
 
 u64 CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)
@@ -69,7 +69,7 @@ u64 CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _Max
 		InitFileSystem();
 
 	const SFileInfo* pFileInfo = FindFileInfo(_rFullPath);
-	if (pFileInfo == NULL)
+	if (pFileInfo == nullptr)
 		return 0;
 
 	if (pFileInfo->m_FileSize > _MaxBufferSize)
@@ -243,7 +243,7 @@ const SFileInfo* CFileSystemGCWii::FindFileInfo(const char* _rFullPath)
 			return &fileInfo;
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 bool CFileSystemGCWii::DetectFileSystem()
@@ -297,7 +297,7 @@ void CFileSystemGCWii::InitFileSystem()
 			NameTableOffset += 0xC;
 		}
 
-		BuildFilenames(1, m_FileInfoVector.size(), NULL, NameTableOffset);
+		BuildFilenames(1, m_FileInfoVector.size(), nullptr, NameTableOffset);
 	}
 }
 
@@ -317,7 +317,7 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _
 		if (rFileInfo->IsDirectory())
 		{
 			// this is a directory, build up the new szDirectory
-			if (_szDirectory != NULL)
+			if (_szDirectory != nullptr)
 				CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s/", _szDirectory, filename.c_str());
 			else
 				CharArrayFromFormat(rFileInfo->m_FullPath, "%s/", filename.c_str());
@@ -327,7 +327,7 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _
 		else
 		{
 			// this is a filename
-			if (_szDirectory != NULL)
+			if (_szDirectory != nullptr)
 				CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s", _szDirectory, filename.c_str());
 			else
 				CharArrayFromFormat(rFileInfo->m_FullPath, "%s", filename.c_str());
diff --git a/Source/Core/DiscIO/Filesystem.cpp b/Source/Core/DiscIO/Filesystem.cpp
index 7cbfa9c877..142505f1b7 100644
--- a/Source/Core/DiscIO/Filesystem.cpp
+++ b/Source/Core/DiscIO/Filesystem.cpp
@@ -22,12 +22,12 @@ IFileSystem* CreateFileSystem(const IVolume* _rVolume)
 	IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
 
 	if (!pFileSystem)
-		return 0;
+		return nullptr;
 
 	if (!pFileSystem->IsValid())
 	{
 		delete pFileSystem;
-		pFileSystem = NULL;
+		pFileSystem = nullptr;
 	}
 
 	return pFileSystem;
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index 96db3b2436..5ea4daa637 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -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
 		{
diff --git a/Source/Core/DiscIO/VolumeCreator.cpp b/Source/Core/DiscIO/VolumeCreator.cpp
index eb2d24e4f5..a223c263ea 100644
--- a/Source/Core/DiscIO/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/VolumeCreator.cpp
@@ -75,8 +75,8 @@ EDiscType GetDiscType(IBlobReader& _rReader);
 IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup, u32 _VolumeNum)
 {
 	IBlobReader* pReader = CreateBlobReader(_rFilename.c_str());
-	if (pReader == NULL)
-		return NULL;
+	if (pReader == nullptr)
+		return nullptr;
 
 	switch (GetDiscType(*pReader))
 	{
@@ -94,7 +94,7 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
 
 			IVolume* pVolume = CreateVolumeFromCryptedWiiImage(*pReader, _PartitionGroup, 0, _VolumeNum, region == 'K');
 
-			if (pVolume == NULL)
+			if (pVolume == nullptr)
 			{
 				delete pReader;
 			}
@@ -106,16 +106,16 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
 		case DISC_TYPE_UNK:
 		default:
 			std::string Filename, ext;
-			SplitPath(_rFilename, NULL, &Filename, &ext);
+			SplitPath(_rFilename, nullptr, &Filename, &ext);
 			Filename += ext;
 			NOTICE_LOG(DISCIO, "%s does not have the Magic word for a gcm, wiidisc or wad file\n"
 						"Set Log Verbosity to Warning and attempt to load the game again to view the values", Filename.c_str());
 			delete pReader;
-			return NULL;
+			return nullptr;
 	}
 
 	// unreachable code
-	return NULL;
+	return nullptr;
 }
 
 IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii, const std::string& _rApploader, const std::string& _rDOL)
@@ -123,7 +123,7 @@ IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii,
 	if (CVolumeDirectory::IsValidDirectory(_rDirectory))
 		return new CVolumeDirectory(_rDirectory, _bIsWii, _rApploader, _rDOL);
 
-	return NULL;
+	return nullptr;
 }
 
 bool IsVolumeWiiDisc(const IVolume *_rVolume)
@@ -152,7 +152,7 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
 
 	// Check if we're looking for a valid partition
 	if ((int)_VolumeNum != -1 && _VolumeNum > numPartitions)
-		return NULL;
+		return nullptr;
 
 	#ifdef _WIN32
 	struct SPartition
@@ -217,7 +217,7 @@ static IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _Part
 		}
 	}
 
-	return NULL;
+	return nullptr;
 }
 
 EDiscType GetDiscType(IBlobReader& _rReader)
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp
index 50a380a278..a8b350c96b 100644
--- a/Source/Core/DiscIO/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/VolumeDirectory.cpp
@@ -26,11 +26,11 @@ CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
 	: m_totalNameSize(0)
 	, m_dataStartAddress(-1)
 	, m_fstSize(0)
-	, m_FSTData(NULL)
+	, m_FSTData(nullptr)
 	, m_apploaderSize(0)
-	, m_apploader(NULL)
+	, m_apploader(nullptr)
 	, m_DOLSize(0)
-	, m_DOL(NULL)
+	, m_DOL(nullptr)
 	, FST_ADDRESS(0)
 	, DOL_ADDRESS(0)
 {
@@ -63,19 +63,19 @@ CVolumeDirectory::CVolumeDirectory(const std::string& _rDirectory, bool _bIsWii,
 CVolumeDirectory::~CVolumeDirectory()
 {
 	delete[] m_FSTData;
-	m_FSTData = NULL;
+	m_FSTData = nullptr;
 
 	delete[] m_diskHeader;
-	m_diskHeader = NULL;
+	m_diskHeader = nullptr;
 
 	delete m_diskHeaderInfo;
-	m_diskHeaderInfo = NULL;
+	m_diskHeaderInfo = nullptr;
 
 	delete[] m_DOL;
-	m_DOL = NULL;
+	m_DOL = nullptr;
 
 	delete[] m_apploader;
-	m_apploader = NULL;
+	m_apploader = nullptr;
 }
 
 bool CVolumeDirectory::IsValidDirectory(const std::string& _rDirectory)
@@ -134,7 +134,7 @@ bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
 		u64 fileOffset = _Offset - fileIter->first;
 
 		PlainFileReader* reader = PlainFileReader::Create(fileIter->second.c_str());
-		if(reader == NULL)
+		if(reader == nullptr)
 			return false;
 
 		u64 fileSize = reader->GetDataSize();
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 4e057df78c..63c60a9846 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -22,12 +22,12 @@ CVolumeGC::CVolumeGC(IBlobReader* _pReader)
 CVolumeGC::~CVolumeGC()
 {
 	delete m_pReader;
-	m_pReader = NULL; // I don't think this makes any difference, but anyway
+	m_pReader = nullptr; // I don't think this makes any difference, but anyway
 }
 
 bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 		return false;
 
 	FileMon::FindFilename(_Offset);
@@ -43,7 +43,7 @@ bool CVolumeGC::RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const
 std::string CVolumeGC::GetUniqueID() const
 {
 	static const std::string NO_UID("NO_UID");
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 		return NO_UID;
 
 	char ID[7];
@@ -77,7 +77,7 @@ IVolume::ECountry CVolumeGC::GetCountry() const
 
 std::string CVolumeGC::GetMakerID() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 		return std::string();
 
 	char makerID[3];
@@ -107,7 +107,7 @@ std::vector<std::string> CVolumeGC::GetNames() const
 	auto const string_decoder = GetStringDecoder(GetCountry());
 
 	char name[0x60 + 1] = {};
-	if (m_pReader != NULL && Read(0x20, 0x60, (u8*)name))
+	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))
 		names.push_back(string_decoder(name));
 
 	return names;
@@ -115,7 +115,7 @@ std::vector<std::string> CVolumeGC::GetNames() const
 
 u32 CVolumeGC::GetFSTSize() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 		return 0;
 
 	u32 size;
@@ -127,7 +127,7 @@ u32 CVolumeGC::GetFSTSize() const
 
 std::string CVolumeGC::GetApploaderDate() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 		return std::string();
 
 	char date[16];
diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp
index 0174f951f1..7dd34c9662 100644
--- a/Source/Core/DiscIO/VolumeWad.cpp
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@@ -46,7 +46,7 @@ CVolumeWAD::~CVolumeWAD()
 
 bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 		return false;
 
 	return m_pReader->Read(_Offset, _Length, _pBuffer);
diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
index 76d507d9ec..3770e42383 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@@ -21,7 +21,7 @@ namespace DiscIO
 CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset,
 									 const unsigned char* _pVolumeKey)
 	: m_pReader(_pReader),
-	m_pBuffer(0),
+	m_pBuffer(nullptr),
 	m_VolumeOffset(_VolumeOffset),
 	dataOffset(0x20000),
 	m_LastDecryptedBlockOffset(-1)
@@ -35,11 +35,11 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(IBlobReader* _pReader, u64 _VolumeOffset,
 CVolumeWiiCrypted::~CVolumeWiiCrypted()
 {
 	delete m_pReader; // is this really our responsibility?
-	m_pReader = NULL;
+	m_pReader = nullptr;
 	delete[] m_pBuffer;
-	m_pBuffer = NULL;
+	m_pBuffer = nullptr;
 	delete m_AES_ctx;
-	m_AES_ctx = NULL;
+	m_AES_ctx = nullptr;
 }
 
 bool CVolumeWiiCrypted::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
@@ -56,7 +56,7 @@ bool CVolumeWiiCrypted::RAWRead( u64 _Offset, u64 _Length, u8* _pBuffer ) const
 
 bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer) const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 	{
 		return(false);
 	}
@@ -119,7 +119,7 @@ void CVolumeWiiCrypted::GetTMD(u8* _pBuffer, u32 * _sz) const
 
 std::string CVolumeWiiCrypted::GetUniqueID() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 	{
 		return std::string();
 	}
@@ -150,7 +150,7 @@ IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
 
 std::string CVolumeWiiCrypted::GetMakerID() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 	{
 		return std::string();
 	}
@@ -174,7 +174,7 @@ std::vector<std::string> CVolumeWiiCrypted::GetNames() const
 	auto const string_decoder = CVolumeGC::GetStringDecoder(GetCountry());
 
 	char name[0xFF] = {};
-	if (m_pReader != NULL && Read(0x20, 0x60, (u8*)&name))
+	if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name))
 		names.push_back(string_decoder(name));
 
 	return names;
@@ -182,7 +182,7 @@ std::vector<std::string> CVolumeWiiCrypted::GetNames() const
 
 u32 CVolumeWiiCrypted::GetFSTSize() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 	{
 		return 0;
 	}
@@ -199,7 +199,7 @@ u32 CVolumeWiiCrypted::GetFSTSize() const
 
 std::string CVolumeWiiCrypted::GetApploaderDate() const
 {
-	if (m_pReader == NULL)
+	if (m_pReader == nullptr)
 	{
 		return std::string();
 	}
diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp
index 4e77d9e959..0a095cf190 100644
--- a/Source/Core/DiscIO/WbfsBlob.cpp
+++ b/Source/Core/DiscIO/WbfsBlob.cpp
@@ -24,7 +24,7 @@ static inline u64 align(u64 value, u64 bounds)
 }
 
 WbfsFileReader::WbfsFileReader(const char* filename)
-	: m_total_files(0), m_size(0), m_wlba_table(0), m_good(true)
+	: m_total_files(0), m_size(0), m_wlba_table(nullptr), m_good(true)
 {
 	if(!filename || (strlen(filename) < 4) || !OpenFiles(filename) || !ReadHeader())
 	{
@@ -182,7 +182,7 @@ WbfsFileReader* WbfsFileReader::Create(const char* filename)
 	else
 	{
 		delete reader;
-		return NULL;
+		return nullptr;
 	}
 }
 
diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp
index 4ca2944397..5f1f7be37d 100644
--- a/Source/Core/DiscIO/WiiWad.cpp
+++ b/Source/Core/DiscIO/WiiWad.cpp
@@ -35,7 +35,7 @@ private:
 WiiWAD::WiiWAD(const std::string& _rName)
 {
 	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-	if (pReader == NULL || File::IsDirectory(_rName))
+	if (pReader == nullptr || File::IsDirectory(_rName))
 	{
 		m_Valid = false;
 		if(pReader) delete pReader;
@@ -63,7 +63,7 @@ u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset
 	if (_Size > 0)
 	{
 		u8* pTmpBuffer = new u8[_Size];
-		_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
+		_dbg_assert_msg_(BOOT, pTmpBuffer!=nullptr, "WiiWAD: Cant allocate memory for WAD entry");
 
 		if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
 		{
@@ -72,7 +72,7 @@ u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset
 		}
 		return pTmpBuffer;
 	}
-	return NULL;
+	return nullptr;
 }
 
 
@@ -121,7 +121,7 @@ bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
 bool WiiWAD::IsWiiWAD(const std::string& _rName)
 {
 	DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-	if (pReader == NULL)
+	if (pReader == nullptr)
 		return false;
 
 	CBlobBigEndianReader Reader(*pReader);