Switch from NULL to nullptr.

18 files changed, 38 insertions, 38 deletions

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index 40c8bb80f..d3f12850b 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -42,7 +42,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 		return CmdResult::FAILURE;
 	}
 
-	XLine* xl = NULL;
+	XLine* xl = nullptr;
 	try
 	{
 		xl = xlf->Generate(ServerInstance->Time(), ConvToNum<unsigned long>(params[4]), params[2], params[5], params[1]);
@@ -53,7 +53,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params)
 		return CmdResult::FAILURE;
 	}
 	xl->SetCreateTime(ServerCommand::ExtractTS(params[3]));
-	if (ServerInstance->XLines->AddLine(xl, NULL))
+	if (ServerInstance->XLines->AddLine(xl, nullptr))
 	{
 		if (xl->duration)
 		{
diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 00cde72fa..4e4524789 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -43,7 +43,7 @@ CmdResult CommandEncap::Handle(User* user, Params& params)
 			return CmdResult::SUCCESS;
 		}
 
-		Command* cmd = NULL;
+		Command* cmd = nullptr;
 		ServerInstance->Parser.CallHandler(params[1], plist, user, &cmd);
 		// Discard return value, ENCAP shall succeed even if the command does not exist
 
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index e5470d9c2..46de08382 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -166,7 +166,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 	if (apply_other_sides_modes)
 	{
 		ServerInstance->Modes.ModeParamsToChangeList(srcuser, MODETYPE_CHANNEL, params, modechangelist, 2, params.size() - 1);
-		ServerInstance->Modes.Process(srcuser, chan, NULL, modechangelist, ModeParser::MODE_LOCALONLY | ModeParser::MODE_MERGE);
+		ServerInstance->Modes.Process(srcuser, chan, nullptr, modechangelist, ModeParser::MODE_LOCALONLY | ModeParser::MODE_MERGE);
 		// Reuse for prefix modes
 		modechangelist.clear();
 	}
@@ -178,7 +178,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 	// Process every member in the message
 	irc::spacesepstream users(params.back());
 	std::string item;
-	Modes::ChangeList* modechangelistptr = (apply_other_sides_modes ? &modechangelist : NULL);
+	Modes::ChangeList* modechangelistptr = (apply_other_sides_modes ? &modechangelist : nullptr);
 	while (users.GetToken(item))
 	{
 		ProcessModeUUIDPair(item, sourceserver, chan, modechangelistptr, fwdfjoin);
@@ -189,7 +189,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 
 	// Set prefix modes on their users if we lost the FJOIN or had equal TS
 	if (apply_other_sides_modes)
-		ServerInstance->Modes.Process(srcuser, chan, NULL, modechangelist, ModeParser::MODE_LOCALONLY);
+		ServerInstance->Modes.Process(srcuser, chan, nullptr, modechangelist, ModeParser::MODE_LOCALONLY);
 
 	return CmdResult::SUCCESS;
 }
@@ -233,7 +233,7 @@ void CommandFJoin::ProcessModeUUIDPair(const std::string& item, TreeServer* sour
 		}
 	}
 
-	Membership* memb = chan->ForceJoin(who, NULL, sourceserver->IsBursting());
+	Membership* memb = chan->ForceJoin(who, nullptr, sourceserver->IsBursting());
 	if (!memb)
 	{
 		// User was already on the channel, forward because of the modes they potentially got
@@ -264,7 +264,7 @@ void CommandFJoin::RemoveStatus(Channel* c)
 		mh->RemoveMode(c, changelist);
 	}
 
-	ServerInstance->Modes.Process(ServerInstance->FakeClient, c, NULL, changelist, ModeParser::MODE_LOCALONLY);
+	ServerInstance->Modes.Process(ServerInstance->FakeClient, c, nullptr, changelist, ModeParser::MODE_LOCALONLY);
 }
 
 void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index e59812efa..789342207 100644
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -54,7 +54,7 @@ CmdResult CommandFMode::Handle(User* who, Params& params)
 	if ((TS == ourTS) && IS_SERVER(who))
 		flags |= ModeParser::MODE_MERGE;
 
-	ServerInstance->Modes.Process(who, chan, NULL, changelist, flags);
+	ServerInstance->Modes.Process(who, chan, nullptr, changelist, flags);
 	return CmdResult::SUCCESS;
 }
 
@@ -97,6 +97,6 @@ CmdResult CommandLMode::Handle(User* who, Params& params)
 	if (chants == chan->age && IS_SERVER(who))
 		flags |= ModeParser::MODE_MERGE;
 
-	ServerInstance->Modes.Process(who, chan, NULL, changelist, flags);
+	ServerInstance->Modes.Process(who, chan, nullptr, changelist, flags);
 	return CmdResult::SUCCESS;
 }
diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp
index 1e756b115..625f0bdfc 100644
--- a/src/modules/m_spanningtree/ijoin.cpp
+++ b/src/modules/m_spanningtree/ijoin.cpp
@@ -49,7 +49,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params)
 		apply_modes = false;
 
 	// Join the user and set the membership id to what they sent
