diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-04-01 02:13:43 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-04-01 02:13:43 +0200 |
| commit | 1cb05553e286227e6bbd463d0b4b8cae40ff3940 (patch) | |
| tree | d8c211e91ce29fcaf94dc3a4bf1814200804509c /include | |
| parent | 9b9140d5f8a94ba160120ab91821338f08fba6e1 (diff) | |
Change channel name parameter of Module::OnUserPreJoin() and Channel::JoinUser() to std::string from char*
Diffstat (limited to 'include')
| -rw-r--r-- | include/channels.h | 4 | ||||
| -rw-r--r-- | include/modules.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/channels.h b/include/channels.h index dda53f69d..3a6b38640 100644 --- a/include/channels.h +++ b/include/channels.h @@ -222,14 +222,14 @@ class CoreExport Channel : public Extensible, public InviteBase /* Join a user to a channel. May be a channel that doesnt exist yet. * @param user The user to join to the channel. - * @param cn The channel name to join to. Does not have to exist. + * @param channame The channel name to join to. Does not have to exist. * @param key The key of the channel, if given * @param override If true, override all join restrictions such as +bkil * @return A pointer to the Channel the user was joined to. A new Channel may have * been created if the channel did not exist before the user was joined to it. * If the user could not be joined to a channel, the return value may be NULL. */ - static Channel* JoinUser(User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0); + static Channel* JoinUser(User *user, std::string channame, bool override, const std::string& key, bool bursting, time_t TS = 0); /** Write to a channel, from a user, using va_args for text * @param user User whos details to prefix the line with diff --git a/include/modules.h b/include/modules.h index 68ac9cb6c..626f6e9b8 100644 --- a/include/modules.h +++ b/include/modules.h @@ -509,7 +509,7 @@ class CoreExport Module : public classbase, public usecountbase * @param keygiven The key given to join the channel, or an empty string if none was provided * @return 1 To prevent the join, 0 to allow it. */ - virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven); + virtual ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven); /** Called whenever a user is about to be kicked. * Returning a value of 1 from this function stops the process immediately, causing no |