X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=cd82bce67a0232cf2e77b383533372fcee69ab0f;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=f5d5ee46134f04d6d0aee5c0348ed942f788d574;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index f5d5ee461..cd82bce67 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,19 +17,20 @@
 
 /** Handle /SWHOIS
  */
-class cmd_swhois : public command_t
+class CommandSwhois : public Command
 {
 	
  public:
-	cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
+	CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
 	{
 		this->source = "m_swhois.so";
 		syntax = "<nick> <swhois>";
+		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* dest = ServerInstance->FindNick(parameters[0]);
+		User* dest = ServerInstance->FindNick(parameters[0]);
 		
 		if (!dest)
 		{
@@ -96,7 +97,7 @@ class cmd_swhois : public command_t
 
 class ModuleSWhois : public Module
 {
-	cmd_swhois* mycommand;
+	CommandSwhois* mycommand;
 	
 	ConfigReader* Conf;
 	
@@ -105,11 +106,11 @@ class ModuleSWhois : public Module
 	{
 		
 		Conf = new ConfigReader(ServerInstance);
-		mycommand = new cmd_swhois(ServerInstance);
+		mycommand = new CommandSwhois(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
 	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user, const std::string &parameter)
 	{
 		DELETE(Conf);
 		Conf = new ConfigReader(ServerInstance);
@@ -121,7 +122,7 @@ class ModuleSWhois : public Module
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-	int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+	int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
 	{
 		/* We use this and not OnWhois because this triggers for remote, too */
 		if (numeric == 312)
@@ -139,11 +140,11 @@ class ModuleSWhois : public Module
 	}
 
 	// Whenever the linking module wants to send out data, but doesnt know what the data
-	// represents (e.g. it is metadata, added to a userrec or chanrec by a module) then
+	// represents (e.g. it is metadata, added to a User or Channel by a module) then
 	// this method is called. We should use the ProtoSendMetaData function after we've
 	// corrected decided how the data should look, to send the metadata on its way if
 	// it is ours.
-	virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
 	{
 		// check if the linking module wants to know about OUR metadata
 		if (extname == "swhois")
@@ -161,7 +162,7 @@ class ModuleSWhois : public Module
 	}
 
 	// when a user quits, tidy up their metadata
-	virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
 	{
 		std::string* swhois;
 		user->GetExt("swhois", swhois);
@@ -177,7 +178,7 @@ class ModuleSWhois : public Module
 	{
 		if (target_type == TYPE_USER)
 		{
-			userrec* user = (userrec*)item;
+			User* user = (User*)item;
 			std::string* swhois;
 			user->GetExt("swhois", swhois);
 			if (swhois)
@@ -200,7 +201,7 @@ class ModuleSWhois : public Module
 		// check if its our metadata key, and its associated with a user
 		if ((target_type == TYPE_USER) && (extname == "swhois"))
 		{
-			userrec* dest = (userrec*)target;
+			User* dest = (User*)target;
 			// if they dont already have an swhois field, accept the remote server's
 			std::string* text;
 			if (!dest->GetExt("swhois", text))
@@ -211,7 +212,7 @@ class ModuleSWhois : public Module
 		}
 	}
 	
-	virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+	virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, User *user, CmdResult result, const std::string &original_line)
 	{
 		if ((command != "OPER") || (result != CMD_SUCCESS))
 			return;