Replace std::deque with std::vector in spanningtree and related modules

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

diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp
index 12c3583f9af0744b044c409d39f7d09ec4e79185..c1105aa71c7b19cd956f6196f789f7bdc847714f 100644 (file)
--- a/src/modules/m_spanningtree/opertype.cpp
+++ b/src/modules/m_spanningtree/opertype.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,40 +12,31 @@
  */
 
 #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 "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
+
+/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/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 */
 
 /** Because the core won't let users or even SERVERS set +o,
  * we use the OPERTYPE command to do this.
  */
-bool TreeSocket::OperType(const std::string &prefix, std::deque<std::string> &params)
+bool TreeSocket::OperType(const std::string &prefix, parameterlist &params)
 {
        if (params.size() != 1)
                return true;
        std::string opertype = params[0];
-       User* u = this->Instance->FindNick(prefix);
+       User* u = this->ServerInstance->FindNick(prefix);
        if (u)
        {
-               if (!u->IsModeSet('o'))
-                       this->Instance->Users->all_opers.push_back(u);
+               if (!IS_OPER(u))
+                       this->ServerInstance->Users->all_opers.push_back(u);
                u->modes[UM_OPERATOR] = 1;
-               strlcpy(u->oper,opertype.c_str(),NICKMAX-1);
-               Utils->DoOneToAllButSender(u->nick,"OPERTYPE",params,u->server);
+               u->oper.assign(opertype, 0, 512);
+               Utils->DoOneToAllButSender(u->uuid, "OPERTYPE", params, u->server);
 
                TreeServer* remoteserver = Utils->FindServer(u->server);
                bool dosend = true;
@@ -58,7 +49,7 @@ bool TreeSocket::OperType(const std::string &prefix, std::deque<std::string> &pa
                         */
                        if (
                                remoteserver->bursting ||
-                               this->Instance->SilentULine(this->Instance->FindServerNamePtr(u->server))
+                               this->ServerInstance->SilentULine(this->ServerInstance->FindServerNamePtr(u->server))
                           )
                        {
                                dosend = false;
@@ -66,7 +57,7 @@ bool TreeSocket::OperType(const std::string &prefix, std::deque<std::string> &pa
                }
 
                if (dosend)
-                       this->Instance->SNO->WriteToSnoMask('o',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server, u->nick,u->ident,u->host,irc::Spacify(opertype.c_str()));
+                       this->ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server, u->nick.c_str(),u->ident.c_str(), u->host.c_str(), irc::Spacify(opertype.c_str()));
        }
        return true;
 }