X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=88148340598fbeb5bbaf080009eb07cae358ba1b;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=0d77ee7cdf5682fb1128ff57fb0d052ba34ac74f;hpb=364735e18b500f0a071fab4cc5c9e7bace1835fc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 0d77ee7cd..881483405 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,44 +2,35 @@
  *       | 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;
-
 /* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "inspircd.h"
 
 /** Handle /UNINVITE
  */	 
-class cmd_uninvite : public command_t
+class CommandUninvite : public Command
 {
  public:
-	cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2)
+	CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
 	{
 		this->source = "m_uninvite.so";
 		syntax = "<nick> <channel>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, User *user)
 	{
-		userrec* u = ServerInstance->FindNick(parameters[0]);
-		chanrec* c = ServerInstance->FindChan(parameters[1]);
+		User* u = ServerInstance->FindNick(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[1]);
 			 
 		if ((!c) || (!u))
 		{	
@@ -88,14 +79,14 @@ class cmd_uninvite : public command_t
 
 class ModuleUninvite : public Module
 {
-	cmd_uninvite *mycommand;
+	CommandUninvite *mycommand;
 
  public:
 
-	ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
+	ModuleUninvite(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_uninvite(ServerInstance);
+		mycommand = new CommandUninvite(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 	
@@ -105,31 +96,9 @@ class ModuleUninvite : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
+		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
+MODULE_INIT(ModuleUninvite)
 
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-	ModuleUninviteFactory()
-	{
-	}
-	
-	~ModuleUninviteFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUninvite(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUninviteFactory;
-}