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

some Code/Legacy fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-07 18:38:05 -07:00
parent cc00a535d7
commit 7d34004b6d
10 changed files with 402 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CrySystem/XML/XmlUtils.cpp
+28 -28
View File
@@ -40,11 +40,11 @@ CXmlUtils::CXmlUtils(ISystem* pSystem)
#ifdef CRY_COLLECT_XML_NODE_STATS
g_pCXmlNode_Stats = new SXmlNodeStats();
#endif
m_pStatsXmlNodePool = 0;
m_pStatsXmlNodePool = nullptr;
#ifndef _RELEASE
m_statsThreadOwner = CryGetCurrentThreadId();
#endif
m_pXMLPatcher = NULL;
m_pXMLPatcher = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -129,10 +129,10 @@ class CXmlSerializer
public:
CXmlSerializer()
: m_nRefCount(0)
, m_pReaderImpl(NULL)
, m_pReaderSer(NULL)
, m_pWriterSer(NULL)
, m_pWriterImpl(NULL)
, m_pReaderImpl(nullptr)
, m_pReaderSer(nullptr)
, m_pWriterSer(nullptr)
, m_pWriterImpl(nullptr)
{
}
~CXmlSerializer()
@@ -148,8 +148,8 @@ public:
}
//////////////////////////////////////////////////////////////////////////
virtual void AddRef() { ++m_nRefCount; }
virtual void Release()
void AddRef() override { ++m_nRefCount; }
void Release() override
{
if (--m_nRefCount <= 0)
{
@@ -157,14 +157,14 @@ public:
}
}
virtual ISerialize* GetWriter(XmlNodeRef& node)
ISerialize* GetWriter(XmlNodeRef& node) override
{
ClearAll();
m_pWriterImpl = new CSerializeXMLWriterImpl(node);
m_pWriterSer = new CSimpleSerializeWithDefaults<CSerializeXMLWriterImpl>(*m_pWriterImpl);
return m_pWriterSer;
}
virtual ISerialize* GetReader(XmlNodeRef& node)
ISerialize* GetReader(XmlNodeRef& node) override
{
ClearAll();
m_pReaderImpl = new CSerializeXMLReaderImpl(node);
@@ -172,7 +172,7 @@ public:
return m_pReaderSer;
}
virtual void GetMemoryUsage(ICrySizer* pSizer) const
void GetMemoryUsage(ICrySizer* pSizer) const override
{
pSizer->Add(*this);
pSizer->AddObject(m_pReaderImpl);
@@ -271,7 +271,7 @@ public:
return m_fileHandle != AZ::IO::InvalidHandle;
}
;
virtual void Write(const void* pData, size_t size)
void Write(const void* pData, size_t size) override
{
if (m_fileHandle != AZ::IO::InvalidHandle)
{
@@ -292,7 +292,7 @@ bool CXmlUtils::SaveBinaryXmlFile(const char* filename, XmlNodeRef root)
}
XMLBinary::CXMLBinaryWriter writer;
AZStd::string error;
return writer.WriteNode(&fileSink, root, false, 0, error);
return writer.WriteNode(&fileSink, root, false, nullptr, error);
}
//////////////////////////////////////////////////////////////////////////
@@ -302,7 +302,7 @@ XmlNodeRef CXmlUtils::LoadBinaryXmlFile(const char* filename, bool bEnablePatchi
XMLBinary::XMLBinaryReader::EResult result;
XmlNodeRef root = reader.LoadFromFile(filename, result);
if (result == XMLBinary::XMLBinaryReader::eResult_Success && bEnablePatching == true && m_pXMLPatcher != NULL)
if (result == XMLBinary::XMLBinaryReader::eResult_Success && bEnablePatching == true && m_pXMLPatcher != nullptr)
{
root = m_pXMLPatcher->ApplyXMLDataPatch(root, filename);
}
@@ -326,12 +326,12 @@ public:
CXmlTableReader();
virtual ~CXmlTableReader();
virtual void Release();
void Release() override;
virtual bool Begin(XmlNodeRef rootNode);
virtual int GetEstimatedRowCount();
virtual bool ReadRow(int& rowIndex);
virtual bool ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize);
bool Begin(XmlNodeRef rootNode) override;
int GetEstimatedRowCount() override;
bool ReadRow(int& rowIndex) override;
bool ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize) override;
float GetCurrentRowHeight() override;
private:
@@ -372,7 +372,7 @@ void CXmlTableReader::Release()
//////////////////////////////////////////////////////////////////////////
bool CXmlTableReader::Begin(XmlNodeRef rootNode)
{
m_tableNode = 0;
m_tableNode = nullptr;
if (!rootNode)
{
@@ -391,11 +391,11 @@ bool CXmlTableReader::Begin(XmlNodeRef rootNode)
m_tableNode = rootNode->findChild("Table");
}
m_rowNode = 0;
m_rowNode = nullptr;
m_rowNodeIndex = -1;
m_row = -1;
return (m_tableNode != 0);
return (m_tableNode != nullptr);
}
//////////////////////////////////////////////////////////////////////////
@@ -441,7 +441,7 @@ bool CXmlTableReader::ReadRow(int& rowIndex)
if (!m_rowNode->isTag("Row"))
{
m_rowNode = 0;
m_rowNode = nullptr;
continue;
}
@@ -454,7 +454,7 @@ bool CXmlTableReader::ReadRow(int& rowIndex)
if (index < m_row)
{
m_rowNodeIndex = rowNodeCount;
m_rowNode = 0;
m_rowNode = nullptr;
return false;
}
m_row = index;
@@ -502,7 +502,7 @@ bool CXmlTableReader::ReadRow(int& rowIndex)
//////////////////////////////////////////////////////////////////////////
bool CXmlTableReader::ReadCell(int& columnIndex, const char*& pContent, size_t& contentSize)
{
pContent = 0;
pContent = nullptr;
contentSize = 0;
if (!m_tableNode)
@@ -632,7 +632,7 @@ IXmlTableReader* CXmlUtils::CreateXmlTableReader()
void CXmlUtils::InitStatsXmlNodePool(uint32 nPoolSize)
{
CHECK_STATS_THREAD_OWNERSHIP();
if (0 == m_pStatsXmlNodePool)
if (nullptr == m_pStatsXmlNodePool)
{
// create special xml node pools for game statistics
@@ -651,7 +651,7 @@ void CXmlUtils::InitStatsXmlNodePool(uint32 nPoolSize)
XmlNodeRef CXmlUtils::CreateStatsXmlNode(const char* sNodeName)
{
CHECK_STATS_THREAD_OWNERSHIP();
if (0 == m_pStatsXmlNodePool)
if (nullptr == m_pStatsXmlNodePool)
{
CryLog("[CXmlNodePool]: Xml stats nodes pool isn't initialized. Perform default initialization.");
InitStatsXmlNodePool();
@@ -682,7 +682,7 @@ void CXmlUtils::SetXMLPatcher(XmlNodeRef* pPatcher)
{
SAFE_DELETE(m_pXMLPatcher);
if (pPatcher != NULL)
if (pPatcher != nullptr)
{
m_pXMLPatcher = new CXMLPatcher(*pPatcher);
}