diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 10:50:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 10:50:22 +0300 |
| commit | 4228763829f71ec4db50ed185483d7707c5e47eb (patch) | |
| tree | 55e6ae79345b0580b13928162a85d4b7ba2ef664 /src/gui | |
| parent | 38b46ebb02bbe307765aa9a456b587eafd3dfd7e (diff) | |
| download | manaverse-4228763829f71ec4db50ed185483d7707c5e47eb.tar.gz manaverse-4228763829f71ec4db50ed185483d7707c5e47eb.tar.bz2 manaverse-4228763829f71ec4db50ed185483d7707c5e47eb.tar.xz manaverse-4228763829f71ec4db50ed185483d7707c5e47eb.zip | |
Remove getter for guildHandler.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/socialguildtab.h | 4 | ||||
| -rw-r--r-- | src/gui/windows/socialwindow.cpp | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 89de39145..8e9939991 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1024,7 +1024,7 @@ void PopupMenu::handleLink(const std::string &link, if (guild) { if (guild->getServerGuild()) - Net::getGuildHandler()->invite(guild->getId(), mNick); + guildHandler->invite(guild->getId(), mNick); else if (guildManager) guildManager->invite(mNick); } @@ -1437,7 +1437,7 @@ void PopupMenu::handleLink(const std::string &link, if (guild) { if (guild->getServerGuild()) - Net::getGuildHandler()->kick(guild->getMember(mNick), ""); + guildHandler->kick(guild->getMember(mNick), ""); else if (guildManager) guildManager->kick(mNick); } @@ -1826,7 +1826,7 @@ void PopupMenu::handleLink(const std::string &link, const Guild *const guild = localPlayer->getGuild(); if (guild) { - Net::getGuildHandler()->changeMemberPostion( + guildHandler->changeMemberPostion( guild->getMember(mNick), num); } } diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index ba9127418..ed9261133 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -75,7 +75,7 @@ class SocialGuildTab final : public SocialTab, if (eventId == "do invite") { const std::string name = mInviteDialog->getText(); - Net::getGuildHandler()->invite(mGuild->getId(), name); + guildHandler->invite(mGuild->getId(), name); if (localChatTab) { @@ -94,7 +94,7 @@ class SocialGuildTab final : public SocialTab, } else if (eventId == "yes") { - Net::getGuildHandler()->leave(mGuild->getId()); + guildHandler->leave(mGuild->getId()); if (localChatTab) { // TRANSLATORS: chat message diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 500f72b66..5b7868abb 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -306,7 +306,7 @@ void SocialWindow::action(const ActionEvent &event) mPartyInviter.c_str())); } if (!guildManager || !GuildManager::getEnableGuildBot()) - Net::getGuildHandler()->inviteResponse(mGuildInvited, true); + guildHandler->inviteResponse(mGuildInvited, true); else guildManager->inviteResponse(true); } @@ -320,7 +320,7 @@ void SocialWindow::action(const ActionEvent &event) mPartyInviter.c_str())); } if (!guildManager || !GuildManager::getEnableGuildBot()) - Net::getGuildHandler()->inviteResponse(mGuildInvited, false); + guildHandler->inviteResponse(mGuildInvited, false); else guildManager->inviteResponse(false); } @@ -352,7 +352,7 @@ void SocialWindow::action(const ActionEvent &event) if (name.size() > 16) return; - Net::getGuildHandler()->create(name); + guildHandler->create(name); if (localChatTab) { // TRANSLATORS: chat message |