Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 877b9b441fa7da06769f17d79470ea53714bbeec..3890f82e6626c947e6aabe00a9370580c43c1576 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.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.
@@ -19,36 +19,35 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-       
+
        ConfigReader *Conf;
 
  public:
-       ModuleModesOnOper(InspIRCd* Me)
-               : Module(Me)
-       {
-               
-               Conf = new ConfigReader(ServerInstance);
+       ModuleModesOnOper()
+                       {
+
+               Conf = new ConfigReader;
                Implementation eventlist[] = { I_OnPostOper, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                delete Conf;
-               Conf = new ConfigReader(ServerInstance);
+               Conf = new ConfigReader;
        }
-       
+
        virtual ~ModuleModesOnOper()
        {
                delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR, API_VERSION);
        }
-       
+
        virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
        {
                // whenever a user opers, go through the oper types, find their <type:modes>,
@@ -99,25 +98,17 @@ class ModuleModesOnOper : public Module
                while (ss >> buf)
                        tokens.push_back(buf);
 
-               int size = tokens.size() + 1;
-               const char** modes = new const char*[size];
-               modes[0] = u->nick;
+               std::vector<std::string> modes;
+               modes.push_back(u->nick);
 
                // process mode params
-               int i = 1;
                for (unsigned int k = 0; k < tokens.size(); k++)
                {
-                       modes[i] = tokens[k].c_str();
-                       i++;
+                       modes.push_back(tokens[k]);
                }
 
-               std::deque<std::string> n;
-               for (unsigned int j = 1; j < tokens.size(); j++)
-                       n.push_back(modes[j]);
-
-               ServerInstance->PI->SendMode(u->uuid, n);
-               ServerInstance->SendMode(modes, size, u);
-               delete [] modes;
+               ServerInstance->SendMode(modes, u);
+               ServerInstance->PI->SendMode(u->uuid, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
        }
 };