Change allocation of InspIRCd::Parser to be physically part of the object containing it

12 files changed, 12 insertions, 12 deletions

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index a7bf8ceee..77d86cb31 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -42,7 +42,7 @@ class ModuleAbbreviation : public Module
 		size_t clen = command.length() - 1;
 		std::string foundcommand, matchlist;
 		bool foundmatch = false;
-		const CommandParser::CommandMap& commands = ServerInstance->Parser->GetCommands();
+		const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
 		for (CommandParser::CommandMap::const_iterator n = commands.begin(); n != commands.end(); ++n)
 		{
 			if (!command.compare(0, clen, n->first, 0, clen))
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 764761099..2d4bdded3 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -344,7 +344,7 @@ class ModuleAlias : public Module
 		{
 			pars.push_back(token);
 		}
-		ServerInstance->Parser->CallHandler(command, pars, user);
+		ServerInstance->Parser.CallHandler(command, pars, user);
 	}
 
 	void Prioritize()
diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp
index 9bfa3971f..36238f846 100644
--- a/src/modules/m_ldapoper.cpp
+++ b/src/modules/m_ldapoper.cpp
@@ -41,7 +41,7 @@ class LDAPOperBase : public LDAPInterface
 		if (!user)
 			return;
 
-		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
+		Command* oper_command = ServerInstance->Parser.GetHandler("OPER");
 		if (!oper_command)
 			return;
 
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index d015d5ead..68f50bf6d 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -49,7 +49,7 @@ class ModuleOperLog : public Module
 
 		if ((user->IsOper()) && (user->HasPermission(command)))
 		{
-			Command* thiscommand = ServerInstance->Parser->GetHandler(command);
+			Command* thiscommand = ServerInstance->Parser.GetHandler(command);
 			if ((thiscommand) && (thiscommand->flags_needed == 'o'))
 			{
 				std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + irc::stringjoiner(parameters);
diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index 8cdd343b1..3050dba0b 100644
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -96,7 +96,7 @@ class ModulePassForward : public Module
 
 		tmp.clear();
 		FormatStr(tmp,forwardcmd, user);
-		ServerInstance->Parser->ProcessBuffer(tmp,user);
+		ServerInstance->Parser.ProcessBuffer(tmp,user);
 	}
 };
 
diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp
index c42877eef..132a22267 100644
--- a/src/modules/m_showfile.cpp
+++ b/src/modules/m_showfile.cpp
@@ -104,7 +104,7 @@ class ModuleShowFile : public Module
 		FileReader reader(file);
 
 		CommandShowFile* sfcmd;
-		Command* handler = ServerInstance->Parser->GetHandler(cmdname);
+		Command* handler = ServerInstance->Parser.GetHandler(cmdname);
 		if (handler)
 		{
 			// Command exists, check if it is ours
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 3a213c6e7..5e157420e 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -85,7 +85,7 @@ class CommandSVSSilence : public Command
 
 		if (IS_LOCAL(u))
 		{
-			ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u);
+			ServerInstance->Parser.CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u);
 		}
 
 		return CMD_SUCCESS;
diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 566f15da8..95f8f4e4a 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -28,7 +28,7 @@ CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
 	{
 		parameterlist plist(params.begin() + 2, params.end());
 		Command* cmd = NULL;
-		ServerInstance->Parser->CallHandler(params[1], plist, user, &cmd);
+		ServerInstance->Parser.CallHandler(params[1], plist, user, &cmd);
 		// Discard return value, ENCAP shall succeed even if the command does not exist
 
 		if ((cmd) && (cmd->force_manual_route))
diff --git a/src/modules/m_spanningtree/idle.cpp b/src/modules/m_spanningtree/idle.cpp
index 1b020701b..06af4d0fd 100644
--- a/src/modules/m_spanningtree/idle.cpp
+++ b/src/modules/m_spanningtree/idle.cpp
@@ -47,7 +47,7 @@ CmdResult CommandIdle::HandleRemote(RemoteUser* issuer, std::vector<std::string>
 
 	if (params.size() >= 2)
 	{
-		ServerInstance->Parser->CallHandler("WHOIS", params, issuer);
+		ServerInstance->Parser.CallHandler("WHOIS", params, issuer);
 	}
 	else
 	{
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 8d939d22a..882596b81 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -304,7 +304,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 	if (!scmd)
 	{
 		// Not a special server-to-server command
-		cmd = ServerInstance->Parser->GetHandler(command);
+		cmd = ServerInstance->Parser.GetHandler(command);
 		if (!cmd)
 		{
 			if (command == "ERROR")
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index fb5b65e56..3d5551eb0 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -61,7 +61,7 @@ class OpMeQuery : public SQLQuery
 		if (!user)
 			return;
 
-		Command* oper_command = ServerInstance->Parser->GetHandler("OPER");
+		Command* oper_command = ServerInstance->Parser.GetHandler("OPER");
 
 		if (oper_command)
 		{
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 57ca18a8f..94292e4be 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -119,7 +119,7 @@ class CommandSVSWatch : public Command
 
 		if (IS_LOCAL(u))
 		{
-			ServerInstance->Parser->CallHandler("WATCH", parameters, u);
+			ServerInstance->Parser.CallHandler("WATCH", parameters, u);
 		}
 
 		return CMD_SUCCESS;