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/tradewindow.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/tradewindow.cpp')
| -rw-r--r-- | src/gui/tradewindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index 437b8bc9f..5cb77dd9d 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -61,8 +61,8 @@ TradeWindow::TradeWindow(): Window(_("Trade: You"), false, nullptr, "trade.xml"), - ActionListener(), - SelectionListener(), + gcn::ActionListener(), + gcn::SelectionListener(), mMyInventory(new Inventory(Inventory::TRADE)), mPartnerInventory(new Inventory(Inventory::TRADE)), mMyItemContainer(new ItemContainer(mMyInventory.get())), @@ -104,13 +104,13 @@ TradeWindow::TradeWindow(): ScrollArea *const myScroll = new ScrollArea(mMyItemContainer, true, "trade_background.xml"); - myScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); + myScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mPartnerItemContainer->addSelectionListener(this); ScrollArea *const partnerScroll = new ScrollArea(mPartnerItemContainer, true, "trade_background.xml"); - partnerScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); + partnerScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); Label *const moneyLabel2 = new Label(_("You give:")); |