From 1fdf3d68c25fd4a975451ec30eaea7942725d326 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Aug 2004 22:09:23 +0000 Subject: [PATCH] s/TCHAR/char/ --- stepmania/src/XmlFile.cpp | 26 +++++++++++++------------- stepmania/src/XmlFile.h | 6 +++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp index 210147f2ce..d63db1ad4f 100644 --- a/stepmania/src/XmlFile.cpp +++ b/stepmania/src/XmlFile.cpp @@ -9,11 +9,11 @@ #include "DateTime.h" -static const TCHAR chXMLTagOpen = '<'; -static const TCHAR chXMLTagClose = '>'; -static const TCHAR chXMLTagQuestion = '?'; // used in checking for meta tags: "" -static const TCHAR chXMLTagPre = '/'; -static const TCHAR chXMLEscape = '\\'; // for value field escape +static const char chXMLTagOpen = '<'; +static const char chXMLTagClose = '>'; +static const char chXMLTagQuestion = '?'; // used in checking for meta tags: "" +static const char chXMLTagPre = '/'; +static const char chXMLEscape = '\\'; // for value field escape static const XENTITY x_EntityTable[] = { @@ -205,7 +205,7 @@ char* XNode::LoadAttributes( const char* pszAttrs , PARSEINFO *pi /*= &piDefault return xml; // XML Attr Name - TCHAR* pEnd = strpbrk( xml, " =" ); + char* pEnd = strpbrk( xml, " =" ); if( pEnd == NULL ) { // error @@ -254,7 +254,7 @@ char* XNode::LoadAttributes( const char* pszAttrs , PARSEINFO *pi /*= &piDefault } bool trim = pi->trim_value; - TCHAR escape = pi->escape_value; + char escape = pi->escape_value; //SetString( xml, pEnd, &attr->value, trim, chXMLEscape ); SetString( xml, pEnd, &attr->value, trim, escape ); xml = pEnd; @@ -303,7 +303,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ ) // XML Node Tag Name Open xml++; - TCHAR* pTagEnd = strpbrk( xml, " />" ); + char* pTagEnd = strpbrk( xml, " />" ); SetString( xml, pTagEnd, &name ); xml = pTagEnd; // Generate XML Attributte List @@ -351,7 +351,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ ) if( XIsEmptyString( value ) ) { // Text Value - TCHAR* pEnd = tcsechr( ++xml, chXMLTagOpen, chXMLEscape ); + char* pEnd = tcsechr( ++xml, chXMLTagOpen, chXMLEscape ); if( pEnd == NULL ) { if( pi->erorr_occur == false ) @@ -366,7 +366,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ ) } bool trim = pi->trim_value; - TCHAR escape = pi->escape_value; + char escape = pi->escape_value; //SetString( xml, pEnd, &value, trim, chXMLEscape ); SetString( xml, pEnd, &value, trim, escape ); @@ -405,7 +405,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ ) return NULL; CString closename; - TCHAR* pEnd = strpbrk( xml, " >" ); + char* pEnd = strpbrk( xml, " >" ); if( pEnd == NULL ) { if( pi->erorr_occur == false ) @@ -449,7 +449,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ ) if( xml && XIsEmptyString( value ) && *xml !=chXMLTagOpen ) { // Text Value - TCHAR* pEnd = tcsechr( xml, chXMLTagOpen, chXMLEscape ); + char* pEnd = tcsechr( xml, chXMLTagOpen, chXMLEscape ); if( pEnd == NULL ) { // error cos not exist CloseTag @@ -464,7 +464,7 @@ char* XNode::Load( const char* pszXml, PARSEINFO *pi /*= &piDefault*/ ) } bool trim = pi->trim_value; - TCHAR escape = pi->escape_value; + char escape = pi->escape_value; //SetString( xml, pEnd, &value, trim, chXMLEscape ); SetString( xml, pEnd, &value, trim, escape ); diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h index 68ae516871..c631027425 100644 --- a/stepmania/src/XmlFile.h +++ b/stepmania/src/XmlFile.h @@ -31,8 +31,8 @@ typedef std::vector XNodes; // Entity Encode/Decode Support struct XENTITY { - TCHAR entity; // entity ( & " ' < > ) - TCHAR ref[10]; // entity reference ( & " etc ) + char entity; // entity ( & " ' < > ) + char ref[10]; // entity reference ( & " etc ) int ref_len; // entity reference length }; @@ -69,7 +69,7 @@ struct PARSEINFO bool trim_value; // [set] do trim when parse? bool entity_value; // [set] do convert from reference to entity? ( < -> < ) XENTITYS *entitys; // [set] entity table for entity decode - TCHAR escape_value; // [set] escape value (default '\\') + char escape_value; // [set] escape value (default '\\') char* xml; // [get] xml source bool erorr_occur; // [get] is occurance of error?