Index: core/include/fxcrt/fx_xml.h |
diff --git a/core/include/fxcrt/fx_xml.h b/core/include/fxcrt/fx_xml.h |
index ba33b2083ad1f1e4555e131328fd79dae22e4f35..233a8f9bb65753d8456d1213ed78c78246c462ae 100644 |
--- a/core/include/fxcrt/fx_xml.h |
+++ b/core/include/fxcrt/fx_xml.h |
@@ -38,21 +38,21 @@ public: |
class CXML_Content |
{ |
public: |
- CXML_Content() : m_bCDATA(FALSE), m_Content() {} |
- void Set(FX_BOOL bCDATA, const CFX_WideStringC& content) |
+ CXML_Content() : m_bCDATA(false), m_Content() {} |
+ void Set(bool bCDATA, const CFX_WideStringC& content) |
{ |
m_bCDATA = bCDATA; |
m_Content = content; |
} |
- FX_BOOL m_bCDATA; |
+ bool m_bCDATA; |
CFX_WideString m_Content; |
}; |
class CXML_Element |
{ |
public: |
- static CXML_Element* Parse(const void* pBuffer, size_t size, FX_BOOL bSaveSpaceChars = FALSE, FX_FILESIZE* pParsedSize = NULL); |
- static CXML_Element* Parse(IFX_FileRead *pFile, FX_BOOL bSaveSpaceChars = FALSE, FX_FILESIZE* pParsedSize = NULL); |
- static CXML_Element* Parse(IFX_BufferRead *pBuffer, FX_BOOL bSaveSpaceChars = FALSE, FX_FILESIZE* pParsedSize = NULL); |
+ static CXML_Element* Parse(const void* pBuffer, size_t size, bool bSaveSpaceChars = false, FX_FILESIZE* pParsedSize = NULL); |
+ static CXML_Element* Parse(IFX_FileRead *pFile, bool bSaveSpaceChars = false, FX_FILESIZE* pParsedSize = NULL); |
+ static CXML_Element* Parse(IFX_BufferRead *pBuffer, bool bSaveSpaceChars = false, FX_FILESIZE* pParsedSize = NULL); |
CXML_Element(const CFX_ByteStringC& qSpace, const CFX_ByteStringC& tagName); |
CXML_Element(const CFX_ByteStringC& qTagName); |
CXML_Element(); |
@@ -63,9 +63,9 @@ public: |
- CFX_ByteString GetTagName(FX_BOOL bQualified = FALSE) const; |
+ CFX_ByteString GetTagName(bool bQualified = false) const; |
- CFX_ByteString GetNamespace(FX_BOOL bQualified = FALSE) const; |
+ CFX_ByteString GetNamespace(bool bQualified = false) const; |
CFX_ByteString GetNamespaceURI(const CFX_ByteStringC& qName) const; |
@@ -81,9 +81,9 @@ public: |
void GetAttrByIndex(int index, CFX_ByteString &space, CFX_ByteString &name, CFX_WideString &value) const; |
- FX_BOOL HasAttr(const CFX_ByteStringC& qName) const; |
+ bool HasAttr(const CFX_ByteStringC& qName) const; |
- FX_BOOL GetAttrValue(const CFX_ByteStringC& name, CFX_WideString& attribute) const; |
+ bool GetAttrValue(const CFX_ByteStringC& name, CFX_WideString& attribute) const; |
CFX_WideString GetAttrValue(const CFX_ByteStringC& name) const |
{ |
CFX_WideString attr; |
@@ -91,7 +91,7 @@ public: |
return attr; |
} |
- FX_BOOL GetAttrValue(const CFX_ByteStringC& space, const CFX_ByteStringC& name, CFX_WideString& attribute) const; |
+ bool GetAttrValue(const CFX_ByteStringC& space, const CFX_ByteStringC& name, CFX_WideString& attribute) const; |
CFX_WideString GetAttrValue(const CFX_ByteStringC& space, const CFX_ByteStringC& name) const |
{ |
CFX_WideString attr; |
@@ -99,7 +99,7 @@ public: |
return attr; |
} |
- FX_BOOL GetAttrInteger(const CFX_ByteStringC& name, int& attribute) const; |
+ bool GetAttrInteger(const CFX_ByteStringC& name, int& attribute) const; |
int GetAttrInteger(const CFX_ByteStringC& name) const |
{ |
int attr = 0; |
@@ -107,7 +107,7 @@ public: |
return attr; |
} |
- FX_BOOL GetAttrInteger(const CFX_ByteStringC& space, const CFX_ByteStringC& name, int& attribute) const; |
+ bool GetAttrInteger(const CFX_ByteStringC& space, const CFX_ByteStringC& name, int& attribute) const; |
int GetAttrInteger(const CFX_ByteStringC& space, const CFX_ByteStringC& name) const |
{ |
int attr = 0; |
@@ -115,7 +115,7 @@ public: |
return attr; |
} |
- FX_BOOL GetAttrFloat(const CFX_ByteStringC& name, FX_FLOAT& attribute) const; |
+ bool GetAttrFloat(const CFX_ByteStringC& name, FX_FLOAT& attribute) const; |
FX_FLOAT GetAttrFloat(const CFX_ByteStringC& name) const |
{ |
FX_FLOAT attr = 0; |
@@ -123,7 +123,7 @@ public: |
return attr; |
} |
- FX_BOOL GetAttrFloat(const CFX_ByteStringC& space, const CFX_ByteStringC& name, FX_FLOAT& attribute) const; |
+ bool GetAttrFloat(const CFX_ByteStringC& space, const CFX_ByteStringC& name, FX_FLOAT& attribute) const; |
FX_FLOAT GetAttrFloat(const CFX_ByteStringC& space, const CFX_ByteStringC& name) const |
{ |
FX_FLOAT attr = 0; |