diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 15:15:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-19 16:39:56 +0300 |
| commit | 10badd2c0e099c7611f6d23b3973e54f210bc172 (patch) | |
| tree | 3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/selldialog.cpp | |
| parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
| download | manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz manaplus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip | |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/selldialog.cpp')
| -rw-r--r-- | src/gui/selldialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index e299362cc..13d06bc47 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -49,8 +49,8 @@ SellDialog::DialogList SellDialog::instances; SellDialog::SellDialog(const int npcId) : Window(_("Sell"), false, nullptr, "sell.xml"), - ActionListener(), - SelectionListener(), + gcn::ActionListener(), + gcn::SelectionListener(), mNpcId(npcId), mMaxItems(0), mAmountItems(0), mNick("") { init(); @@ -58,8 +58,8 @@ SellDialog::SellDialog(const int npcId) : SellDialog::SellDialog(std::string nick): Window(_("Sell"), false, nullptr, "sell.xml"), - ActionListener(), - SelectionListener(), + gcn::ActionListener(), + gcn::SelectionListener(), mNpcId(-1), mMaxItems(0), mAmountItems(0), mNick(nick) { init(); @@ -288,7 +288,7 @@ void SellDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED) mSlider->setValue(0); updateButtonsAndLabels(); - mSlider->gcn::Slider::setScale(1, mMaxItems); + mSlider->setScale(1, mMaxItems); } void SellDialog::setMoney(const int amount) |