diff options
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_notes.h | 4 | ||||
| -rwxr-xr-x | protocols/JabberG/src/jabber_thread.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_notes.h b/protocols/JabberG/src/jabber_notes.h index eebd31fa4f..30ec4e5c04 100644 --- a/protocols/JabberG/src/jabber_notes.h +++ b/protocols/JabberG/src/jabber_notes.h @@ -38,7 +38,7 @@ private: public:
CNoteItem();
- CNoteItem(HXML hXml, wchar_t *szFrom = 0);
+ CNoteItem(HXML hXml, wchar_t *szFrom = nullptr);
~CNoteItem();
void SetData(wchar_t *title, wchar_t *from, wchar_t *text, wchar_t *tags);
@@ -76,7 +76,7 @@ public: OBJLIST<CNoteItem>::remove(p);
}
- void AddNote(HXML hXml, wchar_t *szFrom = 0);
+ void AddNote(HXML hXml, wchar_t *szFrom = nullptr);
void LoadXml(HXML hXml);
void SaveXml(HXML hXmlParent);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 700512d631..b5954585cc 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1066,8 +1066,8 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info) if (!m_options.EnableCarbons)
return;
- HXML forwarded = NULL;
- HXML message = NULL;
+ HXML forwarded = nullptr;
+ HXML message = nullptr;
//Carbons MUST have forwarded/message content
if (!(forwarded = XmlGetChildByTag(carbon, "forwarded", "xmlns", JABBER_XMLNS_FORWARD))
|| !(message = XmlGetChild(forwarded, "message")))
|