Fix for bug #415, affects only trunk (wish i'd known this before i started!)

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

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e19cf76524c185131c5b2adb745d927a4b083766..0f8922854cb451eed08318ae49c0e113a31700da 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
@@ -90,7 +86,7 @@ class ModuleOverride : public Module
                output.append(" OVERRIDE");
        }
 
-       virtual bool CanOverride(userrec* source, char* token)
+       virtual bool CanOverride(userrec* source, const char* token)
        {
                // checks to see if the oper's type has <type:override>
                override_t::iterator j = overrides.find(source->oper);
@@ -291,27 +287,4 @@ class ModuleOverride : public Module
        }
 };
 
-
-class ModuleOverrideFactory : public ModuleFactory
-{
- public:
-       ModuleOverrideFactory()
-       {
-       }
-       
-       ~ModuleOverrideFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOverride(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleOverrideFactory;
-}
+MODULE_INIT(ModuleOverride)