From c8b41aa5d256d99eee67ec94492a94dc30e0ea35 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Tue, 24 Jul 2012 14:54:29 +0200 Subject: Remove superfluous std::string()s --- src/modules/m_ojoin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/m_ojoin.cpp') diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index d4daf2b63..fcb267750 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -61,7 +61,7 @@ class CommandOjoin : public Command // Make sure the channel name is allowable. if (!ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax)) { - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long"); + user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long"); return CMD_FAILURE; } @@ -71,19 +71,19 @@ class CommandOjoin : public Command if (channel) { - ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN to join "+channel->name); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name); if (notice) { channel = ServerInstance->FindChan(parameters[0]); channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s joined on official network business.", parameters[0].c_str(), user->nick.c_str()); - ServerInstance->PI->SendChannelNotice(channel, 0, std::string(user->nick) + " joined on official network business."); + ServerInstance->PI->SendChannelNotice(channel, 0, user->nick + " joined on official network business."); } } else { - ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN in "+parameters[0]); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN in "+parameters[0]); // they're already in the channel std::vector modes; modes.push_back(parameters[0]); -- cgit v1.3.1-10-gc9f91