From 3a7313c027407e3b35360a021c72fe78f181d81d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 00:55:22 +0300 Subject: Remove getter for chatHandler. --- src/gui/windows/chatwindow.cpp | 2 +- src/gui/windows/shopwindow.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/windows') 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); } -- cgit v1.2.3-70-g09d2