newer standards prefer nullptr over NULL - this is most of them but there are others too

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarIteratorCore.cpp

@@ -9,7 +9,7 @@ namespace ChatSystem
 // AVATAR ITERATOR CORE
 
 AvatarIteratorCore::AvatarIteratorCore()
-: m_map(NULL)
+: m_map(nullptr)
 {
 }
 
@@ -33,7 +33,7 @@ AvatarIteratorCore &AvatarIteratorCore::operator=(const AvatarIteratorCore& rhs)
 
 ChatAvatar *AvatarIteratorCore::getCurAvatar()
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 	
 	if (!outOfBounds())
 	{
@@ -87,7 +87,7 @@ bool AvatarIteratorCore::outOfBounds()
 // MODERATOR ITERATOR CORE
 
 ModeratorIteratorCore::ModeratorIteratorCore()
-: m_set(NULL)
+: m_set(nullptr)
 {
 }
 
@@ -111,7 +111,7 @@ ModeratorIteratorCore &ModeratorIteratorCore::operator=(const ModeratorIteratorC
 
 ChatAvatar *ModeratorIteratorCore::getCurAvatar()
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 	
 	if (!outOfBounds())
 	{
@@ -165,7 +165,7 @@ bool ModeratorIteratorCore::outOfBounds()
 // TEMPORARY MODERATOR ITERATOR CORE
 
 TemporaryModeratorIteratorCore::TemporaryModeratorIteratorCore()
-: m_set(NULL)
+: m_set(nullptr)
 {
 }
 
@@ -189,7 +189,7 @@ TemporaryModeratorIteratorCore &TemporaryModeratorIteratorCore::operator=(const
 
 ChatAvatar *TemporaryModeratorIteratorCore::getCurAvatar()
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 	
 	if (!outOfBounds())
 	{
@@ -243,7 +243,7 @@ bool TemporaryModeratorIteratorCore::outOfBounds()
 // VOICE ITERATOR CORE
 
 VoiceIteratorCore::VoiceIteratorCore()
-: m_set(NULL)
+: m_set(nullptr)
 {
 }
 
@@ -267,7 +267,7 @@ VoiceIteratorCore &VoiceIteratorCore::operator=(const VoiceIteratorCore& rhs)
 
 ChatAvatar *VoiceIteratorCore::getCurAvatar()
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 	
 	if (!outOfBounds())
 	{
@@ -321,7 +321,7 @@ bool VoiceIteratorCore::outOfBounds()
 // INVITE ITERATOR CORE
 
 InviteIteratorCore::InviteIteratorCore()
-: m_set(NULL)
+: m_set(nullptr)
 {
 }
 
@@ -345,7 +345,7 @@ InviteIteratorCore &InviteIteratorCore::operator=(const InviteIteratorCore& rhs)
 
 ChatAvatar *InviteIteratorCore::getCurAvatar()
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 	
 	if (!outOfBounds())
 	{
@@ -399,7 +399,7 @@ bool InviteIteratorCore::outOfBounds()
 // BAN ITERATOR CORE
 
 BanIteratorCore::BanIteratorCore()
-: m_set(NULL)
+: m_set(nullptr)
 {
 }
 
@@ -423,7 +423,7 @@ BanIteratorCore &BanIteratorCore::operator=(const BanIteratorCore& rhs)
 
 ChatAvatar *BanIteratorCore::getCurAvatar()
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 	
 	if (!outOfBounds())
 	{

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/AvatarListItemCore.cpp

@@ -7,7 +7,7 @@ namespace ChatSystem
 	using namespace Plat_Unicode;
 
 	AvatarListItem::AvatarListItem()
-	: m_core(NULL)
+	: m_core(nullptr)
 	{
 	}
 
@@ -16,7 +16,7 @@ namespace ChatSystem
 	}
 
 	AvatarListItemCore::AvatarListItemCore()
-	: m_interface(NULL)
+	: m_interface(nullptr)
 	{
 	}
 

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.cpp

@@ -13,7 +13,7 @@ namespace ChatSystem
 {
 
 ChatAPI::ChatAPI(const char *registrar_host, short registrar_port, const char *server_host, short server_port)
-: m_defaultRoomParams(NULL), 
+: m_defaultRoomParams(nullptr), 
   m_defaultLoginPriority(0), 
   m_defaultEntryType(false)
 {
@@ -25,13 +25,13 @@ ChatAPI::ChatAPI(const char *registrar_host, short registrar_port, const char *s
 ChatAPI::~ChatAPI()
 {
 	delete m_defaultRoomParams;
-	m_defaultRoomParams = NULL;
+	m_defaultRoomParams = nullptr;
 	delete m_core;
-	m_core = NULL;
+	m_core = nullptr;
 }
 
 ChatAPI::ChatAPI(ChatAPICore *core)
-: m_defaultRoomParams(NULL)
+: m_defaultRoomParams(nullptr)
 {
 	m_core = core;
 	m_core->setAPI(this);
@@ -721,7 +721,7 @@ void ChatAPI::setDefaultRoomParams(RoomParams *roomParams)
 {
 	if (roomParams)
 	{
-		if (m_defaultRoomParams == NULL)
+		if (m_defaultRoomParams == nullptr)
 		{
 			m_defaultRoomParams = new RoomParams;
 		}
@@ -732,7 +732,7 @@ void ChatAPI::setDefaultRoomParams(RoomParams *roomParams)
 	else
 	{
 		delete m_defaultRoomParams;
-		m_defaultRoomParams = NULL;
+		m_defaultRoomParams = nullptr;
 	}
 }
 void ChatAPI::setDefaultLoginLocation(const ChatUnicodeString &defaultLoginLocation)

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPI.h

@@ -105,7 +105,7 @@ namespace ChatSystem
 		//    will be connected to, as well as the hostname and port of the Registrar
 		//    ChatServer (which will automatically reroute the ChatAPI connection to 
 		//    a hotspare ChatServer if the provided choice is unavailable).
-		//    NULL pointers are NOT valid input.
+		//    nullptr pointers are NOT valid input.
 		ChatAPI(const char *registrar_host, short registrar_port, const char *server_host, short server_port);
 		virtual ~ChatAPI();
 
@@ -209,7 +209,7 @@ namespace ChatSystem
 		// getAvatar
 		//    Requests immediate return of a ChatAvatar object that this API
 		//    has cached due to a RequestLoginAvatar.  Request does not go 
-		//    to ChatServer.  Returns NULL if API does not have object locally.
+		//    to ChatServer.  Returns nullptr if API does not have object locally.
 		ChatAvatar *getAvatar(const ChatUnicodeString &avatarName, const ChatUnicodeString &avatarAddress);
 		ChatAvatar *getAvatar(unsigned avatarID);
 
@@ -286,7 +286,7 @@ namespace ChatSystem
 		//    Requests immediate return of a ChatRoom object that this API
 		//    has cached due to a RequestGetRoom, RequestCreateRoom, or 
 		//    RequestEnterRoom.  Request does not go to ChatServer.  Returns 
-		//    NULL if API does not have object locally.
+		//    nullptr if API does not have object locally.
 		ChatRoom *getRoom(const ChatUnicodeString &roomAddress);
 		ChatRoom *getRoom(unsigned roomID);
 
@@ -298,13 +298,13 @@ namespace ChatSystem
 		
 		// getDefaultRoomParams
 		//    Requests the ChatAPI's current default RoomParams object. Used for
-		//    the EnterRoom call. If NULL, EnterRoom will not do passive room
+		//    the EnterRoom call. If nullptr, EnterRoom will not do passive room
 		//    creation if the room to enter does not yet exist. Initial value
-		//    is NULL (no RoomParams object defined).
+		//    is nullptr (no RoomParams object defined).
 		const RoomParams *getDefaultRoomParams(void);
 
 		// setDefaultRoomParams
-		//    Sets the ChatAPI's current default RoomParams object. Passing a NULL
+		//    Sets the ChatAPI's current default RoomParams object. Passing a nullptr
 		//    pointer will cause the default params not to be used by EnterRoom.
 		void setDefaultRoomParams(RoomParams *roomParams);
 		

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAPICore.cpp

@@ -67,7 +67,7 @@ const char * const ChatAPICore::ms_errorStringsEnglish[] =
 	"UID node already exists",
 	"Wrong chat server for request",
 	"Succeeded, but local data is invalid",
-	"Login with null name",
+	"Login with nullptr name",
 	"No server assigned to this identity",			// 45
 	"Another server already assumed this identity",
 	"Remote server is down",
@@ -82,9 +82,9 @@ const char * const ChatAPICore::ms_errorStringsEnglish[] =
 	"Duplicate voice",
 	"Chat avatar must first be logged out",
 	"No work to do",
-	"Cannot perform rename to NULL avatar name",
+	"Cannot perform rename to nullptr avatar name",
 	"Cannot perform station acct transfer to stationID = 0",	// 60
-	"Cannot perform avatar move to NULL avatar address",
+	"Cannot perform avatar move to nullptr avatar address",
 	"Failed to obtain an ID for a new room or avatar",
 	"Room is local to namespace/world; cannot enter from other worlds",
 	"Room is local to game; cannot enter from other game namespaces",
@@ -122,7 +122,7 @@ ChatAPICore::ChatAPICore(const char *registrar_host, short registrar_port, const
   m_registrarPort(registrar_port),
   m_defaultServerPort(server_port),
   m_assignedServerPort(server_port),
-  m_timeSinceLastDisconnect(time(NULL)),
+  m_timeSinceLastDisconnect(time(nullptr)),
   m_rcvdRegistrarResponse(false),
   m_shouldSendVersion(true)
 {
@@ -132,7 +132,7 @@ ChatAPICore::ChatAPICore(const char *registrar_host, short registrar_port, const
 
 ChatAPICore::~ChatAPICore()
 {
-	m_api = NULL;
+	m_api = nullptr;
 
 	std::map<unsigned, ChatAvatarCore*>::iterator iter = m_avatarCoreCache.begin();
 	for (; iter != m_avatarCoreCache.end(); ++iter)
@@ -209,7 +209,7 @@ void ChatAPICore::cacheAvatar(ChatAvatarCore *avatarCore)
 
 ChatAvatarCore *ChatAPICore::getAvatarCore(unsigned avatarID)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	std::map<unsigned, ChatAvatarCore *>::iterator iter = m_avatarCoreCache.find(avatarID);
 	if(iter != m_avatarCoreCache.end())
@@ -221,7 +221,7 @@ ChatAvatarCore *ChatAPICore::getAvatarCore(unsigned avatarID)
 
 ChatAvatar *ChatAPICore::getAvatar(unsigned avatarID)
 {
-	ChatAvatar *returnAvatar = NULL;
+	ChatAvatar *returnAvatar = nullptr;
 
 	std::map<unsigned, ChatAvatar *>::iterator iter = m_avatarCache.find(avatarID);
 	if(iter != m_avatarCache.end())
@@ -233,7 +233,7 @@ ChatAvatar *ChatAPICore::getAvatar(unsigned avatarID)
 
 ChatAvatarCore *ChatAPICore::decacheAvatar(unsigned avatarID)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 	std::map<unsigned, ChatAvatarCore *>::iterator iterCore = m_avatarCoreCache.find(avatarID);
 	if(iterCore != m_avatarCoreCache.end())
 	{
@@ -267,7 +267,7 @@ void ChatAPICore::cacheRoom(ChatRoomCore *roomCore)
 
 ChatRoomCore *ChatAPICore::getRoomCore(unsigned roomID)
 {
-	ChatRoomCore *returnRoom = NULL;
+	ChatRoomCore *returnRoom = nullptr;
 	std::map<unsigned, ChatRoomCore *>::iterator iter = m_roomCoreCache.find(roomID);
 	if(iter != m_roomCoreCache.end())
 	{
@@ -279,7 +279,7 @@ ChatRoomCore *ChatAPICore::getRoomCore(unsigned roomID)
 
 ChatRoom *ChatAPICore::getRoom(unsigned roomID)
 {
-	ChatRoom *returnRoom = NULL;
+	ChatRoom *returnRoom = nullptr;
 	std::map<unsigned, ChatRoom *>::iterator iter = m_roomCache.find(roomID);
 	if(iter != m_roomCache.end())
 	{
@@ -291,7 +291,7 @@ ChatRoom *ChatAPICore::getRoom(unsigned roomID)
 
 ChatRoomCore *ChatAPICore::decacheRoom(unsigned roomID)
 {
-	ChatRoomCore *returnRoom = NULL;
+	ChatRoomCore *returnRoom = nullptr;
 
 	std::map<unsigned, ChatRoomCore *>::iterator iterCore = m_roomCoreCache.find(roomID);
 	if(iterCore != m_roomCoreCache.end())
@@ -315,7 +315,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_LOGINAVATAR:
 		{
 			ResLoginAvatar *R = static_cast<ResLoginAvatar *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 
 			if(R->getAvatar())
 			{
@@ -338,7 +338,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
     case RESPONSE_TEMPORARYAVATAR:
         {
             ResTemporaryAvatar* R = static_cast<ResTemporaryAvatar*>(res);
-            ChatAvatar* avatar = NULL;
+            ChatAvatar* avatar = nullptr;
 
             if ( R->getAvatar() )
             {
@@ -394,8 +394,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_GETAVATAR:
 		{
 			ResGetAvatar *R = static_cast<ResGetAvatar *>(res);
-			ChatAvatar *cachedAvatar = NULL;
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *cachedAvatar = nullptr;
+			ChatAvatar *avatar = nullptr;
 			ChatAvatarCore *avatarCore = R->getAvatar();
 			
 			if (R->getResult() == 0 && avatarCore) // if success
@@ -403,7 +403,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 				// attempt to return locally cached avatar, if available
 				cachedAvatar = getAvatar(avatarCore->getAvatarID());
 				
-				if (cachedAvatar != NULL)
+				if (cachedAvatar != nullptr)
 				{
 					// update cached information with returned data
 					cachedAvatar->setAttributes(avatarCore->getAttributes());
@@ -427,7 +427,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 
 			m_api->OnGetAvatar(R->getTrack(), R->getResult(), avatar, R->getUser());
 
-			if (cachedAvatar == NULL)
+			if (cachedAvatar == nullptr)
 			{
 				delete avatar;
 			}
@@ -438,8 +438,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
     case RESPONSE_GETANYAVATAR:
         {
             ResGetAnyAvatar *R = static_cast<ResGetAnyAvatar *>(res);
-            ChatAvatar *cachedAvatar = NULL;
-            ChatAvatar *avatar = NULL;
+            ChatAvatar *cachedAvatar = nullptr;
+            ChatAvatar *avatar = nullptr;
             ChatAvatarCore *avatarCore = R->getAvatar();
 
             if (R->getResult() == 0 && avatarCore) // if success
@@ -447,7 +447,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
                 // attempt to return locally cached avatar, if available
                 cachedAvatar = getAvatar(avatarCore->getAvatarID());
 
-                if (cachedAvatar != NULL)
+                if (cachedAvatar != nullptr)
                 {
                     // update cached information with returned data
                     cachedAvatar->setAttributes(avatarCore->getAttributes());
@@ -471,7 +471,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 
             m_api->OnGetAnyAvatar(R->getTrack(), R->getResult(), avatar, R->isLoggedIn(), R->getUser());
 
-            if (cachedAvatar == NULL)
+            if (cachedAvatar == nullptr)
             {
                 delete avatar;
             }
@@ -490,8 +490,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_SETAVATARATTRIBUTES:
 		{
 			ResSetAvatarAttributes *R = static_cast<ResSetAvatarAttributes *>(res);
-			ChatAvatar *cachedAvatar = NULL;
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *cachedAvatar = nullptr;
+			ChatAvatar *avatar = nullptr;
 			ChatAvatarCore *avatarCore = R->getAvatar();
 			
 			if (R->getResult() == 0 && avatarCore) // if success
@@ -502,14 +502,14 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 					// attempt to return locally cached avatar, if available
 					cachedAvatar = getAvatar(avatar->getAvatarID());
 
-					if (cachedAvatar != NULL)
+					if (cachedAvatar != nullptr)
 					{
 						cachedAvatar->setAttributes(avatar->getAttributes());
 					}
 				}
 			}
 			
-			if (cachedAvatar != NULL)
+			if (cachedAvatar != nullptr)
 			{
 				cachedAvatar = avatar;
 				m_api->OnSetAvatarAttributes(R->getTrack(), R->getResult(), cachedAvatar, R->getUser());
@@ -531,8 +531,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
     case RESPONSE_SETSTATUSMESSAGE:
         {
             ResSetAvatarStatusMessage *R = static_cast<ResSetAvatarStatusMessage*>(res);
-            ChatAvatar *cachedAvatar = NULL;
-            ChatAvatar *avatar = NULL;
+            ChatAvatar *cachedAvatar = nullptr;
+            ChatAvatar *avatar = nullptr;
             ChatAvatarCore *avatarCore = R->getAvatar();
 
             if (R->getResult() == 0 && avatarCore) // if success
@@ -543,14 +543,14 @@ void ChatAPICore::responseCallback(GenericResponse *res)
                     // attempt to return locally cached avatar, if available
                     cachedAvatar = getAvatar(avatar->getAvatarID());
 
-                    if (cachedAvatar != NULL)
+                    if (cachedAvatar != nullptr)
                     {
                         cachedAvatar->setStatusMessage(avatar->getStatusMessage());
                     }
                 }
             }
 
-            if (cachedAvatar != NULL)
+            if (cachedAvatar != nullptr)
             {
                 cachedAvatar = avatar;
                 m_api->OnSetAvatarStatusMessage(R->getTrack(), R->getResult(), cachedAvatar, R->getUser());
@@ -572,8 +572,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_SETAVATAREMAIL:
 		{
 			ResSetAvatarForwardingEmail*R = static_cast<ResSetAvatarForwardingEmail*>(res);
-			ChatAvatar *cachedAvatar = NULL;
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *cachedAvatar = nullptr;
+			ChatAvatar *avatar = nullptr;
 			ChatAvatarCore *avatarCore = R->getAvatar();
 			
 			if (R->getResult() == 0 && avatarCore) // if success
@@ -584,14 +584,14 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 					// attempt to return locally cached avatar, if available
 					cachedAvatar = getAvatar(avatar->getAvatarID());
 
-					if (cachedAvatar != NULL)
+					if (cachedAvatar != nullptr)
 					{
 						cachedAvatar->setForwardingEmail(avatar->getForwardingEmail());
 					}
 				}
 			}
 			
-			if (cachedAvatar != NULL)
+			if (cachedAvatar != nullptr)
 			{
 				cachedAvatar = avatar;
 				m_api->OnSetAvatarForwardingEmail(R->getTrack(), R->getResult(), cachedAvatar, R->getUser());
@@ -613,8 +613,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_SETAVATARINBOXLIMIT:
 		{
 			ResSetAvatarInboxLimit *R = static_cast<ResSetAvatarInboxLimit*>(res);
-			ChatAvatar *cachedAvatar = NULL;
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *cachedAvatar = nullptr;
+			ChatAvatar *avatar = nullptr;
 			ChatAvatarCore *avatarCore = R->getAvatar();
 			
 			if (R->getResult() == 0 && avatarCore) // if success
@@ -625,14 +625,14 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 					// attempt to return locally cached avatar, if available
 					cachedAvatar = getAvatar(avatar->getAvatarID());
 
-					if (cachedAvatar != NULL)
+					if (cachedAvatar != nullptr)
 					{
 						cachedAvatar->setInboxLimit(avatar->getInboxLimit());
 					}
 				}
 			}
 			
-			if (cachedAvatar != NULL)
+			if (cachedAvatar != nullptr)
 			{
 				cachedAvatar = avatar;
 				m_api->OnSetAvatarInboxLimit(R->getTrack(), R->getResult(), cachedAvatar, R->getUser());
@@ -654,13 +654,13 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_GETROOM:
 		{
 			ResGetRoom *R = static_cast<ResGetRoom *>(res);
-			ChatRoom *room = NULL;
+			ChatRoom *room = nullptr;
 			ChatRoomCore *roomCore = R->getRoom();
 
 			if (R->getResult() == 0 && roomCore) // if success
 			{
 				unsigned roomid = roomCore->getRoomID();
-				if (getRoomCore(roomid) == NULL)
+				if (getRoomCore(roomid) == nullptr)
 				{
 					// we need to cache this room first
 					cacheRoom(roomCore);					
@@ -708,8 +708,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 		{
 			ResCreateRoom *R = static_cast<ResCreateRoom *>(res);
 
-			ChatRoom *room = NULL;
-			ChatRoomCore* roomCore = NULL;
+			ChatRoom *room = nullptr;
+			ChatRoomCore* roomCore = nullptr;
 
 			if (R->getResult() == 0) // if success
 			{
@@ -939,7 +939,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 				else if (!room && !roomCore)
 				{
 					// we didn't have room cached, and we didn't get one to cache,
-					// thus we'll have trouble giving a callback with a NULL pointer.
+					// thus we'll have trouble giving a callback with a nullptr pointer.
 					_chatdebug_("ChatAPI:BadData: RESPONSE_ENTERROOM: avatar=%p, room=%p , roomCore=%p\n", avatar, room, roomCore);
 				}
 			}
@@ -1175,8 +1175,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_FINDAVATARBYUID:
 		{
 			ResFindAvatarByUID *R = static_cast<ResFindAvatarByUID *>(res);
-			ChatAvatar **avatarMatches = NULL;
-			ChatAvatarCore **avatarCoreMatches = NULL;
+			ChatAvatar **avatarMatches = nullptr;
+			ChatAvatarCore **avatarCoreMatches = nullptr;
 			
 			unsigned numAvatarsOnline = R->getNumAvatarsOnline();
 
@@ -1374,7 +1374,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 					// duplicate login from this API, then effectively
 					// our API must consider him logged out because he's now
 					// no longer logged in to his AID controller.
-					m_api->OnLogoutAvatar(0, 0, avatar, NULL);
+					m_api->OnLogoutAvatar(0, 0, avatar, nullptr);
 				}
 			}
 			
@@ -1476,7 +1476,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_GETAVATARKEYWORDS:
 		{
 			ResGetAvatarKeywords *R = static_cast<ResGetAvatarKeywords *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
@@ -1494,7 +1494,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_SETAVATARKEYWORDS:
 		{
 			ResSetAvatarKeywords *R = static_cast<ResSetAvatarKeywords *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getAvatarID());
@@ -1510,8 +1510,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_SEARCHAVATARKEYWORDS:
 		{
 			ResSearchAvatarKeywords *R = static_cast<ResSearchAvatarKeywords *>(res);
-			ChatAvatar **avatarMatches = NULL;
-			ChatAvatarCore **avatarCoreMatches = NULL;
+			ChatAvatar **avatarMatches = nullptr;
+			ChatAvatarCore **avatarCoreMatches = nullptr;
 			
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
@@ -1530,7 +1530,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_CONFIRMFRIEND:
 		{
 			ResFriendConfirm *R = static_cast<ResFriendConfirm *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getAvatarID());
@@ -1546,7 +1546,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_CONFIRMFRIEND_RECIPROCATE:
 		{
 			ResFriendConfirmReciprocate *R = static_cast<ResFriendConfirmReciprocate *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getAvatarID());
@@ -1616,7 +1616,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_ADDSNOOPAVATAR:
 		{
 			ResAddSnoopAvatar *R = static_cast<ResAddSnoopAvatar *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getSrcAvatarID());
@@ -1632,7 +1632,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_REMOVESNOOPAVATAR:
 		{
 			ResRemoveSnoopAvatar *R = static_cast<ResRemoveSnoopAvatar *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getSrcAvatarID());
@@ -1648,7 +1648,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_ADDSNOOPROOM:
 		{
 			ResAddSnoopRoom *R = static_cast<ResAddSnoopRoom *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getSrcAvatarID());
@@ -1664,7 +1664,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_REMOVESNOOPROOM:
 		{
 			ResRemoveSnoopRoom *R = static_cast<ResRemoveSnoopRoom *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getSrcAvatarID());
@@ -1680,7 +1680,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 	case RESPONSE_GETSNOOPLIST:
 		{
 			ResGetSnoopList *R = static_cast<ResGetSnoopList *>(res);
-			ChatAvatar *avatar = NULL;
+			ChatAvatar *avatar = nullptr;
 			if(R->getResult() == CHATRESULT_SUCCESS)
 			{
 				avatar = getAvatar(R->getSrcAvatarID());
@@ -1691,8 +1691,8 @@ void ChatAPICore::responseCallback(GenericResponse *res)
 				_chatdebug_("ChatAPI:BadData: RESPONSE_REMOVESNOOPROOM: avatar=%p\n", avatar);
 			}
 
-			AvatarSnoopPair **avatarList = NULL;
-			ChatUnicodeString **roomList = NULL;
+			AvatarSnoopPair **avatarList = nullptr;
+			ChatUnicodeString **roomList = nullptr;
 			
 			unsigned numAvatars = R->getAvatarSnoopListLength();
 			unsigned numRooms = R->getRoomSnoopListLength();
@@ -1763,7 +1763,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 				ChatAvatar *destAvatar = getAvatar(M.getDestList()[i]);
 				if (!destAvatar)
 				{
-					_chatdebug_("ChatAPI:BadData: MESSAGE_ROOMMESSAGE: destAvatar[%i]=NULL\n", i);
+					_chatdebug_("ChatAPI:BadData: MESSAGE_ROOMMESSAGE: destAvatar[%i]=nullptr\n", i);
 					continue;
 				}
 				m_api->OnReceiveRoomMessage(srcAvatar, destAvatar, destRoom, ChatUnicodeString(M.getMsg().data(), M.getMsg().size()), ChatUnicodeString(M.getOOB().data(), M.getOOB().size()));
@@ -1797,7 +1797,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 				ChatAvatar *destAvatar = getAvatar(M.getDestList()[i]);
 				if (!destAvatar) 
 				{
-					_chatdebug_("ChatAPI:BadData: MESSAGE_BROADCASTMESSAGE: destAvatar[%i]=NULL\n", i);
+					_chatdebug_("ChatAPI:BadData: MESSAGE_BROADCASTMESSAGE: destAvatar[%i]=nullptr\n", i);
 					continue;
 				}
 				m_api->OnReceiveBroadcastMessage(srcAvatar, ChatUnicodeString(M.getSrcAddress().data(), M.getSrcAddress().size()), destAvatar, ChatUnicodeString(M.getMsg().data(), M.getMsg().size()), ChatUnicodeString(M.getOOB().data(), M.getOOB().size()));
@@ -1877,7 +1877,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID());
 
 			if (!destRoomCore) {
-				_chatdebug_("ChatAPI:destroomCore is null!");
+				_chatdebug_("ChatAPI:destroomCore is nullptr!");
 				break;
 			}
 
@@ -1889,7 +1889,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 
 			ChatAvatar *destAvatar = M.getDestAvatar()->getNewChatAvatar();
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
-			ChatAvatarCore *kickedAvatar = destRoomCore ? destRoomCore->removeAvatar(destAvatar->getAvatarID()) : NULL;
+			ChatAvatarCore *kickedAvatar = destRoomCore ? destRoomCore->removeAvatar(destAvatar->getAvatarID()) : nullptr;
 			
 			ChatRoom *destRoom = getRoom(M.getRoomID());
 			if (!srcAvatar || !destAvatar || !kickedAvatar || !destRoom) 
@@ -2439,12 +2439,12 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
 			if (!srcAvatar)
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_ENTERROOM: srcAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_ENTERROOM: srcAvatar=nullptr\n");
 				delete M.getSrcAvatar();
 				break;
 			}
 
-			bool isLocalAvatar = (getAvatar(srcAvatar->getAvatarID()) != NULL);
+			bool isLocalAvatar = (getAvatar(srcAvatar->getAvatarID()) != nullptr);
 			if(!destRoomCore->addAvatar(M.getSrcAvatar(),isLocalAvatar))
 			{
  				delete M.getSrcAvatar();
@@ -2492,10 +2492,10 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			if (destRoomCore)
 			{
 				ChatRoom *destRoom = getRoom(M.getRoomID());
-				ChatAvatar *srcAvatar = NULL;
+				ChatAvatar *srcAvatar = nullptr;
 				if (!M.getSrcAvatar())
 				{
-					_chatdebug_("ChatAPI:BadData: MESSAGE_DESTROYROOM: M.getSrcAvatar=NULL\n");
+					_chatdebug_("ChatAPI:BadData: MESSAGE_DESTROYROOM: M.getSrcAvatar=nullptr\n");
 				}
 				else
 				{
@@ -2527,7 +2527,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID());
 			if (!destRoomCore) 
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: destRoomCore=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: destRoomCore=nullptr\n");
 				break;
 			}
 
@@ -2544,7 +2544,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			
 			if (!M.getSrcAvatar())
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: M.getSrcAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_SETROOMPARAMS: M.getSrcAvatar=nullptr\n");
 				break;
 			}
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
@@ -2686,7 +2686,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 		{
 			MAddAdmin M(iter);
 			ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID());
-			if (destRoomCore && (destRoomCore->addAdministrator(M.getAvatar()) == NULL))
+			if (destRoomCore && (destRoomCore->addAdministrator(M.getAvatar()) == nullptr))
 			{
 				delete (M.getAvatar());
 			}
@@ -2696,7 +2696,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 		{
 			MRemoveAdmin M(iter);
 			ChatRoomCore *destRoomCore = getRoomCore(M.getRoomID());
-			ChatAvatarCore *admin = NULL;
+			ChatAvatarCore *admin = nullptr;
 			if (destRoomCore)
 				admin = destRoomCore->removeAdministrator(M.getAvatarID());
 			delete admin;
@@ -2707,7 +2707,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			MFriendConfirmRequest M(iter);
 			if (!M.getSrcAvatar())
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMREQUEST: M.getSrcAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMREQUEST: M.getSrcAvatar=nullptr\n");
 				break;
 			}
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
@@ -2730,7 +2730,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 
 			if (!M.getSrcAvatar()) 			
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRESPONSE: M.getSrcAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRESPONSE: M.getSrcAvatar=nullptr\n");
 				break;
 			}
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
@@ -2752,7 +2752,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			MFriendConfirmReciprocateRequest M(iter);
 			if (!M.getSrcAvatar())
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_REQUEST: M.getSrcAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_REQUEST: M.getSrcAvatar=nullptr\n");
 				break;
 			}
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
@@ -2775,7 +2775,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 
 			if (!M.getSrcAvatar()) 			
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_RESPONSE: M.getSrcAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_FRIENDCONFIRMRECIPROCATE_RESPONSE: M.getSrcAvatar=nullptr\n");
 				break;
 			}
 			ChatAvatar *srcAvatar = M.getSrcAvatar()->getNewChatAvatar();
@@ -2799,7 +2799,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 			ChatRoomCore *destRoomCore = getRoomCore(M.getDestRoomID());
 			if (!destRoomCore) 
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_CHANGEROOMOWNER: destRoomCore=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_CHANGEROOMOWNER: destRoomCore=nullptr\n");
 				break;
 			}
 
@@ -2822,7 +2822,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
 
 			if (!M.getRequestorAvatar()) 			
 			{
-				_chatdebug_("ChatAPI:BadData: MESSAGE_REQUESTROOMENTRY: M.getRequestorAvatar=NULL\n");
+				_chatdebug_("ChatAPI:BadData: MESSAGE_REQUESTROOMENTRY: M.getRequestorAvatar=nullptr\n");
 				break;
 			}
 			ChatAvatar *srcAvatar = M.getRequestorAvatar()->getNewChatAvatar();
@@ -3025,7 +3025,7 @@ void ChatAPICore::processAPI()
 	}
 	// if we've been disconnected for at least a minute...
 	else if (!m_connected &&
-			 time(NULL) - m_timeSinceLastDisconnect >= 60)
+			 time(nullptr) - m_timeSinceLastDisconnect >= 60)
 	{
 		if (m_setToRegistrar)
 		{
@@ -3043,7 +3043,7 @@ void ChatAPICore::processAPI()
 			m_setToRegistrar = true;
 		}
 
-		m_timeSinceLastDisconnect = time(NULL);
+		m_timeSinceLastDisconnect = time(nullptr);
 	}
 
 
@@ -3072,7 +3072,7 @@ void ChatAPICore::OnConnect(const char *host, short port)
 		res->setTrack(m_currTrack);
 		m_currTrack++;
 
-		time_t timeout = time(NULL) + m_requestTimeout;
+		time_t timeout = time(nullptr) + m_requestTimeout;
 		req->setTimeout(timeout);
 		res->setTimeout(timeout);
 		
@@ -3103,7 +3103,7 @@ void ChatAPICore::OnConnect(const char *host, short port)
 		res->setTrack(m_currTrack);
 		m_currTrack++;
 
-		time_t timeout = time(NULL) + m_requestTimeout;
+		time_t timeout = time(nullptr) + m_requestTimeout;
 		req->setTimeout(timeout);
 		res->setTimeout(timeout);
 
@@ -3147,7 +3147,7 @@ void ChatAPICore::OnDisconnect(const char *host, short port)
 		// stop processing immediately
 		suspendProcessing();
 
-		m_timeSinceLastDisconnect = time(NULL);
+		m_timeSinceLastDisconnect = time(nullptr);
 
 		// determine who we disconnected from and take appropriate action
 		if (strcmp(host, m_registrarHost.c_str()) == 0 &&
@@ -3214,7 +3214,7 @@ void ChatAPICore::failoverReloginOneAvatar(ChatAvatarCore * avatarCore)
 		res->setTrack(m_currTrack);
 		m_currTrack++;
 
-		time_t timeout = time(NULL) + m_requestTimeout;
+		time_t timeout = time(nullptr) + m_requestTimeout;
 		req->setTimeout(timeout);
 		res->setTimeout(timeout);
 
@@ -3241,7 +3241,7 @@ void ChatAPICore::failoverRecreateRooms()
 	{
 		// first build multimap of rooms keyed by their node level (ascending order is default).
 		multimap<unsigned, ChatRoomCore *> levelMap;
-		ChatRoomCore *roomCore = NULL;
+		ChatRoomCore *roomCore = nullptr;
 		for (roomIter = m_roomCoreCache.begin(); roomIter != m_roomCoreCache.end(); ++roomIter)
 		{
 			roomCore = (*roomIter).second;
@@ -3268,7 +3268,7 @@ void ChatAPICore::failoverRecreateRooms()
 			res->setTrack(m_currTrack);
 			m_currTrack++;
 
-			time_t timeout = time(NULL) + m_requestTimeout;
+			time_t timeout = time(nullptr) + m_requestTimeout;
 			req->setTimeout(timeout);
 			res->setTimeout(timeout);
 			
@@ -3296,7 +3296,7 @@ void ChatAPICore::failoverRecreateRooms()
 
 ChatAvatar *ChatAPICore::getAvatar(const ChatUnicodeString &avatarName, const ChatUnicodeString &avatarAddress)
 {
-	ChatAvatar *returnVal = NULL;
+	ChatAvatar *returnVal = nullptr;
 
 	map<unsigned, ChatAvatar *>::iterator iter = m_avatarCache.begin();
 
@@ -3317,7 +3317,7 @@ ChatAvatar *ChatAPICore::getAvatar(const ChatUnicodeString &avatarName, const Ch
 
 ChatRoom *ChatAPICore::getRoom(const ChatUnicodeString &roomAddress)
 {
-	ChatRoom *returnVal = NULL;
+	ChatRoom *returnVal = nullptr;
 
 	map<unsigned, ChatRoom *>::iterator iter = m_roomCache.begin();
 

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatEnum.cpp

@@ -43,7 +43,7 @@ ChatUnicodeString::ChatUnicodeString(const std::string& nSrc)
 
 ChatUnicodeString::ChatUnicodeString(const char *nStrSrc)
 {
-	if (nStrSrc==NULL) 
+	if (nStrSrc==nullptr) 
 	{
 		m_wideString = getEmptyString();
 		m_cString = wideToNarrow(m_wideString);

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatFriendStatusCore.cpp

@@ -7,7 +7,7 @@ namespace ChatSystem
 using namespace Base;
 using namespace Plat_Unicode;
 ChatFriendStatusCore::ChatFriendStatusCore()
-: m_interface(NULL),
+: m_interface(nullptr),
   m_status(0)
 {
 }
@@ -31,7 +31,7 @@ ChatFriendStatusCore::~ChatFriendStatusCore()
 }
 
 ChatFriendStatus::ChatFriendStatus()
-: m_core(NULL)
+: m_core(nullptr)
 {
 }
 

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatIgnoreStatusCore.cpp

@@ -7,7 +7,7 @@ namespace ChatSystem
 	using namespace Plat_Unicode;
 
 	ChatIgnoreStatus::ChatIgnoreStatus()
-	: m_core(NULL)
+	: m_core(nullptr)
 	{
 	}
 
@@ -16,7 +16,7 @@ namespace ChatSystem
 	}
 
 	ChatIgnoreStatusCore::ChatIgnoreStatusCore()
-	: m_interface(NULL)
+	: m_interface(nullptr)
 	{
 	}
 

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoom.cpp

@@ -581,7 +581,7 @@ unsigned RoomSummary::getRoomMaxSize() const
 
 ChatRoom::ChatRoom()
 {
-	m_core = NULL;
+	m_core = nullptr;
 }
 
 ChatRoom::ChatRoom(ChatRoomCore *core)

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatRoomCore.cpp

@@ -189,7 +189,7 @@ ChatRoomCore::~ChatRoomCore()
 
 ChatAvatarCore *ChatRoomCore::getAvatarCore(unsigned avatarID)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	map<unsigned, ChatAvatarCore *>::iterator iterCore = m_inroomAvatarsCore.find(avatarID);
 
@@ -202,7 +202,7 @@ ChatAvatarCore *ChatRoomCore::getAvatarCore(unsigned avatarID)
 
 ChatAvatar *ChatRoomCore::getAvatar(unsigned avatarID)
 {
-	ChatAvatar *returnAvatar = NULL;
+	ChatAvatar *returnAvatar = nullptr;
 
 	map<unsigned, ChatAvatar *>::iterator iter = m_inroomAvatars.find(avatarID);
 
@@ -215,7 +215,7 @@ ChatAvatar *ChatRoomCore::getAvatar(unsigned avatarID)
 
 ChatAvatarCore *ChatRoomCore::getModeratorCore(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_moderatorAvatarsCore.begin();
 
@@ -238,7 +238,7 @@ ChatAvatarCore *ChatRoomCore::getModeratorCore(const Plat_Unicode::String &name,
 
 ChatAvatar *ChatRoomCore::getModerator(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatar *returnAvatar = NULL;
+	ChatAvatar *returnAvatar = nullptr;
 
 	set<ChatAvatar *>::iterator iter = m_moderatorAvatars.begin();
 
@@ -263,7 +263,7 @@ ChatAvatar *ChatRoomCore::getModerator(const Plat_Unicode::String &name, const P
 
 ChatAvatarCore *ChatRoomCore::getBannedCore(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_banAvatarsCore.begin();
 
@@ -286,7 +286,7 @@ ChatAvatarCore *ChatRoomCore::getBannedCore(const Plat_Unicode::String &name, co
 
 ChatAvatar *ChatRoomCore::getBanned(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatar *returnAvatar = NULL;
+	ChatAvatar *returnAvatar = nullptr;
 
 	set<ChatAvatar *>::iterator iter = m_banAvatars.begin();
 
@@ -311,7 +311,7 @@ ChatAvatar *ChatRoomCore::getBanned(const Plat_Unicode::String &name, const Plat
 
 ChatAvatarCore *ChatRoomCore::getInvitedCore(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_inviteAvatarsCore.begin();
 
@@ -334,7 +334,7 @@ ChatAvatarCore *ChatRoomCore::getInvitedCore(const Plat_Unicode::String &name, c
 
 ChatAvatar *ChatRoomCore::getInvited(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatar *returnAvatar = NULL;
+	ChatAvatar *returnAvatar = nullptr;
 
 	set<ChatAvatar *>::iterator iter = m_inviteAvatars.begin();
 
@@ -359,7 +359,7 @@ ChatAvatar *ChatRoomCore::getInvited(const Plat_Unicode::String &name, const Pla
 
 ChatAvatarCore *ChatRoomCore::addAvatar(ChatAvatarCore *newAvatar, bool local)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -394,7 +394,7 @@ void ChatRoomCore::addLocalAvatar(unsigned avatarID)
 
 ChatAvatarCore *ChatRoomCore::removeAvatar(unsigned avatarID)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	map<unsigned, ChatAvatarCore *>::iterator iterCore = m_inroomAvatarsCore.find(avatarID);
 
@@ -422,7 +422,7 @@ ChatAvatarCore *ChatRoomCore::removeAvatar(unsigned avatarID)
 
 ChatAvatarCore *ChatRoomCore::addBan(ChatAvatarCore *newAvatar)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -446,7 +446,7 @@ ChatAvatarCore *ChatRoomCore::addBan(ChatAvatarCore *newAvatar)
 
 ChatAvatarCore *ChatRoomCore::removeBan(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_banAvatarsCore.begin();
 
@@ -494,7 +494,7 @@ ChatAvatarCore *ChatRoomCore::removeBan(const Plat_Unicode::String &name, const
 
 ChatAvatarCore *ChatRoomCore::addAdministrator(ChatAvatarCore *newAvatar)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -518,7 +518,7 @@ ChatAvatarCore *ChatRoomCore::addAdministrator(ChatAvatarCore *newAvatar)
 
 ChatAvatarCore *ChatRoomCore::removeAdministrator(unsigned avatarID)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	map<unsigned, ChatAvatarCore *>::iterator iterCore = m_adminAvatarsCore.find(avatarID);
 
@@ -541,7 +541,7 @@ ChatAvatarCore *ChatRoomCore::removeAdministrator(unsigned avatarID)
 
 ChatAvatarCore *ChatRoomCore::addModerator(ChatAvatarCore *newAvatar)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -565,7 +565,7 @@ ChatAvatarCore *ChatRoomCore::addModerator(ChatAvatarCore *newAvatar)
 
 ChatAvatarCore *ChatRoomCore::removeModerator(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_moderatorAvatarsCore.begin();
 
@@ -613,7 +613,7 @@ ChatAvatarCore *ChatRoomCore::removeModerator(const Plat_Unicode::String &name,
 
 ChatAvatarCore *ChatRoomCore::addTempModerator(ChatAvatarCore *newAvatar)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -637,7 +637,7 @@ ChatAvatarCore *ChatRoomCore::addTempModerator(ChatAvatarCore *newAvatar)
 
 ChatAvatarCore *ChatRoomCore::removeTempModerator(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_tempModeratorAvatarsCore.begin();
 
@@ -685,7 +685,7 @@ ChatAvatarCore *ChatRoomCore::removeTempModerator(const Plat_Unicode::String &na
 
 ChatAvatarCore *ChatRoomCore::addInvite(ChatAvatarCore* newAvatar)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -709,7 +709,7 @@ ChatAvatarCore *ChatRoomCore::addInvite(ChatAvatarCore* newAvatar)
 
 ChatAvatarCore *ChatRoomCore::removeInvite(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_inviteAvatarsCore.begin();
 
@@ -757,7 +757,7 @@ ChatAvatarCore *ChatRoomCore::removeInvite(const Plat_Unicode::String &name, con
 
 ChatAvatarCore *ChatRoomCore::addVoice(ChatAvatarCore* newAvatar)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	if(newAvatar)
 	{
@@ -781,7 +781,7 @@ ChatAvatarCore *ChatRoomCore::addVoice(ChatAvatarCore* newAvatar)
 
 ChatAvatarCore *ChatRoomCore::removeVoice(const Plat_Unicode::String &name, const Plat_Unicode::String &address)
 {
-	ChatAvatarCore *returnAvatar = NULL;
+	ChatAvatarCore *returnAvatar = nullptr;
 
 	set<ChatAvatarCore *>::iterator iterCore = m_voiceAvatarsCore.begin();
 
@@ -1053,7 +1053,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
 	for (avatarIter = m_inroomAvatarsCore.begin(); avatarIter != m_inroomAvatarsCore.end(); ++avatarIter)
 	{
 		// include only the avatars that are on this API
-		if ( this->getAvatar((*avatarIter).second->getAvatarID()) != NULL )
+		if ( this->getAvatar((*avatarIter).second->getAvatarID()) != nullptr )
 		{
 			avatarsToSend.insert((*avatarIter).second);
 		}

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Message.cpp

@@ -21,7 +21,7 @@ namespace ChatSystem
 
 	MRoomMessage::MRoomMessage(ByteStream::ReadIterator &iter)
 	: GenericMessage(MESSAGE_ROOMMESSAGE),
-	  m_destList(NULL),
+	  m_destList(nullptr),
 	  m_srcAvatar(iter),
 	  m_messageID(0)
 	{
@@ -45,13 +45,13 @@ namespace ChatSystem
 	MRoomMessage::~MRoomMessage()
 	{
 		delete[] m_destList;
-		m_destList = NULL;
+		m_destList = nullptr;
 	}
 
 	MBroadcastMessage::MBroadcastMessage(ByteStream::ReadIterator &iter)
 	: GenericMessage(MESSAGE_BROADCASTMESSAGE),
 	  m_srcAvatar(iter),
-	  m_destList(NULL)
+	  m_destList(nullptr)
 	{
 		ASSERT_VALID_STRING_LENGTH(get(iter, m_srcAddress));
 		get(iter, m_listLength);
@@ -68,7 +68,7 @@ namespace ChatSystem
 	MBroadcastMessage::~MBroadcastMessage()
 	{
 		delete[] m_destList;
-		m_destList = NULL;
+		m_destList = nullptr;
 	}
 
 	MFilterMessage::MFilterMessage(ByteStream::ReadIterator &iter)

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/PersistentMessage.cpp

@@ -8,7 +8,7 @@ using namespace Base;
 using namespace Plat_Unicode;
 
 PersistentHeader::PersistentHeader()
-: m_core(NULL)
+: m_core(nullptr)
 {
 }
 
@@ -66,7 +66,7 @@ PersistentHeaderCore::PersistentHeaderCore()
   m_avatarID(0),
   m_sentTime(0),
   m_status(0),
-  m_interface(NULL)
+  m_interface(nullptr)
 {
 }
 

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp

@@ -127,7 +127,7 @@ void RGetAvatarKeywords::pack(ByteStream &msg)
 RSearchAvatarKeywords::RSearchAvatarKeywords(const ChatUnicodeString &nodeAddress, const ChatUnicodeString *keywordsList, unsigned keywordsLength)
 : GenericRequest(REQUEST_SEARCHAVATARKEYWORDS),
   m_keywordsLength(keywordsLength),
-  m_keywordsList(NULL)
+  m_keywordsList(nullptr)
 {
 	m_nodeAddress.assign(nodeAddress.string_data);
 	m_keywordsList = new String[keywordsLength];
@@ -898,7 +898,7 @@ m_srcAddress(srcAddress.string_data, srcAddress.string_length),
   m_destRoomAddress(destRoomAddress.string_data, destRoomAddress.string_length)
 {
 	// we take in a const RoomParams, so make our own and guarantee
-	// null-terminated char buffers.
+	// nullptr-terminated char buffers.
 	m_newRoomName.assign(params->getRoomName().string_data, params->getRoomName().string_length);
 	m_newRoomTopic.assign(params->getRoomTopic().string_data, params->getRoomTopic().string_length);
 	m_newRoomPassword.assign(params->getRoomPassword().string_data, params->getRoomPassword().string_length);

external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Response.cpp

@@ -20,7 +20,7 @@ using namespace Plat_Unicode;
 
 ResLoginAvatar::ResLoginAvatar(void *user, int avatarLoginPriority)
 : GenericResponse(RESPONSE_LOGINAVATAR, CHATRESULT_TIMEOUT, user),
-  m_avatar(NULL),
+  m_avatar(nullptr),
   m_submittedPriority(avatarLoginPriority),
   m_requiredPriority(INT_MAX)
 {
@@ -63,7 +63,7 @@ void ResLoginAvatar::unpack(ByteStream::ReadIterator &iter)
 
 ResTemporaryAvatar::ResTemporaryAvatar(void *user)
 : GenericResponse(RESPONSE_TEMPORARYAVATAR, CHATRESULT_TIMEOUT, user)
-, m_avatar(NULL)
+, m_avatar(nullptr)
 {
 }
 
@@ -110,7 +110,7 @@ void ResDestroyAvatar::unpack(ByteStream::ReadIterator &iter)
 
 ResGetAvatar::ResGetAvatar(void *user)
 : GenericResponse(RESPONSE_GETAVATAR, CHATRESULT_TIMEOUT, user),
-  m_avatar(NULL)
+  m_avatar(nullptr)
 {
 }
 
@@ -144,7 +144,7 @@ void ResGetAvatar::unpack(ByteStream::ReadIterator &iter)
 
 ResGetAnyAvatar::ResGetAnyAvatar(void* user)
     : GenericResponse( RESPONSE_GETANYAVATAR, CHATRESULT_TIMEOUT, user )
-    , m_avatar( NULL )
+    , m_avatar( nullptr )
 {
 }
 
@@ -181,8 +181,8 @@ void ResGetAnyAvatar::unpack(Base::ByteStream::ReadIterator& iter)
 ResAvatarList::ResAvatarList(void *user)
 : GenericResponse(RESPONSE_AVATARLIST, CHATRESULT_TIMEOUT, user)
 , m_listLength(0)
-, m_avatarList(NULL)
-, m_cores(NULL)
+, m_avatarList(nullptr)
+, m_cores(nullptr)
 {
 }
 
@@ -214,7 +214,7 @@ void ResAvatarList::unpack(ByteStream::ReadIterator &iter)
 
 ResSetAvatarAttributes::ResSetAvatarAttributes(void *user)
 : GenericResponse(RESPONSE_SETAVATARATTRIBUTES, CHATRESULT_TIMEOUT, user),
-  m_avatar(NULL)
+  m_avatar(nullptr)
 {
 }
 
@@ -248,7 +248,7 @@ void ResSetAvatarAttributes::unpack(ByteStream::ReadIterator &iter)
 
 ResSetAvatarStatusMessage::ResSetAvatarStatusMessage(void *user)
 : GenericResponse(RESPONSE_SETSTATUSMESSAGE, CHATRESULT_TIMEOUT, user),
-m_avatar(NULL)
+m_avatar(nullptr)
 {
 }
 
@@ -285,7 +285,7 @@ void ResSetAvatarStatusMessage::unpack(ByteStream::ReadIterator &iter)
 
 ResSetAvatarForwardingEmail::ResSetAvatarForwardingEmail(void *user)
 : GenericResponse(RESPONSE_SETAVATAREMAIL, CHATRESULT_TIMEOUT, user),
-  m_avatar(NULL)
+  m_avatar(nullptr)
 {
 }
 
@@ -312,7 +312,7 @@ void ResSetAvatarForwardingEmail::unpack(ByteStream::ReadIterator &iter)
 
 ResSetAvatarInboxLimit::ResSetAvatarInboxLimit(void *user)
 : GenericResponse(RESPONSE_SETAVATARINBOXLIMIT, CHATRESULT_TIMEOUT, user),
-  m_avatar(NULL)
+  m_avatar(nullptr)
 {
 }
 
@@ -340,7 +340,7 @@ void ResSetAvatarInboxLimit::unpack(ByteStream::ReadIterator &iter)
 ResSearchAvatarKeywords::ResSearchAvatarKeywords(void *user)
 : GenericResponse(RESPONSE_SETAVATARKEYWORDS, CHATRESULT_TIMEOUT, user),
   m_numMatches(0), 
-  m_avatarMatches(NULL)
+  m_avatarMatches(nullptr)
 {
 }
 
@@ -388,8 +388,8 @@ void ResSetAvatarKeywords::unpack(ByteStream::ReadIterator &iter)
 ResGetAvatarKeywords::ResGetAvatarKeywords(void *user, unsigned avatarID)
 : GenericResponse(RESPONSE_GETAVATARKEYWORDS, CHATRESULT_TIMEOUT, user),
   m_avatarID(avatarID),
-  m_keywordList(NULL),
-  m_chatStrList(NULL)
+  m_keywordList(nullptr),
+  m_chatStrList(nullptr)
 {
 }
 
@@ -420,7 +420,7 @@ void ResGetAvatarKeywords::unpack(ByteStream::ReadIterator &iter)
 
 ResGetRoom::ResGetRoom(void *user)
 : GenericResponse(RESPONSE_GETROOM, CHATRESULT_TIMEOUT, user),
-  m_room(NULL),
+  m_room(nullptr),
   m_numExtraRooms(0)
 {
 }
@@ -448,7 +448,7 @@ void ResGetRoom::unpack(ByteStream::ReadIterator &iter)
 ResCreateRoom::ResCreateRoom(void *user, unsigned avatarID)
 : GenericResponse(RESPONSE_CREATEROOM, CHATRESULT_TIMEOUT, user),
   m_srcAvatarID(avatarID),
-  m_room(NULL),
+  m_room(nullptr),
   m_numExtraRooms(0)
 {
 }
@@ -637,8 +637,8 @@ ResFriendStatus::ResFriendStatus(void *user, unsigned avatarID)
 : GenericResponse(RESPONSE_FRIENDSTATUS, CHATRESULT_TIMEOUT, user),
   m_avatarID(avatarID),
   m_listLength(0),
-  m_friendList(NULL),
-  m_cores(NULL)
+  m_friendList(nullptr),
+  m_cores(nullptr)
 {
 }
 
@@ -704,8 +704,8 @@ ResIgnoreStatus::ResIgnoreStatus(void *user, unsigned avatarID)
 : GenericResponse(RESPONSE_IGNORESTATUS, CHATRESULT_TIMEOUT, user),
   m_avatarID(avatarID),
   m_listLength(0),
-  m_ignoreList(NULL),
-  m_cores(NULL)
+  m_ignoreList(nullptr),
+  m_cores(nullptr)
 {
 }
 
@@ -740,7 +740,7 @@ ResEnterRoom::ResEnterRoom(void *user, unsigned avatarID, const ChatUnicodeStrin
   m_avatarID(avatarID),
   m_destAddress(destAddress.string_data, destAddress.string_length),
   m_gotRoomObj(false),
-  m_room(NULL),
+  m_room(nullptr),
   m_numExtraRooms(0)
 {
 }
@@ -1012,7 +1012,7 @@ void ResChangeRoomOwner::unpack(ByteStream::ReadIterator &iter)
 ResGetRoomSummaries::ResGetRoomSummaries(void *user)
 : GenericResponse(RESPONSE_GETROOMSUMMARIES, CHATRESULT_TIMEOUT, user),
   m_numRooms(0),
-  m_roomSummaries(NULL)
+  m_roomSummaries(nullptr)
 {
 }
 
@@ -1132,8 +1132,8 @@ ResGetPersistentMessage::ResGetPersistentMessage(void *user, unsigned srcAvatarI
 : GenericResponse(RESPONSE_GETPERSISTENTMESSAGE, CHATRESULT_TIMEOUT, user),
   m_srcAvatarID(srcAvatarID),
   m_messageID(messageID),
-  m_core(NULL),
-  m_header(NULL)
+  m_core(nullptr),
+  m_header(nullptr)
 {
 }
 
@@ -1167,7 +1167,7 @@ void ResGetPersistentMessage::unpack(ByteStream::ReadIterator &iter)
 ResGetMultiplePersistentMessages::ResGetMultiplePersistentMessages(void *user, unsigned srcAvatarID)
 : GenericResponse(RESPONSE_GETMULTIPLEPERSISTENTMESSAGES, CHATRESULT_TIMEOUT, user),
   m_srcAvatarID(srcAvatarID),
-  m_messages(NULL)
+  m_messages(nullptr)
 {
 }
 
@@ -1217,8 +1217,8 @@ ResGetPersistentHeaders::ResGetPersistentHeaders(void *user, unsigned srcAvatarI
 : GenericResponse(RESPONSE_GETPERSISTENTHEADERS, CHATRESULT_TIMEOUT, user),
   m_srcAvatarID(srcAvatarID),
   m_listLength(0),
-  m_headers(NULL),
-  m_cores(NULL)
+  m_headers(nullptr),
+  m_cores(nullptr)
 {
 }
 
@@ -1263,8 +1263,8 @@ ResGetPartialPersistentHeaders::ResGetPartialPersistentHeaders(void *user, unsig
 : GenericResponse(RESPONSE_PARTIALPERSISTENTHEADERS, CHATRESULT_TIMEOUT, user),
   m_srcAvatarID(srcAvatarID),
   m_listLength(0),
-  m_headers(NULL),
-  m_cores(NULL)
+  m_headers(nullptr),
+  m_cores(nullptr)
 {
 }
 
@@ -1396,7 +1396,7 @@ void ResUnregisterRoom::unpack(ByteStream::ReadIterator &iter)
 }
 
 ResFailoverReloginAvatar::ResFailoverReloginAvatar(unsigned avatarID)
-: GenericResponse(RESPONSE_FAILOVER_RELOGINAVATAR, CHATRESULT_TIMEOUT, NULL),
+: GenericResponse(RESPONSE_FAILOVER_RELOGINAVATAR, CHATRESULT_TIMEOUT, nullptr),
   m_avatarID(avatarID)
 {
 }
@@ -1414,9 +1414,9 @@ void ResFailoverReloginAvatar::unpack(ByteStream::ReadIterator &iter)
 }
 
 ResFailoverRecreateRoom::ResFailoverRecreateRoom(unsigned roomID, bool forced)
-: GenericResponse(RESPONSE_FAILOVER_RECREATEROOM, CHATRESULT_TIMEOUT, NULL),
+: GenericResponse(RESPONSE_FAILOVER_RECREATEROOM, CHATRESULT_TIMEOUT, nullptr),
   m_roomID(roomID),
-  m_room(NULL),
+  m_room(nullptr),
   m_forced(forced)
 {
 }
@@ -1478,7 +1478,7 @@ void ResGetFanClubHandle::unpack(ByteStream::ReadIterator &iter)
 ResFindAvatarByUID::ResFindAvatarByUID(void *user)
 : GenericResponse(RESPONSE_FINDAVATARBYUID, CHATRESULT_TIMEOUT, user),
   m_numAvatarsOnline(0),
-  m_avatars(NULL)
+  m_avatars(nullptr)
 {
 }
 
@@ -1512,7 +1512,7 @@ void ResFindAvatarByUID::unpack(ByteStream::ReadIterator &iter)
 }
 
 ResRegistrarGetChatServer::ResRegistrarGetChatServer()
-: GenericResponse(RESPONSE_REGISTRAR_GETCHATSERVER, CHATRESULT_TIMEOUT, NULL)
+: GenericResponse(RESPONSE_REGISTRAR_GETCHATSERVER, CHATRESULT_TIMEOUT, nullptr)
 {
 }
 
@@ -1527,7 +1527,7 @@ void ResRegistrarGetChatServer::unpack(ByteStream::ReadIterator &iter)
 }
 
 ResSendApiVersion::ResSendApiVersion()
-: GenericResponse(RESPONSE_SETAPIVERSION, CHATRESULT_TIMEOUT, NULL)
+: GenericResponse(RESPONSE_SETAPIVERSION, CHATRESULT_TIMEOUT, nullptr)
 {
 }
 
@@ -1600,8 +1600,8 @@ void ResRemoveSnoopRoom::unpack(ByteStream::ReadIterator &iter)
 ResGetSnoopList::ResGetSnoopList(void *user, unsigned srcAvatarID)
 : GenericResponse(RESPONSE_GETSNOOPLIST, CHATRESULT_TIMEOUT, user),
   m_srcAvatarID(srcAvatarID),
-  m_avatarSnoops(NULL),
-  m_roomSnoops(NULL)
+  m_avatarSnoops(nullptr),
+  m_roomSnoops(nullptr)
 {
 }