summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-12 14:42:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-12 14:42:11 +0300
commitdf338f41694df0fb3327a554bd4db6841b5a191f (patch)
tree4d8aaf7e473fcb4b8adaa864dcb0a9a16e489117
parenta9c39ea2e28e47118f58a040c4eb949b84bf9e20 (diff)
downloadmanaplus-df338f41694df0fb3327a554bd4db6841b5a191f.tar.gz
manaplus-df338f41694df0fb3327a554bd4db6841b5a191f.tar.bz2
manaplus-df338f41694df0fb3327a554bd4db6841b5a191f.tar.xz
manaplus-df338f41694df0fb3327a554bd4db6841b5a191f.zip
Move partyTab variable definition from net code into partytab class.
-rw-r--r--src/gui/widgets/tabs/chat/partytab.cpp2
-rw-r--r--src/net/ea/partyhandler.cpp2
-rw-r--r--src/net/ea/partyhandler.h2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/widgets/tabs/chat/partytab.cpp b/src/gui/widgets/tabs/chat/partytab.cpp
index 88357aa6a..23c3a7bff 100644
--- a/src/gui/widgets/tabs/chat/partytab.cpp
+++ b/src/gui/widgets/tabs/chat/partytab.cpp
@@ -39,6 +39,8 @@
#include "debug.h"
+PartyTab *partyTab = nullptr;
+
PartyTab::PartyTab(const Widget2 *const widget) :
// TRANSLATORS: party chat tab name
ChatTab(widget, _("Party"), "")
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index bc72a0043..425ba7793 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -41,8 +41,6 @@
#include "debug.h"
-PartyTab *partyTab = nullptr;
-
namespace Ea
{
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index b595891c4..e18e8551a 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -85,6 +85,4 @@ extern Party *taParty;
} // namespace Ea
-extern PartyTab *partyTab;
-
#endif // NET_EA_PARTYHANDLER_H