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/buydialog.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/buydialog.cpp')
-rw-r--r-- | src/gui/buydialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index fd2e3a5f3..e855c1b57 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -51,8 +51,8 @@ BuyDialog::DialogList BuyDialog::instances; BuyDialog::BuyDialog(const int npcId) : Window(_("Buy"), false, nullptr, "buy.xml"), - ActionListener(), - SelectionListener(), + gcn::ActionListener(), + gcn::SelectionListener(), mNpcId(npcId), mMoney(0), mAmountItems(0), mMaxItems(0), mNick("") { init(); @@ -60,8 +60,8 @@ BuyDialog::BuyDialog(const int npcId) : BuyDialog::BuyDialog(std::string nick) : Window(_("Buy"), false, nullptr, "buy.xml"), - ActionListener(), - SelectionListener(), + gcn::ActionListener(), + gcn::SelectionListener(), mNpcId(-1), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(nick) { init(); @@ -253,7 +253,7 @@ void BuyDialog::action(const gcn::ActionEvent &event) // Reset selection mAmountItems = 1; mSlider->setValue(1); - mSlider->gcn::Slider::setScale(1, mMaxItems); + mSlider->setScale(1, mMaxItems); } else if (tradeWindow) { @@ -280,7 +280,7 @@ void BuyDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED) mSlider->setValue(1); updateButtonsAndLabels(); - mSlider->gcn::Slider::setScale(1, mMaxItems); + mSlider->setScale(1, mMaxItems); mAmountField->setRange(1, mMaxItems); mAmountField->setValue(1); } |