more nullptr

2 files changed, 5 insertions, 5 deletions

diff --git a/plugins/ContactsPlus/src/receive.h b/plugins/ContactsPlus/src/receive.h
index 286f91ca13..967ae7c12b 100644
--- a/plugins/ContactsPlus/src/receive.h
+++ b/plugins/ContactsPlus/src/receive.h
@@ -38,7 +38,7 @@ struct TReceivedItem {
 	wchar_t* mcaUIN;

 	wchar_t* mcaNick;

 	~TReceivedItem() { mir_free(mcaUIN); mir_free(mcaNick); }

-	TReceivedItem() { mcaUIN = NULL; mcaNick = NULL; }

+	TReceivedItem() { mcaUIN = nullptr; mcaNick = nullptr; }

 };

 

 struct TRecvContactsData

diff --git a/plugins/ContactsPlus/src/send.h b/plugins/ContactsPlus/src/send.h
index 1cd9f2ec04..3a63934ec0 100644
--- a/plugins/ContactsPlus/src/send.h
+++ b/plugins/ContactsPlus/src/send.h
@@ -73,7 +73,7 @@ struct TAckData
   MCONTACT hContact;    // to whom was it sent

   MCONTACT* aContacts;  // obj

   int nContacts;      // how many

-  TAckData(MCONTACT contact) { hContact = contact; aContacts = NULL; nContacts = 0;};

+  TAckData(MCONTACT contact) { hContact = contact; aContacts = nullptr; nContacts = 0;};

   ~TAckData() { mir_free(aContacts); }

 };

 

@@ -94,10 +94,10 @@ struct gAckItem {  // some shit here
 struct gAckList {

   gAckItem** Items;

   int Count;

-  TAckData* Get(HANDLE hProcc) { for (int i=0; i<Count; i++) if (Items[i]->hProcc==hProcc) { return Items[i]->ackData; }; return NULL; };

+  TAckData* Get(HANDLE hProcc) { for (int i=0; i<Count; i++) if (Items[i]->hProcc==hProcc) { return Items[i]->ackData; }; return nullptr; };

   TAckData* Add(HANDLE hProcc, TAckData* ackData) { Items=(gAckItem**)mir_realloc(Items, (Count+1)*sizeof(gAckItem*)); Items[Count]=new gAckItem(hProcc, ackData); Count++; return ackData; };

-  TAckData* Remove(HANDLE hProcc) { for (int i=0; i<Count; i++) if (Items[i]->hProcc==hProcc) { TAckData* data=Items[i]->ackData; delete Items[i]; memmove(Items+i, Items+i+1, (Count-i-1)*sizeof(gAckItem*)); Count--; return data; }; return NULL; };

-  gAckList() { Count = 0; Items = NULL; }

+  TAckData* Remove(HANDLE hProcc) { for (int i=0; i<Count; i++) if (Items[i]->hProcc==hProcc) { TAckData* data=Items[i]->ackData; delete Items[i]; memmove(Items+i, Items+i+1, (Count-i-1)*sizeof(gAckItem*)); Count--; return data; }; return nullptr; };

+  gAckList() { Count = 0; Items = nullptr; }

   ~gAckList() { if (Count) { for (int i=0; i<Count; i++) delete Items[i]; mir_free(Items); }; }

 };