8 files changed, 9 insertions, 16 deletions
diff --git a/include/modes/cmode_i.h b/include/modes/cmode_i.h
index 5c83afb18..a59131ac5 100644
--- a/include/modes/cmode_i.h
+++ b/include/modes/cmode_i.h
@@ -17,9 +17,9 @@ class InspIRCd;
 
 /** Channel mode +i
  */
-class ModeChannelInviteOnly : public ModeHandler
+class ModeChannelInviteOnly : public SimpleChannelModeHandler
 {
  public:
 	ModeChannelInviteOnly(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 };
+
diff --git a/include/modes/cmode_m.h b/include/modes/cmode_m.h
index 69ec34703..6623014de 100644
--- a/include/modes/cmode_m.h
+++ b/include/modes/cmode_m.h
@@ -17,9 +17,8 @@ class InspIRCd;
 
 /** Channel mode +m
  */
-class ModeChannelModerated : public ModeHandler
+class ModeChannelModerated : public SimpleChannelModeHandler
 {
  public:
 	ModeChannelModerated(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 };
diff --git a/include/modes/cmode_n.h b/include/modes/cmode_n.h
index ccc967ed2..b623904f7 100644
--- a/include/modes/cmode_n.h
+++ b/include/modes/cmode_n.h
@@ -17,9 +17,8 @@ class InspIRCd;
 
 /** Channel mode +n
  */
-class ModeChannelNoExternal : public ModeHandler
+class ModeChannelNoExternal : public SimpleChannelModeHandler
 {
  public:
 	ModeChannelNoExternal(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 };
diff --git a/include/modes/cmode_p.h b/include/modes/cmode_p.h
index ac564d734..833ad6ef2 100644
--- a/include/modes/cmode_p.h
+++ b/include/modes/cmode_p.h
@@ -17,9 +17,8 @@ class InspIRCd;
 
 /** Channel mode +p
  */
-class ModeChannelPrivate : public ModeHandler
+class ModeChannelPrivate : public SimpleChannelModeHandler
 {
  public:
 	ModeChannelPrivate(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 };
diff --git a/include/modes/cmode_s.h b/include/modes/cmode_s.h
index a6b2054c5..530394c99 100644
--- a/include/modes/cmode_s.h
+++ b/include/modes/cmode_s.h
@@ -17,9 +17,8 @@ class InspIRCd;
 
 /** Channel mode +s
  */
-class ModeChannelSecret : public ModeHandler
+class ModeChannelSecret : public SimpleChannelModeHandler
 {
  public:
 	ModeChannelSecret(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 };
diff --git a/include/modes/umode_i.h b/include/modes/umode_i.h
index 83223b8fd..8a998973b 100644
--- a/include/modes/umode_i.h
+++ b/include/modes/umode_i.h
@@ -17,10 +17,9 @@ class InspIRCd;
 
 /** User mode +i
  */
-class ModeUserInvisible : public ModeHandler
+class ModeUserInvisible : public SimpleUserModeHandler
 {
  public:
 	ModeUserInvisible(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_s.h b/include/modes/umode_s.h
index 047defd87..4747b15d0 100644
--- a/include/modes/umode_s.h
+++ b/include/modes/umode_s.h
@@ -17,10 +17,9 @@ class InspIRCd;
 
 /** User mode +s
  */
-class ModeUserServerNotice : public ModeHandler
+class ModeUserServerNotice : public SimpleUserModeHandler
 {
  public:
 	ModeUserServerNotice(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 	unsigned int GetCount();
 };
diff --git a/include/modes/umode_w.h b/include/modes/umode_w.h
index ac9adbc35..a45c64ef0 100644
--- a/include/modes/umode_w.h
+++ b/include/modes/umode_w.h
@@ -17,10 +17,9 @@ class InspIRCd;
 
 /** User mode +w
  */
-class ModeUserWallops : public ModeHandler
+class ModeUserWallops : public SimpleUserModeHandler
 {
  public:
 	ModeUserWallops(InspIRCd* Instance);
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode);
 	unsigned int GetCount();
 };