actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/XmlFileUtil.cpp
+5 -6
View File
@@ -6,7 +6,6 @@
#include "RageUtil.h"
#include "RageLog.h"
#include "arch/Dialog/Dialog.h"
#include "Foreach.h"
#include "LuaManager.h"
bool XmlFileUtil::LoadFromFileShowErrors( XNode &xml, RageFileBasic &f )
@@ -285,7 +284,7 @@ RString::size_type LoadInternal( XNode *pNode, const RString &xml, RString &sErr
// open/close tag <TAG ..> ... </TAG>
// ^- current pointer
if( pNode->GetAttr(XNode::TEXT_ATTRIBUTE) == NULL )
if( pNode->GetAttr(XNode::TEXT_ATTRIBUTE) == nullptr )
{
// Text Value
++iOffset;
@@ -368,7 +367,7 @@ RString::size_type LoadInternal( XNode *pNode, const RString &xml, RString &sErr
}
else // Alone child Tag Loaded
{
if( pNode->GetAttr(XNode::TEXT_ATTRIBUTE) == NULL && iOffset < xml.size() && xml[iOffset] != chXMLTagOpen )
if( pNode->GetAttr(XNode::TEXT_ATTRIBUTE) == nullptr && iOffset < xml.size() && xml[iOffset] != chXMLTagOpen )
{
// Text Value
RString::size_type iEnd = xml.find( chXMLTagOpen, iOffset );
@@ -420,7 +419,7 @@ bool GetXMLInternal( const XNode *pNode, RageFileBasic &f, bool bWriteTabs, int
WRITE( "'" );
}
if( pNode->ChildrenEmpty() && pNode->GetAttr(XNode::TEXT_ATTRIBUTE) == NULL )
if( pNode->ChildrenEmpty() && pNode->GetAttr(XNode::TEXT_ATTRIBUTE) == nullptr )
{
// <TAG Attr1="Val1"/> alone tag
WRITE( "/>" );
@@ -439,7 +438,7 @@ bool GetXMLInternal( const XNode *pNode, RageFileBasic &f, bool bWriteTabs, int
// Text Value
const XNodeValue *pText = pNode->GetAttr( XNode::TEXT_ATTRIBUTE );
if( pText != NULL )
if( pText != nullptr )
{
if( !pNode->ChildrenEmpty() )
{
@@ -789,7 +788,7 @@ void XmlFileUtil::MergeIniUnder( XNode *pFrom, XNode *pTo )
// If this node doesn't exist in pTo, just move the whole node.
XNode *pSectionNode = *it;
XNode *pChildNode = pTo->GetChild( pSectionNode->GetName() );
if( pChildNode == NULL )
if( pChildNode == nullptr )
{
aToMove.push_back( it );
}