birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Editor code: tidy up BOOLs,NULLs and overrides pt4.

Browse Source 
A few 'typedefs' replaced by 'using's
This shouldn't have any functional changes at all, just c++17 modernization
It's a part 4 of a split #2847

Signed-off-by: Nemerle <nemerle5+git@gmail.com>
This commit is contained in:
Nemerle
2021-08-05 16:49:02 +02:00
parent 7404622b48
commit 1a80d313e5
36 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Util/NamedData.cpp
+6 -6
View File
@@ -36,7 +36,7 @@ void CNamedData::AddDataBlock(const QString& blockName, void* pData, int nSize
assert(pData);
assert(nSize > 0);
DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)nullptr);
if (pBlock)
{
delete pBlock;
@@ -66,7 +66,7 @@ void CNamedData::AddDataBlock(const QString& blockName, void* pData, int nSize
void CNamedData::AddDataBlock(const QString& blockName, CMemoryBlock& mem)
{
DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)nullptr);
if (pBlock)
{
delete pBlock;
@@ -102,7 +102,7 @@ void CNamedData::Clear()
//////////////////////////////////////////////////////////////////////////
bool CNamedData::GetDataBlock(const QString& blockName, void*& pData, int& nSize)
{
pData = 0;
pData = nullptr;
nSize = 0;
bool bUncompressed = false;
@@ -119,10 +119,10 @@ bool CNamedData::GetDataBlock(const QString& blockName, void*& pData, int& nSize
//////////////////////////////////////////////////////////////////////////
CMemoryBlock* CNamedData::GetDataBlock(const QString& blockName, bool& bCompressed)
{
DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)nullptr);
if (!pBlock)
{
return 0;
return nullptr;
}
if (bCompressed)
@@ -150,7 +150,7 @@ CMemoryBlock* CNamedData::GetDataBlock(const QString& blockName, bool& bCompress
}
}
}
return 0;
return nullptr;
}
//////////////////////////////////////////////////////////////////////////