Replace anope_{final,override} with their C++11 equivalent.

7 files changed, 110 insertions, 110 deletions

diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp
index 6aa75919c..b379293c8 100644
--- a/modules/pseudoclients/botserv.cpp
+++ b/modules/pseudoclients/botserv.cpp
@@ -22,13 +22,13 @@ class BotServCore : public Module
 	{
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &bsnick = conf->GetModule(this)->Get<const Anope::string>("client");
 		BotServ = BotInfo::Find(bsnick, true);
 	}
 
-	void OnSetCorrectModes(User *user, Channel *chan, AccessGroup &access, bool &give_modes, bool &take_modes) anope_override
+	void OnSetCorrectModes(User *user, Channel *chan, AccessGroup &access, bool &give_modes, bool &take_modes) override
 	{
 		/* Do not allow removing bot modes on our service bots */
 		if (chan->ci && chan->ci->bi == user)
@@ -39,7 +39,7 @@ class BotServCore : public Module
 		}
 	}
 
-	void OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) anope_override
+	void OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) override
 	{
 		if (ci->c && ci->c->users.size() >= Config->GetModule(this)->Get<unsigned>("minusers"))
 		{
@@ -48,7 +48,7 @@ class BotServCore : public Module
 		}
 	}
 
-	void OnJoinChannel(User *user, Channel *c) anope_override
+	void OnJoinChannel(User *user, Channel *c) override
 	{
 		if (!Config || !IRCD)
 			return;
@@ -103,7 +103,7 @@ class BotServCore : public Module
 		}
 	}
 
-	void OnLeaveChannel(User *u, Channel *c) anope_override
+	void OnLeaveChannel(User *u, Channel *c) override
 	{
 		/* Channel is persistent, it shouldn't be deleted and the service bot should stay */
 		if (c->ci && persist && persist->HasExt(c->ci))
@@ -124,7 +124,7 @@ class BotServCore : public Module
 			c->ci->bi->Part(c->ci->c);
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty())
 			return EVENT_CONTINUE;
@@ -159,7 +159,7 @@ class BotServCore : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *BotServ)
 			return;
@@ -174,7 +174,7 @@ class BotServCore : public Module
 				"one of the following characters: %s"), fantasycharacters.c_str());
 	}
 
