From c89900e2c152e6ffe076c39415d34c45fe58861d Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 1 Oct 2006 12:29:14 +0000 Subject: [PATCH] Always true. --- stepmania/src/XmlFile.cpp | 18 ++++++------------ stepmania/src/XmlFile.h | 5 +---- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp index 153df966f7..8d67a5c656 100644 --- a/stepmania/src/XmlFile.cpp +++ b/stepmania/src/XmlFile.cpp @@ -192,12 +192,10 @@ unsigned XNode::LoadAttributes( const RString &xml, PARSEINFO *pi, unsigned iOff return string::npos; } - bool trim = pi->trim_value; - SetString( xml, iOffset, iEnd, &sValue, trim ); + SetString( xml, iOffset, iEnd, &sValue, true ); iOffset = iEnd; // ATTRVALUE - if( pi->entity_value ) - ReplaceEntityText( sValue, g_mapEntitiesToChars ); + ReplaceEntityText( sValue, g_mapEntitiesToChars ); if( quote == '"' || quote == '\'' ) ++iOffset; @@ -319,13 +317,11 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) return string::npos; } - bool trim = pi->trim_value; - SetString( xml, iOffset, iEnd, &m_sValue, trim ); + SetString( xml, iOffset, iEnd, &m_sValue, true ); iOffset = iEnd; // TEXTVALUE reference - if( pi->entity_value ) - ReplaceEntityText( m_sValue, g_mapEntitiesToChars ); + ReplaceEntityText( m_sValue, g_mapEntitiesToChars ); } // generate child nodes @@ -405,13 +401,11 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) return string::npos; } - bool trim = pi->trim_value; - SetString( xml, iOffset, iEnd, &m_sValue, trim ); + SetString( xml, iOffset, iEnd, &m_sValue, true ); iOffset = iEnd; //TEXTVALUE - if( pi->entity_value ) - ReplaceEntityText( m_sValue, g_mapEntitiesToChars ); + ReplaceEntityText( m_sValue, g_mapEntitiesToChars ); } } } diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h index 767cb7fc82..e95dccfd28 100644 --- a/stepmania/src/XmlFile.h +++ b/stepmania/src/XmlFile.h @@ -38,13 +38,10 @@ typedef multimap XNodes; // Parse info. struct PARSEINFO { - bool trim_value; // [set] do trim when parse? - bool entity_value; // [set] do convert from reference to entity? ( < -> < ) - bool error_occur; // [get] is occurance of error? RString error_string; // [get] error string - PARSEINFO() { trim_value = true; entity_value = true; error_occur = false; } + PARSEINFO() { error_occur = false; } }; // display optional environment