From ee5cd8493e34a1c049066ead25e9094b30cd49b5 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 18 Feb 2012 15:04:26 -0500 Subject: Use C++11's explicit override feature if available --- modules/commands/bs_assign.cpp | 8 +-- modules/commands/bs_badwords.cpp | 8 +-- modules/commands/bs_bot.cpp | 4 +- modules/commands/bs_botlist.cpp | 4 +- modules/commands/bs_control.cpp | 8 +-- modules/commands/bs_info.cpp | 4 +- modules/commands/bs_kick.cpp | 12 ++--- modules/commands/bs_set.cpp | 6 +-- modules/commands/cs_access.cpp | 24 ++++----- modules/commands/cs_akick.cpp | 8 +-- modules/commands/cs_appendtopic.cpp | 4 +- modules/commands/cs_ban.cpp | 4 +- modules/commands/cs_clearusers.cpp | 4 +- modules/commands/cs_clone.cpp | 4 +- modules/commands/cs_drop.cpp | 4 +- modules/commands/cs_enforce.cpp | 4 +- modules/commands/cs_entrymsg.cpp | 12 ++--- modules/commands/cs_flags.cpp | 12 ++--- modules/commands/cs_getkey.cpp | 4 +- modules/commands/cs_info.cpp | 4 +- modules/commands/cs_invite.cpp | 4 +- modules/commands/cs_kick.cpp | 4 +- modules/commands/cs_list.cpp | 4 +- modules/commands/cs_log.cpp | 6 +-- modules/commands/cs_mode.cpp | 4 +- modules/commands/cs_modes.cpp | 40 +++++++-------- modules/commands/cs_register.cpp | 6 +-- modules/commands/cs_saset.cpp | 4 +- modules/commands/cs_saset_noexpire.cpp | 4 +- modules/commands/cs_seen.cpp | 29 +++++------ modules/commands/cs_set.cpp | 4 +- modules/commands/cs_set_bantype.cpp | 4 +- modules/commands/cs_set_description.cpp | 4 +- modules/commands/cs_set_founder.cpp | 4 +- modules/commands/cs_set_keeptopic.cpp | 4 +- modules/commands/cs_set_misc.cpp | 8 +-- modules/commands/cs_set_peace.cpp | 4 +- modules/commands/cs_set_persist.cpp | 4 +- modules/commands/cs_set_private.cpp | 4 +- modules/commands/cs_set_restricted.cpp | 4 +- modules/commands/cs_set_secure.cpp | 4 +- modules/commands/cs_set_securefounder.cpp | 4 +- modules/commands/cs_set_secureops.cpp | 4 +- modules/commands/cs_set_signkick.cpp | 4 +- modules/commands/cs_set_successor.cpp | 4 +- modules/commands/cs_set_topiclock.cpp | 4 +- modules/commands/cs_suspend.cpp | 12 ++--- modules/commands/cs_sync.cpp | 4 +- modules/commands/cs_tban.cpp | 6 +-- modules/commands/cs_topic.cpp | 4 +- modules/commands/cs_unban.cpp | 4 +- modules/commands/cs_updown.cpp | 8 +-- modules/commands/cs_xop.cpp | 42 +++++++--------- modules/commands/gl_global.cpp | 4 +- modules/commands/help.cpp | 2 +- modules/commands/hs_del.cpp | 8 +-- modules/commands/hs_group.cpp | 4 +- modules/commands/hs_list.cpp | 4 +- modules/commands/hs_off.cpp | 4 +- modules/commands/hs_on.cpp | 4 +- modules/commands/hs_request.cpp | 22 ++++---- modules/commands/hs_set.cpp | 8 +-- modules/commands/ms_cancel.cpp | 4 +- modules/commands/ms_check.cpp | 4 +- modules/commands/ms_del.cpp | 6 +-- modules/commands/ms_ignore.cpp | 4 +- modules/commands/ms_info.cpp | 4 +- modules/commands/ms_list.cpp | 6 +-- modules/commands/ms_read.cpp | 6 +-- modules/commands/ms_rsend.cpp | 4 +- modules/commands/ms_send.cpp | 4 +- modules/commands/ms_sendall.cpp | 4 +- modules/commands/ms_set.cpp | 4 +- modules/commands/ms_staff.cpp | 4 +- modules/commands/ns_access.cpp | 4 +- modules/commands/ns_ajoin.cpp | 10 ++-- modules/commands/ns_alist.cpp | 4 +- modules/commands/ns_cert.cpp | 6 +-- modules/commands/ns_drop.cpp | 4 +- modules/commands/ns_getemail.cpp | 4 +- modules/commands/ns_getpass.cpp | 4 +- modules/commands/ns_ghost.cpp | 4 +- modules/commands/ns_group.cpp | 12 ++--- modules/commands/ns_identify.cpp | 4 +- modules/commands/ns_info.cpp | 4 +- modules/commands/ns_list.cpp | 4 +- modules/commands/ns_logout.cpp | 4 +- modules/commands/ns_recover.cpp | 4 +- modules/commands/ns_register.cpp | 16 +++--- modules/commands/ns_release.cpp | 4 +- modules/commands/ns_resetpass.cpp | 6 +-- modules/commands/ns_saset.cpp | 8 +-- modules/commands/ns_saset_noexpire.cpp | 4 +- modules/commands/ns_sendpass.cpp | 4 +- modules/commands/ns_set.cpp | 8 +-- modules/commands/ns_set_autoop.cpp | 8 +-- modules/commands/ns_set_display.cpp | 8 +-- modules/commands/ns_set_email.cpp | 10 ++-- modules/commands/ns_set_greet.cpp | 8 +-- modules/commands/ns_set_hide.cpp | 8 +-- modules/commands/ns_set_kill.cpp | 8 +-- modules/commands/ns_set_language.cpp | 8 +-- modules/commands/ns_set_message.cpp | 8 +-- modules/commands/ns_set_misc.cpp | 10 ++-- modules/commands/ns_set_private.cpp | 8 +-- modules/commands/ns_set_secure.cpp | 8 +-- modules/commands/ns_status.cpp | 4 +- modules/commands/ns_suspend.cpp | 12 ++--- modules/commands/ns_update.cpp | 4 +- modules/commands/os_akill.cpp | 8 +-- modules/commands/os_chankill.cpp | 4 +- modules/commands/os_config.cpp | 4 +- modules/commands/os_defcon.cpp | 20 ++++---- modules/commands/os_forbid.cpp | 20 ++++---- modules/commands/os_forbid.h | 4 +- modules/commands/os_ignore.cpp | 12 ++--- modules/commands/os_ignore.h | 4 +- modules/commands/os_jupe.cpp | 4 +- modules/commands/os_kick.cpp | 4 +- modules/commands/os_kill.cpp | 4 +- modules/commands/os_list.cpp | 8 +-- modules/commands/os_login.cpp | 10 ++-- modules/commands/os_mode.cpp | 8 +-- modules/commands/os_modinfo.cpp | 8 +-- modules/commands/os_module.cpp | 12 ++--- modules/commands/os_news.cpp | 16 +++--- modules/commands/os_news.h | 4 +- modules/commands/os_noop.cpp | 4 +- modules/commands/os_oline.cpp | 4 +- modules/commands/os_oper.cpp | 8 +-- modules/commands/os_reload.cpp | 4 +- modules/commands/os_session.cpp | 36 ++++++------- modules/commands/os_session.h | 6 +-- modules/commands/os_set.cpp | 4 +- modules/commands/os_shutdown.cpp | 12 ++--- modules/commands/os_stats.cpp | 4 +- modules/commands/os_svsnick.cpp | 4 +- modules/commands/os_sxline.cpp | 14 +++--- modules/commands/os_update.cpp | 4 +- modules/database/db_flatfile.cpp | 7 +-- modules/database/db_old.cpp | 2 +- modules/database/db_plain.cpp | 7 +-- modules/database/db_sql.cpp | 10 ++-- modules/database/db_sql_live_read.cpp | 12 ++--- modules/database/db_sql_live_write.cpp | 84 +++++++++++++++---------------- modules/encryption/enc_md5.cpp | 4 +- modules/encryption/enc_none.cpp | 6 +-- modules/encryption/enc_old.cpp | 4 +- modules/encryption/enc_sha1.cpp | 4 +- modules/encryption/enc_sha256.cpp | 4 +- modules/extra/bs_autoassign.cpp | 4 +- modules/extra/ldap.h | 5 +- modules/extra/m_dnsbl.cpp | 6 +-- modules/extra/m_helpchan.cpp | 4 +- modules/extra/m_ldap.cpp | 18 +++---- modules/extra/m_ldap_authentication.cpp | 22 ++++---- modules/extra/m_ldap_oper.cpp | 10 ++-- modules/extra/m_mysql.cpp | 16 +++--- modules/extra/m_proxyscan.cpp | 26 +++++----- modules/extra/m_rewrite.cpp | 4 +- modules/extra/m_sqlite.cpp | 25 ++++----- modules/extra/m_ssl.cpp | 18 +++---- modules/extra/m_statusupdate.cpp | 4 +- modules/extra/m_xmlrpc.cpp | 12 ++--- modules/extra/m_xmlrpc_main.cpp | 11 ++-- modules/extra/ns_maxemail.cpp | 4 +- modules/extra/sql.h | 5 +- modules/extra/xmlrpc.h | 4 +- modules/protocol/bahamut.cpp | 64 +++++++++++------------ modules/protocol/inspircd-ts6.h | 74 +++++++++++++-------------- modules/protocol/inspircd11.cpp | 66 ++++++++++++------------ modules/protocol/inspircd12.cpp | 10 ++-- modules/protocol/inspircd20.cpp | 12 ++--- modules/protocol/plexus.cpp | 64 +++++++++++------------ modules/protocol/ratbox.cpp | 60 +++++++++++----------- modules/protocol/unreal.cpp | 84 +++++++++++++++---------------- modules/pseudoclients/botserv.cpp | 14 +++--- modules/pseudoclients/chanserv.cpp | 10 ++-- modules/pseudoclients/global.cpp | 10 ++-- modules/pseudoclients/hostserv.cpp | 6 +-- modules/pseudoclients/memoserv.cpp | 16 +++--- modules/pseudoclients/nickserv.cpp | 26 +++++----- modules/pseudoclients/operserv.cpp | 42 ++++++++-------- 183 files changed, 946 insertions(+), 955 deletions(-) (limited to 'modules') diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp index b4d272d7b..5c1691047 100644 --- a/modules/commands/bs_assign.cpp +++ b/modules/commands/bs_assign.cpp @@ -22,7 +22,7 @@ class CommandBSAssign : public Command this->SetSyntax(_("\037channel\037 \037nick\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &nick = params[1]; @@ -74,7 +74,7 @@ class CommandBSAssign : public Command source.Reply(_("Bot \002%s\002 has been assigned to %s."), bi->nick.c_str(), ci->name.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -94,7 +94,7 @@ class CommandBSUnassign : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; @@ -136,7 +136,7 @@ class CommandBSUnassign : public Command source.Reply(_("There is no bot assigned to %s anymore."), ci->name.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp index a700fa6c9..bb7a073f1 100644 --- a/modules/commands/bs_badwords.cpp +++ b/modules/commands/bs_badwords.cpp @@ -38,7 +38,7 @@ class BadwordsDelCallback : public NumberList source.Reply(_("Deleted %d entries from %s bad words list."), Deleted, ci->name.c_str()); } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetBadWordCount()) return; @@ -76,7 +76,7 @@ class CommandBSBadwords : public Command { } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetBadWordCount()) return; @@ -229,7 +229,7 @@ class CommandBSBadwords : public Command this->SetSyntax(_("\037channel\037 CLEAR")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &cmd = params[1]; const Anope::string &word = params.size() > 2 ? params[2] : ""; @@ -274,7 +274,7 @@ class CommandBSBadwords : public Command this->OnSyntaxError(source, ""); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp index e5779ef73..526cd922c 100644 --- a/modules/commands/bs_bot.cpp +++ b/modules/commands/bs_bot.cpp @@ -300,7 +300,7 @@ class CommandBSBot : public Command this->SetSyntax(_("\002DEL \037nick\037\002")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &cmd = params[0]; User *u = source.u; @@ -374,7 +374,7 @@ class CommandBSBot : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp index 45cea0998..ed50371fc 100644 --- a/modules/commands/bs_botlist.cpp +++ b/modules/commands/bs_botlist.cpp @@ -22,7 +22,7 @@ class CommandBSBotList : public Command this->SetSyntax(""); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; unsigned count = 0; @@ -61,7 +61,7 @@ class CommandBSBotList : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp index d6b126672..6ca435b37 100644 --- a/modules/commands/bs_control.cpp +++ b/modules/commands/bs_control.cpp @@ -22,7 +22,7 @@ class CommandBSSay : public Command this->SetSyntax(_("\037channel\037 \037text\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &text = params[1]; @@ -68,7 +68,7 @@ class CommandBSSay : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -86,7 +86,7 @@ class CommandBSAct : public Command this->SetSyntax(_("\037channel\037 \037text\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; Anope::string message = params[1]; @@ -129,7 +129,7 @@ class CommandBSAct : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp index 39a299d32..5026de3c7 100644 --- a/modules/commands/bs_info.cpp +++ b/modules/commands/bs_info.cpp @@ -55,7 +55,7 @@ class CommandBSInfo : public Command this->SetSyntax(_("\002INFO {\037chan\037 | \037nick\037}\002")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &query = params[0]; @@ -221,7 +221,7 @@ class CommandBSInfo : public Command source.Reply(_("\002%s\002 is not a valid bot or registered channel."), query.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index cccdd5b35..5824a8650 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -23,7 +23,7 @@ class CommandBSKick : public Command this->SetSyntax(_("\037channel\037 \037option\037 {\037ON|\037} [\037settings\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &option = params[1]; @@ -459,7 +459,7 @@ class CommandBSKick : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) { @@ -626,7 +626,7 @@ struct BanData : public ExtensibleItem } } - void OnDelete() + void OnDelete() anope_override { delete this; } @@ -659,7 +659,7 @@ struct UserData : public ExtensibleItem Anope::string lastline; - void OnDelete() + void OnDelete() anope_override { delete this; } @@ -671,7 +671,7 @@ class BanDataPurger : public CallBack public: BanDataPurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { Log(LOG_DEBUG) << "bs_main: Running bandata purger"; @@ -785,7 +785,7 @@ class BSKick : public Module } } - void OnPrivmsg(User *u, Channel *c, Anope::string &msg) + void OnPrivmsg(User *u, Channel *c, Anope::string &msg) anope_override { /* Now we can make kicker stuff. We try to order the checks * from the fastest one to the slowest one, since there's diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp index 0b1aba233..25472baf9 100644 --- a/modules/commands/bs_set.cpp +++ b/modules/commands/bs_set.cpp @@ -22,7 +22,7 @@ class CommandBSSet : public Command this->SetSyntax(_("\037(channel | bot)\037 \037option\037 \037settings\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &option = params[1]; @@ -150,7 +150,7 @@ class CommandBSSet : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) { @@ -226,7 +226,7 @@ class CommandBSSet : public Command return true; } - void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) + void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.empty()) Command::OnSyntaxError(source, ""); diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index 3c36fabbd..b8b5aa546 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -31,7 +31,7 @@ class AccessChanAccess : public ChanAccess { } - bool HasPriv(const Anope::string &name) const + bool HasPriv(const Anope::string &name) const anope_override { return this->ci->GetLevel(name) != ACCESS_INVALID && this->level >= this->ci->GetLevel(name); } @@ -41,7 +41,7 @@ class AccessChanAccess : public ChanAccess return stringify(this->level); } - void Unserialize(const Anope::string &data) + void Unserialize(const Anope::string &data) anope_override { this->level = convertTo(data); } @@ -80,7 +80,7 @@ class AccessAccessProvider : public AccessProvider { } - ChanAccess *Create() + ChanAccess *Create() anope_override { return new AccessChanAccess(this); } @@ -211,7 +211,7 @@ class CommandCSAccess : public Command } } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetAccessCount()) return; @@ -294,7 +294,7 @@ class CommandCSAccess : public Command { } - void HandleNumber(unsigned number) + void HandleNumber(unsigned number) anope_override { if (!number || number > ci->GetAccessCount()) return; @@ -434,7 +434,7 @@ class CommandCSAccess : public Command this->SetSyntax(_("\037channel\037 CLEAR\002")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &cmd = params[1]; const Anope::string &nick = params.size() > 2 ? params[2] : ""; @@ -491,7 +491,7 @@ class CommandCSAccess : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -690,7 +690,7 @@ class CommandCSLevels : public Command this->SetSyntax(_("\037channel\037 RESET")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &cmd = params[1]; const Anope::string &what = params.size() > 2 ? params[2] : ""; @@ -726,7 +726,7 @@ class CommandCSLevels : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { if (subcommand.equals_ci("DESC")) { @@ -804,7 +804,7 @@ class CSAccess : public Module } } - void OnReload() + void OnReload() anope_override { defaultLevels.clear(); ConfigReader config; @@ -829,12 +829,12 @@ class CSAccess : public Module } } - void OnCreateChan(ChannelInfo *ci) + void OnCreateChan(ChannelInfo *ci) anope_override { reset_levels(ci); } - EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv) + EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv) anope_override { if (group->ci == NULL) return EVENT_CONTINUE; diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index 47f174e59..328a169d4 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -202,7 +202,7 @@ class CommandCSAKick : public Command source.Reply(_("Deleted %d entries from %s autokick list."), Deleted, ci->name.c_str()); } - void HandleNumber(unsigned Number) + void HandleNumber(unsigned Number) anope_override { if (!Number || Number > ci->GetAkickCount()) return; @@ -258,7 +258,7 @@ class CommandCSAKick : public Command { } - void HandleNumber(unsigned number) + void HandleNumber(unsigned number) anope_override { if (!number || number > ci->GetAkickCount()) return; @@ -413,7 +413,7 @@ class CommandCSAKick : public Command this->SetSyntax(_("\037channel\037 CLEAR")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { Anope::string chan = params[0]; Anope::string cmd = params[1]; @@ -452,7 +452,7 @@ class CommandCSAKick : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_appendtopic.cpp b/modules/commands/cs_appendtopic.cpp index 4186bdaff..fe1633b8a 100644 --- a/modules/commands/cs_appendtopic.cpp +++ b/modules/commands/cs_appendtopic.cpp @@ -48,7 +48,7 @@ class CommandCSAppendTopic : public Command this->SetSyntax(_("\037channel\037 \037text\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &newtopic = params[1]; @@ -84,7 +84,7 @@ class CommandCSAppendTopic : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index e0c5dd95e..867d654c5 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -23,7 +23,7 @@ class CommandCSBan : public Command this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &target = params[1]; @@ -121,7 +121,7 @@ class CommandCSBan : public Command source.Reply(NICK_X_NOT_IN_USE, target.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_clearusers.cpp b/modules/commands/cs_clearusers.cpp index e65aa34eb..58de57f5a 100644 --- a/modules/commands/cs_clearusers.cpp +++ b/modules/commands/cs_clearusers.cpp @@ -22,7 +22,7 @@ class CommandCSClearUsers : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -63,7 +63,7 @@ class CommandCSClearUsers : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp index 905a26177..8205b723c 100644 --- a/modules/commands/cs_clone.cpp +++ b/modules/commands/cs_clone.cpp @@ -22,7 +22,7 @@ public: this->SetSyntax(_("\037channel\037 \037target\037 [\037what\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &channel = params[0]; const Anope::string &target = params[1]; @@ -159,7 +159,7 @@ public: return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index 429f70ad1..e9736851a 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -22,7 +22,7 @@ class CommandCSDrop : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -68,7 +68,7 @@ class CommandCSDrop : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { User *u = source.u; this->SendSyntax(source); diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index ed13c3f4f..1c5cabddd 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -118,7 +118,7 @@ class CommandCSEnforce : public Command this->SetSyntax(_("\037channel\037 [\037what\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &what = params.size() > 1 ? params[1] : ""; @@ -165,7 +165,7 @@ class CommandCSEnforce : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp index 758c3f96c..477f68cb2 100644 --- a/modules/commands/cs_entrymsg.cpp +++ b/modules/commands/cs_entrymsg.cpp @@ -29,12 +29,12 @@ struct EntryMsg : Serializable this->when = ct; } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "EntryMsg"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data data; @@ -167,7 +167,7 @@ class CommandEntryMessage : public Command this->SetSyntax(_("\037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; @@ -208,7 +208,7 @@ class CommandEntryMessage : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -233,7 +233,7 @@ class CSEntryMessage : public Module this->OnReload(); } - void OnJoinChannel(User *u, Channel *c) + void OnJoinChannel(User *u, Channel *c) anope_override { if (u && c && c->ci && u->server->IsSynced()) { @@ -245,7 +245,7 @@ class CSEntryMessage : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; MaxEntries = config.ReadInteger("cs_entrymsg", "maxentries", "5", 0, true); diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 0e48f59c7..f5dc7fe1c 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -24,7 +24,7 @@ class FlagsChanAccess : public ChanAccess { } - bool HasPriv(const Anope::string &priv) const + bool HasPriv(const Anope::string &priv) const anope_override { std::map::iterator it = defaultFlags.find(priv); if (it != defaultFlags.end() && this->flags.count(it->second) > 0) @@ -37,7 +37,7 @@ class FlagsChanAccess : public ChanAccess return Anope::string(this->flags.begin(), this->flags.end()); } - void Unserialize(const Anope::string &data) + void Unserialize(const Anope::string &data) anope_override { for (unsigned i = data.length(); i > 0; --i) this->flags.insert(data[i - 1]); @@ -65,7 +65,7 @@ class FlagsAccessProvider : public AccessProvider { } - ChanAccess *Create() + ChanAccess *Create() anope_override { return new FlagsChanAccess(this); } @@ -300,7 +300,7 @@ class CommandCSFlags : public Command this->SetSyntax(_("\037channel\037 CLEAR\002")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &cmd = params[1]; @@ -336,7 +336,7 @@ class CommandCSFlags : public Command this->OnSyntaxError(source, cmd); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -394,7 +394,7 @@ class CSFlags : public Module this->OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; defaultFlags.clear(); diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp index 287ed82b0..f8164707d 100644 --- a/modules/commands/cs_getkey.cpp +++ b/modules/commands/cs_getkey.cpp @@ -22,7 +22,7 @@ class CommandCSGetKey : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -55,7 +55,7 @@ class CommandCSGetKey : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp index b86755d58..1554a0693 100644 --- a/modules/commands/cs_info.cpp +++ b/modules/commands/cs_info.cpp @@ -34,7 +34,7 @@ class CommandCSInfo : public Command this->SetSyntax(_("\037channel\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -119,7 +119,7 @@ class CommandCSInfo : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp index 7dc4b9f7d..b38828c9d 100644 --- a/modules/commands/cs_invite.cpp +++ b/modules/commands/cs_invite.cpp @@ -22,7 +22,7 @@ class CommandCSInvite : public Command this->SetSyntax(_("\037channel\037 [\037nick\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; @@ -86,7 +86,7 @@ class CommandCSInvite : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp index 09d51b39f..3ee444698 100644 --- a/modules/commands/cs_kick.cpp +++ b/modules/commands/cs_kick.cpp @@ -23,7 +23,7 @@ class CommandCSKick : public Command this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &target = params[1]; @@ -105,7 +105,7 @@ class CommandCSKick : public Command source.Reply(NICK_X_NOT_IN_USE, target.c_str()); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index dff564d70..57c14d157 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -23,7 +23,7 @@ class CommandCSList : public Command this->SetSyntax(_("\037pattern\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; @@ -117,7 +117,7 @@ class CommandCSList : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index 35f8831e6..28c7e6f91 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -24,7 +24,7 @@ public: this->SetSyntax(_("\037channel\037 \037command\037 \037method\037 [\037status\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &channel = params[0]; @@ -151,7 +151,7 @@ public: this->OnSyntaxError(source, ""); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -192,7 +192,7 @@ class CSLog : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnLog(Log *l) + void OnLog(Log *l) anope_override { if (l->Type != LOG_COMMAND || l->u == NULL || l->c == NULL || l->ci == NULL || !Me || !Me->IsSynced()) return; diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index f2e6479c1..e0dda5524 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -339,7 +339,7 @@ class CommandCSMode : public Command this->SetSyntax(_("\037channel\037 SET \037modes\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &subcommand = params[1]; @@ -360,7 +360,7 @@ class CommandCSMode : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_modes.cpp b/modules/commands/cs_modes.cpp index 0e1f9ef64..a460c6c87 100644 --- a/modules/commands/cs_modes.cpp +++ b/modules/commands/cs_modes.cpp @@ -90,14 +90,14 @@ class CommandCSOp : public CommandModeBase this->SetDesc(_("Gives Op status to a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OPDEOP", "OPDEOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -119,14 +119,14 @@ class CommandCSDeOp : public CommandModeBase this->SetDesc(_("Deops a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OPDEOP", "OPDEOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -148,14 +148,14 @@ class CommandCSVoice : public CommandModeBase this->SetDesc(_("Voices a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "VOICE", "VOICEME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -178,14 +178,14 @@ class CommandCSDeVoice : public CommandModeBase this->SetDesc(_("Devoices a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE); return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "VOICE", "VOICEME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -208,7 +208,7 @@ class CommandCSHalfOp : public CommandModeBase this->SetDesc(_("Halfops a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP); @@ -218,7 +218,7 @@ class CommandCSHalfOp : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "HALFOP", "HALFOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -241,7 +241,7 @@ class CommandCSDeHalfOp : public CommandModeBase this->SetDesc(_("Dehalfops a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP); @@ -251,7 +251,7 @@ class CommandCSDeHalfOp : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "HALFOP", "HALFOPME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -274,7 +274,7 @@ class CommandCSProtect : public CommandModeBase this->SetDesc(_("Protects a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT); @@ -284,7 +284,7 @@ class CommandCSProtect : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "PROTECT", "PROTECTME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -306,7 +306,7 @@ class CommandCSDeProtect : public CommandModeBase this->SetDesc(_("Deprotects a selected nick on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT); @@ -316,7 +316,7 @@ class CommandCSDeProtect : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "PROTECT", "PROTECTME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -338,7 +338,7 @@ class CommandCSOwner : public CommandModeBase this->SetDesc(_("Gives you owner status on channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER); @@ -348,7 +348,7 @@ class CommandCSOwner : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OWNER", "OWNERME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -369,7 +369,7 @@ class CommandCSDeOwner : public CommandModeBase this->SetDesc(_("Removes your owner status on a channel")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER); @@ -379,7 +379,7 @@ class CommandCSDeOwner : public CommandModeBase return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OWNER", "OWNERME"); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp index bf834c01f..9cf5a7a9b 100644 --- a/modules/commands/cs_register.cpp +++ b/modules/commands/cs_register.cpp @@ -22,7 +22,7 @@ class CommandCSRegister : public Command this->SetSyntax(_("\037channel\037 [\037description\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &chan = params[0]; const Anope::string &chdesc = params.size() > 1 ? params[1] : ""; @@ -101,7 +101,7 @@ class CommandCSRegister : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -142,7 +142,7 @@ class CSRegister : public Module ModuleManager::Attach(I_OnDelChan, this); } - void OnDelChan(ChannelInfo *ci) + void OnDelChan(ChannelInfo *ci) anope_override { if (ci->c && ci->c->HasMode(CMODE_REGISTERED)) ci->c->RemoveMode(NULL, CMODE_REGISTERED, "", false); diff --git a/modules/commands/cs_saset.cpp b/modules/commands/cs_saset.cpp index 3290e7cc3..c564a9c90 100644 --- a/modules/commands/cs_saset.cpp +++ b/modules/commands/cs_saset.cpp @@ -22,13 +22,13 @@ class CommandCSSASet : public Command this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { this->OnSyntaxError(source, ""); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_saset_noexpire.cpp b/modules/commands/cs_saset_noexpire.cpp index 2e4ff774e..a71544a25 100644 --- a/modules/commands/cs_saset_noexpire.cpp +++ b/modules/commands/cs_saset_noexpire.cpp @@ -22,7 +22,7 @@ class CommandCSSASetNoexpire : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSASetNoexpire : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index 59f2dcdc9..8466cf82c 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -37,12 +37,12 @@ struct SeenInfo : Serializable { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "SeenInfo"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data data; @@ -110,7 +110,7 @@ class CommandOSSeen : public Command this->SetSyntax(_("\037CLEAR\037 \037time\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { if (params[0].equals_ci("STATS")) { @@ -156,7 +156,7 @@ class CommandOSSeen : public Command this->SendSyntax(source); } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -181,7 +181,7 @@ class CommandSeen : public Command this->SetSyntax(_("\037nick\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { const Anope::string &target = params[0]; User *u = source.u; @@ -276,7 +276,7 @@ class CommandSeen : public Command } } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); @@ -292,7 +292,7 @@ class DataBasePurger : public CallBack public: DataBasePurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { } - void Tick(time_t) + void Tick(time_t) anope_override { size_t previous_size = database.size(); for (database_map::iterator it = database.begin(), it_end = database.end(); it != it_end;) @@ -334,7 +334,7 @@ class CSSeen : public Module OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; purgetime = dotime(config.ReadValue("cs_seen", "purgetime", "30d", 0)); @@ -344,37 +344,38 @@ class CSSeen : public Module purger.SetSecs(expiretimeout); } - void OnUserConnect(User *u) + void OnUserConnect(dynamic_reference &u, bool &exempt) anope_override { UpdateUser(u, NEW, u->nick, "", "", ""); } - void OnUserNickChange(User *u, const Anope::string &oldnick) + void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override { UpdateUser(u, NICK_TO, oldnick, u->nick, "", ""); UpdateUser(u, NICK_FROM, u->nick, oldnick, "", ""); } - void OnUserQuit(User *u, const Anope::string &msg) + void OnUserQuit(User *u, const Anope::string &msg) anope_override { UpdateUser(u, QUIT, u->nick, "", "", msg); } - void OnJoinChannel(User *u, Channel *c) + void OnJoinChannel(User *u, Channel *c) anope_override { UpdateUser(u, JOIN, u->nick, "", c->name, ""); } - void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg) + void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg) anope_override { UpdateUser(u, PART, u->nick, "", channel, msg); } - void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg) + void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg) anope_override { UpdateUser(target, KICK, target->nick, source, c->name, msg); } + private: void UpdateUser(const User *u, const TypeInfo Type, const Anope::string &nick, const Anope::string &nick2, const Anope::string &channel, const Anope::string &message) { SeenInfo *info = FindInfo(nick); diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 9a63c8335..ac91d213f 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -22,13 +22,13 @@ class CommandCSSet : public Command this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { this->OnSyntaxError(source, ""); return; } - bool OnHelp(CommandSource &source, const Anope::string &subcommand) + bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_bantype.cpp b/modules/commands/cs_set_bantype.cpp index e55093d6d..af63d0568 100644 --- a/modules/commands/cs_set_bantype.cpp +++ b/modules/commands/cs_set_bantype.cpp @@ -22,7 +22,7 @@ class CommandCSSetBanType : public Command this->SetSyntax(_("\037channel\037 \037bantype\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetBanType : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_description.cpp b/modules/commands/cs_set_description.cpp index 79cb93b24..0abd8462e 100644 --- a/modules/commands/cs_set_description.cpp +++ b/modules/commands/cs_set_description.cpp @@ -22,7 +22,7 @@ class CommandCSSetDescription : public Command this->SetSyntax(_("\037channel\037 [\037description\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -52,7 +52,7 @@ class CommandCSSetDescription : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_founder.cpp b/modules/commands/cs_set_founder.cpp index fade8a27b..0d375f760 100644 --- a/modules/commands/cs_set_founder.cpp +++ b/modules/commands/cs_set_founder.cpp @@ -22,7 +22,7 @@ class CommandCSSetFounder : public Command this->SetSyntax(_("\037channel\037 \037nick\037")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms)anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -68,7 +68,7 @@ class CommandCSSetFounder : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_keeptopic.cpp b/modules/commands/cs_set_keeptopic.cpp index 2c07d2a7b..3c9df3f3f 100644 --- a/modules/commands/cs_set_keeptopic.cpp +++ b/modules/commands/cs_set_keeptopic.cpp @@ -22,7 +22,7 @@ class CommandCSSetKeepTopic : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetKeepTopic : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp index beb0cf255..75794697d 100644 --- a/modules/commands/cs_set_misc.cpp +++ b/modules/commands/cs_set_misc.cpp @@ -22,12 +22,12 @@ struct CSMiscData : Anope::string, ExtensibleItem, Serializable { } - Anope::string serialize_name() const + Anope::string serialize_name() const anope_override { return "CSMiscData"; } - serialized_data serialize() + serialized_data serialize() anope_override { serialized_data sdata; @@ -64,7 +64,7 @@ class CommandCSSetMisc : public Command this->SetSyntax(_("\037channel\037 [\037parameters\037]")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { ChannelInfo *ci = cs_findchan(params[0]); if (ci == NULL) @@ -115,7 +115,7 @@ class CSSetMisc : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden) + void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden) anope_override { std::deque list; ci->GetExtList(list); diff --git a/modules/commands/cs_set_peace.cpp b/modules/commands/cs_set_peace.cpp index e670993fd..002690721 100644 --- a/modules/commands/cs_set_peace.cpp +++ b/modules/commands/cs_set_peace.cpp @@ -22,7 +22,7 @@ class CommandCSSetPeace : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetPeace : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_persist.cpp b/modules/commands/cs_set_persist.cpp index 7d31b9fff..4136a2fa2 100644 --- a/modules/commands/cs_set_persist.cpp +++ b/modules/commands/cs_set_persist.cpp @@ -22,7 +22,7 @@ class CommandCSSetPersist : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -126,7 +126,7 @@ class CommandCSSetPersist : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_private.cpp b/modules/commands/cs_set_private.cpp index 733c4a22e..4fd261c45 100644 --- a/modules/commands/cs_set_private.cpp +++ b/modules/commands/cs_set_private.cpp @@ -22,7 +22,7 @@ class CommandCSSetPrivate : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetPrivate : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_restricted.cpp b/modules/commands/cs_set_restricted.cpp index 2ea996224..f02d17f3f 100644 --- a/modules/commands/cs_set_restricted.cpp +++ b/modules/commands/cs_set_restricted.cpp @@ -21,7 +21,7 @@ class CommandCSSetRestricted : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -53,7 +53,7 @@ class CommandCSSetRestricted : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_secure.cpp b/modules/commands/cs_set_secure.cpp index c58501bf4..480071cbc 100644 --- a/modules/commands/cs_set_secure.cpp +++ b/modules/commands/cs_set_secure.cpp @@ -22,7 +22,7 @@ class CommandCSSetSecure : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetSecure : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_securefounder.cpp b/modules/commands/cs_set_securefounder.cpp index cd5666b05..ad4a91033 100644 --- a/modules/commands/cs_set_securefounder.cpp +++ b/modules/commands/cs_set_securefounder.cpp @@ -22,7 +22,7 @@ class CommandCSSetSecureFounder : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -55,7 +55,7 @@ class CommandCSSetSecureFounder : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHelp(CommandSource &source, const Anope::string &) anope_override { this->SendSyntax(source); source.Reply(" "); diff --git a/modules/commands/cs_set_secureops.cpp b/modules/commands/cs_set_secureops.cpp index 912c56f57..b83e32a63 100644 --- a/modules/commands/cs_set_secureops.cpp +++ b/modules/commands/cs_set_secureops.cpp @@ -22,7 +22,7 @@ class CommandCSSetSecureOps : public Command this->SetSyntax(_("\037channel\037 {ON | OFF}")); } - void Execute(CommandSource &source, const std::vector ¶ms) + void Execute(CommandSource &source, const std::vector ¶ms) anope_override { User *u = source.u; ChannelInfo *ci = cs_findchan(params[0]); @@ -54,7 +54,7 @@ class CommandCSSetSecureOps : public Command return; } - bool OnHelp(CommandSource &source, const Anope::string &) + bool OnHel