From d2de6252bde0224c4b71c9dcf28afa5e7294b85b Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Sat, 24 Feb 2018 18:45:25 +0100 Subject: Jabber: remove extra qualification on members --- include/m_jabber.h | 2 +- protocols/JabberG/src/jabber_proto.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/m_jabber.h b/include/m_jabber.h index a89f873a2b..00f7e43f5a 100644 --- a/include/m_jabber.h +++ b/include/m_jabber.h @@ -177,7 +177,7 @@ __forceinline IJabberInterface *getJabberApi(const char *szAccount) if (!CallProtoService(szAccount, JS_GETJABBERAPI, 0, (LPARAM)&ji)) return ji; - return NULL; + return nullptr; } #endif // __cplusplus diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 718a788e1f..bca7b73ab8 100755 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -285,14 +285,14 @@ struct CJabberProto : public PROTO, public IJabberInterface //---- jabber_notes.c ----------------------------------------------------------------- - void CJabberProto::ProcessIncomingNote(CNoteItem *pNote, bool ok); - void CJabberProto::ProcessOutgoingNote(CNoteItem *pNote, bool ok); + void ProcessIncomingNote(CNoteItem *pNote, bool ok); + void ProcessOutgoingNote(CNoteItem *pNote, bool ok); - bool CJabberProto::OnIncomingNote(const wchar_t *szFrom, HXML hXml); + bool OnIncomingNote(const wchar_t *szFrom, HXML hXml); - INT_PTR __cdecl CJabberProto::OnMenuSendNote(WPARAM, LPARAM); - INT_PTR __cdecl CJabberProto::OnMenuHandleNotes(WPARAM, LPARAM); - INT_PTR __cdecl CJabberProto::OnIncomingNoteEvent(WPARAM, LPARAM); + INT_PTR __cdecl OnMenuSendNote(WPARAM, LPARAM); + INT_PTR __cdecl OnMenuHandleNotes(WPARAM, LPARAM); + INT_PTR __cdecl OnIncomingNoteEvent(WPARAM, LPARAM); //---- jabber_byte.c ----------------------------------------------------------------- -- cgit v1.2.3