diff options
author | Peter Powell <petpow@saberuk.com> | 2018-07-26 19:43:54 +0100 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2018-07-26 20:12:14 +0100 |
commit | 384ef31bc01e4a1a2e59d082c9066002410ba54a (patch) | |
tree | 06bd81f9e0e48183c1ada07cf7a8757a5028cad1 /src/coremods/core_info | |
parent | 09c5439c02f31e9875083e51966dad535af005a9 (diff) |
Use CommandBase::Params instead of std::vector<std::string>.
This is presently a typedef but will soon be replaced with a class
that encapsulates both tags and parameters.
Diffstat (limited to 'src/coremods/core_info')
-rw-r--r-- | src/coremods/core_info/cmd_admin.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/cmd_commands.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/cmd_info.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/cmd_modules.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/cmd_motd.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/cmd_time.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/cmd_version.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/core_info.cpp | 2 | ||||
-rw-r--r-- | src/coremods/core_info/core_info.h | 16 |
9 files changed, 16 insertions, 16 deletions
diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp index f79ebc036..44827555d 100644 --- a/src/coremods/core_info/cmd_admin.cpp +++ b/src/coremods/core_info/cmd_admin.cpp @@ -30,7 +30,7 @@ CommandAdmin::CommandAdmin(Module* parent) /** Handle /ADMIN */ -CmdResult CommandAdmin::Handle (const std::vector<std::string>& parameters, User *user) +CmdResult CommandAdmin::Handle(User* user, const Params& parameters) { if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName) return CMD_SUCCESS; diff --git a/src/coremods/core_info/cmd_commands.cpp b/src/coremods/core_info/cmd_commands.cpp index a7a622f5f..0a3efdf23 100644 --- a/src/coremods/core_info/cmd_commands.cpp +++ b/src/coremods/core_info/cmd_commands.cpp @@ -36,7 +36,7 @@ CommandCommands::CommandCommands(Module* parent) /** Handle /COMMANDS */ -CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user) +CmdResult CommandCommands::Handle(User* user, const Params& parameters) { const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands(); std::vector<std::string> list; diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp index e84daeccb..89e92e5a8 100644 --- a/src/coremods/core_info/cmd_info.cpp +++ b/src/coremods/core_info/cmd_info.cpp @@ -77,7 +77,7 @@ static const char* const lines[] = { /** Handle /INFO */ -CmdResult CommandInfo::Handle (const std::vector<std::string>& parameters, User *user) +CmdResult CommandInfo::Handle(User* user, const Params& parameters) { if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName) return CMD_SUCCESS; diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp index fa8c2aebb..952b6bca2 100644 --- a/src/coremods/core_info/cmd_modules.cpp +++ b/src/coremods/core_info/cmd_modules.cpp @@ -38,7 +38,7 @@ CommandModules::CommandModules(Module* parent) /** Handle /MODULES */ -CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, User *user) +CmdResult CommandModules::Handle(User* user, const Params& parameters) { // Don't ask remote servers about their modules unless the local user asking is an oper // 2.0 asks anyway, so let's handle that the same way diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp index cfb083eed..cc770b157 100644 --- a/src/coremods/core_info/cmd_motd.cpp +++ b/src/coremods/core_info/cmd_motd.cpp @@ -29,7 +29,7 @@ CommandMotd::CommandMotd(Module* parent) /** Handle /MOTD */ -CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User *user) +CmdResult CommandMotd::Handle(User* user, const Params& parameters) { if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName) { diff --git a/src/coremods/core_info/cmd_time.cpp b/src/coremods/core_info/cmd_time.cpp index 6755e5837..73987cf01 100644 --- a/src/coremods/core_info/cmd_time.cpp +++ b/src/coremods/core_info/cmd_time.cpp @@ -27,7 +27,7 @@ CommandTime::CommandTime(Module* parent) syntax = "[<servername>]"; } -CmdResult CommandTime::Handle (const std::vector<std::string>& parameters, User *user) +CmdResult CommandTime::Handle(User* user, const Params& parameters) { if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName) return CMD_SUCCESS; diff --git a/src/coremods/core_info/cmd_version.cpp b/src/coremods/core_info/cmd_version.cpp index 9ec0108b1..29d96169e 100644 --- a/src/coremods/core_info/cmd_version.cpp +++ b/src/coremods/core_info/cmd_version.cpp @@ -27,7 +27,7 @@ CommandVersion::CommandVersion(Module* parent) syntax = "[<servername>]"; } -CmdResult CommandVersion::Handle (const std::vector<std::string>&, User *user) +CmdResult CommandVersion::Handle(User* user, const Params& parameters) { std::string version = ServerInstance->GetVersionString((user->IsOper())); user->WriteNumeric(RPL_VERSION, version); diff --git a/src/coremods/core_info/core_info.cpp b/src/coremods/core_info/core_info.cpp index bd519076d..f1a17d089 100644 --- a/src/coremods/core_info/core_info.cpp +++ b/src/coremods/core_info/core_info.cpp @@ -20,7 +20,7 @@ #include "inspircd.h" #include "core_info.h" -RouteDescriptor ServerTargetCommand::GetRouting(User* user, const std::vector<std::string>& parameters) +RouteDescriptor ServerTargetCommand::GetRouting(User* user, const Params& parameters) { // Parameter must be a server name, not a nickname or uuid if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos)) diff --git a/src/coremods/core_info/core_info.h b/src/coremods/core_info/core_info.h index 53b949ac5..127041b46 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<std::string>& parameters) CXX11_OVERRIDE; + RouteDescriptor GetRouting(User* user, const Params& 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) 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<std::string>& parameters, User* user) CXX11_OVERRIDE; + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE; }; |