m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 535f6ec103e598e77feb44a7a053fde194a744eb..48d8cc8710b47529d18e304d14b56da06e0dc450 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,23 +21,22 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
 
 /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
- public:
        GenericCap cap;
+ public:
        ModuleNamesX() : cap(this, "multi-prefix")
        {
-               Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-
-       ~ModuleNamesX()
+       void init()
        {
+               Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        Version GetVersion()
@@ -45,9 +44,9 @@ class ModuleNamesX : public Module
                return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               output.append(" NAMESX");
+               tokens["NAMESX"];
        }
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
@@ -105,7 +104,7 @@ class ModuleNamesX : public Module
 
                // Try to find this channel
                std::string channame = line.substr(a, b-a);
-               Channel* chan = ServerInstance->FindChan(channame.c_str());
+               Channel* chan = ServerInstance->FindChan(channame);
                if (!chan)
                        return;