summaryrefslogtreecommitdiff
path: root/src/gui/statuswindow.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/statuswindow.cpp
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadManaVerse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
ManaVerse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
ManaVerse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
ManaVerse-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/gui/statuswindow.cpp')
-rw-r--r--src/gui/statuswindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 078669bca..a8f5b8e39 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -127,7 +127,7 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
StatusWindow::StatusWindow() :
Window(player_node ? player_node->getName() :
"?", false, nullptr, "status.xml"),
- ActionListener(),
+ gcn::ActionListener(),
mLvlLabel(new Label(strprintf(_("Level: %d"), 0))),
mMoneyLabel(new Label(strprintf(_("Money: %s"), ""))),
mHpLabel(new Label(_("HP:"))),
@@ -795,7 +795,7 @@ DerDisplay::DerDisplay(const int id, const std::string &name) :
ChangeDisplay::ChangeDisplay(const int id, const std::string &name) :
AttrDisplay(id, name),
- ActionListener(),
+ gcn::ActionListener(),
mNeeded(1),
mPoints(new Label(_("Max"))),
mDec(nullptr),