X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnickcollide.cpp;h=3d29e402a7ffc0470edc53220d16334da7c5706a;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=38d59affb401e530fa5daddf722e25b595a22461;hpb=c8b41aa5d256d99eee67ec94492a94dc30e0ea35;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 38d59affb..3d29e402a 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -19,15 +19,10 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
 #include "treesocket.h"
-#include "treeserver.h"
 #include "utils.h"
 
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
-
 /*
  * Yes, this function looks a little ugly.
  * However, in some circumstances we may not have a User, so we need to do things this way.
@@ -114,7 +109,7 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 		params.push_back(ConvToStr(u->age));
 		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
 
-		u->ForceNickChange(u->uuid.c_str());
+		u->ForceNickChange(u->uuid);
 
 		if (!bChangeRemote)
 			return 1;
@@ -132,7 +127,7 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 		if (remote)
 		{
 			/* nick change collide. Force change their nick. */
-			remote->ForceNickChange(remoteuid.c_str());
+			remote->ForceNickChange(remoteuid);
 		}
 
 		if (!bChangeLocal)