In the grand tradition of huge fucking commits:

 - chanrec -> Channel
 - userrec -> User
Enjoy.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8204 e03df62e-2008-0410-955e-edbf42e46eb7

17 files changed, 45 insertions, 45 deletions

diff --git a/include/modes/cmode_b.h b/include/modes/cmode_b.h
index 417480777..c7d349541 100644
--- a/include/modes/cmode_b.h
+++ b/include/modes/cmode_b.h
@@ -24,13 +24,13 @@ class ModeChannelBan : public ModeHandler
 	BanItem b;
  public:
 	ModeChannelBan(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string& AddBan(userrec *user,std::string& dest,chanrec *chan,int status);
-	std::string& DelBan(userrec *user,std::string& dest,chanrec *chan,int status);
-	void DisplayList(userrec* user, chanrec* channel);
-	void DisplayEmptyList(userrec* user, chanrec* channel);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
-	void RemoveMode(userrec* user);
-	void RemoveMode(chanrec* channel);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string& AddBan(User *user,std::string& dest,Channel *chan,int status);
+	std::string& DelBan(User *user,std::string& dest,Channel *chan,int status);
+	void DisplayList(User* user, Channel* channel);
+	void DisplayEmptyList(User* user, Channel* channel);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
+	void RemoveMode(User* user);
+	void RemoveMode(Channel* channel);
 };
 
diff --git a/include/modes/cmode_h.h b/include/modes/cmode_h.h
index 77d1d57ae..cd524196e 100644
--- a/include/modes/cmode_h.h
+++ b/include/modes/cmode_h.h
@@ -23,12 +23,12 @@ class ModeChannelHalfOp : public ModeHandler
  private:
  public:
 	ModeChannelHalfOp(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string AddHalfOp(userrec *user,const char *dest,chanrec *chan,int status);
-	std::string DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string AddHalfOp(User *user,const char *dest,Channel *chan,int status);
+	std::string DelHalfOp(User *user,const char *dest,Channel *chan,int status);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	unsigned int GetPrefixRank();
-	void RemoveMode(chanrec* channel);
-	void RemoveMode(userrec* user);
+	void RemoveMode(Channel* channel);
+	void RemoveMode(User* user);
 };
 
