X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=efe50731d3b9b480ea11863aa5a13b22f447c550;hb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;hp=f7a072b6f3f80710a6088982d3a02c6251b113ed;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index f7a072b6f..efe50731d 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,27 +2,17 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 // Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for GLOBOPS and user mode +g */
@@ -47,6 +37,7 @@ class cmd_globops : public command_t
 		}
 		ServerInstance->SNO->WriteToSnoMask('g',line);
 
+		/* route it (ofc :p) */
 		return CMD_SUCCESS;
 	}
 };
@@ -56,7 +47,7 @@ class ModuleGlobops : public Module
 	cmd_globops* mycommand;
  public:
 	ModuleGlobops(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		mycommand = new cmd_globops(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
@@ -66,7 +57,6 @@ class ModuleGlobops : public Module
 	virtual ~ModuleGlobops()
 	{
 		ServerInstance->SNO->DisableSnomask('g');
-		DELETE(mycommand);
 	}
 	
 	virtual Version GetVersion()
@@ -79,27 +69,4 @@ class ModuleGlobops : public Module
 	}
 };
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)