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

---
 plugins/UserInfoEx/src/ex_import/classExImContactBase.h | 12 ++++++------
 plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h          | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'plugins/UserInfoEx/src/ex_import')

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
index d24ffd5f8d..ad89480259 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
@@ -49,12 +49,12 @@ public:
 	__inline DBVARIANT& uid()		{ return _dbvUID;	}
 	__inline MCONTACT handle() const { return _hContact; }
 	
-	__inline void	disp(LPCSTR val)			{ _pszDisp		=	val ? mir_strdup(val): NULL; }
-	__inline void	group(LPCSTR val)			{ _pszGroup		=	val ? mir_strdup(val): NULL; }
-	__inline void	nick(LPCSTR val)			{ _pszNick		=	val ? mir_strdup(val): NULL; }
-	__inline void	proto(LPCSTR val)			{ _pszProto		=	val ? mir_strdup(val): NULL; }
-	__inline void	ampro(LPCSTR val)			{ _pszAMPro		=	val ? mir_strdup(val): NULL; }
-	__inline void	uidk(LPCSTR val)			{ _pszUIDKey	=	val ? mir_strdup(val): NULL; }
+	__inline void	disp(LPCSTR val)			{ _pszDisp		=	val ? mir_strdup(val): nullptr; }
+	__inline void	group(LPCSTR val)			{ _pszGroup		=	val ? mir_strdup(val): nullptr; }
+	__inline void	nick(LPCSTR val)			{ _pszNick		=	val ? mir_strdup(val): nullptr; }
+	__inline void	proto(LPCSTR val)			{ _pszProto		=	val ? mir_strdup(val): nullptr; }
+	__inline void	ampro(LPCSTR val)			{ _pszAMPro		=	val ? mir_strdup(val): nullptr; }
+	__inline void	uidk(LPCSTR val)			{ _pszUIDKey	=	val ? mir_strdup(val): nullptr; }
 	__inline void	uid(BYTE val)				{ _dbvUID.type	= DBVT_BYTE;  _dbvUID.bVal = val; }
 	__inline void	uid(WORD val)				{ _dbvUID.type	= DBVT_WORD;  _dbvUID.wVal = val; }
 	__inline void	uid(DWORD val)				{ _dbvUID.type	= DBVT_DWORD; _dbvUID.dVal = val; }
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
index 36fd2b265e..0636d37dd4 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
@@ -75,13 +75,13 @@ private:
 	BYTE			 _useUtf8;
 	WORD			 _hasUtf8;
 
-	size_t	packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *cbRew = NULL);
+	size_t	packList(LPIDSTRLIST pList, UINT nList, int iID, size_t *cbRew = nullptr);
 	BYTE GetSetting(const CHAR *pszModule, const CHAR *pszSetting, DBVARIANT *dbv);
-	size_t	packDB(const CHAR *pszModule, const CHAR *pszSetting, size_t *cbRew = NULL);
-	size_t	packDBList(const CHAR *pszModule, const CHAR *pszSetting, MIRANDASERVICE GetList, BYTE bSigned = FALSE, size_t *cbRew = NULL);
+	size_t	packDB(const CHAR *pszModule, const CHAR *pszSetting, size_t *cbRew = nullptr);
+	size_t	packDBList(const CHAR *pszModule, const CHAR *pszSetting, MIRANDASERVICE GetList, BYTE bSigned = FALSE, size_t *cbRew = nullptr);
 	
-	void	writeLine(const CHAR *szSet, size_t *cbRew = NULL);
-	void	writeLineEncoded(const CHAR *szSet, size_t *cbRew = NULL);
+	void	writeLine(const CHAR *szSet, size_t *cbRew = nullptr);
+	void	writeLineEncoded(const CHAR *szSet, size_t *cbRew = nullptr);
 	int		readLine(LPSTR szVCFSetting, WORD cchSetting);
 
 public:
-- 
cgit v1.2.3