X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=0f8922854cb451eed08318ae49c0e113a31700da;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=31b52e853fd18a65f0fb89bf6a86f75b2a1197e8;hpb=ec2106579c77a98dfdb209864a1e1b5ae1f07e7f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 31b52e853..0f8922854 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -11,10 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -33,7 +29,7 @@ class ModuleOverride : public Module
  public:
  
 	ModuleOverride(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{		
 		// read our config options (main config file)
 		OnRehash(NULL,"");
@@ -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" void * init_module( void )
-{
-	return new ModuleOverrideFactory;
-}
+MODULE_INIT(ModuleOverride)