-	EventReturn OnChannelModeSet(Channel *c, MessageSource &source, ChannelMode *mode, const Anope::string &param) anope_override
+	EventReturn OnChannelModeSet(Channel *c, MessageSource &source, ChannelMode *mode, const Anope::string &param) override
 	{
 		if (source.GetUser() && !source.GetBot() && Config->GetModule(this)->Get<bool>("smartjoin") && mode->name == "BAN" && c->ci && c->ci->bi && c->FindUser(c->ci->bi))
 		{
@@ -188,7 +188,7 @@ class BotServCore : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnCreateChan(ChannelInfo *ci) anope_override
+	void OnCreateChan(ChannelInfo *ci) override
 	{
 		/* Set default bot flags */
 		spacesepstream sep(Config->GetModule(this)->Get<const Anope::string>("defaults", "greet fantasy"));
@@ -196,7 +196,7 @@ class BotServCore : public Module
 			ci->Extend<bool>("BS_" + token.upper());
 	}
 
-	void OnUserKicked(const MessageSource &source, User *target, const Anope::string &channel, ChannelStatus &status, const Anope::string &kickmsg) anope_override
+	void OnUserKicked(const MessageSource &source, User *target, const Anope::string &channel, ChannelStatus &status, const Anope::string &kickmsg) override
 	{
 		BotInfo *bi = BotInfo::Find(target->GetUID());
 		if (bi)
@@ -204,7 +204,7 @@ class BotServCore : public Module
 			bi->Join(channel, &status);
 	}
 
-	void OnCreateBot(BotInfo *bi) anope_override
+	void OnCreateBot(BotInfo *bi) override
 	{
 		if (bi->botmodes.empty())
 			bi->botmodes = Config->GetModule(this)->Get<const Anope::string>("botumodes");
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index 36f28d924..a98c5bd40 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -33,7 +33,7 @@ class ChanServCore : public Module, public ChanServService
 	{
 	}
 
-	void Hold(Channel *c) anope_override
+	void Hold(Channel *c) override
 	{
 		/** A timer used to keep the BotServ bot/ChanServ in the channel
 		 * after kicking the last user in a channel
@@ -68,7 +68,7 @@ class ChanServCore : public Module, public ChanServService
 			/** Called when the delay is up
 			 * @param The current time
 			 */
-			void Tick(time_t) anope_override
+			void Tick(time_t) override
 			{
 				if (!c)
 					return;
@@ -96,7 +96,7 @@ class ChanServCore : public Module, public ChanServService
 		new ChanServTimer(ChanServ, inhabit, this->owner, c);
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &channick = conf->GetModule(this)->Get<const Anope::string>("client");
 
@@ -123,13 +123,13 @@ class ChanServCore : public Module, public ChanServService
 		always_lower = conf->GetModule(this)->Get<bool>("always_lower_ts");
 	}
 
-	void OnBotDelete(BotInfo *bi) anope_override
+	void OnBotDelete(BotInfo *bi) override
 	{
 		if (bi == ChanServ)
 			ChanServ = NULL;
 	}
 
-	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override
+	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) override
 	{
 		if (bi == ChanServ && Config->GetModule(this)->Get<bool>("opersonly") && !u->HasMode("OPER"))
 		{
@@ -140,7 +140,7 @@ class ChanServCore : public Module, public ChanServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnDelCore(NickCore *nc) anope_override
+	void OnDelCore(NickCore *nc) override
 	{
 		std::deque<ChannelInfo *> chans;
 		nc->GetChannelReferences(chans);
@@ -213,7 +213,7 @@ class ChanServCore : public Module, public ChanServService
 		}
 	}
 
-	void OnDelChan(ChannelInfo *ci) anope_override
+	void OnDelChan(ChannelInfo *ci) override
 	{
 		/* remove access entries that are this channel */
 
@@ -248,7 +248,7 @@ class ChanServCore : public Module, public ChanServService
 		}
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *ChanServ)
 			return EVENT_CONTINUE;
@@ -263,7 +263,7 @@ class ChanServCore : public Module, public ChanServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *ChanServ)
 			return;
@@ -280,7 +280,7 @@ class ChanServCore : public Module, public ChanServService
 				"lists and settings for any channel."));
 	}
 
-	void OnCheckModes(Reference<Channel> &c) anope_override
+	void OnCheckModes(Reference<Channel> &c) override
 	{
 		if (!c)
 			return;
@@ -300,14 +300,14 @@ class ChanServCore : public Module, public ChanServService
 		}
 	}
 
-	void OnCreateChan(ChannelInfo *ci) anope_override
+	void OnCreateChan(ChannelInfo *ci) override
 	{
 		/* Set default chan flags */
 		for (unsigned i = 0; i < defaults.size(); ++i)
 			ci->Extend<bool>(defaults[i].upper());
 	}
 
-	EventReturn OnCanSet(User *u, const ChannelMode *cm) anope_override
+	EventReturn OnCanSet(User *u, const ChannelMode *cm) override
 	{
 		if (Config->GetModule(this)->Get<const Anope::string>("nomlock").find(cm->mchar) != Anope::string::npos
 			|| Config->GetModule(this)->Get<const Anope::string>("require").find(cm->mchar) != Anope::string::npos)
@@ -315,7 +315,7 @@ class ChanServCore : public Module, public ChanServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnChannelSync(Channel *c) anope_override
+	void OnChannelSync(Channel *c) override
 	{
 		bool perm = c->HasMode("PERM") || (c->ci && persist && persist->HasExt(c->ci));
 		if (!perm && !c->botchannel && (c->users.empty() || (c->users.size() == 1 && c->users.begin()->second->user->server == Me)))
@@ -324,13 +324,13 @@ class ChanServCore : public Module, public ChanServService
 		}
 	}
 
