Fix Windows build and a few more problems

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

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 9e0acdd12305e0a080a2244ca32b56058390bf77..9376a551406142e977d9a19e5dc2847029285ee9 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -150,9 +150,10 @@ void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lo
         * We're going backwards so we don't remove users
         * while we still need them ;)
         */
-       for (unsigned int q = 0; q < Current->ChildCount(); q++)
+       const TreeServer::ChildServers& children = Current->GetChildren();
+       for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
        {
-               TreeServer* recursive_server = Current->GetChild(q);
+               TreeServer* recursive_server = *i;
                this->SquitServer(from,recursive_server, num_lost_servers, num_lost_users);
        }
        /* Now we've whacked the kids, whack self */
@@ -206,7 +207,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
        }
 }
 
-CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandSQuit::HandleServer(TreeServer* server, std::vector<std::string>& params)
 {
        TreeServer* quitting = Utils->FindServer(params[0]);
        if (!quitting)
@@ -215,7 +216,7 @@ CmdResult CommandSQuit::Handle(User* user, std::vector<std::string>& params)
                return CMD_FAILURE;
        }
 
-       TreeSocket* sock = Utils->FindServer(user->server)->GetSocket();
+       TreeSocket* sock = server->GetSocket();
        sock->Squit(quitting, params[1]);
        return CMD_SUCCESS;
 }