summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-13 20:33:39 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-13 20:33:39 +0300
commit071ec67ad18431d197332a4a7e13368e60a834e2 (patch)
tree20b0a7950b6b18e79c0344333833f8393547a5d3
parent041a5a85ba09650a85f3ac7a3e88e183c6b88c28 (diff)
downloadplus-071ec67ad18431d197332a4a7e13368e60a834e2.tar.gz
plus-071ec67ad18431d197332a4a7e13368e60a834e2.tar.bz2
plus-071ec67ad18431d197332a4a7e13368e60a834e2.tar.xz
plus-071ec67ad18431d197332a4a7e13368e60a834e2.zip
Fix compilation warnings.
-rw-r--r--src/gui/windows/chatwindow.h2
-rw-r--r--src/net/eathena/chathandler.cpp5
-rw-r--r--src/net/eathena/chathandler.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index b21930bd0..a2b1781bf 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -200,7 +200,7 @@ class ChatWindow final : public Window,
WhisperTab *getWhisperTab(const std::string &nick) const A_WARN_UNUSED;
ChannelTab *addChannelTab(const std::string &name,
- const bool switchTo = false) A_WARN_UNUSED;
+ const bool switchTo = false);
ChatTab *addChatTab(const std::string &name,
const bool switchTo,
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 0a5029b6e..d16692cf5 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -406,8 +406,7 @@ void ChatHandler::processColorChat(Net::MessageIn &msg)
processChatContinue(message, ChatMsgType::BY_UNKNOWN);
}
-std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg,
- ChatMsgType::Type &own)
+std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg)
{
std::string msg = chatMsg;
std::string channel(GENERAL_CHANNEL);
@@ -425,7 +424,7 @@ std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg,
void ChatHandler::processChatContinue(std::string chatMsg, ChatMsgType::Type own)
{
- const std::string channel = extractChannelFromMessage(chatMsg, own);
+ const std::string channel = extractChannelFromMessage(chatMsg);
bool allow(true);
if (chatWindow)
{
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 93cb77935..6bcf315bd 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -83,8 +83,7 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
const std::string &password) const override final;
protected:
- static std::string extractChannelFromMessage(std::string &chatMsg,
- ChatMsgType::Type &own);
+ static std::string extractChannelFromMessage(std::string &chatMsg);
void processChat(Net::MessageIn &msg);