more nullptr

3 files changed, 5 insertions, 5 deletions

diff --git a/protocols/IcqOscarJ/src/changeinfo.h b/protocols/IcqOscarJ/src/changeinfo.h
index 4c90b617f4..b487f75a64 100644
--- a/protocols/IcqOscarJ/src/changeinfo.h
+++ b/protocols/IcqOscarJ/src/changeinfo.h
@@ -85,7 +85,7 @@ struct ChangeInfoData : public MZeroedObject
   HANDLE hAckHook;

   HANDLE hUpload[2];

 

-  ChangeInfoData() { settingData = (SettingItemData*)SAFE_MALLOC(sizeof(SettingItemData) * settingCount); hAckHook = NULL; hUpload[0] = NULL; hUpload[1] = NULL;}

+  ChangeInfoData() { settingData = (SettingItemData*)SAFE_MALLOC(sizeof(SettingItemData) * settingCount); hAckHook = nullptr; hUpload[0] = nullptr; hUpload[1] = nullptr;}

   ~ChangeInfoData() { SAFE_FREE((void**)&settingData); }

 

   char* GetItemSettingText(int i, char *buf, size_t buf_size);

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 5599fc409e..294fea1da5 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -588,8 +588,8 @@ struct CIcqProto : public PROTO<CIcqProto>
 

 	void   servlistPendingAddContactOperation(MCONTACT hContact, LPARAM param, PENDING_CONTACT_CALLBACK callback, DWORD flags);

 	void   servlistPendingAddGroupOperation(const char *pszGroup, LPARAM param, PENDING_GROUP_CALLBACK callback, DWORD flags);

-	int    servlistPendingAddContact(MCONTACT hContact, WORD wContactID, WORD wGroupID, LPARAM param, PENDING_CONTACT_CALLBACK callback, int bDoInline, LPARAM operationParam = 0, PENDING_CONTACT_CALLBACK operationCallback = NULL);

-	int    servlistPendingAddGroup(const char *pszGroup, WORD wGroupID, LPARAM param, PENDING_GROUP_CALLBACK callback, int bDoInline, LPARAM operationParam = 0, PENDING_GROUP_CALLBACK operationCallback = NULL);

+	int    servlistPendingAddContact(MCONTACT hContact, WORD wContactID, WORD wGroupID, LPARAM param, PENDING_CONTACT_CALLBACK callback, int bDoInline, LPARAM operationParam = 0, PENDING_CONTACT_CALLBACK operationCallback = nullptr);

+	int    servlistPendingAddGroup(const char *pszGroup, WORD wGroupID, LPARAM param, PENDING_GROUP_CALLBACK callback, int bDoInline, LPARAM operationParam = 0, PENDING_GROUP_CALLBACK operationCallback = nullptr);

 	void   servlistPendingRemoveContact(MCONTACT hContact, WORD wContactID, WORD wGroupID, int nResult);

 	void   servlistPendingRemoveGroup(const char *pszGroup, WORD wGroupID, int nResult);

 	void   servlistPendingFlushOperations();

@@ -673,7 +673,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 	void   icq_requestnewfamily(WORD wFamily, void (CIcqProto::*familyhandler)(HNETLIBCONN hConn, char* cookie, size_t cookieLen));

 

 	void   icq_setidle(int bAllow);

-	void   icq_setstatus(WORD wStatus, const char *szStatusNote = NULL);

+	void   icq_setstatus(WORD wStatus, const char *szStatusNote = nullptr);

 	DWORD  icq_sendGetInfoServ(MCONTACT hContact, DWORD, int);

 	DWORD  icq_sendGetAimProfileServ(MCONTACT hContact, char *szUid);

 	DWORD  icq_sendGetAwayMsgServ(MCONTACT hContact, DWORD, int, WORD);

diff --git a/protocols/IcqOscarJ/src/icq_rates.h b/protocols/IcqOscarJ/src/icq_rates.h
index 73c12d01ba..500acfa8fb 100644
--- a/protocols/IcqOscarJ/src/icq_rates.h
+++ b/protocols/IcqOscarJ/src/icq_rates.h
@@ -101,7 +101,7 @@ protected:
 	WORD wGroup;

 

 	virtual BOOL isEqual(rates_queue_item *pItem);

-	virtual rates_queue_item* copyItem(rates_queue_item *pDest = NULL);

+	virtual rates_queue_item* copyItem(rates_queue_item *pDest = nullptr);

 public:

 	rates_queue_item(CIcqProto *ppro, WORD wGroup);

 	virtual ~rates_queue_item();