summaryrefslogtreecommitdiff
path: root/src/actions/chat.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-28 21:44:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-28 21:49:37 +0300
commita83513ef88a9cfca8692db9176b68ddeea71931f (patch)
tree1d01876eb230a36d5c5f98cddd9c57e2476150ab /src/actions/chat.cpp
parentcfc84945c9cee7d42accdad39ff387738a3d32ac (diff)
downloadmv-a83513ef88a9cfca8692db9176b68ddeea71931f.tar.gz
mv-a83513ef88a9cfca8692db9176b68ddeea71931f.tar.bz2
mv-a83513ef88a9cfca8692db9176b68ddeea71931f.tar.xz
mv-a83513ef88a9cfca8692db9176b68ddeea71931f.zip
Fix code style.
Diffstat (limited to 'src/actions/chat.cpp')
-rw-r--r--src/actions/chat.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index feab53e93..c10a48fa3 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -40,7 +40,6 @@
#include "utils/booleanoptions.h"
#include "utils/gettext.h"
-#include "utils/stringutils.h"
#include "debug.h"
@@ -172,7 +171,7 @@ impHandler0(scrollChatDown)
impHandler(msg)
{
std::string recvnick;
- std::string msg;
+ std::string message;
if (event.args.substr(0, 1) == "\"")
{
@@ -181,7 +180,7 @@ impHandler(msg)
{
recvnick = event.args.substr(1, pos - 1);
if (pos + 2 < event.args.length())
- msg = event.args.substr(pos + 2, event.args.length());
+ message = event.args.substr(pos + 2, event.args.length());
}
}
else
@@ -191,18 +190,18 @@ impHandler(msg)
{
recvnick = event.args.substr(0, pos);
if (pos + 1 < event.args.length())
- msg = event.args.substr(pos + 1, event.args.length());
+ message = event.args.substr(pos + 1, event.args.length());
}
else
{
recvnick = std::string(event.args);
- msg.clear();
+ message.clear();
}
}
- trim(msg);
+ trim(message);
- if (msg.length() > 0)
+ if (message.length() > 0)
{
std::string playerName = localPlayer->getName();
std::string tempNick = recvnick;
@@ -213,12 +212,13 @@ impHandler(msg)
if (tempNick.compare(playerName) == 0 || event.args.empty())
return true;
- chatWindow->addWhisper(recvnick, msg, ChatMsgType::BY_PLAYER);
+ chatWindow->addWhisper(recvnick, message, ChatMsgType::BY_PLAYER);
}
else
{
// TRANSLATORS: whisper send
- event.tab->chatLog(_("Cannot send empty whispers!"), ChatMsgType::BY_SERVER);
+ event.tab->chatLog(_("Cannot send empty whispers!"),
+ ChatMsgType::BY_SERVER);
}
return true;
}