swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-02 03:16:11 -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
engine/server/application/CustomerServiceServer/src/shared/CustomerServiceServer.cpp
+14 -14
View File
@@ -49,7 +49,7 @@ namespace CustomerServiceServerNamespace
using namespace CustomerServiceServerNamespace;
CustomerServiceServer *CustomerServiceServer::m_instance = NULL;
CustomerServiceServer *CustomerServiceServer::m_instance = nullptr;
///////////////////////////////////////////////////////////////////////////////
//
@@ -83,12 +83,12 @@ CustomerServiceServer::PendingTicket::PendingTicket()
CustomerServiceServer::CustomerServiceServer() :
m_callback(new MessageDispatch::Callback),
m_centralServerConnection(NULL),
m_centralServerConnection(nullptr),
m_connectionServerSet(new ConnectionServerSet),
m_done(false),
m_csInterface(ConfigCustomerServiceServer::getCustomerServiceServerAddress(), ConfigCustomerServiceServer::getCustomerServiceServerPort(), ConfigCustomerServiceServer::getRequestTimeoutSeconds()),
m_gameServerService(NULL),
m_chatServerService(NULL),
m_gameServerService(nullptr),
m_chatServerService(nullptr),
m_nextSequenceId(0),
m_pendingTicketList(new PendingTicketList)
{
@@ -113,7 +113,7 @@ m_pendingTicketList(new PendingTicketList)
m_csInterface.setMaxPacketsPerSecond(ConfigCustomerServiceServer::getMaxPacketsPerSecond());
m_csInterface.connectCSAssist(NULL,
m_csInterface.connectCSAssist(nullptr,
Unicode::narrowToWide(ConfigCustomerServiceServer::getGameCode()).data(),
Unicode::narrowToWide(ConfigCustomerServiceServer::getClusterName()).data());
@@ -148,19 +148,19 @@ CustomerServiceServer::~CustomerServiceServer()
m_centralServerConnection->disconnect();
delete m_callback;
m_callback = NULL;
m_callback = nullptr;
delete m_connectionServerSet;
m_connectionServerSet = NULL;
m_connectionServerSet = nullptr;
delete m_gameServerService;
m_gameServerService = NULL;
m_gameServerService = nullptr;
delete m_chatServerService;
m_chatServerService = NULL;
m_chatServerService = nullptr;
delete m_pendingTicketList;
m_pendingTicketList = NULL;
m_pendingTicketList = nullptr;
MetricsManager::remove();
delete s_customerServiceServerMetricsData;
@@ -233,7 +233,7 @@ void CustomerServiceServer::update()
CustomerServiceServer &CustomerServiceServer::getInstance()
{
if (m_instance == NULL)
if (m_instance == nullptr)
{
m_instance = new CustomerServiceServer;
}
@@ -405,7 +405,7 @@ void CustomerServiceServer::getTickets(
NetworkId *tmpNetworkId = new NetworkId(requester);
m_csInterface.requestGetTicketByCharacter(
reinterpret_cast<const void *>(tmpNetworkId), suid, NULL,
reinterpret_cast<const void *>(tmpNetworkId), suid, nullptr,
start, count, markAsRead);
}
@@ -475,7 +475,7 @@ void CustomerServiceServer::requestNewTicketActivity(const NetworkId &requester,
NetworkId *tmpNetworkId = new NetworkId(requester);
m_csInterface.requestNewTicketActivity(reinterpret_cast<const void *>(tmpNetworkId), suid, NULL);
m_csInterface.requestNewTicketActivity(reinterpret_cast<const void *>(tmpNetworkId), suid, nullptr);
}
//-----------------------------------------------------------------------
@@ -497,7 +497,7 @@ void CustomerServiceServer::requestRegisterCharacter(const NetworkId &requester,
LOG("CSServer", ("CustomerServiceInterface::requestRegisterCharacter() - networkId(%s) suid(%i)", requester.getValueString().c_str(), suid));
NetworkId *tmpNetworkId = new NetworkId(requester);
m_csInterface.requestRegisterCharacter(reinterpret_cast<const void *>(tmpNetworkId), suid, NULL, 0);
m_csInterface.requestRegisterCharacter(reinterpret_cast<const void *>(tmpNetworkId), suid, nullptr, 0);
}
}