diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:19:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:19:17 +0300 |
commit | 418d749f0d4889904d0b91e825a87e70a08d134c (patch) | |
tree | 5c244fcc48d343dd9ee8f6232b9f0fce92ca06c1 /src/gui | |
parent | dc5766216ee50103909d3b5dcdc5747c149855e0 (diff) | |
download | mv-418d749f0d4889904d0b91e825a87e70a08d134c.tar.gz mv-418d749f0d4889904d0b91e825a87e70a08d134c.tar.bz2 mv-418d749f0d4889904d0b91e825a87e70a08d134c.tar.xz mv-418d749f0d4889904d0b91e825a87e70a08d134c.zip |
Remove getter for partyHandler.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/popups/popupmenu.cpp | 8 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialpartytab.h | 4 | ||||
-rw-r--r-- | src/gui/windows/socialwindow.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index aa5a983fc..9aa99b229 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1292,12 +1292,12 @@ void PopupMenu::handleLink(const std::string &link, else if (link == "party" && being && being->getType() == ActorType::Player) { - Net::getPartyHandler()->invite(being->getName()); + partyHandler->invite(being->getName()); } else if (link == "kick party" && being && being->getType() == ActorType::Player) { - Net::getPartyHandler()->kick(being); + partyHandler->kick(being); } else if (link == "kick party" && !mNick.empty()) { @@ -1306,7 +1306,7 @@ void PopupMenu::handleLink(const std::string &link, const PartyMember *const member = localPlayer-> getParty()->getMember(mNick); if (member) - Net::getPartyHandler()->kick(mNick); + partyHandler->kick(mNick); } } else if (link == "name" && !mNick.empty()) @@ -1328,7 +1328,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "leave party" && mTab) { - Net::getPartyHandler()->leave(); + partyHandler->leave(); } else if (link == "chat clear" && mTab) { diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index 9aea998d2..777a3ea6b 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -76,7 +76,7 @@ class SocialPartyTab final : public SocialTab, if (eventId == "do invite") { const std::string name = mInviteDialog->getText(); - Net::getPartyHandler()->invite(name); + partyHandler->invite(name); if (localChatTab) { @@ -94,7 +94,7 @@ class SocialPartyTab final : public SocialTab, } else if (eventId == "yes") { - Net::getPartyHandler()->leave(); + partyHandler->leave(); if (localChatTab) { // TRANSLATORS: tab in social window diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 5b7868abb..e792d0a0a 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -277,7 +277,7 @@ void SocialWindow::action(const ActionEvent &event) strprintf(_("Accepted party invite from %s."), mPartyInviter.c_str())); } - Net::getPartyHandler()->inviteResponse(mPartyInviter, true); + partyHandler->inviteResponse(mPartyInviter, true); } else if (eventId == "no") { @@ -288,7 +288,7 @@ void SocialWindow::action(const ActionEvent &event) strprintf(_("Rejected party invite from %s."), mPartyInviter.c_str())); } - Net::getPartyHandler()->inviteResponse(mPartyInviter, false); + partyHandler->inviteResponse(mPartyInviter, false); } mPartyInviter.clear(); @@ -373,7 +373,7 @@ void SocialWindow::action(const ActionEvent &event) if (name.size() > 16) return; - Net::getPartyHandler()->create(name); + partyHandler->create(name); if (localChatTab) { // TRANSLATORS: chat message |