summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 00:55:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 00:55:22 +0300
commit3a7313c027407e3b35360a021c72fe78f181d81d (patch)
treebb313b81c7feb42c2a0b5855c1eca00ef2d7c1b1 /src/gui
parent1307b14ff24f3935fa58aef405ffb246c0741336 (diff)
downloadmv-3a7313c027407e3b35360a021c72fe78f181d81d.tar.gz
mv-3a7313c027407e3b35360a021c72fe78f181d81d.tar.bz2
mv-3a7313c027407e3b35360a021c72fe78f181d81d.tar.xz
mv-3a7313c027407e3b35360a021c72fe78f181d81d.zip
Remove getter for chatHandler.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/tabs/chattab.cpp2
-rw-r--r--src/gui/widgets/tabs/whispertab.cpp4
-rw-r--r--src/gui/windows/chatwindow.cpp2
-rw-r--r--src/gui/windows/shopwindow.cpp8
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index d699b29fe..54d675a85 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -434,7 +434,7 @@ void ChatTab::clearText()
void ChatTab::handleInput(const std::string &msg)
{
- Net::getChatHandler()->talk(ChatWindow::doReplace(msg),
+ chatHandler->talk(ChatWindow::doReplace(msg),
mChannelName);
}
diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp
index a67b9450c..6c89a887b 100644
--- a/src/gui/widgets/tabs/whispertab.cpp
+++ b/src/gui/widgets/tabs/whispertab.cpp
@@ -53,7 +53,7 @@ void WhisperTab::handleInput(const std::string &msg)
{
std::string newMsg;
newMsg = ChatWindow::doReplace(msg);
- Net::getChatHandler()->privateMessage(mNick, newMsg);
+ chatHandler->privateMessage(mNick, newMsg);
if (localPlayer)
chatLog(localPlayer->getName(), newMsg);
@@ -77,7 +77,7 @@ void WhisperTab::handleCommand(const std::string &msg)
if (type == "me")
{
std::string str = strprintf("*%s*", args.c_str());
- Net::getChatHandler()->privateMessage(mNick, str);
+ chatHandler->privateMessage(mNick, str);
if (localPlayer)
chatLog(localPlayer->getName(), str);
else
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 9644b5a7c..318c89332 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1074,7 +1074,7 @@ void ChatWindow::addWhisper(const std::string &restrict nick,
{
if (own == ChatMsgType::BY_PLAYER)
{
- Net::getChatHandler()->privateMessage(nick, mes);
+ chatHandler->privateMessage(nick, mes);
// TRANSLATORS: chat message
localChatTab->chatLog(strprintf(_("Whispering to %s: %s"),
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 3645ccc9b..e846e0dce 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -261,12 +261,12 @@ void ShopWindow::action(const ActionEvent &event)
else if (eventId == "auction buy" && mBuyShopItems
&& mBuyShopItems->getNumberOfElements() > 0)
{
- Net::getChatHandler()->privateMessage("AuctionBot", "!pull4144 seek");
+ chatHandler->privateMessage("AuctionBot", "!pull4144 seek");
}
else if (eventId == "auction sell" && mSellShopItems
&& mSellShopItems->getNumberOfElements() > 0)
{
- Net::getChatHandler()->privateMessage("AuctionBot", "!pull4144 offer");
+ chatHandler->privateMessage("AuctionBot", "!pull4144 offer");
}
if (mSelectedItem < 1)
@@ -543,7 +543,7 @@ void ShopWindow::announce(ShopItems *const list, const int mode)
}
}
- Net::getChatHandler()->talk(data, GENERAL_CHANNEL);
+ chatHandler->talk(data, GENERAL_CHANNEL);
}
void ShopWindow::giveList(const std::string &nick, const int mode)
@@ -635,7 +635,7 @@ void ShopWindow::sendMessage(const std::string &nick,
}
if (config.getBoolValue("hideShopMessages"))
- Net::getChatHandler()->privateMessage(nick, data);
+ chatHandler->privateMessage(nick, data);
else
chatWindow->addWhisper(nick, data, ChatMsgType::BY_PLAYER);
}