From 91e0af0fc4889f20d2f63426f8fe379674fc0393 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 21 Nov 2017 13:05:17 +0000 Subject: Add the override keyword in places that it is missing. GCCs warnings for this are much better than Clangs. --- src/coremods/core_channel/core_channel.cpp | 2 +- src/coremods/core_channel/core_channel.h | 14 ++++---- src/coremods/core_hostname_lookup.cpp | 4 +-- src/coremods/core_info/core_info.h | 16 ++++----- src/coremods/core_ison.cpp | 2 +- src/coremods/core_list.cpp | 2 +- src/coremods/core_loadmodule.cpp | 4 +-- src/coremods/core_lusers.cpp | 4 +-- src/coremods/core_oper/core_oper.h | 14 ++++---- src/coremods/core_privmsg.cpp | 4 +-- src/coremods/core_reloadmodule.cpp | 4 +-- src/coremods/core_stats.cpp | 4 +-- src/coremods/core_stub.cpp | 8 ++--- src/coremods/core_user/core_user.cpp | 6 ++-- src/coremods/core_user/core_user.h | 20 +++++------ src/coremods/core_userhost.cpp | 2 +- src/coremods/core_wallops.cpp | 4 +-- src/coremods/core_who.cpp | 2 +- src/coremods/core_whois.cpp | 4 +-- src/coremods/core_xline/core_xline.h | 12 +++---- src/modules.cpp | 2 +- src/modules/extra/m_mysql.cpp | 16 ++++----- src/modules/extra/m_pgsql.cpp | 8 ++--- src/modules/extra/m_sqlite3.cpp | 12 +++---- src/modules/extra/m_ssl_gnutls.cpp | 2 +- src/modules/m_alltime.cpp | 4 +-- src/modules/m_autoop.cpp | 2 +- src/modules/m_banredirect.cpp | 2 +- src/modules/m_callerid.cpp | 12 +++---- src/modules/m_cban.cpp | 14 ++++---- src/modules/m_chanfilter.cpp | 9 +++-- src/modules/m_chanhistory.cpp | 2 +- src/modules/m_channames.cpp | 2 +- src/modules/m_check.cpp | 4 +-- src/modules/m_chghost.cpp | 4 +-- src/modules/m_chgident.cpp | 4 +-- src/modules/m_chgname.cpp | 4 +-- src/modules/m_clearchan.cpp | 2 +- src/modules/m_cloaking.cpp | 4 +-- src/modules/m_clones.cpp | 2 +- src/modules/m_close.cpp | 2 +- src/modules/m_customtitle.cpp | 2 +- src/modules/m_cycle.cpp | 2 +- src/modules/m_dccallow.cpp | 4 +-- src/modules/m_deaf.cpp | 2 +- src/modules/m_delayjoin.cpp | 2 +- src/modules/m_delaymsg.cpp | 4 +-- src/modules/m_exemptchanops.cpp | 9 +++-- src/modules/m_filter.cpp | 4 +-- src/modules/m_globalload.cpp | 12 +++---- src/modules/m_globops.cpp | 2 +- src/modules/m_helpop.cpp | 2 +- src/modules/m_hidelist.cpp | 2 +- src/modules/m_hideoper.cpp | 2 +- src/modules/m_joinflood.cpp | 2 +- src/modules/m_jumpserver.cpp | 2 +- src/modules/m_kicknorejoin.cpp | 2 +- src/modules/m_knock.cpp | 4 +-- src/modules/m_lockserv.cpp | 4 +-- src/modules/m_md5.cpp | 2 +- src/modules/m_messageflood.cpp | 2 +- src/modules/m_modenotice.cpp | 4 +-- src/modules/m_monitor.cpp | 8 ++--- src/modules/m_namedmodes.cpp | 4 +-- src/modules/m_nationalchars.cpp | 2 +- src/modules/m_nickflood.cpp | 2 +- src/modules/m_nicklock.cpp | 8 ++--- src/modules/m_ojoin.cpp | 4 +-- src/modules/m_opermotd.cpp | 4 +-- src/modules/m_operprefix.cpp | 2 +- src/modules/m_password_hash.cpp | 2 +- src/modules/m_permchannels.cpp | 2 +- src/modules/m_redirect.cpp | 2 +- src/modules/m_remove.cpp | 4 +-- src/modules/m_repeat.cpp | 2 +- src/modules/m_ripemd160.cpp | 2 +- src/modules/m_rline.cpp | 14 ++++---- src/modules/m_rmode.cpp | 2 +- src/modules/m_sajoin.cpp | 4 +-- src/modules/m_sakick.cpp | 4 +-- src/modules/m_samode.cpp | 2 +- src/modules/m_sanick.cpp | 4 +-- src/modules/m_sapart.cpp | 4 +-- src/modules/m_saquit.cpp | 4 +-- src/modules/m_sasl.cpp | 6 ++-- src/modules/m_satopic.cpp | 2 +- src/modules/m_services_account.cpp | 6 ++-- src/modules/m_servprotect.cpp | 2 +- src/modules/m_sethost.cpp | 2 +- src/modules/m_setident.cpp | 2 +- src/modules/m_setidle.cpp | 2 +- src/modules/m_setname.cpp | 2 +- src/modules/m_sha1.cpp | 2 +- src/modules/m_sha256.cpp | 2 +- src/modules/m_showwhois.cpp | 2 +- src/modules/m_shun.cpp | 14 ++++---- src/modules/m_silence.cpp | 6 ++-- src/modules/m_spanningtree/cachetimer.h | 2 +- src/modules/m_spanningtree/commands.h | 58 +++++++++++++++--------------- src/modules/m_spanningtree/servercommand.h | 6 ++-- src/modules/m_sslinfo.cpp | 8 ++--- src/modules/m_sslmodes.cpp | 2 +- src/modules/m_starttls.cpp | 2 +- src/modules/m_svshold.cpp | 16 ++++----- src/modules/m_swhois.cpp | 2 +- src/modules/m_timedbans.cpp | 6 ++-- src/modules/m_tline.cpp | 2 +- src/modules/m_topiclock.cpp | 10 +++--- src/modules/m_uninvite.cpp | 4 +-- src/modules/m_userip.cpp | 2 +- src/modules/m_vhost.cpp | 2 +- src/modules/m_watch.cpp | 2 +- src/xline.cpp | 10 +++--- 113 files changed, 292 insertions(+), 294 deletions(-) (limited to 'src') diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp index 3af809645..045d94a1c 100644 --- a/src/coremods/core_channel/core_channel.cpp +++ b/src/coremods/core_channel/core_channel.cpp @@ -94,7 +94,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener } // Generate the MAXLIST token from the limits map. - std::string& buffer = tokens["MAXLIST"]; + std::string& buffer = tokens["MAX LIST"]; for (insp::flat_map::const_iterator iter = limits.begin(); iter != limits.end(); ++iter) { if (!buffer.empty()) diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h index 19a984827..46def3e7b 100644 --- a/src/coremods/core_channel/core_channel.h +++ b/src/coremods/core_channel/core_channel.h @@ -48,8 +48,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(const std::vector& parameters, User*user); - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; }; /** Handle /JOIN. @@ -66,7 +66,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(const std::vector& parameters, LocalUser* user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; }; /** Handle /TOPIC. @@ -87,7 +87,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(const std::vector& parameters, LocalUser* user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; }; /** Handle /NAMES. @@ -108,7 +108,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(const std::vector& parameters, LocalUser* user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; /** Spool the NAMES list for a given channel to the given user * @param user User to spool the NAMES list to @@ -132,6 +132,6 @@ class CommandKick : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User *user); - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; }; diff --git a/src/coremods/core_hostname_lookup.cpp b/src/coremods/core_hostname_lookup.cpp index 4ec88698e..4320b1e57 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) + void OnLookupComplete(const DNS::Query* r) CXX11_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) + void OnError(const DNS::Query* query) CXX11_OVERRIDE { LocalUser* bound_user = (LocalUser*)ServerInstance->FindUUID(uuid); if (bound_user) diff --git a/src/coremods/core_info/core_info.h b/src/coremods/core_info/core_info.h index ecfeb4f36..53b949ac5 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 std::vector& parameters); + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /MOTD. @@ -131,7 +131,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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /TIME. @@ -148,7 +148,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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /VERSION. @@ -165,5 +165,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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp index f1733ba88..642e36b43 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(const std::vector& parameters, LocalUser* user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; }; class IsonReplyBuilder : public Numeric::Builder<' ', true> diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp index 910ebb987..600ec47c2 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(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; diff --git a/src/coremods/core_loadmodule.cpp b/src/coremods/core_loadmodule.cpp index fde149587..1064da6c8 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(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /LOADMODULE @@ -72,7 +72,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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; CmdResult CommandUnloadmodule::Handle(const std::vector& parameters, User* user) diff --git a/src/coremods/core_lusers.cpp b/src/coremods/core_lusers.cpp index 7f1903dd0..a995e59e7 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(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /LUSERS @@ -110,7 +110,7 @@ public: { } - void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding) + void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding) CXX11_OVERRIDE { if (dest->registered != REG_ALL) return; diff --git a/src/coremods/core_oper/core_oper.h b/src/coremods/core_oper/core_oper.h index 619fdf1fa..be615239e 100644 --- a/src/coremods/core_oper/core_oper.h +++ b/src/coremods/core_oper/core_oper.h @@ -51,7 +51,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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /KILL. @@ -71,10 +71,10 @@ class CommandKill : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User* user); - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; - void EncodeParameter(std::string& param, unsigned int index); + void EncodeParameter(std::string& param, unsigned int index) CXX11_OVERRIDE; }; /** Handle /OPER. @@ -91,7 +91,7 @@ class CommandOper : public SplitCommand * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult HandleLocal(const std::vector& parameters, LocalUser* user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; }; /** Handle /REHASH. @@ -108,7 +108,7 @@ class CommandRehash : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; /** Handle /RESTART @@ -125,5 +125,5 @@ class CommandRestart : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; diff --git a/src/coremods/core_privmsg.cpp b/src/coremods/core_privmsg.cpp index 449097a75..d19ae09b5 100644 --- a/src/coremods/core_privmsg.cpp +++ b/src/coremods/core_privmsg.cpp @@ -54,7 +54,7 @@ class MessageCommandBase : public Command */ CmdResult HandleMessage(const std::vector& parameters, User* user, MessageType mt); - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { if (IS_LOCAL(user)) // This is handled by the OnUserMessage hook to split the LoopCall pieces @@ -263,7 +263,7 @@ class CommandMessage : public MessageCommandBase { } - CmdResult Handle(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { return HandleMessage(parameters, user, MT); } diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp index ffd4f9bf5..9684c8c13 100644 --- a/src/coremods/core_reloadmodule.cpp +++ b/src/coremods/core_reloadmodule.cpp @@ -45,7 +45,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(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; namespace ReloadModule @@ -579,7 +579,7 @@ class ReloadAction : public HandlerBase0 { } - void Call() + void Call() CXX11_OVERRIDE { ReloadModule::DataKeeper datakeeper; datakeeper.Save(mod); diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp index 7c3484917..ef6a12d34 100644 --- a/src/coremods/core_stats.cpp +++ b/src/coremods/core_stats.cpp @@ -41,8 +41,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(const std::vector& parameters, User *user); - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos)) return ROUTE_UNICAST(parameters[1]); diff --git a/src/coremods/core_stub.cpp b/src/coremods/core_stub.cpp index 71b0ddaea..6adc02f32 100644 --- a/src/coremods/core_stub.cpp +++ b/src/coremods/core_stub.cpp @@ -41,7 +41,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(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { /* * This is handled by the server linking module, if necessary. Do not remove this stub. @@ -68,7 +68,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(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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."); @@ -94,7 +94,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(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { if (user->registered == REG_ALL) { @@ -127,7 +127,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(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { user->WriteNotice("Look into loading a linking module (like m_spanningtree) if you want this to do anything useful."); return CMD_FAILURE; diff --git a/src/coremods/core_user/core_user.cpp b/src/coremods/core_user/core_user.cpp index a2ffc009e..5068bd4aa 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(const std::vector& parameters, LocalUser *user) + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE { // Check to make sure they haven't registered -- Fix by FCS if (user->registered == REG_ALL) @@ -73,7 +73,7 @@ class CommandPing : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { user->WriteServ("PONG %s :%s", ServerInstance->Config->ServerName.c_str(), parameters[0].c_str()); return CMD_SUCCESS; @@ -99,7 +99,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(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { // set the user as alive so they survive to next ping LocalUser* localuser = IS_LOCAL(user); diff --git a/src/coremods/core_user/core_user.h b/src/coremods/core_user/core_user.h index 72ba67869..2a1ba7bfd 100644 --- a/src/coremods/core_user/core_user.h +++ b/src/coremods/core_user/core_user.h @@ -58,8 +58,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(const std::vector& parameters, User *user); - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; }; class CommandMode : public Command @@ -91,9 +91,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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; }; /** Handle /NICK. @@ -110,7 +110,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(const std::vector& parameters, LocalUser* user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; }; /** Handle /PART. @@ -129,8 +129,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(const std::vector& parameters, User *user); - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; }; /** Handle /QUIT. @@ -152,9 +152,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(const std::vector& parameters, User*user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const std::vector& parameters); + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE; }; /** Handle /USER. @@ -171,7 +171,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(const std::vector& parameters, LocalUser *user); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_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. diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp index 7ee093cdb..2ed19f4d7 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(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; CmdResult CommandUserhost::Handle (const std::vector& parameters, User *user) diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp index 0210df8ee..d45ede846 100644 --- a/src/coremods/core_wallops.cpp +++ b/src/coremods/core_wallops.cpp @@ -42,9 +42,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(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { return ROUTE_BROADCAST; } diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index ba1883e77..5a3db9f83 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -74,7 +74,7 @@ class CommandWho : public Command * @param user The user issuing the command * @return A value from CmdResult to indicate command success or failure. */ - CmdResult Handle(const std::vector& parameters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; bool whomatch(User* cuser, User* user, const char* matchtext); }; diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp index d726b6b6c..1dd087e12 100644 --- a/src/coremods/core_whois.cpp +++ b/src/coremods/core_whois.cpp @@ -78,8 +78,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(const std::vector& parameters, LocalUser* user); - CmdResult HandleRemote(const std::vector& parameters, RemoteUser* target); + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE; + CmdResult HandleRemote(const std::vector& parameters, RemoteUser* target) CXX11_OVERRIDE; }; class WhoisNumericSink diff --git a/src/coremods/core_xline/core_xline.h b/src/coremods/core_xline/core_xline.h index 5b34e7a4d..11756c06b 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) + long Run(const std::string& mask) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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(const std::vector& parameters, User* user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; diff --git a/src/modules.cpp b/src/modules.cpp index 065f12a1f..9a3618264 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -444,7 +444,7 @@ namespace { Module* const mod; UnloadAction(Module* m) : mod(m) {} - void Call() + void Call() CXX11_OVERRIDE { DLLManager* dll = mod->ModuleDLLManager; ServerInstance->Modules->DoSafeUnload(mod); diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 3490f7fa6..aa396d55f 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -126,8 +126,8 @@ class DispatcherThread : public SocketThread public: DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } ~DispatcherThread() { } - void Run(); - void OnNotify(); + void Run() CXX11_OVERRIDE; + void OnNotify() CXX11_OVERRIDE; }; #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 @@ -193,12 +193,12 @@ class MySQLresult : public SQLResult } - int Rows() + int Rows() CXX11_OVERRIDE { return rows; } - void GetCols(std::vector& result) + void GetCols(std::vector& result) CXX11_OVERRIDE { result.assign(colnames.begin(), colnames.end()); } @@ -212,7 +212,7 @@ class MySQLresult : public SQLResult return SQLEntry(); } - bool GetRow(SQLEntries& result) + bool GetRow(SQLEntries& result) CXX11_OVERRIDE { if (currentrow < rows) { @@ -319,14 +319,14 @@ class SQLConnection : public SQLProvider mysql_close(connection); } - void submit(SQLQuery* q, const std::string& qs) + void submit(SQLQuery* q, const std::string& qs) CXX11_OVERRIDE { Parent()->Dispatcher->LockQueue(); Parent()->qq.push_back(QQueueItem(q, qs, this)); Parent()->Dispatcher->UnlockQueueWakeup(); } - void submit(SQLQuery* call, const std::string& q, const ParamL& p) + void submit(SQLQuery* call, const std::string& q, const ParamL& p) CXX11_OVERRIDE { std::string res; unsigned int param = 0; @@ -354,7 +354,7 @@ class SQLConnection : public SQLProvider submit(call, res); } - void submit(SQLQuery* call, const std::string& q, const ParamM& p) + void submit(SQLQuery* call, const std::string& q, const ParamM& p) CXX11_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 09aba7de9..7aaf96a67 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); + bool Tick(time_t TIME) CXX11_OVERRIDE; }; struct QueueItem @@ -100,12 +100,12 @@ class PgSQLresult : public SQLResult PQclear(res); } - int Rows() + int Rows() CXX11_OVERRIDE { return rows; } - void GetCols(std::vector& result) + void GetCols(std::vector& result) CXX11_OVERRIDE { result.resize(PQnfields(res)); for(unsigned int i=0; i < result.size(); i++) @@ -123,7 +123,7 @@ class PgSQLresult : public SQLResult return SQLEntry(std::string(v, PQgetlength(res, row, column))); } - bool GetRow(SQLEntries& result) + bool GetRow(SQLEntries& result) CXX11_OVERRIDE { if (currentrow >= PQntuples(res)) return false; diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index c7af2c23a..5f6cd1ce3 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -58,12 +58,12 @@ class SQLite3Result : public SQLResult { } - int Rows() + int Rows() CXX11_OVERRIDE { return rows; } - bool GetRow(SQLEntries& result) + bool GetRow(SQLEntries& result) CXX11_OVERRIDE { if (currentrow < rows) { @@ -78,7 +78,7 @@ class SQLite3Result : public SQLResult } } - void GetCols(std::vector& result) + void GetCols(std::vector& result) CXX11_OVERRIDE { result.assign(columns.begin(), columns.end()); } @@ -159,13 +159,13 @@ class SQLConn : public SQLProvider sqlite3_finalize(stmt); } - void submit(SQLQuery* query, const std::string& q) + void submit(SQLQuery* query, const std::string& q) CXX11_OVERRIDE { Query(query, q); delete query; } - void submit(SQLQuery* query, const std::string& q, const ParamL& p) + void submit(SQLQuery* query, const std::string& q, const ParamL& p) CXX11_OVERRIDE { std::string res; unsigned int param = 0; @@ -186,7 +186,7 @@ class SQLConn : public SQLProvider submit(query, res); } - void submit(SQLQuery* query, const std::string& q, const ParamM& p) + void submit(SQLQuery* query, const std::string& q, const ParamM& p) CXX11_OVERRIDE { std::string res; for(std::string::size_type i = 0; i < q.length(); i++) diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 534c3abbc..2d278c967 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -115,7 +115,7 @@ static Module* thismod; class RandGen : public HandlerBase2 { public: - void Call(char* buffer, size_t len) + void Call(char* buffer, size_t len) CXX11_OVERRIDE { #ifdef GNUTLS_HAS_RND gnutls_rnd(GNUTLS_RND_RANDOM, buffer, len); diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp index 73c0fa994..de3e702ac 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(const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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 std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { return ROUTE_OPT_BCAST; } diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp index 257c3647c..3eab189f2 100644 --- a/src/modules/m_autoop.cpp +++ b/src/modules/m_autoop.cpp @@ -41,7 +41,7 @@ class AutoOpList : public ListModeBase return mh ? mh->IsPrefixMode() : NULL; } - ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) CXX11_OVERRIDE { std::string::size_type pos = parameter.find(':'); if (pos == 0 || pos == std::string::npos) diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 4c5d53d35..4a4188757 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 ¶m, bool adding) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string& param, bool adding) CXX11_OVERRIDE { /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 74334cd24..137ab6b93 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -73,7 +73,7 @@ struct CallerIDExtInfo : public ExtensionItem { } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE { std::string ret; if (format != FORMAT_NETWORK) @@ -84,7 +84,7 @@ struct CallerIDExtInfo : public ExtensionItem return ret; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE { if (format == FORMAT_NETWORK) return; @@ -125,7 +125,7 @@ struct CallerIDExtInfo : public ExtensionItem return dat; } - void free(void* item) + void free(void* item) CXX11_OVERRIDE { callerid_data* dat = static_cast(item); @@ -182,7 +182,7 @@ public: TRANSLATE1(TR_CUSTOM); } - void EncodeParameter(std::string& parameter, unsigned int index) + void EncodeParameter(std::string& parameter, unsigned int index) CXX11_OVERRIDE { // Send lists as-is (part of 2.0 compat) if (parameter.find(',') != std::string::npos) @@ -201,7 +201,7 @@ public: * /accept nick1,nick2,nick3,* * to add 3 nicks and then show your list */ - CmdResult Handle(const std::vector ¶meters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { if (CommandParser::LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; @@ -234,7 +234,7 @@ public: return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE); } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_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, diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 42cff2850..54b1e39ee 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -38,17 +38,17 @@ public: } // XXX I shouldn't have to define this - bool Matches(User *u) + bool Matches(User* u) CXX11_OVERRIDE { return false; } - bool Matches(const std::string &s) + bool Matches(const std::string& s) CXX11_OVERRIDE { return irc::equals(matchtext, s); } - const std::string& Displayable() + const std::string& Displayable() CXX11_OVERRIDE { return matchtext; } @@ -63,12 +63,12 @@ class CBanFactory : public XLineFactory /** Generate a CBAN */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE { return new CBan(set_time, duration, source, reason, xline_specific_mask); } - bool AutoApplyToUserList(XLine *x) + bool AutoApplyToUserList(XLine* x) CXX11_OVERRIDE { return false; // No, we apply to channels. } @@ -84,7 +84,7 @@ class CommandCBan : public Command flags_needed = 'o'; this->syntax = " [ :]"; } - CmdResult Handle(const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ @@ -131,7 +131,7 @@ class CommandCBan : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { if (IS_LOCAL(user)) return ROUTE_LOCALONLY; // spanningtree will send ADDLINE diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 90e266fc3..133c5180d 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -34,8 +34,7 @@ class ChanFilter : public ListModeBase public: ChanFilter(Module* Creator) : ListModeBase(Creator, "filter", 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { } - bool ValidateParam(User* user, Channel* chan, std::string &word) - { + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { if (word.length() > 35) { user->WriteNumeric(935, chan->name, word, "%word is too long for censor list"); @@ -45,17 +44,17 @@ class ChanFilter : public ListModeBase return true; } - void TellListTooLong(User* user, Channel* chan, std::string &word) + void TellListTooLong(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { user->WriteNumeric(939, chan->name, word, "Channel spamfilter list is full"); } - void TellAlreadyOnList(User* user, Channel* chan, std::string &word) + void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { user->WriteNumeric(937, chan->name, InspIRCd::Format("The word %s is already on the spamfilter list", word.c_str())); } - void TellNotSet(User* user, Channel* chan, std::string &word) + void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { user->WriteNumeric(938, chan->name, "No such spamfilter word is set"); } diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index a969ab2e2..4ed1ae6ae 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -59,7 +59,7 @@ class HistoryMode : public ParamMode > { } - ModeAction OnSet(User* source, Channel* channel, std::string& parameter) + ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE { std::string::size_type colon = parameter.find(':'); if (colon == std::string::npos) diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index 7513cb33a..b23148b44 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -24,7 +24,7 @@ static std::bitset<256> allowedmap; class NewIsChannelHandler : public HandlerBase1 { public: - bool Call(const std::string&); + bool Call(const std::string&) CXX11_OVERRIDE; }; bool NewIsChannelHandler::Call(const std::string& channame) diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index e401c79f1..f2da47f1b 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 (const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_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 std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos)) return ROUTE_OPT_UCAST(parameters[1]); diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 8b588b63d..30efd1390 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -35,7 +35,7 @@ class CommandChghost : public Command TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost) { @@ -73,7 +73,7 @@ class CommandChghost : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { return ROUTE_OPT_UCAST(parameters[0]); } diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 8ba5b4a5b..f09bef0ab 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(const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { User* dest = ServerInstance->FindNick(parameters[0]); @@ -68,7 +68,7 @@ class CommandChgident : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { return ROUTE_OPT_UCAST(parameters[0]); } diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index 2582ef652..46894befc 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(const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { User* dest = ServerInstance->FindNick(parameters[0]); @@ -64,7 +64,7 @@ class CommandChgname : public Command return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) CXX11_OVERRIDE { return ROUTE_OPT_UCAST(parameters[0]); } diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index 08a7a88b5..0c6d52265 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(const std::vector& parameters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { Channel* chan = activechan = ServerInstance->FindChan(parameters[0]); if (!chan) diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 1cfd9516c..a1e4d1af7 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -53,7 +53,7 @@ class CloakUser : public ModeHandler { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE { LocalUser* user = IS_LOCAL(dest); @@ -131,7 +131,7 @@ class CommandCloak : public Command syntax = ""; } - CmdResult Handle(const std::vector ¶meters, User *user); + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE; }; class ModuleCloaking : public Module diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp index 3084b32a8..7cce32188 100644 --- a/src/modules/m_clones.cpp +++ b/src/modules/m_clones.cpp @@ -31,7 +31,7 @@ class CommandClones : public Command flags_needed = 'o'; syntax = ""; } - CmdResult Handle (const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { std::string clonesstr = "CLONES "; diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index 3f0eedaaf..8ef93830d 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 (const std::vector ¶meters, User *src) + CmdResult Handle(const std::vector& parameters, User* src) CXX11_OVERRIDE { std::map closed; diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 2a08592ea..16d1ae738 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -33,7 +33,7 @@ class CommandTitle : public Command syntax = " "; } - CmdResult Handle(const std::vector ¶meters, User* user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { const std::string userHost = user->ident + "@" + user->GetRealHost(); const std::string userIP = user->ident + "@" + user->GetIPString(); diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp index 202cb123f..68463a4e7 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(const std::vector ¶meters, LocalUser* user) + CmdResult HandleLocal(const std::vector& parameters, LocalUser* user) CXX11_OVERRIDE { Channel* channel = ServerInstance->FindChan(parameters[0]); std::string reason = "Cycling"; diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp index 12955d709..18ec87179 100644 --- a/src/modules/m_dccallow.cpp +++ b/src/modules/m_dccallow.cpp @@ -96,7 +96,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(const std::vector ¶meters, User *user) + CmdResult Handle(const std::vector& parameters, User* user) CXX11_OVERRIDE { /* syntax: DCCALLOW [+|-] (