m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index a94f7d9cfff12426472b6ac94ba58e8912fea88d..1a30b747949d9f1efd98415f26c54ebbafa8a4d8 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -86,7 +86,6 @@ class joinfloodsettings
                locked = true;
                unlocktime = ServerInstance->Time() + 60;
        }
-
 };
 
 /** Handles channel mode +j
@@ -190,11 +189,9 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-
        JoinFlood jf;
 
  public:
-
        ModuleJoinFlood()
                : jf(this)
        {
@@ -202,14 +199,13 @@ class ModuleJoinFlood : public Module
 
        void init()
        {
-               if (!ServerInstance->Modes->AddMode(&jf))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->Extensions.Register(&jf.ext);
+               ServerInstance->Modules->AddService(jf);
+               ServerInstance->Modules->AddService(jf.ext);
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
        {
                if (chan)
                {
@@ -244,10 +240,6 @@ class ModuleJoinFlood : public Module
                }
        }
 
-       ~ModuleJoinFlood()
-       {
-       }
-
        Version GetVersion()
        {
                return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);