summaryrefslogtreecommitdiff
path: root/src/net/eathena/guildhandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-12 13:54:02 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-12 13:54:02 +0300
commitc9d8a97059e24d24011870fae89199e1cb44e5ef (patch)
tree1319aa49a8e4fac0d8307e2393d45f62f99224cd /src/net/eathena/guildhandler.cpp
parent3121b17f34cb74e1b54ef5bde8b3937627d79d91 (diff)
downloadManaVerse-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/eathena/guildhandler.cpp')
-rw-r--r--src/net/eathena/guildhandler.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index a1ea449c5..f64569d10 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -30,7 +30,7 @@
#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
-#include "net/ea/gui/guildtab.h"
+#include "gui/widgets/tabs/chat/guildtab.h"
#include "net/eathena/messageout.h"
#include "net/eathena/protocol.h"
@@ -372,11 +372,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);
@@ -406,8 +406,8 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const
m->setOnline(online);
if (online)
m->setGender(gender);
- if (Ea::guildTab)
- Ea::guildTab->showOnline(m->getName(), online);
+ if (guildTab)
+ guildTab->showOnline(m->getName(), online);
if (socialWindow)
socialWindow->updateGuildCounter();
}