summaryrefslogtreecommitdiff
path: root/src/gui/socialwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 15:15:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-19 16:39:56 +0300
commit10badd2c0e099c7611f6d23b3973e54f210bc172 (patch)
tree3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/socialwindow.cpp
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
plus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/gui/socialwindow.cpp')
-rw-r--r--src/gui/socialwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index a91057ddb..ad0bf9206 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -138,7 +138,7 @@ class SocialGuildTab final : public SocialTab, public gcn::ActionListener
public:
SocialGuildTab(Guild *const guild, const bool showBackground) :
SocialTab(),
- ActionListener(),
+ gcn::ActionListener(),
mGuild(guild)
{
setCaption(_("Guild"));
@@ -244,7 +244,7 @@ class SocialGuildTab2 final : public SocialTab, public gcn::ActionListener
public:
SocialGuildTab2(Guild *const guild, const bool showBackground) :
SocialTab(),
- ActionListener(),
+ gcn::ActionListener(),
mGuild(guild)
{
setCaption(_("Guild"));
@@ -306,7 +306,7 @@ class SocialPartyTab final : public SocialTab, public gcn::ActionListener
public:
SocialPartyTab(Party *const party, const bool showBackground) :
SocialTab(),
- ActionListener(),
+ gcn::ActionListener(),
mParty(party)
{
setCaption(_("Party"));
@@ -1218,7 +1218,7 @@ private:
SocialWindow::SocialWindow() :
Window(_("Social"), false, nullptr, "social.xml"),
- ActionListener(),
+ gcn::ActionListener(),
mGuildInvited(0),
mGuildAcceptDialog(nullptr),
mGuildCreateDialog(nullptr),