Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 70e73cfad501e69ef045b4a93d435e62f71441fd..044907b69310838cd9c1f6d01b3364c991268e64 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -22,17 +22,17 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "message.h"
+
+#include "configreader.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
         
 class cmd_uninvite : public command_t
 {
  public:
-       cmd_uninvite () : command_t("UNINVITE", 0, 2)
+ cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2)
        {
                this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
@@ -82,7 +82,7 @@ class cmd_uninvite : public command_t
                u->RemoveInvite(xname);
                user->WriteServ("494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
                u->WriteServ("493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
-               c->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
+               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
        }
 };
 
@@ -92,11 +92,11 @@ class ModuleUninvite : public Module
 
  public:
 
-       ModuleUninvite(Server* Me) : Module::Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_uninvite();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_uninvite(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleUninvite()
@@ -122,7 +122,7 @@ class ModuleUninviteFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleUninvite(Me);
        }