Remove usage of deprecated CallCommandHandler() and IsValidModuleCommand()

4 files changed, 7 insertions, 7 deletions

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 0cc293fa5..dabfc086b 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -32,7 +32,7 @@ void TreeSocket::Encap(User* who, parameterlist &params)
 		if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
 		{
 			parameterlist plist(params.begin() + 2, params.end());
-			ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
+			ServerInstance->Parser->CallHandler(params[1], plist, who);
 			// discard return value, ENCAP shall succeed even if the command does not exist
 		}
 		
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index b08f60925..471bbfcb9 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -39,10 +39,10 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 
 void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user)
 {
-	if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user))
+	if (!ServerInstance->Parser->IsValidCommand(command, parameters.size(), user))
 		return;
 
-	/* We know it's non-null because IsValidModuleCommand returned true */
+	/* We know it's non-null because IsValidCommand returned true */
 	Command* thiscmd = ServerInstance->Parser->GetHandler(command);
 
 	RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 6b12a5aaf..472e79ca4 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -82,9 +82,9 @@ class CommandTban : public Command
 		setban.push_back(parameters[0]);
 		setban.push_back("+b");
 		setban.push_back(parameters[2]);
-		// use CallCommandHandler to make it so that the user sets the mode
+		// use CallHandler to make it so that the user sets the mode
 		// themselves
-		ServerInstance->CallCommandHandler("MODE",setban,user);
+		ServerInstance->Parser->CallHandler("MODE",setban,user);
 		for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
 			if (!strcasecmp(i->data.c_str(), mask.c_str()))
 				goto found;
diff --git a/src/users.cpp b/src/users.cpp
index aebc66bfc..0c6204adb 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -814,13 +814,13 @@ void LocalUser::FullConnect()
 	std::vector<std::string> parameters;
 	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler(command, parameters, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
 
 	MOD_RESULT = MOD_RES_PASSTHRU;
 	command = "LUSERS";
 	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler(command, parameters, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
 
 	if (ServerInstance->Config->RawLog)
 		WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());