NULL to nullptr

This commit is contained in:
Arthur Ice
2013-05-04 18:06:58 -07:00
parent e1c2657b11
commit 7560b6b0a7
216 changed files with 4151 additions and 4151 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
using namespace std;
//atoi is not uint32 or uint32 safe!!!!
#define atoul(str) strtoul(str, NULL, 10)
#define atoul(str) strtoul(str, nullptr, 10)
class Database : public DBcore {
public:
+4 -4
View File
@@ -262,7 +262,7 @@ void LFGuildManager::TogglePlayer(uint32 FromZoneID, uint32 FromInstanceID, char
safe_delete_array(query);
uint32 Now = time(NULL);
uint32 Now = time(nullptr);
if(Toggle == 1)
{
@@ -313,7 +313,7 @@ void LFGuildManager::ToggleGuild(uint32 FromZoneID, uint32 FromInstanceID, char
safe_delete_array(query);
uint32 Now = time(NULL);
uint32 Now = time(nullptr);
if(Toggle == 1)
{
@@ -351,7 +351,7 @@ void LFGuildManager::ExpireEntries()
for(it = Players.begin(); it != Players.end(); ++it)
{
if((*it).TimePosted + 604800 <= (uint32)time(NULL))
if((*it).TimePosted + 604800 <= (uint32)time(nullptr))
{
if(!database.RunQuery(query, MakeAnyLenString(&query, "DELETE from `lfguild` WHERE `type` = 0 AND `name` = '%s'", (*it).Name.c_str()), errbuf, 0, 0))
_log(QUERYSERV__ERROR, "Error expiring player LFGuild entry, query was %s, %s", query, errbuf);
@@ -364,7 +364,7 @@ void LFGuildManager::ExpireEntries()
for(it2 = Guilds.begin(); it2 != Guilds.end(); ++it2)
{
if((*it2).TimePosted + 2592000 <= time(NULL))
if((*it2).TimePosted + 2592000 <= time(nullptr))
{
if(!database.RunQuery(query, MakeAnyLenString(&query, "DELETE from `lfguild` WHERE `type` = 1 AND `name` = '%s'", (*it2).Name.c_str()), errbuf, 0, 0))
_log(QUERYSERV__ERROR, "Error removing guild LFGuild entry, query was %s, %s", query, errbuf);
+1 -1
View File
@@ -22,7 +22,7 @@
#include "../common/debug.h"
#include "queryservconfig.h"
queryservconfig *queryservconfig::_chat_config = NULL;
queryservconfig *queryservconfig::_chat_config = nullptr;
string queryservconfig::GetByName(const string &var_name) const {
return(EQEmuConfig::GetByName(var_name));
+2 -2
View File
@@ -36,14 +36,14 @@ public:
// Produce a const singleton
static const queryservconfig *get() {
if (_chat_config == NULL)
if (_chat_config == nullptr)
LoadConfig();
return(_chat_config);
}
// Load the config
static bool LoadConfig() {
if (_chat_config != NULL)
if (_chat_config != nullptr)
delete _chat_config;
_chat_config=new queryservconfig;
_config=_chat_config;