diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-19 11:59:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-19 11:59:14 +0300 |
commit | b5c7e137032d78a70c737cb390c6d729f95c72a2 (patch) | |
tree | 2ce73a70f6f5a032f688728ed2b14af6164a096d /src/gui/widgets | |
parent | 0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7 (diff) | |
download | manaplus-b5c7e137032d78a70c737cb390c6d729f95c72a2.tar.gz manaplus-b5c7e137032d78a70c737cb390c6d729f95c72a2.tar.bz2 manaplus-b5c7e137032d78a70c737cb390c6d729f95c72a2.tar.xz manaplus-b5c7e137032d78a70c737cb390c6d729f95c72a2.zip |
Fix virtual overload function handleCommand.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/gmtab.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/gmtab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/whispertab.cpp | 4 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/whispertab.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 35e9f5d7f..727d12de2 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -407,7 +407,7 @@ void ChatTab::chatInput(const std::string &message) switch (msg[0]) { case '/': - handleCommand(std::string(msg, 1)); + handleCommandStr(std::string(msg, 1)); break; case '?': if (msg.size() > 1) @@ -441,7 +441,7 @@ void ChatTab::handleInput(const std::string &msg) mChannelName); } -void ChatTab::handleCommand(const std::string &msg) +void ChatTab::handleCommandStr(const std::string &msg) { const size_t pos = msg.find(' '); const std::string type(msg, 0, pos); diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 1c735de24..762158e8a 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -184,7 +184,7 @@ class ChatTab notfinal : public Tab virtual void handleInput(const std::string &msg); - virtual void handleCommand(const std::string &msg); + virtual void handleCommandStr(const std::string &msg); virtual void handleHelp(const std::string &msg); diff --git a/src/gui/widgets/tabs/chat/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp index 4db496e76..caa475309 100644 --- a/src/gui/widgets/tabs/chat/gmtab.cpp +++ b/src/gui/widgets/tabs/chat/gmtab.cpp @@ -47,7 +47,7 @@ void GmTab::handleInput(const std::string &msg) chatHandler->channelMessage(mChannelName, ChatWindow::doReplace(msg)); } -void GmTab::handleCommand(const std::string &msg A_UNUSED) +void GmTab::handleCommandStr(const std::string &msg A_UNUSED) { } diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h index de016e61f..a120eb745 100644 --- a/src/gui/widgets/tabs/chat/gmtab.h +++ b/src/gui/widgets/tabs/chat/gmtab.h @@ -40,7 +40,7 @@ class GmTab final : public ChatTab void handleInput(const std::string &msg) override final; - void handleCommand(const std::string &msg) override final; + void handleCommandStr(const std::string &msg) override final; }; extern GmTab *gmChatTab; diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp index 61daac084..87de80724 100644 --- a/src/gui/widgets/tabs/chat/whispertab.cpp +++ b/src/gui/widgets/tabs/chat/whispertab.cpp @@ -61,7 +61,7 @@ void WhisperTab::handleInput(const std::string &msg) chatLog("?", newMsg); } -void WhisperTab::handleCommand(const std::string &msg) +void WhisperTab::handleCommandStr(const std::string &msg) { if (msg == "close") { @@ -85,7 +85,7 @@ void WhisperTab::handleCommand(const std::string &msg) } else { - ChatTab::handleCommand(msg); + ChatTab::handleCommandStr(msg); } } diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h index 2dc956389..514b1badb 100644 --- a/src/gui/widgets/tabs/chat/whispertab.h +++ b/src/gui/widgets/tabs/chat/whispertab.h @@ -64,7 +64,7 @@ class WhisperTab final : public ChatTab void handleInput(const std::string &msg) override final; - void handleCommand(const std::string &msg) override final; + void handleCommandStr(const std::string &msg) override final; private: std::string mNick; |