-	void OnLog(Log *l) anope_override
+	void OnLog(Log *l) override
 	{
 		if (l->type == LOG_CHANNEL)
 			l->bi = ChanServ;
 	}
 
-	void OnExpireTick() anope_override
+	void OnExpireTick() override
 	{
 		time_t chanserv_expire = Config->GetModule(this)->Get<time_t>("expire", "30d");
 
@@ -368,7 +368,7 @@ class ChanServCore : public Module, public ChanServService
 		}
 	}
 
-	EventReturn OnCheckDelete(Channel *c) anope_override
+	EventReturn OnCheckDelete(Channel *c) override
 	{
 		/* Do not delete this channel if ChanServ/a BotServ bot is inhabiting it */
 		if (inhabit.HasExt(c))
@@ -377,7 +377,7 @@ class ChanServCore : public Module, public ChanServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnPostInit() anope_override
+	void OnPostInit() override
 	{
 		if (!persist)
 			return;
@@ -413,7 +413,7 @@ class ChanServCore : public Module, public ChanServService
 
 	}
 
-	void OnChanRegistered(ChannelInfo *ci) anope_override
+	void OnChanRegistered(ChannelInfo *ci) override
 	{
 		if (!persist || !ci->c)
 			return;
@@ -425,7 +425,7 @@ class ChanServCore : public Module, public ChanServService
 			ci->c->SetMode(NULL, "PERM");
 	}
 
-	void OnJoinChannel(User *u, Channel *c) anope_override
+	void OnJoinChannel(User *u, Channel *c) override
 	{
 		if (always_lower && c->ci && c->creation_time > c->ci->time_registered)
 		{
@@ -436,7 +436,7 @@ class ChanServCore : public Module, public ChanServService
 		}
 	}
 
-	EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, ChannelMode *mode, const Anope::string &param) anope_override
+	EventReturn OnChannelModeSet(Channel *c, MessageSource &setter, ChannelMode *mode, const Anope::string &param) override
 	{
 		if (!always_lower && Anope::CurTime == c->creation_time && c->ci && setter.GetUser() && !setter.GetUser()->server->IsULined())
 		{
@@ -455,7 +455,7 @@ class ChanServCore : public Module, public ChanServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool show_all) anope_override
+	void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool show_all) override
 	{
 		if (!show_all)
 			return;
@@ -465,7 +465,7 @@ class ChanServCore : public Module, public ChanServService
 			info[_("Expires")] = Anope::strftime(ci->last_used + chanserv_expire, source.GetAccount());
 	}
 
-	void OnSetCorrectModes(User *user, Channel *chan, AccessGroup &access, bool &give_modes, bool &take_modes) anope_override
+	void OnSetCorrectModes(User *user, Channel *chan, AccessGroup &access, bool &give_modes, bool &take_modes) override
 	{
 		if (always_lower)
 			// Since we always lower the TS, the other side will remove the modes if the channel ts lowers, so we don't
diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index d07a541e9..9285f3845 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -29,12 +29,12 @@ class GlobalCore : public Module, public GlobalService
 	{
 	}
 
-	Reference<BotInfo> GetDefaultSender() anope_override
+	Reference<BotInfo> GetDefaultSender() override
 	{
 		return Global;
 	}
 
-	void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) anope_override
+	void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) override
 	{
 		if (Me->GetLinks().empty())
 			return;
@@ -53,7 +53,7 @@ class GlobalCore : public Module, public GlobalService
 		this->ServerGlobal(sender, Servers::GetUplink(), rmessage);
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &glnick = conf->GetModule(this)->Get<const Anope::string>("client");
 
@@ -67,28 +67,28 @@ class GlobalCore : public Module, public GlobalService
 		Global = bi;
 	}
 