-	Membership* memb = chan->ForceJoin(user, apply_modes ? &params[3] : NULL);
+	Membership* memb = chan->ForceJoin(user, apply_modes ? &params[3] : nullptr);
 	if (!memb)
 		return CmdResult::FAILURE;
 
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index b2fa9c2d8..ad45a2746 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -532,7 +532,7 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by
 		params.add(memb);
 		params.finalize();
 		params.Broadcast();
-		Utils->SendListLimits(memb->chan, NULL);
+		Utils->SendListLimits(memb->chan, nullptr);
 	}
 	else
 	{
@@ -659,7 +659,7 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 	{
 		CmdBuilder params(user ? user : ServerInstance->FakeClient, "REHASH");
 		params.push(parameter);
-		params.Forward(user ? TreeServer::Get(user)->GetRoute() : NULL);
+		params.Forward(user ? TreeServer::Get(user)->GetRoute() : nullptr);
 	}
 }
 
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index d4edfebef..abbb21efd 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -154,7 +154,7 @@ public:
 
 	/** Connect a server locally
 	 */
-	void ConnectServer(std::shared_ptr<Link> x, std::shared_ptr<Autoconnect> y = NULL);
+	void ConnectServer(std::shared_ptr<Link> x, std::shared_ptr<Autoconnect> y = nullptr);
 
 	/** Connect the next autoconnect server
 	 */
diff --git a/src/modules/m_spanningtree/metadata.cpp b/src/modules/m_spanningtree/metadata.cpp
index 2119fae3e..bf7f47aa9 100644
--- a/src/modules/m_spanningtree/metadata.cpp
+++ b/src/modules/m_spanningtree/metadata.cpp
@@ -31,7 +31,7 @@ CmdResult CommandMetadata::Handle(User* srcuser, Params& params)
 	if (params[0] == "*")
 	{
 		std::string value = params.size() < 3 ? "" : params[2];
-		FOREACH_MOD(OnDecodeMetaData, (NULL,params[1],value));
+		FOREACH_MOD(OnDecodeMetaData, (nullptr, params[1], value));
 		return CmdResult::SUCCESS;
 	}
 
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 4769d8a94..fe0857bd7 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -30,7 +30,7 @@
 void ModuleSpanningTree::OnPostCommand(Command* command, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop)
 {
 	if (result == CmdResult::SUCCESS)
-		Utils->RouteCommand(NULL, command, parameters, user);
+		Utils->RouteCommand(nullptr, command, parameters, user);
 }
 
 void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscmd, const CommandBase::Params& parameters, User* user)
@@ -105,7 +105,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 			std::string message;
 			if (parameters.size() >= 2)
 				message.assign(parameters[1]);
-			SendChannelMessage(user, c, message, pfx, parameters.GetTags(), exempts, command.c_str(), origin ? origin->GetSocket() : NULL);
+			SendChannelMessage(user, c, message, pfx, parameters.GetTags(), exempts, command.c_str(), origin ? origin->GetSocket() : nullptr);
 		}
 		else if (dest[0] == '$')
 		{
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index 6674b67b0..d8369089d 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -83,7 +83,7 @@ void SpanningTreeProtocolInterface::BroadcastEncap(const std::string& cmd, const
 
 	// If omit is non-NULL we pass the route belonging to the user to Forward(),
 	// otherwise we pass NULL, which is equivalent to Broadcast()
-	TreeServer* server = (omit ? TreeServer::Get(omit)->GetRoute() : NULL);
+	TreeServer* server = (omit ? TreeServer::Get(omit)->GetRoute() : nullptr);
 	CmdBuilder(source, "ENCAP * ").push_raw(cmd).insert(params).Forward(server);
 }
 
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index d8b0edc02..535299e72 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -101,7 +101,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
 	if (params.size() < 5)
 	{
 		SendError("Protocol error - Not enough parameters for SERVER command");
-		return NULL;
+		return nullptr;
 	}
 
 	const std::string& sname = params[0];
@@ -114,7 +114,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
 	if (!ServerInstance->IsSID(sid))
 	{
 		this->SendError("Invalid format server ID: "+sid+"!");
-		return NULL;
+		return nullptr;
 	}
 
 	for (std::shared_ptr<Link> x : Utils->LinkBlocks)
@@ -129,7 +129,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
 		}
 
 		if (!CheckDuplicate(sname, sid))
-			return NULL;
+			return nullptr;
 
 		const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(this);
 		if (ssliohook)
@@ -141,7 +141,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
 		else if (capab->remotesa.family() != AF_UNIX && !irc::sockets::cidr_mask("127.0.0.0/8").match(capab->remotesa) && !irc::sockets::cidr_mask("::1/128").match(capab->remotesa))
 		{
 			this->SendError("Non-local server connections MUST be linked with SSL!");
-			return NULL;
+			return nullptr;
 		}
 
 		ServerInstance->SNO.WriteToSnoMask('l', "Verified server connection " + linkID + " ("+description+")");
