Introduce ModeProcessFlags, can be passed to ModeParser::Process() to indicate local...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / nickcollide.cpp

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 38d59affb401e530fa5daddf722e25b595a22461..2acce9fdce548db607149e95df5251706fb2018e 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -19,13 +19,11 @@
 
 
 #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 */
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treesocket.h */
 
 
 /*
@@ -114,7 +112,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 +130,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)