-	void OnRestart() anope_override
+	void OnRestart() override
 	{
 		const Anope::string &gl = Config->GetModule(this)->Get<const Anope::string>("globaloncycledown");
 		if (!gl.empty())
 			this->SendGlobal(Global, "", gl);
 	}
 
-	void OnShutdown() anope_override
+	void OnShutdown() override
 	{
 		const Anope::string &gl = Config->GetModule(this)->Get<const Anope::string>("globaloncycledown");
 		if (!gl.empty())
 			this->SendGlobal(Global, "", gl);
 	}
 
-	void OnNewServer(Server *s) anope_override
+	void OnNewServer(Server *s) override
 	{
 		const Anope::string &gl = Config->GetModule(this)->Get<const Anope::string>("globaloncycleup");
 		if (!gl.empty() && !Me->IsSynced())
 			s->Notice(Global, gl);
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *Global)
 			return EVENT_CONTINUE;
diff --git a/modules/pseudoclients/hostserv.cpp b/modules/pseudoclients/hostserv.cpp
index d0140b9a2..6c510ecfc 100644
--- a/modules/pseudoclients/hostserv.cpp
+++ b/modules/pseudoclients/hostserv.cpp
@@ -21,7 +21,7 @@ class HostServCore : public Module
 			throw ModuleException("Your IRCd does not support vhosts");
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &hsnick = conf->GetModule(this)->Get<const Anope::string>("client");
 
@@ -35,7 +35,7 @@ class HostServCore : public Module
 		HostServ = bi;
 	}
 
-	void OnUserLogin(User *u) anope_override
+	void OnUserLogin(User *u) override
 	{
 		if (!IRCD->CanSetVHost)
 			return;
@@ -66,7 +66,7 @@ class HostServCore : public Module
 		}
 	}
 
-	void OnNickDrop(CommandSource &source, NickAlias *na) anope_override
+	void OnNickDrop(CommandSource &source, NickAlias *na) override
 	{
 		if (na->HasVhost())
 		{
@@ -75,12 +75,12 @@ class HostServCore : public Module
 		}
 	}
 
-	void OnNickUpdate(User *u) anope_override
+	void OnNickUpdate(User *u) override
 	{
 		this->OnUserLogin(u);
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *HostServ)
 			return EVENT_CONTINUE;
@@ -88,7 +88,7 @@ class HostServCore : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnSetVhost(NickAlias *na) anope_override
+	void OnSetVhost(NickAlias *na) override
 	{
 		if (Config->GetModule(this)->Get<bool>("activate_on_set"))
 		{
@@ -115,7 +115,7 @@ class HostServCore : public Module
 		}
 	}
 
