summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-27 23:59:02 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-27 23:59:02 +0300
commit009b8bb6528cd3380474dc5ba29903c55c8f6fef (patch)
tree88602dc4081e2d51f0596f99ad033bf0aaf60acf
parent1302c401c0197a033d83946ace237dacf8a0d514 (diff)
downloadmanaplus-009b8bb6528cd3380474dc5ba29903c55c8f6fef.tar.gz
manaplus-009b8bb6528cd3380474dc5ba29903c55c8f6fef.tar.bz2
manaplus-009b8bb6528cd3380474dc5ba29903c55c8f6fef.tar.xz
manaplus-009b8bb6528cd3380474dc5ba29903c55c8f6fef.zip
Fix compilation warnings.
-rw-r--r--src/gui/windows/chatwindow.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index b292d20f1..c55662eb6 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1553,17 +1553,17 @@ bool ChatWindow::resortChatLog(std::string line,
size_t idx2 = line.find(": ");
if (idx2 != std::string::npos)
{
- std::string nick = line.substr(0, idx2);
- if (nick.find("#") != std::string::npos ||
- nick.find(":") != std::string::npos ||
- nick.find("%") != std::string::npos ||
- nick.find("@") != std::string::npos)
+ std::string tmpNick = line.substr(0, idx2);
+ if (tmpNick.find("#") != std::string::npos ||
+ tmpNick.find(":") != std::string::npos ||
+ tmpNick.find("%") != std::string::npos ||
+ tmpNick.find("@") != std::string::npos)
{
- replaceAll(nick, "#", "_");
- replaceAll(nick, "%", "_");
+ replaceAll(tmpNick, "#", "_");
+ replaceAll(tmpNick, "%", "_");
const std::string errMsg = strprintf(
// TRANSLATORS: error message
- _("Broken nick detected: %s"), nick.c_str());
+ _("Broken nick detected: %s"), tmpNick.c_str());
if (debugChatTab)
debugChatTab->chatLog(errMsg, ChatMsgType::BY_SERVER);
else