9 files changed, 10 insertions, 10 deletions
diff --git a/include/modes/cmode_b.h b/include/modes/cmode_b.h
index db4a13508..3e4683840 100644
--- a/include/modes/cmode_b.h
+++ b/include/modes/cmode_b.h
@@ -24,8 +24,8 @@ class ModeChannelBan : public ModeHandler
 	BanItem b;
  public:
 	ModeChannelBan(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
-	std::string& AddBan(User *user,std::string& dest,Channel *chan,int status, bool servermode);
+	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);
diff --git a/include/modes/cmode_h.h b/include/modes/cmode_h.h
index 0873c20e6..cd6d260f4 100644
--- a/include/modes/cmode_h.h
+++ b/include/modes/cmode_h.h
@@ -23,7 +23,7 @@ class ModeChannelHalfOp : public ModeHandler
  private:
  public:
 	ModeChannelHalfOp(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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);
diff --git a/include/modes/cmode_k.h b/include/modes/cmode_k.h
index 671143be6..a84adff5f 100644
--- a/include/modes/cmode_k.h
+++ b/include/modes/cmode_k.h
@@ -21,7 +21,7 @@ class ModeChannelKey : public ModeHandler
 {
  public:
 	ModeChannelKey(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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);
 	void RemoveMode(Channel* channel, irc::modestacker* stack = NULL);
 	void RemoveMode(User* user, irc::modestacker* stack = NULL);
diff --git a/include/modes/cmode_l.h b/include/modes/cmode_l.h
index eba711095..a2f1030a2 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(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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(std::string &their_param, const std::string &our_param, Channel* channel);
 };
diff --git a/include/modes/cmode_o.h b/include/modes/cmode_o.h
index 9063d2e3c..f0b3154e2 100644
--- a/include/modes/cmode_o.h
+++ b/include/modes/cmode_o.h
@@ -23,7 +23,7 @@ class ModeChannelOp : public ModeHandler
  private:
  public:
 	ModeChannelOp(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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);
diff --git a/include/modes/cmode_t.h b/include/modes/cmode_t.h
index 55226b6da..b7f87e614 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(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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 61fc55823..06a6ce5a5 100644
--- a/include/modes/cmode_v.h
+++ b/include/modes/cmode_v.h
@@ -23,7 +23,7 @@ class ModeChannelVoice : public ModeHandler
  private:
  public:
 	ModeChannelVoice(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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);
diff --git a/include/modes/umode_o.h b/include/modes/umode_o.h
index c297bc035..9a3439ba7 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(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	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 39e74489e..ac85050f8 100644
--- a/include/modes/umode_s.h
+++ b/include/modes/umode_s.h
@@ -21,7 +21,7 @@ class ModeUserServerNoticeMask : public ModeHandler
 {
  public:
 	ModeUserServerNoticeMask(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
 	void OnParameterMissing(User* user, User* dest, Channel* channel);
 	std::string GetUserParameter(User* user);
 };