-	void OnDeleteVhost(NickAlias *na) anope_override
+	void OnDeleteVhost(NickAlias *na) override
 	{
 		if (Config->GetModule(this)->Get<bool>("activate_on_set"))
 		{
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index d4d00df64..f04681fd5 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -41,7 +41,7 @@ class MemoServCore : public Module, public MemoServService
 	{
 	}
 
-	MemoResult Send(const Anope::string &source, const Anope::string &target, const Anope::string &message, bool force) anope_override
+	MemoResult Send(const Anope::string &source, const Anope::string &target, const Anope::string &message, bool force) override
 	{
 		bool ischan;
 		MemoInfo *mi = MemoInfo::GetMemoInfo(target, ischan);
@@ -129,7 +129,7 @@ class MemoServCore : public Module, public MemoServService
 		return MEMO_SUCCESS;
 	}
 
-	void Check(User *u) anope_override
+	void Check(User *u) override
 	{
 		const NickCore *nc = u->Account();
 		if (!nc)
@@ -150,7 +150,7 @@ class MemoServCore : public Module, public MemoServService
 		}
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &msnick = conf->GetModule(this)->Get<const Anope::string>("client");
 
@@ -164,28 +164,28 @@ class MemoServCore : public Module, public MemoServService
 		MemoServ = bi;
 	}
 
-	void OnNickCoreCreate(NickCore *nc) anope_override
+	void OnNickCoreCreate(NickCore *nc) override
 	{
 		nc->memos.memomax = Config->GetModule(this)->Get<int>("maxmemos");
 	}
 
-	void OnCreateChan(ChannelInfo *ci) anope_override
+	void OnCreateChan(ChannelInfo *ci) override
 	{
 		ci->memos.memomax = Config->GetModule(this)->Get<int>("maxmemos");
 	}
 
-	void OnBotDelete(BotInfo *bi) anope_override
+	void OnBotDelete(BotInfo *bi) override
 	{
 		if (bi == MemoServ)
 			MemoServ = NULL;
 	}
 
-	void OnNickIdentify(User *u) anope_override
+	void OnNickIdentify(User *u) override
 	{
 		this->Check(u);
 	}
 
-	void OnJoinChannel(User *u, Channel *c) anope_override
+	void OnJoinChannel(User *u, Channel *c) override
 	{
 		if (c->ci && !c->ci->memos.memos->empty() && c->ci->AccessFor(u).HasPriv("MEMO"))
 		{
@@ -196,18 +196,18 @@ class MemoServCore : public Module, public MemoServService
 		}
 	}
 
-	void OnUserAway(User *u, const Anope::string &message) anope_override
+	void OnUserAway(User *u, const Anope::string &message) override
 	{
 		if (message.empty())
 			this->Check(u);
 	}
 
-	void OnNickUpdate(User *u) anope_override
+	void OnNickUpdate(User *u) override
 	{
 		this->Check(u);
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *MemoServ)
 			return EVENT_CONTINUE;
@@ -220,7 +220,7 @@ class MemoServCore : public Module, public MemoServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *MemoServ)
 			return;
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index f08fee7a3..e09118e58 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -44,7 +44,7 @@ class NickServCollide : public Timer
 		return na;
 	}
 
-	void Tick(time_t t) anope_override
+	void Tick(time_t t) override
 	{
 		if (!u || !na)
 			return;
@@ -107,7 +107,7 @@ class NickServRelease : public User, public Timer
 		NickServReleases.erase(this->nick);
 	}
 
-	void Tick(time_t t) anope_override { }
+	void Tick(time_t t) override { }
 };
 
 class NickServCore : public Module, public NickServService
@@ -142,7 +142,7 @@ class NickServCore : public Module, public NickServService
 		OnShutdown();
 	}
 
-	void OnShutdown() anope_override
+	void OnShutdown() override
 	{
 		/* On shutdown, restart, or mod unload, remove all of our holds for nicks (svshold or qlines)
 		 * because some IRCds do not allow us to have these automatically expire
@@ -151,12 +151,12 @@ class NickServCore : public Module, public NickServService
 			this->Release(it->second);
 	}
 
-	void OnRestart() anope_override
+	void OnRestart() override
 	{
 		OnShutdown();
 	}
 
-	void Validate(User *u) anope_override
+	void Validate(User *u) override
 	{
 		NickAlias *na = NickAlias::Find(u->nick);
 		if (!na)
@@ -215,7 +215,7 @@ class NickServCore : public Module, public NickServService
 
 	}
 
-	void OnUserLogin(User *u) anope_override
+	void OnUserLogin(User *u) override
 	{
 		NickAlias *na = NickAlias::Find(u->nick);
 		if (na && *na->nc == u->Account() && !Config->GetModule("nickserv")->Get<bool>("nonicknameownership") && !na->nc->HasExt("UNCONFIRMED"))
@@ -226,7 +226,7 @@ class NickServCore : public Module, public NickServService
 			u->SetModes(NickServ, "%s", modesonid.c_str());
 	}
 
-	void Collide(User *u, NickAlias *na) anope_override
+	void Collide(User *u, NickAlias *na) override
 	{
 		if (na)
 			collided.Set(na);
@@ -259,7 +259,7 @@ class NickServCore : public Module, public NickServService
 			u->Kill(*NickServ, "Services nickname-enforcer kill");
 	}
 
-	void Release(NickAlias *na) anope_override
+	void Release(NickAlias *na) override
 	{
 		if (held.HasExt(na))
 		{
@@ -279,7 +279,7 @@ class NickServCore : public Module, public NickServService
 		collided.Unset(na); /* clear pending collide */
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &nsnick = conf->GetModule(this)->Get<const Anope::string>("client");
 
@@ -303,7 +303,7 @@ class NickServCore : public Module, public NickServService
 			defaults.clear();
 	}
 
