From 1c0172cca4f1e90679321912e20436a7f42f122d Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Sat, 24 Feb 2018 15:32:06 +0100 Subject: more nullptr --- protocols/MSN/src/msn_proto.h | 12 ++++++------ protocols/MSN/src/stdafx.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index 0e511fdc58..511c311b0f 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -278,12 +278,12 @@ struct CMsnProto : public PROTO ///////////////////////////////////////////////////////////////////////////////////////// // MSN message queue support - int MsgQueue_Add(const char* wlid, int msgType, const char* msg, int msglen, filetransfer* ft = NULL, int flags = 0, STRLIST *cnt = NULL); + int MsgQueue_Add(const char* wlid, int msgType, const char* msg, int msglen, filetransfer* ft = nullptr, int flags = 0, STRLIST *cnt = nullptr); const char* MsgQueue_CheckContact(const char* wlid, time_t tsc = 0); const char* MsgQueue_GetNextRecipient(void); bool MsgQueue_GetNext(const char* wlid, MsgQueueEntry& retVal); int MsgQueue_NumMsg(const char* wlid); - void MsgQueue_Clear(const char* wlid = NULL, bool msg = false); + void MsgQueue_Clear(const char* wlid = nullptr, bool msg = false); void MsgQueue_Init(void); void MsgQueue_Uninit(void); @@ -321,7 +321,7 @@ struct CMsnProto : public PROTO ///////////////////////////////////////////////////////////////////////////////////////// // MSN contact list - int Lists_Add(int list, int netId, const char* email, MCONTACT hContact = NULL, const char* nick = NULL, const char* invite = NULL); + int Lists_Add(int list, int netId, const char* email, MCONTACT hContact = NULL, const char* nick = nullptr, const char* invite = nullptr); bool Lists_IsInList(int list, const char* email); int Lists_GetMask(const char* email); int Lists_GetNetId(const char* email); @@ -346,11 +346,11 @@ struct CMsnProto : public PROTO bool MSN_RefreshContactList(void); bool MSN_IsMyContact(MCONTACT hContact); - bool MSN_IsMeByContact(MCONTACT hContact, char* szEmail = NULL); - bool MSN_AddUser(MCONTACT hContact, const char* email, int netId, int flags, const char *msg = NULL); + bool MSN_IsMeByContact(MCONTACT hContact, char* szEmail = nullptr); + bool MSN_AddUser(MCONTACT hContact, const char* email, int netId, int flags, const char *msg = nullptr); void MSN_AddAuthRequest(const char *email, const char *nick, const char *reason); void MSN_SetContactDb(MCONTACT hContact, const char *szEmail); - MCONTACT MSN_HContactFromEmail(const char* msnEmail, const char* msnNick = NULL, bool addIfNeeded = false, bool temporary = false); + MCONTACT MSN_HContactFromEmail(const char* msnEmail, const char* msnNick = nullptr, bool addIfNeeded = false, bool temporary = false); MCONTACT MSN_HContactFromChatID(const char* wlid); MCONTACT AddToListByEmail(const char *email, const char *nick, DWORD flags); diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h index 13aa98cb49..df61064891 100644 --- a/protocols/MSN/src/stdafx.h +++ b/protocols/MSN/src/stdafx.h @@ -214,7 +214,7 @@ char* GetGlobalIp(void); template void UrlDecode(chartype* str); -char* MSN_GetAvatarHash(char* szContext, char** pszUrl = NULL); +char* MSN_GetAvatarHash(char* szContext, char** pszUrl = nullptr); bool MSN_MsgWndExist(MCONTACT hContact); #define MSN_SendNickname(a) MSN_SendNicknameUtf(UTF8(a)) @@ -238,7 +238,7 @@ time_t MsnTSToUnixtime(const char *pszTS); wchar_t* EscapeChatTags(const wchar_t* pszText); -void overrideStr(wchar_t*& dest, const wchar_t* src, bool unicode, const wchar_t* def = NULL); +void overrideStr(wchar_t*& dest, const wchar_t* src, bool unicode, const wchar_t* def = nullptr); char* arrayToHex(BYTE* data, size_t datasz); @@ -692,7 +692,7 @@ public: bool Load(); void Save(); virtual bool Refresh(bool = false) { return false; } - bool Expired(time_t t = time(NULL)); + bool Expired(time_t t = time(nullptr)); void Clear(); const char *Token(); __forceinline operator char*() const { return m_pszToken; } @@ -767,7 +767,7 @@ struct MsnContact OBJLIST places; - MsnContact() : email(0), invite(0), nick(0), + MsnContact() : email(nullptr), invite(nullptr), nick(nullptr), hContact(0), list(0), netId(0), p2pMsgId(0), cap1(0), cap2(0), places(1, CompareId) { } -- cgit v1.2.3