X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=87b63ec26df79a06d4cfc6a69078d76fdbe4e58e;hb=dbf4d595433ecefeb61f1267ffa515a91c3ab548;hp=82bcd1ff0597288d12b32bf87b7cdcfe5794789c;hpb=a3f89e772514aca9aa4615ebe1656010111fc455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 82bcd1ff0..87b63ec26 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,33 +12,26 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 /** Because Andy insists that services-compatible servers must
  * implement SVSNICK and SVSJOIN, that's exactly what we do :p
  */
-bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::SVSNick(const std::string &prefix, parameterlist &params)
 {
 	if (params.size() < 3)
 		return true;
 
-	User* u = this->Instance->FindNick(params[0]);
+	User* u = ServerInstance->FindNick(params[0]);
 
 	if (u)
 	{
@@ -46,15 +39,15 @@ bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &p
 
 		if (IS_LOCAL(u))
 		{
-			std::deque<std::string> par;
+			parameterlist par;
 			par.push_back(params[1]);
 
 			if (!u->ForceNickChange(params[1].c_str()))
 			{
 				/* buh. UID them */
-				if (!u->ForceNickChange(u->uuid))
+				if (!u->ForceNickChange(u->uuid.c_str()))
 				{
-					User::QuitUser(this->Instance, u, "Nickname collision");
+					ServerInstance->Users->QuitUser(u, "Nickname collision");
 					return true;
 				}
 			}