From d7a0cd3db1e8b64a6f706f1831e645ad69aa7927 Mon Sep 17 00:00:00 2001 From: w00t Date: Wed, 9 Apr 2008 15:34:54 +0000 Subject: Move QuitUser into UserManager class, and unstaticize it. This prepares for some benchmarking lulz on object pooling I plan to do today, as well as making more sense now we *have* a manager class git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9442 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/kill.cpp | 2 +- src/modules/m_spanningtree/svsnick.cpp | 2 +- src/modules/m_spanningtree/treeserver.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/m_spanningtree') diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp index 5e7739c62..ca68867e6 100644 --- a/src/modules/m_spanningtree/kill.cpp +++ b/src/modules/m_spanningtree/kill.cpp @@ -43,7 +43,7 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque & // NOTE: This is safe with kill hiding on, as RemoteKill is only reached if we have a server prefix. // in short this is not executed for USERS. who->Write(":%s KILL %s :%s (%s)", prefix.c_str(), who->nick, prefix.c_str(), reason.c_str()); - User::QuitUser(this->Instance,who,reason); + this->Instance->Users->QuitUser(who, reason); } return true; } diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp index 82bcd1ff0..adf8f012e 100644 --- a/src/modules/m_spanningtree/svsnick.cpp +++ b/src/modules/m_spanningtree/svsnick.cpp @@ -54,7 +54,7 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque &p /* buh. UID them */ if (!u->ForceNickChange(u->uuid)) { - User::QuitUser(this->Instance, u, "Nickname collision"); + this->Instance->Users->QuitUser(u, "Nickname collision"); return true; } } diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index 43825cc74..0b21a462d 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -186,9 +186,9 @@ int TreeServer::QuitUsers(const std::string &reason) if (!IS_LOCAL(a)) { if (ServerInstance->Config->HideSplits) - User::QuitUser(ServerInstance, a, "*.net *.split", reason_s); + ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s); else - User::QuitUser(ServerInstance, a, reason_s); + ServerInstance->Users->QuitUser(a, reason_s); if (this->Utils->quiet_bursts) ServerInstance->GlobalCulls.MakeSilent(a); -- cgit v1.2.3