@@ -150,7 +150,7 @@ std::shared_ptr<Link> TreeSocket::AuthRemote(const CommandBase::Params& params)
 
 	this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. user mode +s +Ll)");
 	ServerInstance->SNO.WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, invalid link credentials");
-	return NULL;
+	return nullptr;
 }
 
 /*
diff --git a/src/modules/m_spanningtree/servercommand.cpp b/src/modules/m_spanningtree/servercommand.cpp
index b4ce6775c..68f21a4aa 100644
--- a/src/modules/m_spanningtree/servercommand.cpp
+++ b/src/modules/m_spanningtree/servercommand.cpp
@@ -52,7 +52,7 @@ ServerCommand* ServerCommandManager::GetHandler(const std::string& command) cons
 	ServerCommandMap::const_iterator it = commands.find(command);
 	if (it != commands.end())
 		return it->second;
-	return NULL;
+	return nullptr;
 }
 
 bool ServerCommandManager::AddCommand(ServerCommand* cmd)
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index c55021e64..dabf064e6 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -37,8 +37,8 @@
  */
 TreeServer::TreeServer()
 	: Server(ServerInstance->Config->GetSID(), ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc)
-	, Parent(NULL), Route(NULL)
-	, Socket(NULL)
+	, Parent(nullptr), Route(nullptr)
+	, Socket(nullptr)
 	, behind_bursting(0)
 	, pingtimer(this)
 	, ServerUser(ServerInstance->FakeClient)
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 27e96d50e..85e5de440 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -117,7 +117,7 @@ class TreeSocket final
 	std::unique_ptr<CapabData> capab;	/* Link setup data (held until burst is sent) */
 
 	/* The server we are talking to */
-	TreeServer* MyRoot = NULL;
+	TreeServer* MyRoot = nullptr;
 
 	/** Checks if the given servername and sid are both free
 	 */
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 0f6cb5d33..bb5633988 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -272,7 +272,7 @@ User* TreeSocket::FindSource(const std::string& prefix, const std::string& comma
 	}
 
 	// Unknown prefix
-	return NULL;
+	return nullptr;
 }
 
 void TreeSocket::ProcessTag(User* source, const std::string& tag, ClientProtocol::TagMap& tags)
@@ -337,7 +337,7 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
 
 	ServerCommand* scmd = Utils->Creator->CmdManager.GetHandler(command);
 	CommandBase* cmdbase = scmd;
-	Command* cmd = NULL;
+	Command* cmd = nullptr;
 	if (!scmd)
 	{
 		// Not a special server-to-server command
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 1205880b2..7cf345dfd 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -112,12 +112,12 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
 			 * yourself.
 			 */
 			Modes::Change modechange(mh, true, params[paramptr++]);
-			mh->OnModeChange(_new, _new, NULL, modechange);
+			mh->OnModeChange(_new, _new, nullptr, modechange);
 		}
 		else
 		{
 			Modes::Change modechange(mh, true, "");
-			mh->OnModeChange(_new, _new, NULL, modechange);
+			mh->OnModeChange(_new, _new, nullptr, modechange);
 		}
 		_new->SetMode(mh, true);
 	}
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 1d42af1ea..3afe0fddb 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -34,7 +34,7 @@
 #include "resolvers.h"
 #include "commandbuilder.h"
 
-SpanningTreeUtilities* Utils = NULL;
+SpanningTreeUtilities* Utils = nullptr;
 
 ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
@@ -67,7 +67,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 	}
 	else
 	{
-		return NULL;
+		return nullptr;
 	}
 }
 
@@ -81,7 +81,7 @@ TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName)
 		if (InspIRCd::Match(name, ServerName))
 			return server;
 	}
-	return NULL;
+	return nullptr;
 }
 
 TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
@@ -90,7 +90,7 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
 	if (iter != sidlist.end())
 		return iter->second;
 	else
-		return NULL;
+		return nullptr;
 }
 
 TreeServer* SpanningTreeUtilities::FindRouteTarget(const std::string& target)
@@ -103,7 +103,7 @@ TreeServer* SpanningTreeUtilities::FindRouteTarget(const std::string& target)
 	if (user)
 		return TreeServer::Get(user);
 
-	return NULL;
+	return nullptr;
 }
 
 SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
@@ -350,7 +350,7 @@ std::shared_ptr<Link> SpanningTreeUtilities::FindLink(const std::string& name)
 			return x;
 		}
 	}
-	return NULL;
+	return nullptr;
 }
 
 void SpanningTreeUtilities::SendChannelMessage(User* source, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit)
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index ef97cdc9a..074c1c993 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -172,7 +172,7 @@ public:
 
 	/** Sends a PRIVMSG or a NOTICE to a channel obeying an exempt list and an optional prefix
 	 */
-	void SendChannelMessage(User* source, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit = NULL);
+	void SendChannelMessage(User* source, Channel* target, const std::string& text, char status, const ClientProtocol::TagMap& tags, const CUList& exempt_list, const char* message_type, TreeSocket* omit = nullptr);
 
 	// Builds link data to be sent to another server.
 	std::string BuildLinkString(uint16_t protocol, Module* mod);