-	void OnDelNick(NickAlias *na) anope_override
+	void OnDelNick(NickAlias *na) override
 	{
 		User *u = User::Find(na->nick);
 		if (u && u->Account() == na->nc)
@@ -314,7 +314,7 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
-	void OnDelCore(NickCore *nc) anope_override
+	void OnDelCore(NickCore *nc) override
 	{
 		Log(NickServ, "nick") << "Deleting nickname group " << nc->display;
 
@@ -330,12 +330,12 @@ class NickServCore : public Module, public NickServService
 		nc->users.clear();
 	}
 
-	void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) anope_override
+	void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) override
 	{
 		Log(LOG_NORMAL, "nick", NickServ) << "Changing " << nc->display << " nickname group display to " << newdisplay;
 	}
 
-	void OnNickIdentify(User *u) anope_override
+	void OnNickIdentify(User *u) override
 	{
 		Configuration::Block *block = Config->GetModule(this);
 
@@ -374,13 +374,13 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
-	void OnNickGroup(User *u, NickAlias *target) anope_override
+	void OnNickGroup(User *u, NickAlias *target) override
 	{
 		if (!target->nc->HasExt("UNCONFIRMED"))
 			u->SetMode(NickServ, "REGISTERED");
 	}
 
-	void OnNickUpdate(User *u) anope_override
+	void OnNickUpdate(User *u) override
 	{
 		for (User::ChanUserList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
 		{
@@ -391,7 +391,7 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
-	void OnUserConnect(User *u, bool &exempt) anope_override
+	void OnUserConnect(User *u, bool &exempt) override
 	{
 		if (u->Quitting() || !u->server->IsSynced() || u->server->IsULined())
 			return;
@@ -405,14 +405,14 @@ class NickServCore : public Module, public NickServService
 			this->Validate(u);
 	}
 
-	void OnPostUserLogoff(User *u) anope_override
+	void OnPostUserLogoff(User *u) override
 	{
 		NickAlias *na = NickAlias::Find(u->nick);
 		if (na)
 			OnCancel(u, na);
 	}
 
-	void OnServerSync(Server *s) anope_override
+	void OnServerSync(Server *s) override
 	{
 		for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
 		{
@@ -428,7 +428,7 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
-	void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override
+	void OnUserNickChange(User *u, const Anope::string &oldnick) override
 	{
 		NickAlias *old_na = NickAlias::Find(oldnick), *na = NickAlias::Find(u->nick);
 		/* If the new nick isn't registered or it's registered and not yours */
@@ -452,13 +452,13 @@ class NickServCore : public Module, public NickServService
 			OnCancel(u, old_na);
 	}
 
-	void OnUserModeSet(const MessageSource &setter, User *u, const Anope::string &mname) anope_override
+	void OnUserModeSet(const MessageSource &setter, User *u, const Anope::string &mname) override
 	{
 		if (u->server->IsSynced() && mname == "REGISTERED" && !u->IsIdentified(true))
 			u->RemoveMode(NickServ, mname);
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *NickServ)
 			return EVENT_CONTINUE;
@@ -478,7 +478,7 @@ class NickServCore : public Module, public NickServService
 		return EVENT_CONTINUE;
 	}
 
-	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *NickServ)
 			return;
@@ -495,14 +495,14 @@ class NickServCore : public Module, public NickServService
 				"after %d days if not used."), nickserv_expire / 86400);
 	}
 
-	void OnNickCoreCreate(NickCore *nc) anope_override
+	void OnNickCoreCreate(NickCore *nc) override
 	{
 		/* Set default flags */
 		for (unsigned i = 0; i < defaults.size(); ++i)
 			nc->Extend<bool>(defaults[i].upper());
 	}
 
-	void OnUserQuit(User *u, const Anope::string &msg) anope_override
+	void OnUserQuit(User *u, const Anope::string &msg) override
 	{
 		if (u->server && !u->server->GetQuitReason().empty() && Config->GetModule(this)->Get<bool>("hidenetsplitquit"))
 			return;
@@ -516,7 +516,7 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
-	void OnExpireTick() anope_override
+	void OnExpireTick() override
 	{
 		if (Anope::NoExpire || Anope::ReadOnly)
 			return;
@@ -548,7 +548,7 @@ class NickServCore : public Module, public NickServService
 		}
 	}
 
-	void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool show_hidden) anope_override
+	void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool show_hidden) override
 	{
 		if (!na->nc->HasExt("UNCONFIRMED"))
 		{
diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp
index 4be03e228..afacb6d52 100644
--- a/modules/pseudoclients/operserv.cpp
+++ b/modules/pseudoclients/operserv.cpp
@@ -16,27 +16,27 @@ class SGLineManager : public XLineManager
  public:
 	SGLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sgline", 'G') { }
 
-	void OnMatch(User *u, XLine *x) anope_override
+	void OnMatch(User *u, XLine *x) override
 	{
 		this->Send(u, x);
 	}
 
-	void OnExpire(const XLine *x) anope_override
+	void OnExpire(const XLine *x) override
 	{
 		Log(Config->GetClient("OperServ"), "expire/akill") << "AKILL on \002" << x->mask << "\002 has expired";
 	}
 
-	void Send(User *u, XLine *x) anope_override
+	void Send(User *u, XLine *x) override
 	{
 		IRCD->SendAkill(u, x);
 	}
 
-	void SendDel(XLine *x) anope_override
+	void SendDel(XLine *x) override
 	{
 		IRCD->SendAkillDel(x);
 	}
 
-	bool Check(User *u, const XLine *x) anope_override
+	bool Check(User *u, const XLine *x) override
 	{
 		if (x->regex)
 		{
@@ -70,17 +70,17 @@ class SQLineManager : public XLineManager
  public:
 	SQLineManager(Module *creator) : XLineManager(creator, "xlinemanager/sqline", 'Q'), nickserv("NickServService", "NickServ") { }
 
-	void OnMatch(User *u, XLine *x) anope_override
+	void OnMatch(User *u, XLine *x) override
 	{
 		this->Send(u, x);
 	}
 
-	void OnExpire(const XLine *x) anope_override
+	void OnExpire(const XLine *x) override
 	{
 		Log(Config->GetClient("OperServ"), "expire/sqline") << "SQLINE on \002" << x->mask << "\002 has expired";
 	}
 
-	void Send(User *u, XLine *x) anope_override
+	void Send(User *u, XLine *x) override
 	{
 		if (!IRCD->CanSQLine)
 		{
@@ -105,7 +105,7 @@ class SQLineManager : public XLineManager
 		}
 	}
 
-	void SendDel(XLine *x) anope_override
+	void SendDel(XLine *x) override
 	{
 		if (!IRCD->CanSQLine || x->IsRegex())
 			;
@@ -113,7 +113,7 @@ class SQLineManager : public XLineManager
 			IRCD->SendSQLineDel(x);
 	}
 
-	bool Check(User *u, const XLine *x) anope_override
+	bool Check(User *u, const XLine *x) override
 	{
 		if (x->regex)
 			return x->regex->Matches(u->nick);
@@ -149,17 +149,17 @@ class SNLineManager : public XLineManager
  public:
 	SNLineManager(Module *creator) : XLineManager(creator, "xlinemanager/snline", 'N') { }
 
-	void OnMatch(User *u, XLine *x) anope_override
+	void OnMatch(User *u, XLine *x) override
 	{
 		this->Send(u, x);
 	}
 
-	void OnExpire(const XLine *x) anope_override
+	void OnExpire(const XLine *x) override
 	{
 		Log(Config->GetClient("OperServ"), "expire/snline") << "SNLINE on \002" << x->mask << "\002 has expired";
 	}
 
-	void Send(User *u, XLine *x) anope_override
+	void Send(User *u, XLine *x) override
 	{
 		if (IRCD->CanSNLine && !x->IsRegex())
 			IRCD->SendSGLine(u, x);
@@ -168,13 +168,13 @@ class SNLineManager : public XLineManager
 			u->Kill(Config->GetClient("OperServ"), "SNLined: " + x->reason);
 	}
 
-	void SendDel(XLine *x) anope_override
+	void SendDel(XLine *x) override
 	{
 		if (IRCD->CanSNLine && !x->IsRegex())
 			IRCD->SendSGLineDel(x);
 	}
 
-	bool Check(User *u, const XLine *x) anope_override
+	bool Check(User *u, const XLine *x) override
 	{
 		if (x->regex)
 			return x->regex->Matches(u->realname);
@@ -211,7 +211,7 @@ class OperServCore : public Module
 		XLineManager::UnregisterXLineManager(&snlines);
 	}
 
-	void OnReload(Configuration::Conf *conf) anope_override
+	void OnReload(Configuration::Conf *conf) override
 	{
 		const Anope::string &osnick = conf->GetModule(this)->Get<const Anope::string>("client");
 
@@ -225,7 +225,7 @@ class OperServCore : public Module
 		OperServ = bi;
 	}
 
-	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override
+	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) override
 	{
 		if (bi == OperServ && !u->HasMode("OPER") && Config->GetModule(this)->Get<bool>("opersonly"))
 		{
@@ -237,37 +237,37 @@ class OperServCore : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnServerQuit(Server *server) anope_override
+	void OnServerQuit(Server *server) override
 	{
 		if (server->IsJuped())
 			Log(server, "squit", OperServ) << "Received SQUIT for juped server " << server->GetName();
 	}
 
-	void OnUserModeSet(const MessageSource &setter, User *u, const Anope::string &mname) anope_override
+	void OnUserModeSet(const MessageSource &setter, User *u, const Anope::string &mname) override
 	{
 		if (mname == "OPER")
 			Log(u, "oper", OperServ) << "is now an IRC operator.";
 	}
 
-	void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) anope_override
+	void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) override
 	{
 		if (mname == "OPER")
 			Log(u, "oper", OperServ) << "is no longer an IRC operator";
 	}
 
-	void OnUserConnect(User *u, bool &exempt) anope_override
+	void OnUserConnect(User *u, bool &exempt) override
 	{
 		if (!u->Quitting() && !exempt)
 			XLineManager::CheckAll(u);
 	}
 
-	void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override
+	void OnUserNickChange(User *u, const Anope::string &oldnick) override
 	{
 		if (!u->HasMode("OPER"))
 			this->sqlines.CheckAllXLines(u);
 	}
 
-	EventReturn OnCheckKick(User *u, Channel *c, Anope::string &mask, Anope::string &reason) anope_override
+	EventReturn OnCheckKick(User *u, Channel *c, Anope::string &mask, Anope::string &reason) override
 	{
 		XLine *x = this->sqlines.CheckChannel(c);
 		if (x)
@@ -280,7 +280,7 @@ class OperServCore : public Module
 		return EVENT_CONTINUE;
 	}
 
-	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) anope_override
+	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *OperServ)
 			return EVENT_CONTINUE;
@@ -288,7 +288,7 @@ class OperServCore : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnLog(Log *l) anope_override
+	void OnLog(Log *l) override
 	{
 		if (l->type == LOG_SERVER)
 			l->bi = OperServ;