X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_kicknorejoin.cpp;h=02f452cbae2dcef5ec8c0cd81dca07056f8a654a;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=bdb988ad245c2fc1e8bfa22f19fd6259a5aa4a22;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index bdb988ad2..02f452cba 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <sstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
@@ -27,7 +23,7 @@ inline int strtoint(const std::string &str)
 	return result;
 }
 
-typedef std::map<userrec*, time_t> delaylist;
+typedef std::map<User*, time_t> delaylist;
 
 /** Handles channel mode +J
  */
@@ -36,7 +32,7 @@ class KickRejoin : public ModeHandler
  public:
 	KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
 		if (channel->IsModeSet('J'))
 			return std::make_pair(true, channel->GetModeParameter('J'));
@@ -44,13 +40,13 @@ class KickRejoin : public ModeHandler
 			return std::make_pair(false, parameter);
 	} 
 
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
 	{
 		/* When TS is equal, the alphabetically later one wins */
 		return (their_param < our_param);
 	}
 	
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (!adding)
 		{
@@ -128,18 +124,18 @@ public:
 	{
 		
 		kr = new KickRejoin(ServerInstance);
-		if (!ServerInstance->AddMode(kr, 'J'))
+		if (!ServerInstance->AddMode(kr))
 			throw ModuleException("Could not add new modes!");
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
 		if (chan)
 		{
 			delaylist* dl;
 			if (chan->GetExt("norejoinusers", dl))
 			{
-				std::vector<userrec*> itemstoremove;
+				std::vector<User*> itemstoremove;
 			
 				for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
 				{
@@ -172,7 +168,7 @@ public:
 		return 0;
 	}
 		
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+	virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
 	{
 		if (chan->IsModeSet('J') && (source != user))
 		{
@@ -186,7 +182,7 @@ public:
 		}
 	}
 	
-	virtual void OnChannelDelete(chanrec* chan)
+	virtual void OnChannelDelete(Channel* chan)
 	{
 		delaylist* dl;
 			
@@ -200,7 +196,7 @@ public:
 	virtual void OnCleanup(int target_type, void* item)
 	{
 		if(target_type == TYPE_CHANNEL)
-			OnChannelDelete((chanrec*)item);
+			OnChannelDelete((Channel*)item);
 	}
 
 	virtual void Implements(char* List)