diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 13:54:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 13:54:02 +0300 |
commit | c9d8a97059e24d24011870fae89199e1cb44e5ef (patch) | |
tree | 1319aa49a8e4fac0d8307e2393d45f62f99224cd /src/net/tmwa/guildhandler.cpp | |
parent | 3121b17f34cb74e1b54ef5bde8b3937627d79d91 (diff) | |
download | manaverse-c9d8a97059e24d24011870fae89199e1cb44e5ef.tar.gz manaverse-c9d8a97059e24d24011870fae89199e1cb44e5ef.tar.bz2 manaverse-c9d8a97059e24d24011870fae89199e1cb44e5ef.tar.xz manaverse-c9d8a97059e24d24011870fae89199e1cb44e5ef.zip |
Move GuildTab from net namespace into gui.
Diffstat (limited to 'src/net/tmwa/guildhandler.cpp')
-rw-r--r-- | src/net/tmwa/guildhandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index a22cd69b0..3e9faa4c8 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -32,7 +32,7 @@ #include "net/serverfeatures.h" -#include "net/ea/gui/guildtab.h" +#include "gui/widgets/tabs/chat/guildtab.h" #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" @@ -360,11 +360,11 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const g->setEmblemId(emblem); if (!Ea::taGuild) Ea::taGuild = g; - if (!Ea::guildTab && chatWindow) + if (!guildTab && chatWindow) { - Ea::guildTab = new Ea::GuildTab(chatWindow); + guildTab = new GuildTab(chatWindow); if (config.getBoolValue("showChatHistory")) - Ea::guildTab->loadFromLogFile("#Guild"); + guildTab->loadFromLogFile("#Guild"); if (localPlayer) localPlayer->addGuild(Ea::taGuild); memberList(guildId); @@ -391,8 +391,8 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const if (m) { m->setOnline(online); - if (Ea::guildTab) - Ea::guildTab->showOnline(m->getName(), online); + if (guildTab) + guildTab->showOnline(m->getName(), online); if (socialWindow) socialWindow->updateGuildCounter(); } |