diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 14:39:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 14:39:39 +0300 |
| commit | a9c39ea2e28e47118f58a040c4eb949b84bf9e20 (patch) | |
| tree | b14a45632d14d8293422fc4707e8a3fd451b6f18 /src/net/ea/partyhandler.cpp | |
| parent | c9d8a97059e24d24011870fae89199e1cb44e5ef (diff) | |
| download | manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.tar.gz manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.tar.bz2 manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.tar.xz manaverse-a9c39ea2e28e47118f58a040c4eb949b84bf9e20.zip | |
Move PartyTab from net namespace into gui.
Diffstat (limited to 'src/net/ea/partyhandler.cpp')
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 0258bd2c6..bc72a0043 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -33,7 +33,7 @@ #include "net/messagein.h" -#include "net/ea/gui/partytab.h" +#include "gui/widgets/tabs/chat/partytab.h" #include "utils/delete2.h" @@ -41,10 +41,11 @@ #include "debug.h" +PartyTab *partyTab = nullptr; + namespace Ea { -PartyTab *partyTab = nullptr; Party *taParty = nullptr; PartyHandler::PartyHandler() : @@ -168,7 +169,7 @@ void PartyHandler::processPartyMove(Net::MessageIn &msg) const m->setY(msg.readInt16()); // y const bool online = msg.readUInt8() != 0; if (m->getOnline() != online) - Ea::partyTab->showOnline(m->getName(), online); + partyTab->showOnline(m->getName(), online); m->setOnline(online); // online (if 0) msg.readString(24); // party msg.readString(24); // nick @@ -225,7 +226,7 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) const Ea::taParty->clearMembers(); } - delete2(Ea::partyTab) + delete2(partyTab) if (socialWindow && Ea::taParty) socialWindow->removeTab(Ea::taParty); @@ -318,9 +319,9 @@ ChatTab *PartyHandler::getTab() const void PartyHandler::createTab() const { - Ea::partyTab = new Ea::PartyTab(chatWindow); + partyTab = new PartyTab(chatWindow); if (config.getBoolValue("showChatHistory")) - Ea::partyTab->loadFromLogFile("#Party"); + partyTab->loadFromLogFile("#Party"); } } // namespace Ea |