From c78ecdf579c0bf0a75ed0f9641ffef8d89c17ec8 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 25 Jan 2019 02:52:11 +0000 Subject: Replace the override macro with the override keyword. --- src/coremods/core_channel/core_channel.cpp | 30 ++++++------ src/coremods/core_channel/core_channel.h | 22 ++++----- src/coremods/core_channel/invite.cpp | 2 +- src/coremods/core_channel/invite.h | 14 +++--- src/coremods/core_dns.cpp | 18 ++++---- src/coremods/core_hostname_lookup.cpp | 10 ++-- src/coremods/core_info/core_info.cpp | 12 ++--- src/coremods/core_info/core_info.h | 16 +++---- src/coremods/core_ison.cpp | 4 +- src/coremods/core_list.cpp | 6 +-- src/coremods/core_loadmodule.cpp | 8 ++-- src/coremods/core_lusers.cpp | 10 ++-- src/coremods/core_oper/core_oper.cpp | 4 +- src/coremods/core_oper/core_oper.h | 14 +++--- src/coremods/core_privmsg.cpp | 14 +++--- src/coremods/core_reloadmodule.cpp | 10 ++-- src/coremods/core_serialize_rfc.cpp | 10 ++-- src/coremods/core_stats.cpp | 8 ++-- src/coremods/core_stub.cpp | 14 +++--- src/coremods/core_user/core_user.cpp | 10 ++-- src/coremods/core_user/core_user.h | 28 +++++------ src/coremods/core_userhost.cpp | 4 +- src/coremods/core_wallops.cpp | 6 +-- src/coremods/core_who.cpp | 6 +-- src/coremods/core_whois.cpp | 10 ++-- src/coremods/core_whowas.cpp | 10 ++-- src/coremods/core_xline/core_xline.cpp | 6 +-- src/coremods/core_xline/core_xline.h | 12 ++--- src/modules.cpp | 2 +- src/modules/extra/m_geoip.cpp | 18 ++++---- src/modules/extra/m_ldap.cpp | 36 +++++++-------- src/modules/extra/m_mysql.cpp | 26 +++++------ src/modules/extra/m_pgsql.cpp | 30 ++++++------ src/modules/extra/m_regex_pcre.cpp | 6 +-- src/modules/extra/m_regex_posix.cpp | 8 ++-- src/modules/extra/m_regex_re2.cpp | 6 +-- src/modules/extra/m_regex_stdlib.cpp | 8 ++-- src/modules/extra/m_regex_tre.cpp | 6 +-- src/modules/extra/m_sqlite3.cpp | 18 ++++---- src/modules/extra/m_ssl_gnutls.cpp | 24 +++++----- src/modules/extra/m_ssl_mbedtls.cpp | 24 +++++----- src/modules/extra/m_ssl_openssl.cpp | 24 +++++----- src/modules/m_abbreviation.cpp | 6 +-- src/modules/m_alias.cpp | 12 ++--- src/modules/m_allowinvite.cpp | 6 +-- src/modules/m_alltime.cpp | 6 +-- src/modules/m_anticaps.cpp | 8 ++-- src/modules/m_auditorium.cpp | 18 ++++---- src/modules/m_autoop.cpp | 8 ++-- src/modules/m_banexception.cpp | 10 ++-- src/modules/m_banredirect.cpp | 8 ++-- src/modules/m_bcrypt.cpp | 10 ++-- src/modules/m_blockamsg.cpp | 6 +-- src/modules/m_blockcaps.cpp | 8 ++-- src/modules/m_blockcolor.cpp | 6 +-- src/modules/m_botmode.cpp | 4 +- src/modules/m_callerid.cpp | 28 +++++------ src/modules/m_cap.cpp | 18 ++++---- src/modules/m_cban.cpp | 22 ++++----- src/modules/m_censor.cpp | 6 +-- src/modules/m_cgiirc.cpp | 16 +++---- src/modules/m_chancreate.cpp | 6 +-- src/modules/m_chanfilter.cpp | 8 ++-- src/modules/m_chanhistory.cpp | 12 ++--- src/modules/m_chanlog.cpp | 6 +-- src/modules/m_channames.cpp | 10 ++-- src/modules/m_channelban.cpp | 6 +-- src/modules/m_check.cpp | 6 +-- src/modules/m_chghost.cpp | 8 ++-- src/modules/m_chgident.cpp | 6 +-- src/modules/m_chgname.cpp | 6 +-- src/modules/m_classban.cpp | 6 +-- src/modules/m_clearchan.cpp | 10 ++-- src/modules/m_cloaking.cpp | 18 ++++---- src/modules/m_clones.cpp | 4 +- src/modules/m_close.cpp | 4 +- src/modules/m_commonchans.cpp | 4 +- src/modules/m_conn_join.cpp | 10 ++-- src/modules/m_conn_umodes.cpp | 6 +-- src/modules/m_conn_waitpong.cpp | 10 ++-- src/modules/m_connectban.cpp | 8 ++-- src/modules/m_connflood.cpp | 6 +-- src/modules/m_customprefix.cpp | 4 +- src/modules/m_customtitle.cpp | 8 ++-- src/modules/m_cycle.cpp | 4 +- src/modules/m_dccallow.cpp | 14 +++--- src/modules/m_deaf.cpp | 8 ++-- src/modules/m_delayjoin.cpp | 20 ++++---- src/modules/m_delaymsg.cpp | 14 +++--- src/modules/m_denychans.cpp | 6 +-- src/modules/m_disable.cpp | 8 ++-- src/modules/m_dnsbl.cpp | 18 ++++---- src/modules/m_exemptchanops.cpp | 8 ++-- src/modules/m_filter.cpp | 24 +++++----- src/modules/m_flashpolicyd.cpp | 14 +++--- src/modules/m_gecosban.cpp | 6 +-- src/modules/m_globalload.cpp | 14 +++--- src/modules/m_globops.cpp | 6 +-- src/modules/m_haproxy.cpp | 12 ++--- src/modules/m_helpop.cpp | 8 ++-- src/modules/m_hidechans.cpp | 6 +-- src/modules/m_hidelist.cpp | 6 +-- src/modules/m_hidemode.cpp | 8 ++-- src/modules/m_hideoper.cpp | 14 +++--- src/modules/m_hostchange.cpp | 6 +-- src/modules/m_hostcycle.cpp | 6 +-- src/modules/m_httpd.cpp | 20 ++++---- src/modules/m_httpd_acl.cpp | 6 +-- src/modules/m_httpd_config.cpp | 4 +- src/modules/m_httpd_stats.cpp | 4 +- src/modules/m_ident.cpp | 18 ++++---- src/modules/m_inviteexception.cpp | 10 ++-- src/modules/m_ircv3.cpp | 14 +++--- src/modules/m_ircv3_accounttag.cpp | 2 +- src/modules/m_ircv3_batch.cpp | 14 +++--- src/modules/m_ircv3_capnotify.cpp | 14 +++--- src/modules/m_ircv3_chghost.cpp | 6 +-- src/modules/m_ircv3_echomessage.cpp | 6 +-- src/modules/m_ircv3_invitenotify.cpp | 6 +-- src/modules/m_ircv3_servertime.cpp | 2 +- src/modules/m_ircv3_sts.cpp | 10 ++-- src/modules/m_joinflood.cpp | 10 ++-- src/modules/m_jumpserver.cpp | 10 ++-- src/modules/m_kicknorejoin.cpp | 8 ++-- src/modules/m_knock.cpp | 8 ++-- src/modules/m_ldapauth.cpp | 22 ++++----- src/modules/m_ldapoper.cpp | 16 +++---- src/modules/m_lockserv.cpp | 14 +++--- src/modules/m_maphide.cpp | 6 +-- src/modules/m_md5.cpp | 4 +- src/modules/m_messageflood.cpp | 8 ++-- src/modules/m_mlock.cpp | 4 +- src/modules/m_modenotice.cpp | 6 +-- src/modules/m_monitor.cpp | 20 ++++---- src/modules/m_muteban.cpp | 6 +-- src/modules/m_namedmodes.cpp | 10 ++-- src/modules/m_namesx.cpp | 10 ++-- src/modules/m_nationalchars.cpp | 6 +-- src/modules/m_nickflood.cpp | 10 ++-- src/modules/m_nicklock.cpp | 14 +++--- src/modules/m_noctcp.cpp | 6 +-- src/modules/m_nokicks.cpp | 6 +-- src/modules/m_nonicks.cpp | 6 +-- src/modules/m_nonotice.cpp | 6 +-- src/modules/m_nopartmsg.cpp | 6 +-- src/modules/m_ojoin.cpp | 14 +++--- src/modules/m_operchans.cpp | 8 ++-- src/modules/m_operjoin.cpp | 6 +-- src/modules/m_operlevels.cpp | 4 +- src/modules/m_operlog.cpp | 10 ++-- src/modules/m_opermodes.cpp | 4 +- src/modules/m_opermotd.cpp | 10 ++-- src/modules/m_operprefix.cpp | 12 ++--- src/modules/m_override.cpp | 16 +++---- src/modules/m_passforward.cpp | 6 +-- src/modules/m_password_hash.cpp | 6 +-- src/modules/m_pbkdf2.cpp | 14 +++--- src/modules/m_permchannels.cpp | 16 +++---- src/modules/m_randquote.cpp | 6 +-- src/modules/m_redirect.cpp | 6 +-- src/modules/m_regex_glob.cpp | 6 +-- src/modules/m_remove.cpp | 10 ++-- src/modules/m_repeat.cpp | 12 ++--- src/modules/m_restrictchans.cpp | 6 +-- src/modules/m_restrictmsg.cpp | 4 +- src/modules/m_rline.cpp | 32 ++++++------- src/modules/m_rmode.cpp | 4 +- src/modules/m_sajoin.cpp | 6 +-- src/modules/m_sakick.cpp | 6 +-- src/modules/m_samode.cpp | 10 ++-- src/modules/m_sanick.cpp | 6 +-- src/modules/m_sapart.cpp | 6 +-- src/modules/m_saquit.cpp | 6 +-- src/modules/m_sasl.cpp | 24 +++++----- src/modules/m_satopic.cpp | 4 +- src/modules/m_securelist.cpp | 8 ++-- src/modules/m_seenicks.cpp | 6 +-- src/modules/m_serverban.cpp | 6 +-- src/modules/m_services_account.cpp | 22 ++++----- src/modules/m_servprotect.cpp | 14 +++--- src/modules/m_sethost.cpp | 6 +-- src/modules/m_setident.cpp | 4 +- src/modules/m_setidle.cpp | 4 +- src/modules/m_setname.cpp | 4 +- src/modules/m_sha1.cpp | 4 +- src/modules/m_sha256.cpp | 4 +- src/modules/m_showfile.cpp | 6 +-- src/modules/m_showwhois.cpp | 8 ++-- src/modules/m_shun.cpp | 20 ++++---- src/modules/m_silence.cpp | 16 +++---- src/modules/m_spanningtree/cachetimer.h | 2 +- src/modules/m_spanningtree/commands.h | 58 +++++++++++------------ src/modules/m_spanningtree/main.h | 64 +++++++++++++------------- src/modules/m_spanningtree/pingtimer.h | 2 +- src/modules/m_spanningtree/protocolinterface.h | 20 ++++---- src/modules/m_spanningtree/remoteuser.h | 2 +- src/modules/m_spanningtree/resolvers.h | 8 ++-- src/modules/m_spanningtree/servercommand.h | 8 ++-- src/modules/m_spanningtree/treeserver.h | 2 +- src/modules/m_spanningtree/treesocket.h | 12 ++--- src/modules/m_spanningtree/utils.h | 2 +- src/modules/m_sqlauth.cpp | 12 ++--- src/modules/m_sqloper.cpp | 12 ++--- src/modules/m_sslinfo.cpp | 24 +++++----- src/modules/m_sslmodes.cpp | 14 +++--- src/modules/m_starttls.cpp | 6 +-- src/modules/m_stripcolor.cpp | 8 ++-- src/modules/m_svshold.cpp | 26 +++++------ src/modules/m_swhois.cpp | 12 ++--- src/modules/m_timedbans.cpp | 12 ++--- src/modules/m_tline.cpp | 4 +- src/modules/m_topiclock.cpp | 14 +++--- src/modules/m_uhnames.cpp | 8 ++-- src/modules/m_uninvite.cpp | 6 +-- src/modules/m_userip.cpp | 6 +-- src/modules/m_vhost.cpp | 6 +-- src/modules/m_watch.cpp | 18 ++++---- src/modules/m_websocket.cpp | 16 +++---- src/modules/m_xline_db.cpp | 10 ++-- src/threadengines/threadengine_pthread.cpp | 12 ++--- src/usermanager.cpp | 2 +- src/users.cpp | 2 +- src/xline.cpp | 10 ++-- 223 files changed, 1176 insertions(+), 1176 deletions(-) (limited to 'src') diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp index bf51bd4b2..819d85b92 100644 --- a/src/coremods/core_channel/core_channel.cpp +++ b/src/coremods/core_channel/core_channel.cpp @@ -44,7 +44,7 @@ class JoinHook : public ClientProtocol::EventHook { } - void OnEventInit(const ClientProtocol::Event& ev) CXX11_OVERRIDE + void OnEventInit(const ClientProtocol::Event& ev) override { const ClientProtocol::Events::Join& join = static_cast(ev); const Membership& memb = *join.GetMember(); @@ -75,7 +75,7 @@ class JoinHook : public ClientProtocol::EventHook modemsg.SetSourceUser(ServerInstance->FakeClient); } - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override { // If joininguser is NULL then they didn't get any modes on join, skip. // Also don't show their own modes to them, they get that in the NAMES list not via MODE. @@ -145,7 +145,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* optionstag = ServerInstance->Config->ConfValue("options"); @@ -201,7 +201,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener } } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["KEYLEN"] = ConvToStr(ModeChannelKey::maxkeylen); @@ -230,7 +230,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener } } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string&, std::string&, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string&, std::string&, const std::string& keygiven) override { if (!chan) return MOD_RES_PASSTHRU; @@ -277,7 +277,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener return MOD_RES_PASSTHRU; } - void OnPostJoin(Membership* memb) CXX11_OVERRIDE + void OnPostJoin(Membership* memb) override { Channel* const chan = memb->chan; LocalUser* const localuser = IS_LOCAL(memb->user); @@ -294,42 +294,42 @@ class CoreModChannel : public Module, public CheckExemption::EventListener } } - ModResult OnCheckKey(User* user, Channel* chan, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnCheckKey(User* user, Channel* chan, const std::string& keygiven) override { // Hook only runs when being invited bypasses +bkl return IsInvited(user, chan); } - ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE + ModResult OnCheckChannelBan(User* user, Channel* chan) override { // Hook only runs when being invited bypasses +bkl return IsInvited(user, chan); } - ModResult OnCheckLimit(User* user, Channel* chan) CXX11_OVERRIDE + ModResult OnCheckLimit(User* user, Channel* chan) override { // Hook only runs when being invited bypasses +bkl return IsInvited(user, chan); } - ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE + ModResult OnCheckInvite(User* user, Channel* chan) override { // Hook always runs return IsInvited(user, chan); } - void OnUserDisconnect(LocalUser* user) CXX11_OVERRIDE + void OnUserDisconnect(LocalUser* user) override { invapi.RemoveAll(user); } - void OnChannelDelete(Channel* chan) CXX11_OVERRIDE + void OnChannelDelete(Channel* chan) override { // Make sure the channel won't appear in invite lists from now on, don't wait for cull to unset the ext invapi.RemoveAll(chan); } - ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE + ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) override { if (!exemptions.count(restriction)) return MOD_RES_PASSTHRU; @@ -345,13 +345,13 @@ class CoreModChannel : public Module, public CheckExemption::EventListener return MOD_RES_PASSTHRU; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules.SetPriority(this, I_OnPostJoin, PRIORITY_FIRST); ServerInstance->Modules.SetPriority(this, I_OnUserPreJoin, PRIORITY_LAST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the INVITE, JOIN, KICK, NAMES, and TOPIC commands", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h index 6e11275df..71ad4a011 100644 --- a/src/coremods/core_channel/core_channel.h +++ b/src/coremods/core_channel/core_channel.h @@ -70,8 +70,8 @@ class CommandInvite : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; /** Handle /JOIN. @@ -88,7 +88,7 @@ class CommandJoin : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; /** Handle /TOPIC. @@ -109,7 +109,7 @@ class CommandTopic : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; /** Handle /NAMES. @@ -130,7 +130,7 @@ class CommandNames : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; /** Spool the NAMES list for a given channel to the given user * @param user User to spool the NAMES list to @@ -154,8 +154,8 @@ class CommandKick : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; /** Channel mode +b @@ -176,9 +176,9 @@ class ModeChannelKey : public ParamMode public: static const std::string::size_type maxkeylen; ModeChannelKey(Module* Creator); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE; + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override; void SerializeParam(Channel* chan, const std::string* key, std::string& out) ; - ModeAction OnSet(User* source, Channel* chan, std::string& param) CXX11_OVERRIDE; + ModeAction OnSet(User* source, Channel* chan, std::string& param) override; }; /** Channel mode +l @@ -188,9 +188,9 @@ class ModeChannelLimit : public ParamMode public: size_t minlimit; ModeChannelLimit(Module* Creator); - bool ResolveModeConflict(std::string& their_param, const std::string& our_param, Channel* channel) CXX11_OVERRIDE; + bool ResolveModeConflict(std::string& their_param, const std::string& our_param, Channel* channel) override; void SerializeParam(Channel* chan, intptr_t n, std::string& out); - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE; + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override; }; /** Channel mode +o diff --git a/src/coremods/core_channel/invite.cpp b/src/coremods/core_channel/invite.cpp index 51fb638f8..61e0d2650 100644 --- a/src/coremods/core_channel/invite.cpp +++ b/src/coremods/core_channel/invite.cpp @@ -25,7 +25,7 @@ class InviteExpireTimer : public Timer { Invite::Invite* const inv; - bool Tick(time_t currtime) CXX11_OVERRIDE; + bool Tick(time_t currtime) override; public: InviteExpireTimer(Invite::Invite* invite, time_t timeout); diff --git a/src/coremods/core_channel/invite.h b/src/coremods/core_channel/invite.h index 19e3861f8..2dd3213e8 100644 --- a/src/coremods/core_channel/invite.h +++ b/src/coremods/core_channel/invite.h @@ -69,7 +69,7 @@ class Invite::ExtItem : public ExtensionItem free(ext, store); } - void free(Extensible* container, void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) override { Store* store = static_cast*>(item); for (typename Store::List::iterator i = store->invites.begin(); i != store->invites.end(); ) @@ -83,7 +83,7 @@ class Invite::ExtItem : public ExtensionItem delete store; } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override { if (format == FORMAT_NETWORK) return std::string(); @@ -100,7 +100,7 @@ class Invite::ExtItem : public ExtensionItem return ret; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override { if ((ExtType != ExtensionItem::EXT_CHANNEL) && (format != FORMAT_NETWORK)) UnserializeInvite(static_cast(container), value); @@ -115,10 +115,10 @@ class Invite::APIImpl : public APIBase public: APIImpl(Module* owner); - void Create(LocalUser* user, Channel* chan, time_t timeout) CXX11_OVERRIDE; - Invite* Find(LocalUser* user, Channel* chan) CXX11_OVERRIDE; - bool Remove(LocalUser* user, Channel* chan) CXX11_OVERRIDE; - const List* GetList(LocalUser* user) CXX11_OVERRIDE; + void Create(LocalUser* user, Channel* chan, time_t timeout) override; + Invite* Find(LocalUser* user, Channel* chan) override; + bool Remove(LocalUser* user, Channel* chan) override; + const List* GetList(LocalUser* user) override; void RemoveAll(LocalUser* user) { userext.unset(user); } void RemoveAll(Channel* chan) { chanext.unset(chan); } diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp index 5dc5d2ea3..8ec97b980 100644 --- a/src/coremods/core_dns.cpp +++ b/src/coremods/core_dns.cpp @@ -437,7 +437,7 @@ class MyManager : public Manager, public Timer, public EventHandler } } - void Process(DNS::Request* req) CXX11_OVERRIDE + void Process(DNS::Request* req) override { if ((unloading) || (req->creator->dying)) throw Exception("Module is being unloaded"); @@ -504,13 +504,13 @@ class MyManager : public Manager, public Timer, public EventHandler ServerInstance->Timers.AddTimer(req); } - void RemoveRequest(DNS::Request* req) CXX11_OVERRIDE + void RemoveRequest(DNS::Request* req) override { if (requests[req->id] == req) requests[req->id] = NULL; } - std::string GetErrorStr(Error e) CXX11_OVERRIDE + std::string GetErrorStr(Error e) override { switch (e) { @@ -538,12 +538,12 @@ class MyManager : public Manager, public Timer, public EventHandler } } - void OnEventHandlerError(int errcode) CXX11_OVERRIDE + void OnEventHandlerError(int errcode) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "UDP socket got an error event"); } - void OnEventHandlerRead() CXX11_OVERRIDE + void OnEventHandlerRead() override { unsigned char buffer[524]; irc::sockets::sockaddrs from; @@ -659,7 +659,7 @@ class MyManager : public Manager, public Timer, public EventHandler delete request; } - bool Tick(time_t now) CXX11_OVERRIDE + bool Tick(time_t now) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: purging DNS cache"); @@ -803,7 +803,7 @@ class ModuleDNS : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string oldserver = DNSServer; const std::string oldip = SourceIP; @@ -821,7 +821,7 @@ class ModuleDNS : public Module this->manager.Rehash(DNSServer, SourceIP, SourcePort); } - void OnUnloadModule(Module* mod) CXX11_OVERRIDE + void OnUnloadModule(Module* mod) override { for (unsigned int i = 0; i <= MAX_REQUEST_ID; ++i) { @@ -840,7 +840,7 @@ class ModuleDNS : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("DNS support", VF_CORE|VF_VENDOR); } diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index 85d0f530c..d8d19d890 100644 --- a/src/coremods/core_hostname_lookup.cpp +++ b/src/coremods/core_hostname_lookup.cpp @@ -56,7 +56,7 @@ class UserResolver : public DNS::Request * if a previous result has already come back. * @param r The finished query */ - void OnLookupComplete(const DNS::Query* r) CXX11_OVERRIDE + void OnLookupComplete(const DNS::Query* r) override { LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid); if (!bound_user) @@ -164,7 +164,7 @@ class UserResolver : public DNS::Request /** Called on failed lookup * @param query The errored query */ - void OnError(const DNS::Query* query) CXX11_OVERRIDE + void OnError(const DNS::Query* query) override { LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid); if (bound_user) @@ -191,7 +191,7 @@ class ModuleHostnameLookup : public Module ph = &ptrHosts; } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { // If core_dns is not loaded or hostname resolution is disabled for the user's // connect class then the logic in this function does not apply. @@ -221,12 +221,12 @@ class ModuleHostnameLookup : public Module } } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return this->dnsLookup.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for DNS lookups on connecting clients", VF_CORE|VF_VENDOR); } diff --git a/src/coremods/core_info/core_info.cpp b/src/coremods/core_info/core_info.cpp index 2b56e5e51..9d5a2fdb0 100644 --- a/src/coremods/core_info/core_info.cpp +++ b/src/coremods/core_info/core_info.cpp @@ -97,7 +97,7 @@ class CoreModInfo : public Module numeric004.push(INSPIRCD_BRANCH); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { // Process the escape codes in the MOTDs. ConfigFileCache newmotds; @@ -127,7 +127,7 @@ class CoreModInfo : public Module cmdadmin.AdminNick = tag->getString("nick", "admin"); } - void OnUserConnect(LocalUser* user) CXX11_OVERRIDE + void OnUserConnect(LocalUser* user) override { user->WriteNumeric(RPL_WELCOME, InspIRCd::Format("Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), user->GetFullRealHost().c_str())); user->WriteNumeric(RPL_YOURHOST, InspIRCd::Format("Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH)); @@ -157,22 +157,22 @@ class CoreModInfo : public Module } } - void OnServiceAdd(ServiceProvider& service) CXX11_OVERRIDE + void OnServiceAdd(ServiceProvider& service) override { OnServiceChange(service); } - void OnServiceDel(ServiceProvider& service) CXX11_OVERRIDE + void OnServiceDel(ServiceProvider& service) override { OnServiceChange(service); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules.SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ADMIN, COMMANDS, INFO, MODULES, MOTD, TIME and VERSION commands", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_info/core_info.h b/src/coremods/core_info/core_info.h index 5cc619a4a..a231b5f46 100644 --- a/src/coremods/core_info/core_info.h +++ b/src/coremods/core_info/core_info.h @@ -31,7 +31,7 @@ class ServerTargetCommand : public Command { } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; /** Handle /ADMIN. @@ -63,7 +63,7 @@ class CommandAdmin : public ServerTargetCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /COMMANDS. @@ -80,7 +80,7 @@ class CommandCommands : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /INFO. @@ -97,7 +97,7 @@ class CommandInfo : public ServerTargetCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /MODULES. @@ -114,7 +114,7 @@ class CommandModules : public ServerTargetCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /MOTD. @@ -133,7 +133,7 @@ class CommandMotd : public ServerTargetCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /TIME. @@ -150,7 +150,7 @@ class CommandTime : public ServerTargetCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /VERSION. @@ -167,5 +167,5 @@ class CommandVersion : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp index 3f6b1ac74..a4f63959f 100644 --- a/src/coremods/core_ison.cpp +++ b/src/coremods/core_ison.cpp @@ -37,7 +37,7 @@ class CommandIson : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; class IsonReplyBuilder : public Numeric::Builder<' ', true> @@ -88,7 +88,7 @@ class CoreModIson : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ISON command", VF_CORE | VF_VENDOR); } diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp index f03fbbe5e..afbba2f59 100644 --- a/src/coremods/core_list.cpp +++ b/src/coremods/core_list.cpp @@ -56,7 +56,7 @@ class CommandList : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; @@ -200,13 +200,13 @@ class CoreModList : public Module { } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["ELIST"] = "CMNTU"; tokens["SAFELIST"]; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the LIST command", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp index faecab213..1728cb5ae 100644 --- a/src/coremods/core_loadmodule.cpp +++ b/src/coremods/core_loadmodule.cpp @@ -33,7 +33,7 @@ class CommandLoadmodule : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /LOADMODULE @@ -75,7 +75,7 @@ class CommandUnloadmodule : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; CmdResult CommandUnloadmodule::Handle(User* user, const Params& parameters) @@ -118,12 +118,12 @@ class CoreModLoadModule : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the LOADMODULE and UNLOADMODULE commands", VF_VENDOR|VF_CORE); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("security"); cmdunloadmod.allowcoreunload = tag->getBool("allowcoreunload"); diff --git a/src/coremods/core_lusers.cpp b/src/coremods/core_lusers.cpp index 39a5dac7f..97cd604b0 100644 --- a/src/coremods/core_lusers.cpp +++ b/src/coremods/core_lusers.cpp @@ -61,7 +61,7 @@ class CommandLusers : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /LUSERS @@ -110,7 +110,7 @@ public: { } - void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding) CXX11_OVERRIDE + void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding) override { if (dest->registered != REG_ALL) return; @@ -151,20 +151,20 @@ class ModuleLusers : public Module { } - void OnPostConnect(User* user) CXX11_OVERRIDE + void OnPostConnect(User* user) override { counters.UpdateMaxUsers(); if (user->IsModeSet(invisiblemode)) counters.invisible++; } - void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) override { if (user->IsModeSet(invisiblemode)) counters.invisible--; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("LUSERS", VF_VENDOR | VF_CORE); } diff --git a/src/coremods/core_oper/core_oper.cpp b/src/coremods/core_oper/core_oper.cpp index d4afab3b8..600c35ac3 100644 --- a/src/coremods/core_oper/core_oper.cpp +++ b/src/coremods/core_oper/core_oper.cpp @@ -40,7 +40,7 @@ class CoreModOper : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("power"); @@ -56,7 +56,7 @@ class CoreModOper : public Module cmdkill.hideuline = security->getBool("hideulinekills"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the DIE, KILL, OPER, REHASH, and RESTART commands", VF_VENDOR | VF_CORE); } diff --git a/src/coremods/core_oper/core_oper.h b/src/coremods/core_oper/core_oper.h index 7589b86d6..e4bbb0068 100644 --- a/src/coremods/core_oper/core_oper.h +++ b/src/coremods/core_oper/core_oper.h @@ -46,7 +46,7 @@ class CommandDie : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /KILL. @@ -73,11 +73,11 @@ class CommandKill : public Command * @param parameters Parameters to the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; - void EncodeParameter(std::string& param, unsigned int index) CXX11_OVERRIDE; + void EncodeParameter(std::string& param, unsigned int index) override; }; /** Handle /OPER. @@ -94,7 +94,7 @@ class CommandOper : public SplitCommand * @param parameters Parameters to the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; /** Handle /REHASH. @@ -111,7 +111,7 @@ class CommandRehash : public Command * @param parameters Parameters to the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /RESTART @@ -131,5 +131,5 @@ class CommandRestart : public Command * @param parameters Parameters to the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; diff --git a/src/coremods/core_privmsg.cpp b/src/coremods/core_privmsg.cpp index 692a661b3..ee6002cad 100644 --- a/src/coremods/core_privmsg.cpp +++ b/src/coremods/core_privmsg.cpp @@ -29,7 +29,7 @@ public: { } - bool IsCTCP(std::string& name, std::string& body) const CXX11_OVERRIDE + bool IsCTCP(std::string& name, std::string& body) const override { if (!this->IsCTCP()) return false; @@ -60,7 +60,7 @@ public: return true; } - bool IsCTCP(std::string& name) const CXX11_OVERRIDE + bool IsCTCP(std::string& name) const override { if (!this->IsCTCP()) return false; @@ -79,7 +79,7 @@ public: return true; } - bool IsCTCP() const CXX11_OVERRIDE + bool IsCTCP() const override { // According to draft-oakley-irc-ctcp-02 a valid CTCP must begin with SOH and // contain at least one octet which is not NUL, SOH, CR, LF, or SPACE. As most @@ -130,7 +130,7 @@ class MessageCommandBase : public Command */ CmdResult HandleMessage(User* user, const Params& parameters, MessageType mt); - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if (IS_LOCAL(user)) // This is handled by the OnUserPostMessage hook to split the LoopCall pieces @@ -333,7 +333,7 @@ class CommandMessage : public MessageCommandBase { } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { return HandleMessage(user, parameters, MT); } @@ -350,7 +350,7 @@ class ModuleCoreMessage : public Module { } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { // We only handle the idle times of local users. LocalUser* luser = IS_LOCAL(user); @@ -364,7 +364,7 @@ class ModuleCoreMessage : public Module luser->idle_lastmsg = ServerInstance->Time(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("PRIVMSG, NOTICE", VF_CORE|VF_VENDOR); } diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp index ea5d40abd..4be9e82b4 100644 --- a/src/coremods/core_reloadmodule.cpp +++ b/src/coremods/core_reloadmodule.cpp @@ -28,12 +28,12 @@ static ClientProtocol::Serializer* dummyserializer; class DummySerializer : public ClientProtocol::Serializer { - bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) CXX11_OVERRIDE + bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) override { return false; } - ClientProtocol::SerializedMessage Serialize(const ClientProtocol::Message& msg, const ClientProtocol::TagSelection& tagwl) const CXX11_OVERRIDE + ClientProtocol::SerializedMessage Serialize(const ClientProtocol::Message& msg, const ClientProtocol::TagSelection& tagwl) const override { return ClientProtocol::SerializedMessage(); } @@ -69,7 +69,7 @@ class CommandReloadmodule : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; namespace ReloadModule @@ -712,7 +712,7 @@ class ReloadAction : public ActionBase { } - void Call() CXX11_OVERRIDE + void Call() override { ReloadModule::DataKeeper datakeeper; datakeeper.Save(mod); @@ -776,7 +776,7 @@ class CoreModReloadmodule : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the RELOADMODULE command", VF_CORE | VF_VENDOR); } diff --git a/src/coremods/core_serialize_rfc.cpp b/src/coremods/core_serialize_rfc.cpp index 23a4c2052..b6129a9bf 100644 --- a/src/coremods/core_serialize_rfc.cpp +++ b/src/coremods/core_serialize_rfc.cpp @@ -42,8 +42,8 @@ class RFCSerializer : public ClientProtocol::Serializer { } - bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) CXX11_OVERRIDE; - ClientProtocol::SerializedMessage Serialize(const ClientProtocol::Message& msg, const ClientProtocol::TagSelection& tagwl) const CXX11_OVERRIDE; + bool Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) override; + ClientProtocol::SerializedMessage Serialize(const ClientProtocol::Message& msg, const ClientProtocol::TagSelection& tagwl) const override; }; bool RFCSerializer::Parse(LocalUser* user, const std::string& line, ClientProtocol::ParseOutput& parseoutput) @@ -232,7 +232,7 @@ class ModuleCoreRFCSerializer : public Module { } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type != ExtensionItem::EXT_USER) return; @@ -242,13 +242,13 @@ class ModuleCoreRFCSerializer : public Module ServerInstance->Users.QuitUser(user, "Protocol serializer module unloading"); } - void OnUserInit(LocalUser* user) CXX11_OVERRIDE + void OnUserInit(LocalUser* user) override { if (!user->serializer) user->serializer = &rfcserializer; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("RFC client protocol serializer and unserializer", VF_CORE|VF_VENDOR); } diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp index 6a4427aef..99027f706 100644 --- a/src/coremods/core_stats.cpp +++ b/src/coremods/core_stats.cpp @@ -52,8 +52,8 @@ class CommandStats : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos)) return ROUTE_UNICAST(parameters[1]); @@ -409,13 +409,13 @@ class CoreModStats : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* security = ServerInstance->Config->ConfValue("security"); cmd.userstats = security->getString("userstats"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the STATS command", VF_CORE | VF_VENDOR); } diff --git a/src/coremods/core_stub.cpp b/src/coremods/core_stub.cpp index e4f18cb22..9d257e741 100644 --- a/src/coremods/core_stub.cpp +++ b/src/coremods/core_stub.cpp @@ -48,7 +48,7 @@ class CommandConnect : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* * This is handled by the server linking module, if necessary. Do not remove this stub. @@ -75,7 +75,7 @@ class CommandLinks : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { user->WriteNumeric(RPL_LINKS, ServerInstance->Config->ServerName, ServerInstance->Config->ServerName, InspIRCd::Format("0 %s", ServerInstance->Config->ServerDesc.c_str())); user->WriteNumeric(RPL_ENDOFLINKS, '*', "End of /LINKS list."); @@ -101,7 +101,7 @@ class CommandServer : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (user->registered == REG_ALL) { @@ -134,7 +134,7 @@ class CommandSquit : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { user->WriteNotice("Look into loading a linking module (like m_spanningtree) if you want this to do anything useful."); return CMD_FAILURE; @@ -150,7 +150,7 @@ class CommandSummon { } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { user->WriteNumeric(ERR_SUMMONDISABLED, "SUMMON has been disabled"); return CMD_SUCCESS; @@ -166,7 +166,7 @@ class CommandUsers { } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { user->WriteNumeric(ERR_USERSDISABLED, "USERS has been disabled"); return CMD_SUCCESS; @@ -193,7 +193,7 @@ class CoreModStub : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides stubs for unimplemented commands", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_user/core_user.cpp b/src/coremods/core_user/core_user.cpp index e4e7a5056..f04a3044a 100644 --- a/src/coremods/core_user/core_user.cpp +++ b/src/coremods/core_user/core_user.cpp @@ -40,7 +40,7 @@ class CommandPass : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { // Check to make sure they haven't registered -- Fix by FCS if (user->registered == REG_ALL) @@ -73,7 +73,7 @@ class CommandPing : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { ClientProtocol::Messages::Pong pong(parameters[0]); user->Send(ServerInstance->GetRFCEvents().pong, pong); @@ -100,7 +100,7 @@ class CommandPong : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { // set the user as alive so they survive to next ping LocalUser* localuser = IS_LOCAL(user); @@ -169,13 +169,13 @@ class CoreModUser : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { cmdpart.msgwrap.ReadConfig("prefixpart", "suffixpart", "fixedpart"); cmdquit.msgwrap.ReadConfig("prefixquit", "suffixquit", "fixedquit"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the AWAY, MODE, NICK, PART, PASS, PING, PONG, QUIT and USER commands", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h index 1365cd048..912e137b2 100644 --- a/src/coremods/core_user/core_user.h +++ b/src/coremods/core_user/core_user.h @@ -66,8 +66,8 @@ class CommandAway : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; class CommandMode : public Command @@ -99,9 +99,9 @@ class CommandMode : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; /** Handle /NICK. @@ -118,7 +118,7 @@ class CommandNick : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; /** Handle /PART. @@ -137,8 +137,8 @@ class CommandPart : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; /** Handle /QUIT. @@ -160,9 +160,9 @@ class CommandQuit : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& parameters) override; }; /** Handle /USER. @@ -179,7 +179,7 @@ class CommandUser : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; /** Run the OnUserRegister hook if the user has sent both NICK and USER. Called after an unregistered user * successfully executes the USER or the NICK command. @@ -206,14 +206,14 @@ class ModeUserServerNoticeMask : public ModeHandler public: ModeUserServerNoticeMask(Module* Creator); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) CXX11_OVERRIDE; - void OnParameterMissing(User* user, User* dest, Channel* channel) CXX11_OVERRIDE; + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) override; + void OnParameterMissing(User* user, User* dest, Channel* channel) override; /** Create a displayable mode string of the snomasks set on a given user * @param user The user whose notice masks to format * @return The notice mask character sequence */ - std::string GetUserParameter(const User* user) const CXX11_OVERRIDE; + std::string GetUserParameter(const User* user) const override; }; /** User mode +o @@ -222,5 +222,5 @@ class ModeUserOperator : public ModeHandler { public: ModeUserOperator(Module* Creator); - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) CXX11_OVERRIDE; + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) override; }; diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp index 542c1831d..aaaf32627 100644 --- a/src/coremods/core_userhost.cpp +++ b/src/coremods/core_userhost.cpp @@ -40,7 +40,7 @@ class CommandUserhost : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; CmdResult CommandUserhost::Handle(User* user, const Params& parameters) @@ -93,7 +93,7 @@ class CoreModUserhost : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the USERHOST command", VF_CORE | VF_VENDOR); } diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp index 6b055f874..da7ff4070 100644 --- a/src/coremods/core_wallops.cpp +++ b/src/coremods/core_wallops.cpp @@ -44,9 +44,9 @@ class CommandWallops : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_BROADCAST; } @@ -80,7 +80,7 @@ class CoreModWallops : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the WALLOPS command", VF_CORE | VF_VENDOR); } diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index 132f8bc1e..2eeb5766f 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -149,7 +149,7 @@ class CommandWho : public SplitCommand /** Sends a WHO reply to a user. */ void SendWhoLine(LocalUser* user, const std::vector& parameters, Membership* memb, User* u, WhoData& data); - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; }; template<> User* CommandWho::GetUser(UserManager::OperList::const_iterator& t) { return *t; } @@ -558,12 +558,12 @@ class CoreModWho : public Module { } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["WHOX"]; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the WHO command", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index 0db634810..84ef3363a 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -62,7 +62,7 @@ class WhoisContextImpl : public Whois::Context } using Whois::Context::SendLine; - void SendLine(Numeric::Numeric& numeric) CXX11_OVERRIDE; + void SendLine(Numeric::Numeric& numeric) override; }; void WhoisContextImpl::SendLine(Numeric::Numeric& numeric) @@ -115,8 +115,8 @@ class CommandWhois : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE; - CmdResult HandleRemote(RemoteUser* target, const Params& parameters) CXX11_OVERRIDE; + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override; + CmdResult HandleRemote(RemoteUser* target, const Params& parameters) override; }; class WhoisNumericSink @@ -353,7 +353,7 @@ class CoreModWhois : public Module { } - void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + void ReadConfig(ConfigStatus&) override { ConfigTag* tag = ServerInstance->Config->ConfValue("options"); const std::string splitwhois = tag->getString("splitwhois", "no"); @@ -372,7 +372,7 @@ class CoreModWhois : public Module cmd.splitwhois = newsplitstate; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the WHOIS command", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp index 65c83e08b..a17b362e1 100644 --- a/src/coremods/core_whowas.cpp +++ b/src/coremods/core_whowas.cpp @@ -272,18 +272,18 @@ class ModuleWhoWas : public Module, public Stats::EventListener { } - void OnGarbageCollect() CXX11_OVERRIDE + void OnGarbageCollect() override { // Remove all entries older than MaxKeep cmd.manager.Maintain(); } - void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) override { cmd.manager.Add(user); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() == 'z') stats.AddRow(249, "Whowas entries: "+ConvToStr(cmd.manager.GetStats().entrycount)); @@ -291,7 +291,7 @@ class ModuleWhoWas : public Module, public Stats::EventListener return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("whowas"); unsigned int NewGroupSize = tag->getUInt("groupsize", 10, 0, 10000); @@ -301,7 +301,7 @@ class ModuleWhoWas : public Module, public Stats::EventListener cmd.manager.UpdateConfig(NewGroupSize, NewMaxGroups, NewMaxKeep); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("WHOWAS", VF_VENDOR); } diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp index c53834fc0..7369ac386 100644 --- a/src/coremods/core_xline/core_xline.cpp +++ b/src/coremods/core_xline/core_xline.cpp @@ -64,7 +64,7 @@ class CoreModXLine : public Module { } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { if (user->quitting) return; @@ -73,7 +73,7 @@ class CoreModXLine : public Module user->CheckLines(true); } - ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE + ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) override { // Check Q-lines (for local nick changes only, remote servers have our Q-lines to enforce themselves) @@ -93,7 +93,7 @@ class CoreModXLine : public Module return MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ELINE, GLINE, KLINE, QLINE, and ZLINE commands", VF_VENDOR|VF_CORE); } diff --git a/src/coremods/core_xline/core_xline.h b/src/coremods/core_xline/core_xline.h index c607797f1..d77c1cc91 100644 --- a/src/coremods/core_xline/core_xline.h +++ b/src/coremods/core_xline/core_xline.h @@ -34,7 +34,7 @@ class InsaneBan class Matcher : public MatcherBase { public: - long Run(const std::string& mask) CXX11_OVERRIDE + long Run(const std::string& mask) override { long matches = 0; const T* c = static_cast(this); @@ -79,7 +79,7 @@ class CommandEline : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /GLINE. @@ -96,7 +96,7 @@ class CommandGline : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /KLINE. @@ -113,7 +113,7 @@ class CommandKline : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /QLINE. @@ -136,7 +136,7 @@ class CommandQline : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; /** Handle /ZLINE. @@ -159,5 +159,5 @@ class CommandZline : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; diff --git a/src/modules.cpp b/src/modules.cpp index c2233a893..0e69dfc0a 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -440,7 +440,7 @@ namespace { Module* const mod; UnloadAction(Module* m) : mod(m) {} - void Call() CXX11_OVERRIDE + void Call() override { DLLManager* dll = mod->ModuleDLLManager; ServerInstance->Modules->DoSafeUnload(mod); diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp index e4299a1c2..7e2c1d43d 100644 --- a/src/modules/extra/m_geoip.cpp +++ b/src/modules/extra/m_geoip.cpp @@ -89,7 +89,7 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev { } - void init() CXX11_OVERRIDE + void init() override { ipv4db = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); if (!ipv4db) @@ -119,24 +119,24 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev GeoIP_delete(ipv6db); } - void ReadConfig(ConfigStatus&) CXX11_OVERRIDE + void ReadConfig(ConfigStatus&) override { ConfigTag* tag = ServerInstance->Config->ConfValue("geoip"); extban = tag->getBool("extban"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides a way to assign users to connect classes by country using GeoIP lookup", VF_OPTCOMMON|VF_VENDOR); } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { if (extban) tokens["EXTBAN"].push_back('G'); } - ModResult OnCheckBan(User* user, Channel*, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel*, const std::string& mask) override { if (extban && (mask.length() > 2) && (mask[0] == 'G') && (mask[1] == ':')) { @@ -150,7 +150,7 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev return MOD_RES_PASSTHRU; } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { std::string* cc = ext.get(user); if (!cc) @@ -167,14 +167,14 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev return MOD_RES_DENY; } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { // If user has sent NICK/USER, re-set the ExtItem as this is likely CGI:IRC changing the IP if (user->registered == REG_NICKUSER) SetExt(user); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { // If the extban is disabled we don't expose users location. if (!extban) @@ -187,7 +187,7 @@ class ModuleGeoIP : public Module, public Stats::EventListener, public Whois::Ev whois.SendLine(RPL_WHOISCOUNTRY, *cc, "is located in this country"); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'G') return MOD_RES_PASSTHRU; diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index 8c2752dbf..e2c5fd1c5 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -84,7 +84,7 @@ class LDAPBind : public LDAPRequest type = QUERY_BIND; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPSearch : public LDAPRequest @@ -103,7 +103,7 @@ class LDAPSearch : public LDAPRequest type = QUERY_SEARCH; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPAdd : public LDAPRequest @@ -120,7 +120,7 @@ class LDAPAdd : public LDAPRequest type = QUERY_ADD; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPDel : public LDAPRequest @@ -135,7 +135,7 @@ class LDAPDel : public LDAPRequest type = QUERY_DELETE; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPModify : public LDAPRequest @@ -152,7 +152,7 @@ class LDAPModify : public LDAPRequest type = QUERY_MODIFY; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPCompare : public LDAPRequest @@ -169,7 +169,7 @@ class LDAPCompare : public LDAPRequest type = QUERY_COMPARE; } - int run() CXX11_OVERRIDE; + int run() override; }; class LDAPService : public LDAPProvider, public SocketThread @@ -330,20 +330,20 @@ class LDAPService : public LDAPProvider, public SocketThread } } - void BindAsManager(LDAPInterface* i) CXX11_OVERRIDE + void BindAsManager(LDAPInterface* i) override { std::string binddn = config->getString("binddn"); std::string bindauth = config->getString("bindauth"); this->Bind(i, binddn, bindauth); } - void Bind(LDAPInterface* i, const std::string& who, const std::string& pass) CXX11_OVERRIDE + void Bind(LDAPInterface* i, const std::string& who, const std::string& pass) override { LDAPBind* b = new LDAPBind(this, i, who, pass); QueueRequest(b); } - void Search(LDAPInterface* i, const std::string& base, const std::string& filter) CXX11_OVERRIDE + void Search(LDAPInterface* i, const std::string& base, const std::string& filter) override { if (i == NULL) throw LDAPException("No interface"); @@ -352,25 +352,25 @@ class LDAPService : public LDAPProvider, public SocketThread QueueRequest(s); } - void Add(LDAPInterface* i, const std::string& dn, LDAPMods& attributes) CXX11_OVERRIDE + void Add(LDAPInterface* i, const std::string& dn, LDAPMods& attributes) override { LDAPAdd* add = new LDAPAdd(this, i, dn, attributes); QueueRequest(add); } - void Del(LDAPInterface* i, const std::string& dn) CXX11_OVERRIDE + void Del(LDAPInterface* i, const std::string& dn) override { LDAPDel* del = new LDAPDel(this, i, dn); QueueRequest(del); } - void Modify(LDAPInterface* i, const std::string& base, LDAPMods& attributes) CXX11_OVERRIDE + void Modify(LDAPInterface* i, const std::string& base, LDAPMods& attributes) override { LDAPModify* mod = new LDAPModify(this, i, base, attributes); QueueRequest(mod); } - void Compare(LDAPInterface* i, const std::string& dn, const std::string& attr, const std::string& val) CXX11_OVERRIDE + void Compare(LDAPInterface* i, const std::string& dn, const std::string& attr, const std::string& val) override { LDAPCompare* comp = new LDAPCompare(this, i, dn, attr, val); QueueRequest(comp); @@ -476,7 +476,7 @@ class LDAPService : public LDAPProvider, public SocketThread } public: - void Run() CXX11_OVERRIDE + void Run() override { while (!this->GetExitFlag()) { @@ -489,7 +489,7 @@ class LDAPService : public LDAPProvider, public SocketThread } } - void OnNotify() CXX11_OVERRIDE + void OnNotify() override { query_queue r; @@ -524,7 +524,7 @@ class ModuleLDAP : public Module ServiceMap LDAPServices; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ServiceMap conns; @@ -566,7 +566,7 @@ class ModuleLDAP : public Module LDAPServices.swap(conns); } - void OnUnloadModule(Module* m) CXX11_OVERRIDE + void OnUnloadModule(Module* m) override { for (ServiceMap::iterator it = this->LDAPServices.begin(); it != this->LDAPServices.end(); ++it) { @@ -615,7 +615,7 @@ class ModuleLDAP : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("LDAP support", VF_VENDOR); } diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 7c6729603..c1f7bde34 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -112,11 +112,11 @@ class ModuleSQL : public Module ConnMap connections; // main thread only ModuleSQL(); - void init() CXX11_OVERRIDE; + void init() override; ~ModuleSQL(); - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; - void OnUnloadModule(Module* mod) CXX11_OVERRIDE; - Version GetVersion() CXX11_OVERRIDE; + void ReadConfig(ConfigStatus& status) override; + void OnUnloadModule(Module* mod) override; + Version GetVersion() override; }; class DispatcherThread : public SocketThread @@ -126,8 +126,8 @@ class DispatcherThread : public SocketThread public: DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } ~DispatcherThread() { } - void Run() CXX11_OVERRIDE; - void OnNotify() CXX11_OVERRIDE; + void Run() override; + void OnNotify() override; }; #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 @@ -193,17 +193,17 @@ class MySQLresult : public SQL::Result } - int Rows() CXX11_OVERRIDE + int Rows() override { return rows; } - void GetCols(std::vector& result) CXX11_OVERRIDE + void GetCols(std::vector& result) override { result.assign(colnames.begin(), colnames.end()); } - bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE + bool HasColumn(const std::string& column, size_t& index) override { for (size_t i = 0; i < colnames.size(); ++i) { @@ -225,7 +225,7 @@ class MySQLresult : public SQL::Result return SQL::Field(); } - bool GetRow(SQL::Row& result) CXX11_OVERRIDE + bool GetRow(SQL::Row& result) override { if (currentrow < rows) { @@ -332,14 +332,14 @@ class SQLConnection : public SQL::Provider mysql_close(connection); } - void Submit(SQL::Query* q, const std::string& qs) CXX11_OVERRIDE + void Submit(SQL::Query* q, const std::string& qs) override { Parent()->Dispatcher->LockQueue(); Parent()->qq.push_back(QQueueItem(q, qs, this)); Parent()->Dispatcher->UnlockQueueWakeup(); } - void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) override { std::string res; unsigned int param = 0; @@ -366,7 +366,7 @@ class SQLConnection : public SQL::Provider Submit(call, res); } - void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) override { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index bb727b623..32bbd4459 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -65,7 +65,7 @@ class ReconnectTimer : public Timer ReconnectTimer(ModulePgSQL* m) : Timer(5, false), mod(m) { } - bool Tick(time_t TIME) CXX11_OVERRIDE; + bool Tick(time_t TIME) override; }; struct QueueItem @@ -110,19 +110,19 @@ class PgSQLresult : public SQL::Result PQclear(res); } - int Rows() CXX11_OVERRIDE + int Rows() override { return rows; } - void GetCols(std::vector& result) CXX11_OVERRIDE + void GetCols(std::vector& result) override { if (colnames.empty()) getColNames(); result = colnames; } - bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE + bool HasColumn(const std::string& column, size_t& index) override { if (colnames.empty()) getColNames(); @@ -147,7 +147,7 @@ class PgSQLresult : public SQL::Result return SQL::Field(std::string(v, PQgetlength(res, row, column))); } - bool GetRow(SQL::Row& result) CXX11_OVERRIDE + bool GetRow(SQL::Row& result) override { if (currentrow >= PQntuples(res)) return false; @@ -184,7 +184,7 @@ class SQLConn : public SQL::Provider, public EventHandler } } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { this->SQL::Provider::cull(); ServerInstance->Modules->DelService(*this); @@ -207,17 +207,17 @@ class SQLConn : public SQL::Provider, public EventHandler } } - void OnEventHandlerRead() CXX11_OVERRIDE + void OnEventHandlerRead() override { DoEvent(); } - void OnEventHandlerWrite() CXX11_OVERRIDE + void OnEventHandlerWrite() override { DoEvent(); } - void OnEventHandlerError(int errornum) CXX11_OVERRIDE + void OnEventHandlerError(int errornum) override { DelayReconnect(); } @@ -414,7 +414,7 @@ restart: } } - void Submit(SQL::Query *req, const std::string& q) CXX11_OVERRIDE + void Submit(SQL::Query *req, const std::string& q) override { if (qinprog.q.empty()) { @@ -427,7 +427,7 @@ restart: } } - void Submit(SQL::Query *req, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE + void Submit(SQL::Query *req, const std::string& q, const SQL::ParamList& p) override { std::string res; unsigned int param = 0; @@ -452,7 +452,7 @@ restart: Submit(req, res); } - void Submit(SQL::Query *req, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE + void Submit(SQL::Query *req, const std::string& q, const SQL::ParamMap& p) override { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) @@ -535,7 +535,7 @@ class ModulePgSQL : public Module ClearAllConnections(); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ReadConf(); } @@ -576,7 +576,7 @@ class ModulePgSQL : public Module connections.clear(); } - void OnUnloadModule(Module* mod) CXX11_OVERRIDE + void OnUnloadModule(Module* mod) override { SQL::Error err(SQL::BAD_DBID); for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) @@ -604,7 +604,7 @@ class ModulePgSQL : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR); } diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index e8ef96c22..7896d3e05 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -56,7 +56,7 @@ class PCRERegex : public Regex pcre_free(regex); } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return (pcre_exec(regex, NULL, text.c_str(), text.length(), 0, 0, NULL, 0) >= 0); } @@ -66,7 +66,7 @@ class PCREFactory : public RegexFactory { public: PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new PCRERegex(expr); } @@ -80,7 +80,7 @@ class ModuleRegexPCRE : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for PCRE", VF_VENDOR); } diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp index b5fddfab8..7b8e37e6a 100644 --- a/src/modules/extra/m_regex_posix.cpp +++ b/src/modules/extra/m_regex_posix.cpp @@ -54,7 +54,7 @@ class POSIXRegex : public Regex regfree(®buf); } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return (regexec(®buf, text.c_str(), 0, NULL, 0) == 0); } @@ -65,7 +65,7 @@ class PosixFactory : public RegexFactory public: bool extended; PosixFactory(Module* m) : RegexFactory(m, "regex/posix") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new POSIXRegex(expr, extended); } @@ -80,12 +80,12 @@ class ModuleRegexPOSIX : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for POSIX Regular Expressions", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ref.extended = ServerInstance->Config->ConfValue("posix")->getBool("extended"); } diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 4bcf287ca..0cc341a35 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -52,7 +52,7 @@ class RE2Regex : public Regex } } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return RE2::FullMatch(text, regexcl); } @@ -62,7 +62,7 @@ class RE2Factory : public RegexFactory { public: RE2Factory(Module* m) : RegexFactory(m, "regex/re2") { } - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new RE2Regex(expr); } @@ -77,7 +77,7 @@ class ModuleRegexRE2 : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for RE2", VF_VENDOR); } diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp index 42e5c8bf1..4065ec014 100644 --- a/src/modules/extra/m_regex_stdlib.cpp +++ b/src/modules/extra/m_regex_stdlib.cpp @@ -39,7 +39,7 @@ class StdRegex : public Regex } } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return std::regex_search(text, regexcl); } @@ -50,7 +50,7 @@ class StdRegexFactory : public RegexFactory public: std::regex::flag_type regextype; StdRegexFactory(Module* m) : RegexFactory(m, "regex/stdregex") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new StdRegex(expr, regextype); } @@ -64,12 +64,12 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for std::regex", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* Conf = ServerInstance->Config->ConfValue("stdregex"); std::string regextype = Conf->getString("type", "ecmascript"); diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index aa3f1d41e..8bec3a908 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -60,7 +60,7 @@ public: regfree(®buf); } - bool Matches(const std::string& text) CXX11_OVERRIDE + bool Matches(const std::string& text) override { return (regexec(®buf, text.c_str(), 0, NULL, 0) == 0); } @@ -70,7 +70,7 @@ class TREFactory : public RegexFactory { public: TREFactory(Module* m) : RegexFactory(m, "regex/tre") {} - Regex* Create(const std::string& expr) CXX11_OVERRIDE + Regex* Create(const std::string& expr) override { return new TRERegex(expr); } @@ -85,7 +85,7 @@ class ModuleRegexTRE : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR); } diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 4558e087a..e31a41c5c 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -58,12 +58,12 @@ class SQLite3Result : public SQL::Result { } - int Rows() CXX11_OVERRIDE + int Rows() override { return rows; } - bool GetRow(SQL::Row& result) CXX11_OVERRIDE + bool GetRow(SQL::Row& result) override { if (currentrow < rows) { @@ -78,12 +78,12 @@ class SQLite3Result : public SQL::Result } } - void GetCols(std::vector& result) CXX11_OVERRIDE + void GetCols(std::vector& result) override { result.assign(columns.begin(), columns.end()); } - bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE + bool HasColumn(const std::string& column, size_t& index) override { for (size_t i = 0; i < columns.size(); ++i) { @@ -172,13 +172,13 @@ class SQLConn : public SQL::Provider sqlite3_finalize(stmt); } - void Submit(SQL::Query* query, const std::string& q) CXX11_OVERRIDE + void Submit(SQL::Query* query, const std::string& q) override { Query(query, q); delete query; } - void Submit(SQL::Query* query, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE + void Submit(SQL::Query* query, const std::string& q, const SQL::ParamList& p) override { std::string res; unsigned int param = 0; @@ -199,7 +199,7 @@ class SQLConn : public SQL::Provider Submit(query, res); } - void Submit(SQL::Query* query, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE + void Submit(SQL::Query* query, const std::string& q, const SQL::ParamMap& p) override { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) @@ -248,7 +248,7 @@ class ModuleSQLite3 : public Module conns.clear(); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ClearConns(); ConfigTagList tags = ServerInstance->Config->ConfTags("database"); @@ -262,7 +262,7 @@ class ModuleSQLite3 : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("sqlite3 provider", VF_VENDOR); } diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index f5711cbd7..8317ed93d 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1070,12 +1070,12 @@ info_done_dealloc: Handshake(sock); } - void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* user) override { CloseSession(); } - int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* user, std::string& recvq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -1113,7 +1113,7 @@ info_done_dealloc: } } - int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -1176,7 +1176,7 @@ info_done_dealloc: return 1; } - void GetCiphersuite(std::string& out) const CXX11_OVERRIDE + void GetCiphersuite(std::string& out) const override { if (!IsHandshakeDone()) return; @@ -1186,7 +1186,7 @@ info_done_dealloc: out.append(UnknownIfNULL(gnutls_mac_get_name(gnutls_mac_get(sess)))); } - bool GetServerName(std::string& out) const CXX11_OVERRIDE + bool GetServerName(std::string& out) const override { std::vector nameBuffer; size_t nameLength = 0; @@ -1245,12 +1245,12 @@ class GnuTLSIOHookProvider : public IOHookProvider ServerInstance->Modules->DelService(*this); } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { new GnuTLSIOHook(this, sock, GNUTLS_SERVER); } - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { new GnuTLSIOHook(this, sock, GNUTLS_CLIENT); } @@ -1345,14 +1345,14 @@ class ModuleSSLGnuTLS : public Module thismod = this; } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "GnuTLS lib version %s module was compiled for " GNUTLS_VERSION, gnutls_check_version(NULL)); ReadProfiles(); ServerInstance->GenRandom = RandGen::Call; } - void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string ¶m) override { if(param != "ssl") return; @@ -1372,7 +1372,7 @@ class ModuleSSLGnuTLS : public Module ServerInstance->GenRandom = &InspIRCd::DefaultGenRandom; } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type == ExtensionItem::EXT_USER) { @@ -1387,12 +1387,12 @@ class ModuleSSLGnuTLS : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides SSL support for clients", VF_VENDOR); } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { const GnuTLSIOHook* const iohook = static_cast(user->eh.GetModHook(this)); if ((iohook) && (!iohook->IsHandshakeDone())) diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 75b25fbc4..2786cd129 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -677,12 +677,12 @@ class mbedTLSIOHook : public SSLIOHook Handshake(sock); } - void OnStreamSocketClose(StreamSocket* sock) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* sock) override { CloseSession(); } - int OnStreamSocketRead(StreamSocket* sock, std::string& recvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* sock, std::string& recvq) override { // Finish handshake if needed int prepret = PrepareIO(sock); @@ -726,7 +726,7 @@ class mbedTLSIOHook : public SSLIOHook } } - int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& sendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* sock, StreamSocket::SendQueue& sendq) override { // Finish handshake if needed int prepret = PrepareIO(sock); @@ -778,7 +778,7 @@ class mbedTLSIOHook : public SSLIOHook return 1; } - void GetCiphersuite(std::string& out) const CXX11_OVERRIDE + void GetCiphersuite(std::string& out) const override { if (!IsHandshakeDone()) return; @@ -793,7 +793,7 @@ class mbedTLSIOHook : public SSLIOHook out.append(ciphersuitestr + skip); } - bool GetServerName(std::string& out) const CXX11_OVERRIDE + bool GetServerName(std::string& out) const override { // TODO: Implement SNI support. return false; @@ -820,12 +820,12 @@ class mbedTLSIOHookProvider : public IOHookProvider ServerInstance->Modules->DelService(*this); } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { new mbedTLSIOHook(this, sock, true); } - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { new mbedTLSIOHook(this, sock, false); } @@ -912,7 +912,7 @@ class ModuleSSLmbedTLS : public Module } public: - void init() CXX11_OVERRIDE + void init() override { char verbuf[16]; // Should be at least 9 bytes in size mbedtls_version_get_string(verbuf); @@ -923,7 +923,7 @@ class ModuleSSLmbedTLS : public Module ReadProfiles(); } - void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string ¶m) override { if (param != "ssl") return; @@ -938,7 +938,7 @@ class ModuleSSLmbedTLS : public Module } } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type != ExtensionItem::EXT_USER) return; @@ -952,7 +952,7 @@ class ModuleSSLmbedTLS : public Module } } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { const mbedTLSIOHook* const iohook = static_cast(user->eh.GetModHook(this)); if ((iohook) && (!iohook->IsHandshakeDone())) @@ -960,7 +960,7 @@ class ModuleSSLmbedTLS : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides SSL support via mbedTLS (PolarSSL)", VF_VENDOR); } diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 5f61c71a9..125190c7d 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -695,12 +695,12 @@ class OpenSSLIOHook : public SSLIOHook Handshake(sock); } - void OnStreamSocketClose(StreamSocket* user) CXX11_OVERRIDE + void OnStreamSocketClose(StreamSocket* user) override { CloseSession(); } - int OnStreamSocketRead(StreamSocket* user, std::string& recvq) CXX11_OVERRIDE + int OnStreamSocketRead(StreamSocket* user, std::string& recvq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -760,7 +760,7 @@ class OpenSSLIOHook : public SSLIOHook } } - int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) CXX11_OVERRIDE + int OnStreamSocketWrite(StreamSocket* user, StreamSocket::SendQueue& sendq) override { // Finish handshake if needed int prepret = PrepareIO(user); @@ -823,7 +823,7 @@ class OpenSSLIOHook : public SSLIOHook return 1; } - void GetCiphersuite(std::string& out) const CXX11_OVERRIDE + void GetCiphersuite(std::string& out) const override { if (!IsHandshakeDone()) return; @@ -831,7 +831,7 @@ class OpenSSLIOHook : public SSLIOHook out.append(SSL_get_cipher(sess)); } - bool GetServerName(std::string& out) const CXX11_OVERRIDE + bool GetServerName(std::string& out) const override { const char* name = SSL_get_servername(sess, TLSEXT_NAMETYPE_host_name); if (!name) @@ -914,12 +914,12 @@ class OpenSSLIOHookProvider : public IOHookProvider ServerInstance->Modules->DelService(*this); } - void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override { new OpenSSLIOHook(this, sock, profile.CreateServerSession()); } - void OnConnect(StreamSocket* sock) CXX11_OVERRIDE + void OnConnect(StreamSocket* sock) override { new OpenSSLIOHook(this, sock, profile.CreateClientSession()); } @@ -1010,7 +1010,7 @@ class ModuleSSLOpenSSL : public Module #endif } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "OpenSSL lib version \"%s\" module was compiled for \"" OPENSSL_VERSION_TEXT "\"", OpenSSL_version(OPENSSL_VERSION)); @@ -1023,7 +1023,7 @@ class ModuleSSLOpenSSL : public Module ReadProfiles(); } - void OnModuleRehash(User* user, const std::string ¶m) CXX11_OVERRIDE + void OnModuleRehash(User* user, const std::string ¶m) override { if (param != "ssl") return; @@ -1038,7 +1038,7 @@ class ModuleSSLOpenSSL : public Module } } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type == ExtensionItem::EXT_USER) { @@ -1053,7 +1053,7 @@ class ModuleSSLOpenSSL : public Module } } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { const OpenSSLIOHook* const iohook = static_cast(user->eh.GetModHook(this)); if ((iohook) && (!iohook->IsHandshakeDone())) @@ -1061,7 +1061,7 @@ class ModuleSSLOpenSSL : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides SSL support for clients", VF_VENDOR); } diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp index f5065c73f..4745a68af 100644 --- a/src/modules/m_abbreviation.cpp +++ b/src/modules/m_abbreviation.cpp @@ -28,17 +28,17 @@ enum class ModuleAbbreviation : public Module { public: - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR); } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* Command is already validated, has a length of 0, or last character is not a . */ if (validated || command.empty() || *command.rbegin() != '.') diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 3e00db765..99f362522 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -72,7 +72,7 @@ class ModuleAlias : public Module bool active; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { AliasMap newAliases; ConfigTagList tags = ServerInstance->Config->ConfTags("alias"); @@ -111,7 +111,7 @@ class ModuleAlias : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides aliases of commands.", VF_VENDOR); } @@ -155,7 +155,7 @@ class ModuleAlias : public Module return message; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { /* If theyre not registered yet, we dont want * to know. @@ -189,7 +189,7 @@ class ModuleAlias : public Module return MOD_RES_PASSTHRU; } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { // Don't echo anything which is caused by an alias. if (active) @@ -198,7 +198,7 @@ class ModuleAlias : public Module return MOD_RES_PASSTHRU; } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { if ((target.type != MessageTarget::TYPE_CHANNEL) || (details.type != MSG_PRIVMSG)) { @@ -378,7 +378,7 @@ class ModuleAlias : public Module active = false; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // Prioritise after spanningtree so that channel aliases show the alias before the effects. Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so"); diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp index 41edbc855..feb521f02 100644 --- a/src/modules/m_allowinvite.cpp +++ b/src/modules/m_allowinvite.cpp @@ -29,12 +29,12 @@ class ModuleAllowInvite : public Module { } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["EXTBAN"].push_back('A'); } - ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) CXX11_OVERRIDE + ModResult OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout) override { if (IS_LOCAL(user)) { @@ -55,7 +55,7 @@ class ModuleAllowInvite : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it",VF_VENDOR); } diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 486ad1c18..218af1ab5 100644 --- a/src/modules/m_alltime.cpp +++ b/src/modules/m_alltime.cpp @@ -29,7 +29,7 @@ class CommandAlltime : public Command flags_needed = 'o'; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { const std::string fmtdate = InspIRCd::TimeString(ServerInstance->Time(), "%Y-%m-%d %H:%M:%S", true); @@ -41,7 +41,7 @@ class CommandAlltime : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_BCAST; } @@ -56,7 +56,7 @@ class Modulealltime : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Display timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp index 6cb9b940b..efb3d091b 100644 --- a/src/modules/m_anticaps.cpp +++ b/src/modules/m_anticaps.cpp @@ -103,7 +103,7 @@ class AntiCapsMode : public ParamModeConfig->ConfValue("anticaps"); @@ -198,7 +198,7 @@ class ModuleAntiCaps : public Module lowercase.set(static_cast(*iter)); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { // We only want to operate on messages from local users. if (!IS_LOCAL(user)) @@ -295,7 +295,7 @@ class ModuleAntiCaps : public Module return MOD_RES_DENY; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for punishing users that send capitalised messages.", VF_COMMON|VF_VENDOR); } diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 818242795..b88f865f4 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -50,8 +50,8 @@ class JoinHook : public ClientProtocol::EventHook public: JoinHook(ModuleAuditorium* mod); - void OnEventInit(const ClientProtocol::Event& ev) CXX11_OVERRIDE; - ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE; + void OnEventInit(const ClientProtocol::Event& ev) override; + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) override; }; } @@ -76,7 +76,7 @@ class ModuleAuditorium { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium"); OpsVisible = tag->getBool("opvisible"); @@ -84,7 +84,7 @@ class ModuleAuditorium OperCanSee = tag->getBool("opercansee", true); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR); } @@ -118,7 +118,7 @@ class ModuleAuditorium return false; } - ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE + ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) override { if (IsVisible(memb)) return MOD_RES_PASSTHRU; @@ -144,17 +144,17 @@ class ModuleAuditorium } } - void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override { BuildExcept(memb, excepts); } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override { BuildExcept(memb, excepts); } - void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) CXX11_OVERRIDE + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) override { for (IncludeChanList::iterator i = include.begin(); i != include.end(); ) { @@ -177,7 +177,7 @@ class ModuleAuditorium } } - ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) override { if (!memb) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp index ffad7e0f1..bdf7162e7 100644 --- a/src/modules/m_autoop.cpp +++ b/src/modules/m_autoop.cpp @@ -42,7 +42,7 @@ class AutoOpList : public ListModeBase return mh ? mh->IsPrefixMode() : NULL; } - ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) CXX11_OVERRIDE + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) override { std::string::size_type pos = parameter.find(':'); if (pos == 0 || pos == std::string::npos) @@ -80,7 +80,7 @@ class ModuleAutoOp : public Module { } - void OnPostJoin(Membership *memb) CXX11_OVERRIDE + void OnPostJoin(Membership *memb) override { if (!IS_LOCAL(memb->user)) return; @@ -105,12 +105,12 @@ class ModuleAutoOp : public Module } } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { mh.DoRehash(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the +w channel mode", VF_VENDOR); } diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index d9ceeaab1..5d55ad78d 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -54,12 +54,12 @@ class ModuleBanException : public Module { } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["EXCEPTS"] = ConvToStr(be.GetModeChar()); } - ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE + ModResult OnExtBanCheck(User *user, Channel *chan, char type) override { ListModeBase::ModeList* list = be.GetList(chan); if (!list) @@ -80,7 +80,7 @@ class ModuleBanException : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE + ModResult OnCheckChannelBan(User* user, Channel* chan) override { ListModeBase::ModeList* list = be.GetList(chan); if (!list) @@ -100,12 +100,12 @@ class ModuleBanException : public Module return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { be.DoRehash(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the +e channel mode", VF_VENDOR); } diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 7246527d3..906653668 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -54,7 +54,7 @@ class BanRedirect : public ModeWatcher { } - bool BeforeMode(User* source, User* dest, Channel* channel, std::string& param, bool adding) CXX11_OVERRIDE + bool BeforeMode(User* source, User* dest, Channel* channel, std::string& param, bool adding) override { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan @@ -254,7 +254,7 @@ class ModuleBanRedirect : public Module { } - void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) CXX11_OVERRIDE + void OnCleanup(ExtensionItem::ExtensibleType type, Extensible* item) override { if (type == ExtensionItem::EXT_CHANNEL) { @@ -277,7 +277,7 @@ class ModuleBanRedirect : public Module } } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { if (chan) { @@ -344,7 +344,7 @@ class ModuleBanRedirect : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR); } diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp index 59ee1556c..ec225de38 100644 --- a/src/modules/m_bcrypt.cpp +++ b/src/modules/m_bcrypt.cpp @@ -50,12 +50,12 @@ class BCryptProvider : public HashProvider return hash; } - std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE + std::string GenerateRaw(const std::string& data) override { return Generate(data, Salt()); } - bool Compare(const std::string& input, const std::string& hash) CXX11_OVERRIDE + bool Compare(const std::string& input, const std::string& hash) override { std::string ret = Generate(input, hash); if (ret.empty()) @@ -66,7 +66,7 @@ class BCryptProvider : public HashProvider return false; } - std::string ToPrintable(const std::string& raw) CXX11_OVERRIDE + std::string ToPrintable(const std::string& raw) override { return raw; } @@ -87,13 +87,13 @@ class ModuleBCrypt : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* conf = ServerInstance->Config->ConfValue("bcrypt"); bcrypt.rounds = conf->getUInt("rounds", 10, 1); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements bcrypt hashing", VF_VENDOR); } diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index c4af2fd7f..ff9e361f2 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -58,12 +58,12 @@ class ModuleBlockAmsg : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg"); ForgetDelay = tag->getDuration("delay", 3); @@ -81,7 +81,7 @@ class ModuleBlockAmsg : public Module action = IBLOCK_KILLOPERS; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { // Don't do anything with unregistered users if (user->registered != REG_ALL) diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index fa780427c..386486f2e 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -39,12 +39,12 @@ public: { } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["EXTBAN"].push_back('B'); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type == MessageTarget::TYPE_CHANNEL) { @@ -101,7 +101,7 @@ public: return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("blockcaps"); percent = tag->getUInt("percent", 100, 1, 100); @@ -118,7 +118,7 @@ public: uppercase.set(static_cast(*iter)); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR); } diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 273d1204e..c16643877 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -36,12 +36,12 @@ class ModuleBlockColor : public Module { } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["EXTBAN"].push_back('c'); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if ((target.type == MessageTarget::TYPE_CHANNEL) && (IS_LOCAL(user))) { @@ -67,7 +67,7 @@ class ModuleBlockColor : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel mode +c to block color",VF_VENDOR); } diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 1931666d1..1bb06e687 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -38,12 +38,12 @@ class ModuleBotMode : public Module, public Whois::EventListener { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR); } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { if (whois.GetTarget()->IsModeSet(bm)) { diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 3810fcf32..c0cb92663 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -74,7 +74,7 @@ struct CallerIDExtInfo : public ExtensionItem { } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override { std::string ret; if (format != FORMAT_NETWORK) @@ -85,7 +85,7 @@ struct CallerIDExtInfo : public ExtensionItem return ret; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override { if (format == FORMAT_NETWORK) return; @@ -126,7 +126,7 @@ struct CallerIDExtInfo : public ExtensionItem return dat; } - void free(Extensible* container, void* item) CXX11_OVERRIDE + void free(Extensible* container, void* item) override { callerid_data* dat = static_cast(item); @@ -183,7 +183,7 @@ public: TRANSLATE1(TR_CUSTOM); } - void EncodeParameter(std::string& parameter, unsigned int index) CXX11_OVERRIDE + void EncodeParameter(std::string& parameter, unsigned int index) override { // Send lists as-is (part of 2.0 compat) if (parameter.find(',') != std::string::npos) @@ -202,7 +202,7 @@ public: * /accept nick1,nick2,nick3,* * to add 3 nicks and then show your list */ - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (CommandParser::LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; @@ -235,7 +235,7 @@ public: return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE); } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { // There is a list in parameters[0] in two cases: // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists, @@ -337,7 +337,7 @@ class CallerIDAPIImpl : public CallerID::APIBase { } - bool IsOnAcceptList(User* source, User* target) CXX11_OVERRIDE + bool IsOnAcceptList(User* source, User* target) override { callerid_data* dat = ext.get(target, true); return dat->accepting.count(source); @@ -386,18 +386,18 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR); } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["ACCEPT"] = ConvToStr(cmd.maxaccepts); tokens["CALLERID"] = ConvToStr(myumode.GetModeChar()); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER) return MOD_RES_PASSTHRU; @@ -427,18 +427,18 @@ public: return MOD_RES_PASSTHRU; } - void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE + void OnUserPostNick(User* user, const std::string& oldnick) override { if (!tracknick) RemoveFromAllAccepts(user); } - void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) override { RemoveFromAllAccepts(user); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("callerid"); cmd.maxaccepts = tag->getUInt("maxaccepts", 30); @@ -446,7 +446,7 @@ public: notify_cooldown = tag->getDuration("cooldown", 60); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // Want to be after modules like silence or services_account ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index 922061757..838f6abe0 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -86,7 +86,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener throw ModuleException("Too many caps"); } - void OnReloadModuleSave(Module* mod, ReloadModule::CustomData& cd) CXX11_OVERRIDE + void OnReloadModuleSave(Module* mod, ReloadModule::CustomData& cd) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnReloadModuleSave()"); if (mod == creator) @@ -117,7 +117,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener } } - void OnReloadModuleRestore(Module* mod, void* data) CXX11_OVERRIDE + void OnReloadModuleRestore(Module* mod, void* data) override { CapModData* capmoddata = static_cast(data); for (std::vector::const_iterator i = capmoddata->caps.begin(); i != capmoddata->caps.end(); ++i) @@ -166,7 +166,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener } } - void AddCap(Cap::Capability* cap) CXX11_OVERRIDE + void AddCap(Cap::Capability* cap) override { // No-op if the cap is already registered. // This allows modules to call SetActive() on a cap without checking if it's active first. @@ -182,7 +182,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapAddDel, (cap, true)); } - void DelCap(Cap::Capability* cap) CXX11_OVERRIDE + void DelCap(Cap::Capability* cap) override { // No-op if the cap is not registered, see AddCap() above if (!cap->IsRegistered()) @@ -206,7 +206,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener caps.erase(cap->GetName()); } - Capability* Find(const std::string& capname) const CXX11_OVERRIDE + Capability* Find(const std::string& capname) const override { CapMap::const_iterator it = caps.find(capname); if (it != caps.end()) @@ -214,7 +214,7 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener return NULL; } - void NotifyValueChange(Capability* cap) CXX11_OVERRIDE + void NotifyValueChange(Capability* cap) override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Cap %s changed value", cap->GetName().c_str()); FOREACH_MOD_CUSTOM(evprov, Cap::EventListener, OnCapValueChange, (cap)); @@ -385,7 +385,7 @@ class CommandCap : public SplitCommand works_before_reg = true; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (user->registered != REG_ALL) holdext.set(user, 1); @@ -442,12 +442,12 @@ class ModuleCap : public Module { } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return (cmd.holdext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for CAP capability negotiation", VF_VENDOR); } diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 3cdbbbdfb..724ebc10f 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -45,17 +45,17 @@ public: } // XXX I shouldn't have to define this - bool Matches(User* u) CXX11_OVERRIDE + bool Matches(User* u) override { return false; } - bool Matches(const std::string& s) CXX11_OVERRIDE + bool Matches(const std::string& s) override { return irc::equals(matchtext, s); } - const std::string& Displayable() CXX11_OVERRIDE + const std::string& Displayable() override { return matchtext; } @@ -70,12 +70,12 @@ class CBanFactory : public XLineFactory /** Generate a CBAN */ - XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) override { return new CBan(set_time, duration, source, reason, xline_specific_mask); } - bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE + bool AutoApplyToUserList(XLine* x) override { return false; // No, we apply to channels. } @@ -91,7 +91,7 @@ class CommandCBan : public Command flags_needed = 'o'; this->syntax = " [ :]"; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -143,7 +143,7 @@ class CommandCBan : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if (IS_LOCAL(user)) return ROUTE_LOCALONLY; // spanningtree will send ADDLINE @@ -164,7 +164,7 @@ class ModuleCBan : public Module, public Stats::EventListener { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->XLines->RegisterFactory(&f); } @@ -175,7 +175,7 @@ class ModuleCBan : public Module, public Stats::EventListener ServerInstance->XLines->UnregisterFactory(&f); } - ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + ModResult OnStats(Stats::Context& stats) override { if (stats.GetSymbol() != 'C') return MOD_RES_PASSTHRU; @@ -184,7 +184,7 @@ class ModuleCBan : public Module, public Stats::EventListener return MOD_RES_DENY; } - ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override { XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname); @@ -200,7 +200,7 @@ class ModuleCBan : public Module, public Stats::EventListener return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Gives /cban, aka C-lines. Think Q-lines, for channels.", VF_COMMON | VF_VENDOR); } diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 31309ed2f..838c8e77a 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -41,7 +41,7 @@ class ModuleCensor : public Module } // format of a config entry is - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -98,7 +98,7 @@ class ModuleCensor : public Module return MOD_RES_PASSTHRU; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { /* * reload our config file on rehash - we must destroy and re-allocate the classes @@ -120,7 +120,7 @@ class ModuleCensor : public Module censors.swap(newcensors); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides user and channel +G mode",VF_VENDOR); } diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index df8201bde..55129b78e 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -135,7 +135,7 @@ class CommandWebIRC : public SplitCommand this->syntax = " [flags]"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { if (user->registered == REG_ALL || realhost.get(user)) return CMD_FAILURE; @@ -269,12 +269,12 @@ class ModuleCgiIRC { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('w', "CGIIRC"); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::vector identhosts; std::vector webirchosts; @@ -323,7 +323,7 @@ class ModuleCgiIRC cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true); } - ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) override { // If is not set then we have nothing to do. const std::string webirc = myclass->config->getString("webirc"); @@ -341,7 +341,7 @@ class ModuleCgiIRC return InspIRCd::Match(*gateway, webirc) ? MOD_RES_PASSTHRU : MOD_RES_DENY; } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { // There is no need to check for gateways if one is already being used. if (cmd.realhost.get(user)) @@ -374,7 +374,7 @@ class ModuleCgiIRC return MOD_RES_PASSTHRU; } - void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) CXX11_OVERRIDE + void OnWebIRCAuth(LocalUser* user, const WebIRC::FlagMap* flags) override { // We are only interested in connection flags. If none have been // given then we have nothing to do. @@ -434,7 +434,7 @@ class ModuleCgiIRC } } - void OnWhois(Whois::Context& whois) CXX11_OVERRIDE + void OnWhois(Whois::Context& whois) override { if (!whois.IsSelfWhois() && !whois.GetSource()->HasPrivPermission("users/auspex")) return; @@ -452,7 +452,7 @@ class ModuleCgiIRC whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via an ident gateway"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Enables forwarding the real IP address of a user from a gateway to the IRC server", VF_VENDOR); } diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp index 6cf4af235..d6dd36bd3 100644 --- a/src/modules/m_chancreate.cpp +++ b/src/modules/m_chancreate.cpp @@ -24,17 +24,17 @@ class ModuleChanCreate : public Module { public: - void init() CXX11_OVERRIDE + void init() override { ServerInstance->SNO->EnableSnomask('j', "CHANCREATE"); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides snomasks 'j' and 'J', to which notices about newly created channels are sent",VF_VENDOR); } - void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) CXX11_OVERRIDE + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) override { if ((created) && (IS_LOCAL(memb->user))) { diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 051b8c60d..c2a53a8d8 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -39,7 +39,7 @@ class ChanFilter : public ListModeBase { } - bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE + bool ValidateParam(User* user, Channel* chan, std::string& word) override { if (word.length() > maxlen) { @@ -66,7 +66,7 @@ class ModuleChanFilter : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("chanfilter"); hidemask = tag->getBool("hidemask"); @@ -75,7 +75,7 @@ class ModuleChanFilter : public Module cf.DoRehash(); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type != MessageTarget::TYPE_CHANNEL) return MOD_RES_PASSTHRU; @@ -112,7 +112,7 @@ class ModuleChanFilter : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { // We don't send any link data if the length is 35 for compatibility with the 2.0 branch. std::string maxfilterlen; diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index 1057e63b6..ef52a9447 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -55,7 +55,7 @@ class HistoryMode : public ParamMode > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) override { std::string::size_type colon = parameter.find(':'); if (colon == std::string::npos) @@ -130,7 +130,7 @@ class ModuleChanHistory { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory"); m.maxlines = tag->getUInt("maxlines", 50, 1); @@ -138,12 +138,12 @@ class ModuleChanHistory dobots = tag->getBool("bots", true); } - ModResult OnBroadcastMessage(Channel* channel, const Server* server) CXX11_OVERRIDE + ModResult OnBroadcastMessage(Channel* channel, const Server* server) override { return channel->IsModeSet(m) ? MOD_RES_ALLOW : MOD_RES_PASSTHRU; } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override { if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (details.type == MSG_PRIVMSG)) { @@ -158,7 +158,7 @@ class ModuleChanHistory } } - void OnPostJoin(Membership* memb) CXX11_OVERRIDE + void OnPostJoin(Membership* memb) override { LocalUser* localuser = IS_LOCAL(memb->user); if (!localuser) @@ -205,7 +205,7 @@ class ModuleChanHistory batchmanager->End(batch); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides channel history replayed on join", VF_VENDOR); } diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index afe213f61..c7b288818 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -29,7 +29,7 @@ class ModuleChanLog : public Module ChanLogTargets logstreams; public: - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string snomasks; std::string channel; @@ -56,7 +56,7 @@ class ModuleChanLog : public Module } - ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) CXX11_OVERRIDE + ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) override { std::pair itpair = logstreams.equal_range(sno); if (itpair.first == itpair.second) @@ -78,7 +78,7 @@ class ModuleChanLog : public Module return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Logs snomask output to channel(s).", VF_VENDOR); } diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index b3a882c20..0da3aa579 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -56,7 +56,7 @@ class ModuleChannelNames : public Module { } - void init() CXX11_OVERRIDE + void init() override { ServerInstance->IsChannel = NewIsChannelHandler::Call; } @@ -98,7 +98,7 @@ class ModuleChannelNames : public Module badchan = false; } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("channames"); std::string denyToken = tag->getString("denyrange"); @@ -128,7 +128,7 @@ class ModuleChannelNames : public Module ValidateChans(); } - void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) override { if (badchan) { @@ -139,14 +139,14 @@ class ModuleChannelNames : public Module } } - CullResult cull() CXX11_OVERRIDE + CullResult cull() override { ServerInstance->IsChannel = rememberer; ValidateChans(); return Module::cull(); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR); } diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp index ffb43eef1..61ca9cf1e 100644 --- a/src/modules/m_channelban.cpp +++ b/src/modules/m_channelban.cpp @@ -23,12 +23,12 @@ class ModuleBadChannelExtban : public Module { public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR); } - ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) override { if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':')) { @@ -52,7 +52,7 @@ class ModuleBadChannelExtban : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["EXTBAN"].push_back('j'); } diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 1d030acc6..ca9541176 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -140,7 +140,7 @@ class CommandCheck : public Command return ret; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName) return CMD_SUCCESS; @@ -301,7 +301,7 @@ class CommandCheck : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos)) return ROUTE_OPT_UCAST(parameters[1]); @@ -317,7 +317,7 @@ class ModuleCheck : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON); } diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 6e498a8be..bddcc783c 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -37,7 +37,7 @@ class CommandChghost : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost) { @@ -75,7 +75,7 @@ class CommandChghost : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -92,7 +92,7 @@ class ModuleChgHost : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"); @@ -101,7 +101,7 @@ class ModuleChgHost : public Module cmd.hostmap.set(static_cast(*n)); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 9a2d3b2ea..d5f70eaf7 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -35,7 +35,7 @@ class CommandChgident : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); @@ -68,7 +68,7 @@ class CommandChgident : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -83,7 +83,7 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index aedd75d94..17fcf9c4b 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -33,7 +33,7 @@ class CommandChgname : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { User* dest = ServerInstance->FindNick(parameters[0]); @@ -64,7 +64,7 @@ class CommandChgname : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + RouteDescriptor GetRouting(User* user, const Params& parameters) override { return ROUTE_OPT_UCAST(parameters[0]); } @@ -79,7 +79,7 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_classban.cpp b/src/modules/m_classban.cpp index 066834079..3e268d794 100644 --- a/src/modules/m_classban.cpp +++ b/src/modules/m_classban.cpp @@ -22,7 +22,7 @@ class ModuleClassBan : public Module { public: - ModResult OnCheckBan(User* user, Channel* c, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel* c, const std::string& mask) override { LocalUser* localUser = IS_LOCAL(user); if ((localUser) && (mask.length() > 2) && (mask[0] == 'n') && (mask[1] == ':')) @@ -33,12 +33,12 @@ class ModuleClassBan : public Module return MOD_RES_PASSTHRU; } - void On005Numeric(std::map& tokens) CXX11_OVERRIDE + void On005Numeric(std::map& tokens) override { tokens["EXTBAN"].push_back('n'); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Class 'n' - Connection class ban", VF_VENDOR | VF_OPTCOMMON); } diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index dec49866c..41c681cf5 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -35,7 +35,7 @@ class CommandClearChan : public Command force_manual_route = true; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { Channel* chan = activechan = ServerInstance->FindChan(parameters[0]); if (!chan) @@ -150,13 +150,13 @@ class ModuleClearChan : public Module { } - void init() CXX11_OVERRIDE + void init() override { // Only attached while we are working; don't react to events otherwise ServerInstance->Modules->DetachAll(this); } - void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) CXX11_OVERRIDE + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) override { bool found = false; for (IncludeChanList::iterator i = include.begin(); i != include.end(); ++i) @@ -196,7 +196,7 @@ class ModuleClearChan : public Module } } - void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) CXX11_OVERRIDE + void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) override { // Hide the KICK from all non-opers User* leaving = memb->user; @@ -209,7 +209,7 @@ class ModuleClearChan : public Module } } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds /CLEARCHAN that allows opers to masskick, masskill or mass G/Z-line users on a channel.", VF_VENDOR|VF_OPTCOMMON); } diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 3b00d3347..bf96216c3 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -90,7 +90,7 @@ class CloakUser : public ModeHandler { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) override { LocalUser* user = IS_LOCAL(dest); @@ -171,7 +171,7 @@ class CommandCloak : public Command syntax = ""; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) override; }; class ModuleCloaking : public Module @@ -326,7 +326,7 @@ class ModuleCloaking : public Module return rv; } - ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) override { LocalUser* lu = IS_LOCAL(user); if (!lu) @@ -354,7 +354,7 @@ class ModuleCloaking : public Module return MOD_RES_PASSTHRU; } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { /* Needs to be after m_banexception etc. */ ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST); @@ -362,7 +362,7 @@ class ModuleCloaking : public Module // this unsets umode +x on every host change. If we are actually doing a +x // mode change, we will call SetMode back to true AFTER the host change is done. - void OnChangeHost(User* u, const std::string& host) CXX11_OVERRIDE + void OnChangeHost(User* u, const std::string& host) override { if (u->IsModeSet(cu) && !cu.active) { @@ -378,7 +378,7 @@ class ModuleCloaking : public Module cu.active = false; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { std::string testcloak = "broken"; if (Hash && !cloaks.empty()) @@ -404,7 +404,7 @@ class ModuleCloaking : public Module return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR, testcloak); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("cloak"); if (tags.first == tags.second) @@ -466,7 +466,7 @@ class ModuleCloaking : public Module return chost; } - void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* user) override { // Connecting users are handled in OnUserConnect not here. if (user->registered != REG_ALL) @@ -484,7 +484,7 @@ class ModuleCloaking : public Module } } - void OnUserConnect(LocalUser* dest) CXX11_OVERRIDE + void OnUserConnect(LocalUser* dest) override { if (cu.ext.get(dest)) return; diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index 06956c564..69219124e 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -44,7 +44,7 @@ class CommandClones : public SplitCommand syntax = ""; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { unsigned int limit = ConvToNum(parameters[0]); @@ -94,7 +94,7 @@ class ModuleClones : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR); } diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index b0b45b4b6..ae1d42d62 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -31,7 +31,7 @@ class CommandClose : public Command flags_needed = 'o'; } - CmdResult Handle(User* src, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* src, const Params& parameters) override { std::map closed; @@ -74,7 +74,7 @@ class ModuleClose : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides /CLOSE functionality", VF_VENDOR); } diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp index 4cef93029..a1ba25007 100644 --- a/src/modules/m_commonchans.cpp +++ b/src/modules/m_commonchans.cpp @@ -28,12 +28,12 @@ class ModulePrivacyMode : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_VENDOR); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override { if (target.type == MessageTarget::TYPE_USER) { diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index 7a06aedd3..585d71925 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -49,7 +49,7 @@ class JoinTimer : public Timer ServerInstance->Timers.AddTimer(this); } - bool Tick(time_t time) CXX11_OVERRIDE + bool Tick(time_t time) override { if (user->chans.empty()) JoinChannels(user, channels); @@ -71,24 +71,24 @@ class ModuleConnJoin : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("autojoin"); defchans = tag->getString("channel"); defdelay = tag->getDuration("delay", 0, 0, 60); } - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR); } - void OnPostConnect(User* user) CXX11_OVERRIDE + void OnPostConnect(User* user) override { LocalUser* localuser = IS_LOCAL(user); if (!localuser) diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp index 3132aed40..7e53a7a2f 100644 --- a/src/modules/m_conn_umodes.cpp +++ b/src/modules/m_conn_umodes.cpp @@ -25,18 +25,18 @@ class ModuleModesOnConnect : public Module { public: - void Prioritize() CXX11_OVERRIDE + void Prioritize() override { // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR); } - void OnUserConnect(LocalUser* user) CXX11_OVERRIDE + void OnUserConnect(LocalUser* user) override { ConfigTag* tag = user->MyClass->config; std::string ThisModes = tag->getString("modes"); diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index f2e9590c8..d1caec375 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -36,14 +36,14 @@ class ModuleWaitPong : public Module { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong"); sendsnotice = tag->getBool("sendsnotice", true); killonbadreply = tag->getBool("killonbadreply", true); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { std::string pingrpl = ServerInstance->GenRandomStr(10); { @@ -58,7 +58,7 @@ class ModuleWaitPong : public Module return MOD_RES_PASSTHRU; } - ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override { if (command == "PONG") { @@ -82,12 +82,12 @@ class ModuleWaitPong : public Module return MOD_RES_PASSTHRU; } - ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE + ModResult OnCheckReady(LocalUser* user) override { return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Require pong prior to registration", VF_VENDOR); } diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp index 20121f5f9..6a880f827 100644 --- a/src/modules/m_connectban.cpp +++ b/src/modules/m_connectban.cpp @@ -31,12 +31,12 @@ class ModuleConnectBan : public Module std::string banmessage; public: - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTag* tag = ServerInstance->Config->ConfValue("connectban"); @@ -47,7 +47,7 @@ class ModuleConnectBan : public Module banmessage = tag->getString("banmessage", "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect."); } - void OnSetUserIP(LocalUser* u) CXX11_OVERRIDE + void OnSetUserIP(LocalUser* u) override { if (u->exempt) return; @@ -95,7 +95,7 @@ class ModuleConnectBan : public Module } } - void OnGarbageCollect() CXX11_OVERRIDE + void OnGarbageCollect() override { ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Clearing map."); connects.clear(); diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp index 5070dd3a7..a7c4b2b37 100644 --- a/src/modules/m_connflood.cpp +++ b/src/modules/m_connflood.cpp @@ -38,12 +38,12 @@ public: { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Connection throttle", VF_VENDOR); } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { /* read configuration variables */ ConfigTag* tag = ServerInstance->Config->ConfValue("connflood"); @@ -59,7 +59,7 @@ public: first = ServerInstance->Time(); } - ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE + ModResult OnUserRegister(LocalUser* user) override { if (user->exempt) return MOD_RES_PASSTHRU; diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index befc9750d..d2f33de43 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -43,7 +43,7 @@ class ModuleCustomPrefix : public Module { std::vector modes; public: - void init() CXX11_OVERRIDE + void init() override { ConfigTagList tags = ServerInstance->Config->ConfTags("customprefix"); for (ConfigIter iter = tags.first; iter != tags.second; ++iter) @@ -101,7 +101,7 @@ class ModuleCustomPrefix : public Module stdalgo::delete_all(modes); } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides custom prefix channel modes", VF_VENDOR); } diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 2dd378062..6b81a7932 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -77,7 +77,7 @@ class CommandTitle : public Command syntax = " "; } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { MatchingConfigs matching = configs.equal_range(parameters[0]); @@ -116,7 +116,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener { } - void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) override { ConfigTagList tags = ServerInstance->Config->ConfTags("title"); CustomVhostMap newtitles; @@ -142,7 +142,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) override { /* We use this and not OnWhois because this triggers for remote, too */ if (numeric.GetNumeric() == 312) @@ -158,7 +158,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener return MOD_RES_PASSTHRU; } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR); } diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 3ead72a45..e9c9580e5 100644 --- a/src/modules/m_cycle.cpp +++ b/src/modules/m_cycle.cpp @@ -31,7 +31,7 @@ class CommandCycle : public SplitCommand Penalty = 3; syntax = " :[reason]"; } - CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) override { Channel* channel = ServerInstance->FindChan(parameters[0]); std::string reason = "Cycling"; @@ -82,7 +82,7 @@ class ModuleCycle : public Module { } - Version GetVersion() CXX11_OVERRIDE + Version GetVersion() override { return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR); } diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index d9e26d28f..94ddcce02 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -115,7 +115,7 @@ class CommandDccallow : public Command /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */ } - CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult Handle(User* user, const Params& parameters) override { /* syntax: DCCALLOW [+|-] (