summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_xml.h
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-08-23 15:17:37 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-08-23 15:17:45 +0300
commit3d977685e7dbc7b1f5fa3264c8a014b5b5d5ec43 (patch)
tree3be179d8a33dd4ab623d330f628ef09f078f3fa4 /protocols/JabberG/src/jabber_xml.h
parent475debe8c34567137be9c1fd2252ed8816c6da31 (diff)
code cleaning
Diffstat (limited to 'protocols/JabberG/src/jabber_xml.h')
-rw-r--r--protocols/JabberG/src/jabber_xml.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/JabberG/src/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h
index 04360dd5d6..09f2e8831b 100644
--- a/protocols/JabberG/src/jabber_xml.h
+++ b/protocols/JabberG/src/jabber_xml.h
@@ -57,7 +57,7 @@ LPCTSTR __fastcall XmlGetAttrValue(HXML, LPCTSTR key);
struct XmlNode
{
- __forceinline XmlNode() { m_hXml = NULL; }
+ __forceinline XmlNode() { m_hXml = nullptr; }
__forceinline XmlNode(LPCTSTR pszString, int* numBytes, LPCTSTR ptszTag)
{
@@ -83,7 +83,7 @@ class CJabberIqInfo;
struct XmlNodeIq : public XmlNode
{
- XmlNodeIq(const wchar_t *type, int id = -1, const wchar_t *to = NULL);
+ XmlNodeIq(const wchar_t *type, int id = -1, const wchar_t *to = nullptr);
XmlNodeIq(const wchar_t *type, const wchar_t *idStr, const wchar_t *to);
XmlNodeIq(const wchar_t *type, HXML node, const wchar_t *to);
// new request
@@ -169,7 +169,7 @@ struct XCHILD
{
LPCTSTR name, value;
- __forceinline XCHILD(LPCTSTR _name, LPCTSTR _value = NULL) :
+ __forceinline XCHILD(LPCTSTR _name, LPCTSTR _value = nullptr) :
name(_name),
value(_value)
{}
@@ -185,7 +185,7 @@ struct XCHILDNS
{
LPCTSTR name, ns;
- __forceinline XCHILDNS(LPCTSTR _name, LPCTSTR _ns = NULL) :
+ __forceinline XCHILDNS(LPCTSTR _name, LPCTSTR _ns = nullptr) :
name(_name),
ns(_ns)
{}
@@ -228,7 +228,7 @@ public:
m_type(T_UNKNOWN),
m_hXml(hXml),
m_szPath(path),
- m_szParam(NULL)
+ m_szParam(nullptr)
{}
// Read data
@@ -239,7 +239,7 @@ public:
case T_NODE: return m_hXml;
case T_NODESET: return XmlGetNthChild(m_hXml, m_szParam, 1);
}
- return NULL;
+ return nullptr;
}
operator LPTSTR()
{
@@ -249,7 +249,7 @@ public:
case T_NODE: return (wchar_t *)XmlGetText(m_hXml);
case T_NODESET: return (wchar_t *)XmlGetText(XmlGetNthChild(m_hXml, m_szParam, 1));
}
- return NULL;
+ return nullptr;
}
operator int()
{
@@ -266,7 +266,7 @@ public:
}
HXML operator[] (int idx)
{
- return (Lookup() == T_NODESET) ? XmlGetNthChild(m_hXml, m_szParam, idx) : NULL;
+ return (Lookup() == T_NODESET) ? XmlGetNthChild(m_hXml, m_szParam, idx) : nullptr;
}
// Write data