more nullptr

4 files changed, 10 insertions, 10 deletions

diff --git a/plugins/YAMN/src/proto/netclient.h b/plugins/YAMN/src/proto/netclient.h
index 2414dbdef1..55e0fb0d7d 100644
--- a/plugins/YAMN/src/proto/netclient.h
+++ b/plugins/YAMN/src/proto/netclient.h
@@ -5,9 +5,9 @@ class CNetClient
 {

 public:

 	CNetClient(): Stopped(FALSE) {}

-	virtual void Connect(const char* servername,const int port)=0;

+	virtual void Connect(const char* servername, const int port)=0;

 	virtual void Send(const char *query)=0;

-	virtual char* Recv(char *buf=NULL,int buflen=65536)=0;

+	virtual char* Recv(char *buf= nullptr, int buflen=65536)=0;

 	virtual void Disconnect()=0;

 	virtual BOOL Connected()=0;

 	virtual void SSLify()=0;

diff --git a/plugins/YAMN/src/proto/netlib.h b/plugins/YAMN/src/proto/netlib.h
index de41a6ad04..fd00ed6b84 100644
--- a/plugins/YAMN/src/proto/netlib.h
+++ b/plugins/YAMN/src/proto/netlib.h
@@ -4,14 +4,14 @@
 class CNLClient: public CNetClient

 {

 public:

-	CNLClient(): hConnection(NULL) {}

-	void Connect(const char* servername,const int port) throw(DWORD);

+	CNLClient(): hConnection(nullptr) {}

+	void Connect(const char* servername, const int port) throw(DWORD);

 	void Send(const char *query) throw(DWORD);

-	char* Recv(char *buf=NULL,int buflen=65536) throw(DWORD);

+	char* Recv(char *buf= nullptr, int buflen = 65536) throw(DWORD);

 	void Disconnect();

 	void SSLify()throw(DWORD);

 	

-	inline BOOL Connected() {return hConnection!=NULL;}

+	inline BOOL Connected() {return hConnection != nullptr;}

 

 protected:

 	HNETLIBCONN hConnection;

diff --git a/plugins/YAMN/src/proto/pop3/pop3.h b/plugins/YAMN/src/proto/pop3/pop3.h
index c65dc2ee26..82e1a2c17e 100644
--- a/plugins/YAMN/src/proto/pop3/pop3.h
+++ b/plugins/YAMN/src/proto/pop3/pop3.h
@@ -19,8 +19,8 @@
 class CPop3Client

 {

 public:

-	CPop3Client(): NetClient(NULL), Stopped(FALSE) {}

-	~CPop3Client() {if (NetClient != NULL) delete NetClient;}

+	CPop3Client(): NetClient(nullptr), Stopped(FALSE) {}

+	~CPop3Client() {if (NetClient != nullptr) delete NetClient;}

 

 	char* Connect(const char* servername,const int port=110,BOOL UseSSL=FALSE, BOOL NoTLS=FALSE);

 	char* RecvRest(char* prev,int mode,int size=65536);

diff --git a/plugins/YAMN/src/stdafx.h b/plugins/YAMN/src/stdafx.h
index e932de1d2e..98cff20363 100644
--- a/plugins/YAMN/src/stdafx.h
+++ b/plugins/YAMN/src/stdafx.h
@@ -177,8 +177,8 @@ void   WINAPI g_ReleaseIcon(HICON hIcon);
 

 //From synchro.cpp

 void  WINAPI DeleteMessagesToEndFcn(HACCOUNT Account, HYAMNMAIL From);

-DWORD WINAPI WaitToWriteFcn(PSWMRG SObject, PSCOUNTER SCounter = NULL);

-void  WINAPI WriteDoneFcn(PSWMRG SObject, PSCOUNTER SCounter = NULL);

+DWORD WINAPI WaitToWriteFcn(PSWMRG SObject, PSCOUNTER SCounter = nullptr);

+void  WINAPI WriteDoneFcn(PSWMRG SObject, PSCOUNTER SCounter = nullptr);

 DWORD WINAPI WaitToReadFcn(PSWMRG SObject);

 void  WINAPI ReadDoneFcn(PSWMRG SObject);

 DWORD WINAPI SCIncFcn(PSCOUNTER SCounter);