Rename Simple{Channel,User}ModeHandler to match other mode handlers.

22 files changed, 44 insertions, 37 deletions

diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index 353c5347f..e79eb56f7 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -30,7 +30,7 @@ class ModuleAllowInvite : public Module
 {
  private:
 	ExtBan::Acting extban;
-	SimpleChannelModeHandler ni;
+	SimpleChannelMode ni;
 
  public:
 	ModuleAllowInvite()
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index cbaf5ddcc..dd9cb4ffb 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -28,10 +28,12 @@
 #include "modules/names.h"
 #include "modules/who.h"
 
-class AuditoriumMode : public SimpleChannelModeHandler
+class AuditoriumMode final
+	: public SimpleChannelMode
 {
  public:
-	AuditoriumMode(Module* Creator) : SimpleChannelModeHandler(Creator, "auditorium", 'u')
+	AuditoriumMode(Module* Creator)
+		: SimpleChannelMode(Creator, "auditorium", 'u')
 	{
 		ranktoset = ranktounset = OP_VALUE;
 	}
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index e0c705f9a..a38b8a004 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -36,7 +36,7 @@ class ModuleBlockColor : public Module
  private:
 	ExtBan::Acting extban;
 	CheckExemption::EventProvider exemptionprov;
-	SimpleChannelModeHandler bc;
+	SimpleChannelMode bc;
 
  public:
 	ModuleBlockColor()
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index b9362c6eb..ff4ecb6fa 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -38,11 +38,11 @@ enum
 class BotTag : public ClientProtocol::MessageTagProvider
 {
  private:
-	SimpleUserModeHandler& botmode;
+	SimpleUserMode& botmode;
 	CTCTags::CapReference ctctagcap;
 
  public:
-	BotTag(Module* mod, SimpleUserModeHandler& bm)
+	BotTag(Module* mod, SimpleUserMode& bm)
 		: ClientProtocol::MessageTagProvider(mod)
 		, botmode(bm)
 		, ctctagcap(mod)
@@ -69,7 +69,7 @@ class ModuleBotMode
 	, public Whois::EventListener
 {
  private:
-	SimpleUserModeHandler bm;
+	SimpleUserMode bm;
 	BotTag tag;
 	bool forcenotice;
 
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 591be8acb..9cf857460 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -357,7 +357,7 @@ class ModuleCallerID
  private:
 	CommandAccept cmd;
 	CallerIDAPIImpl api;
-	SimpleUserModeHandler myumode;
+	SimpleUserMode myumode;
 
 	// Configuration variables:
 	bool tracknick; // Allow ACCEPT entries to update with nick changes.
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 6645acd6e..68af1ad87 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -35,8 +35,8 @@ class ModuleCensor : public Module
  private:
 	CheckExemption::EventProvider exemptionprov;
 	CensorMap censors;
-	SimpleUserModeHandler cu;
-	SimpleChannelModeHandler cc;
+	SimpleUserMode cu;
+	SimpleChannelMode cc;
 
  public:
 	ModuleCensor()
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 427636e2c..d0c169f38 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -143,7 +143,7 @@ class ModuleChanHistory
 {
  private:
 	HistoryMode historymode;
-	SimpleUserModeHandler nohistorymode;
+	SimpleUserMode nohistorymode;
 	bool prefixmsg;
 	UserModeReference botmode;
 	bool dobots;
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index d9769d0ad..83976d71b 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -29,7 +29,7 @@ class ModuleCommonChans
 	, public CTCTags::EventListener
 {
  private:
-	SimpleUserModeHandler mode;
+	SimpleUserMode mode;
 
 	ModResult HandleMessage(User* user, const MessageTarget& target)
 	{
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index fe1a1ab96..64a543311 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -99,7 +99,7 @@ class ModuleHelpop
 {
  private:
 		CommandHelpop cmd;
-		SimpleUserModeHandler ho;
+		SimpleUserMode ho;
 
 	public:
 		ModuleHelpop()
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index a3a59206f..89495b65e 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -28,10 +28,14 @@
 
 /** Handles user mode +I
  */
-class HideChans : public SimpleUserModeHandler
+class HideChans final
+	: public SimpleUserMode
 {
  public:
-	HideChans(Module* Creator) : SimpleUserModeHandler(Creator, "hidechans", 'I') { }
+	HideChans(Module* Creator)
+		: SimpleUserMode(Creator, "hidechans", 'I')
+	{
+	}
 };
 
 class ModuleHideChans : public Module, public Whois::LineEventListener
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 928c045fa..95a5ac4e6 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -33,20 +33,20 @@
 
 /** Handles user mode +H
  */
-class HideOper : public SimpleUserModeHandler
+class HideOper final
+	: public SimpleUserMode
 {
  public:
 	size_t opercount = 0;
 
 	HideOper(Module* Creator)
-		: SimpleUserModeHandler(Creator, "hideoper", 'H')
+		: SimpleUserMode(Creator, "hideoper", 'H', true)
 	{
-		oper = true;
 	}
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) override
 	{
-		if (SimpleUserModeHandler::OnModeChange(source, dest, channel, change) == MODEACTION_DENY)
+		if (SimpleUserMode::OnModeChange(source, dest, channel, change) == MODEACTION_DENY)
 			return MODEACTION_DENY;
 
 		if (change.adding)
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 3c4d9e414..a4e8eacd3 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -56,13 +56,13 @@ enum KnockNotify : uint8_t
  */
 class CommandKnock : public Command
 {
-	SimpleChannelModeHandler& noknockmode;
+	SimpleChannelMode& noknockmode;
 	ChanModeReference inviteonlymode;
 
  public:
 	int notify;
 
-	CommandKnock(Module* Creator, SimpleChannelModeHandler& Noknockmode)
+	CommandKnock(Module* Creator, SimpleChannelMode& Noknockmode)
 		: Command(Creator,"KNOCK", 2, 2)
 		, noknockmode(Noknockmode)
 		, inviteonlymode(Creator, "inviteonly")
@@ -126,7 +126,7 @@ class CommandKnock : public Command
 
 class ModuleKnock : public Module
 {
-	SimpleChannelModeHandler kn;
+	SimpleChannelMode kn;
 	CommandKnock cmd;
 
  public:
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 177d70181..475c0e1ae 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -35,8 +35,8 @@ class ModuleNoCTCP : public Module
  private:
 	CheckExemption::EventProvider exemptionprov;
 	ExtBan::Acting extban;
-	SimpleChannelModeHandler nc;
-	SimpleUserModeHandler ncu;
+	SimpleChannelMode nc;
+	SimpleUserMode ncu;
 
  public:
 	ModuleNoCTCP()
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index de49eb9a5..36da2e166 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -32,7 +32,7 @@ class ModuleNoKicks : public Module
 {
  private:
 	ExtBan::Acting extban;
-	SimpleChannelModeHandler nk;
+	SimpleChannelMode nk;
 
  public:
 	ModuleNoKicks()
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e6dac07f0..bf16b7f14 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -34,7 +34,7 @@ class ModuleNoNickChange : public Module
  private:
 	CheckExemption::EventProvider exemptionprov;
 	ExtBan::Acting extban;
-	SimpleChannelModeHandler nn;
+	SimpleChannelMode nn;
 
  public:
 	ModuleNoNickChange()
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 5614deddd..b7364abfa 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -34,7 +34,7 @@ class ModuleNoNotice : public Module
  private:
 	ExtBan::Acting extban;
 	CheckExemption::EventProvider exemptionprov;
-	SimpleChannelModeHandler nt;
+	SimpleChannelMode nt;
 
  public:
 	ModuleNoNotice()
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 2b69b2f09..1f7aaee8e 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -64,7 +64,7 @@ class ModuleOperChans
 	: public Module
 {
  private:
-	SimpleChannelModeHandler oc;
+	SimpleChannelMode oc;
 	OperExtBan extban;
 
  public:
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index b0022b207..b6a67cafb 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -41,7 +41,7 @@ class ModuleOverride
  private:
 	bool RequireKey;
 	bool NoisyOverride;
-	SimpleUserModeHandler ou;
+	SimpleUserMode ou;
 	ChanModeReference topiclock;
 	ChanModeReference inviteonly;
 	ChanModeReference key;
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index ea295db03..485cff5e1 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -83,7 +83,7 @@ class ModuleRedirect : public Module
 {
  private:
 	Redirect re;
-	SimpleUserModeHandler antiredirectmode;
+	SimpleUserMode antiredirectmode;
 	ChanModeReference limitmode;
 
  public:
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 4f9f08c00..446fd61a3 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -190,9 +190,9 @@ class ModuleServicesAccount
  private:
 	CallerID::API calleridapi;
 	CheckExemption::EventProvider exemptionprov;
-	SimpleChannelModeHandler reginvitemode;
-	SimpleChannelModeHandler regmoderatedmode;
-	SimpleUserModeHandler regdeafmode;
+	SimpleChannelMode reginvitemode;
+	SimpleChannelMode regmoderatedmode;
+	SimpleUserMode regdeafmode;
 	Channel_r chanregmode;
 	User_r userregmode;
 	AccountExtItemImpl accountname;
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index f48f78954..ba68b9fa6 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -28,11 +28,12 @@
 
 /** Handle user mode +W
  */
-class SeeWhois : public SimpleUserModeHandler
+class SeeWhois final
+	: public SimpleUserMode
 {
  public:
 	SeeWhois(Module* Creator)
-		: SimpleUserModeHandler(Creator, "showwhois", 'W')
+		: SimpleUserMode(Creator, "showwhois", 'W')
 	{
 	}
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 80940240e..fe4c1b512 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -35,8 +35,8 @@ class ModuleStripColor : public Module
  private:
 	CheckExemption::EventProvider exemptionprov;
 	ExtBan::Acting extban;
-	SimpleChannelModeHandler csc;
-	SimpleUserModeHandler usc;
+	SimpleChannelMode csc;
+	SimpleUserMode usc;
 
  public:
 	ModuleStripColor()