swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-12 22:45:02 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
DarthArgus
2016-02-11 15:16:14 -06:00
parent a7f2d0ea6a
commit 3e4cc36e7e
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatAPI/common.cpp
Vendored
+14 -14
View File
@@ -171,37 +171,37 @@ namespace VChatSystem
token = strtok((char*)tmpTokenee.c_str(), seps );
if( token != NULL )
if( token != nullptr )
{
game = token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
if( token != NULL )
if( token != nullptr )
{
server = token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
if( token != NULL )
if( token != nullptr )
{
name = token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
while ( token != NULL )
while ( token != nullptr )
{
name += ".";
name += token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
}
@@ -216,29 +216,29 @@ namespace VChatSystem
std::string tmpTokenee = userName;
token = strtok((char*)tmpTokenee.c_str(), seps );
if( token != NULL )
if( token != nullptr )
{
server = token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
if( token != NULL )
if( token != nullptr )
{
name = token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
while ( token != NULL )
while ( token != nullptr )
{
name += ".";
name += token;
/* Get next token: */
token = strtok( NULL, seps );
token = strtok( nullptr, seps );
}
}
external/3rd/library/soePlatform/VChatAPI/projects/VChat/VChatUnitTest/VChatClient.cpp
Vendored
+14 -14
View File
@@ -23,7 +23,7 @@ unsigned VChatClient::GetAccountEx(const std::string &avatarName,
{
Reset();
VChatAPI::GetAccount(avatarName, game, world, userID, avatarID, NULL);
VChatAPI::GetAccount(avatarName, game, world, userID, avatarID, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -69,7 +69,7 @@ unsigned VChatClient::DeactivateVoiceAccount(const std::string &avatarName,
{
Reset();
VChatAPI::DeactivateVoiceAccount(avatarName, game, world, NULL);
VChatAPI::DeactivateVoiceAccount(avatarName, game, world, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -99,7 +99,7 @@ unsigned VChatClient::GetChannelEx( const std::string &channelName,
bool persistent)
{
Reset();
VChatAPI::GetChannel(channelName, game, server, description, password, limit, persistent, NULL);
VChatAPI::GetChannel(channelName, game, server, description, password, limit, persistent, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -146,7 +146,7 @@ unsigned VChatClient::GetProximityChannelEx(const std::string &channelName,
unsigned distModel)
{
Reset();
VChatAPI::GetProximityChannel(channelName, game, server, description, password, limit, persistent, maxRange, clamping, rollOff, maxGain, distModel, NULL);
VChatAPI::GetProximityChannel(channelName, game, server, description, password, limit, persistent, maxRange, clamping, rollOff, maxGain, distModel, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -183,7 +183,7 @@ unsigned VChatClient::ChannelCommandEx( const std::string &srcUserName,
unsigned banTimeout)
{
Reset();
VChatAPI::ChannelCommand(srcUserName, destUserName, destChannelAddress, command, banTimeout, NULL);
VChatAPI::ChannelCommand(srcUserName, destUserName, destChannelAddress, command, banTimeout, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -211,7 +211,7 @@ unsigned VChatClient::ChangePasswordEx(const std::string &channelName,
const std::string &password)
{
Reset();
VChatAPI::ChangePassword(channelName, game, server, password, NULL);
VChatAPI::ChangePassword(channelName, game, server, password, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -236,7 +236,7 @@ void VChatClient::OnChangePassword( unsigned track,
unsigned VChatClient::GetAllChannelsEx()
{
Reset();
VChatAPI::GetAllChannels(NULL);
VChatAPI::GetAllChannels(nullptr);
while(!IsDone() && !HasFailed())
{
@@ -274,7 +274,7 @@ unsigned VChatClient::DeleteChannelEx(const std::string &channelName,
const std::string &server)
{
Reset();
VChatAPI::DeleteChannel(channelName, game, server, NULL);
VChatAPI::DeleteChannel(channelName, game, server, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -301,7 +301,7 @@ unsigned VChatClient::SetBanStatusEx(unsigned userID,
unsigned banStatus)
{
Reset();
VChatAPI::SetBanStatus(userID, banStatus, NULL);
VChatAPI::SetBanStatus(userID, banStatus, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -328,7 +328,7 @@ unsigned VChatClient::GetChannelInfoEx( const std::string &channelName,
const std::string &server)
{
Reset();
VChatAPI::GetChannelInfo(channelName, game, server, NULL);
VChatAPI::GetChannelInfo(channelName, game, server, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -369,7 +369,7 @@ unsigned VChatClient::GetChannelV2Ex(const std::string &channelName,
bool persistent)
{
Reset();
VChatAPI::GetChannelV2(channelName, game, server, description, password, limit, persistent, NULL);
VChatAPI::GetChannelV2(channelName, game, server, description, password, limit, persistent, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -419,7 +419,7 @@ unsigned VChatClient::AddCharacterChannelEx(const unsigned stationID,
Reset();
VChatAPI::AddCharacterChannel(stationID, avatarID, characterName, worldName,
gameCode, channelType, channelDescription,
password, channelAddress, locale, NULL);
password, channelAddress, locale, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -449,7 +449,7 @@ unsigned VChatClient::RemoveCharacterChannelEx( const unsigned stationID,
{
Reset();
VChatAPI::RemoveCharacterChannel(stationID, avatarID, characterName, worldName,
gameCode, channelType, NULL);
gameCode, channelType, nullptr);
while(!IsDone() && !HasFailed())
{
@@ -477,7 +477,7 @@ unsigned VChatClient::GetCharacterChannelEx(const unsigned stationID,
const std::string &gameCode)
{
Reset();
VChatAPI::GetCharacterChannel(stationID, characterName, worldName, gameCode, NULL);
VChatAPI::GetCharacterChannel(stationID, characterName, worldName, gameCode, nullptr);
while(!IsDone() && !HasFailed())
{