diff --git a/include/modes/cmode_i.h b/include/modes/cmode_i.h
index fb177dc0f..560c7dc14 100644
--- a/include/modes/cmode_i.h
+++ b/include/modes/cmode_i.h
@@ -21,5 +21,5 @@ class ModeChannelInviteOnly : public ModeHandler
 {
  public:
 	ModeChannelInviteOnly(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/cmode_k.h b/include/modes/cmode_k.h
index 51e8ffcaa..c8a1fc20e 100644
--- a/include/modes/cmode_k.h
+++ b/include/modes/cmode_k.h
@@ -21,9 +21,9 @@ class ModeChannelKey : public ModeHandler
 {
  public:
 	ModeChannelKey(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel);
-	void RemoveMode(chanrec* channel);
-	void RemoveMode(userrec* user);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
+	void RemoveMode(Channel* channel);
+	void RemoveMode(User* user);
 };
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index 63b4a1ef1..06d53069a 100644
--- a/include/modes/cmode_l.h
+++ b/include/modes/cmode_l.h
@@ -21,7 +21,7 @@ class ModeChannelLimit : public ModeHandler
 {
  public:
 	ModeChannelLimit(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
-	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel);
 };
diff --git a/include/modes/cmode_m.h b/include/modes/cmode_m.h
index 52288de4c..eb3844fad 100644
--- a/include/modes/cmode_m.h
+++ b/include/modes/cmode_m.h
@@ -21,5 +21,5 @@ class ModeChannelModerated : public ModeHandler
 {
  public:
 	ModeChannelModerated(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/cmode_n.h b/include/modes/cmode_n.h
index 953e0d671..6e51cdd69 100644
--- a/include/modes/cmode_n.h
+++ b/include/modes/cmode_n.h
@@ -21,5 +21,5 @@ class ModeChannelNoExternal : public ModeHandler
 {
  public:
 	ModeChannelNoExternal(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/cmode_o.h b/include/modes/cmode_o.h
index c86fb4586..cc0b295db 100644
--- a/include/modes/cmode_o.h
+++ b/include/modes/cmode_o.h
@@ -23,12 +23,12 @@ class ModeChannelOp : public ModeHandler
  private:
  public:
 	ModeChannelOp(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string AddOp(userrec *user,const char *dest,chanrec *chan,int status);
-	std::string DelOp(userrec *user,const char *dest,chanrec *chan,int status);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string AddOp(User *user,const char *dest,Channel *chan,int status);
+	std::string DelOp(User *user,const char *dest,Channel *chan,int status);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	unsigned int GetPrefixRank();
-	void RemoveMode(chanrec* channel);
-	void RemoveMode(userrec* user);
+	void RemoveMode(Channel* channel);
+	void RemoveMode(User* user);
 };
 
diff --git a/include/modes/cmode_p.h b/include/modes/cmode_p.h
index ad3f3ae89..d2a67f975 100644
--- a/include/modes/cmode_p.h
+++ b/include/modes/cmode_p.h
@@ -21,5 +21,5 @@ class ModeChannelPrivate : public ModeHandler
 {
  public:
 	ModeChannelPrivate(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/cmode_s.h b/include/modes/cmode_s.h
index 0bc229c37..0a9f709d6 100644
--- a/include/modes/cmode_s.h
+++ b/include/modes/cmode_s.h
@@ -21,5 +21,5 @@ class ModeChannelSecret : public ModeHandler
 {
  public:
 	ModeChannelSecret(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/cmode_t.h b/include/modes/cmode_t.h
index 8a7517ee3..049cb60d3 100644
--- a/include/modes/cmode_t.h
+++ b/include/modes/cmode_t.h
@@ -21,5 +21,5 @@ class ModeChannelTopicOps : public ModeHandler
 {
  public:
 	ModeChannelTopicOps(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/cmode_v.h b/include/modes/cmode_v.h
index 75420a6d5..e6666311d 100644
--- a/include/modes/cmode_v.h
+++ b/include/modes/cmode_v.h
@@ -23,12 +23,12 @@ class ModeChannelVoice : public ModeHandler
  private:
  public:
 	ModeChannelVoice(InspIRCd* Instance);
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding);
-	std::string AddVoice(userrec *user,const char *dest,chanrec *chan,int status);
-	std::string DelVoice(userrec *user,const char *dest,chanrec *chan,int status);
-	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	std::string AddVoice(User *user,const char *dest,Channel *chan,int status);
+	std::string DelVoice(User *user,const char *dest,Channel *chan,int status);
+	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter);
 	unsigned int GetPrefixRank();
-	void RemoveMode(userrec* user);
-	void RemoveMode(chanrec* channel);
+	void RemoveMode(User* user);
+	void RemoveMode(Channel* channel);
 };
 
diff --git a/include/modes/umode_i.h b/include/modes/umode_i.h
index cc7d15102..e6a27d8c7 100644
--- a/include/modes/umode_i.h
+++ b/include/modes/umode_i.h
@@ -21,6 +21,6 @@ class ModeUserInvisible : public ModeHandler
 {
  public:
 	ModeUserInvisible(InspIRCd* Instance);
-	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);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_n.h b/include/modes/umode_n.h
index cd1275acc..d75b843c3 100644
--- a/include/modes/umode_n.h
+++ b/include/modes/umode_n.h
@@ -21,5 +21,5 @@ class ModeUserServerNoticeMask : public ModeHandler
 {
  public:
 	ModeUserServerNoticeMask(InspIRCd* Instance);
-	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);
 };
diff --git a/include/modes/umode_o.h b/include/modes/umode_o.h
index 7dfdb4128..57b3e8ac8 100644
--- a/include/modes/umode_o.h
+++ b/include/modes/umode_o.h
@@ -21,6 +21,6 @@ class ModeUserOperator : public ModeHandler
 {
  public:
 	ModeUserOperator(InspIRCd* Instance);
-	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);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_s.h b/include/modes/umode_s.h
index cda223eee..aa788b353 100644
--- a/include/modes/umode_s.h
+++ b/include/modes/umode_s.h
@@ -21,6 +21,6 @@ class ModeUserServerNotice : public ModeHandler
 {
  public:
 	ModeUserServerNotice(InspIRCd* Instance);
-	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);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_w.h b/include/modes/umode_w.h
index 271e959c4..d6f2c0ca7 100644
--- a/include/modes/umode_w.h
+++ b/include/modes/umode_w.h
@@ -21,6 +21,6 @@ class ModeUserWallops : public ModeHandler
 {
  public:
 	ModeUserWallops(InspIRCd* Instance);
-	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);
 	unsigned int GetCount();
 };