Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/m_spanningtree/svsjoin.cpp b/src/modules/m_spanningtree/svsjoin.cpp
index 38ba687ccb747b5588ae7c7f063a9648ed8fcdf9..dff882f622cc2198c7746ddd8bfc9be62c8a0609 100644 (file)
--- a/src/modules/m_spanningtree/svsjoin.cpp
+++ b/src/modules/m_spanningtree/svsjoin.cpp
@@ -12,32 +12,30 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.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/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-bool TreeSocket::ServiceJoin(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::ServiceJoin(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 2)
                return true;
 
-       User* u = this->ServerInstance->FindNick(params[0]);
+       User* u = ServerInstance->FindNick(params[0]);
 
        if (u)
        {
                /* only join if it's local, otherwise just pass it on! */
                if (IS_LOCAL(u))
-                       Channel::JoinUser(this->ServerInstance, u, params[1].c_str(), false, "", false, ServerInstance->Time());
+                       Channel::JoinUser(u, params[1].c_str(), false, "", false, ServerInstance->Time());
                Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix);
        }
        return true;