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.h | |
parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
download | plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz plus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/selldialog.h')
-rw-r--r-- | src/gui/selldialog.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index 1c62ede42..2e257ec52 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -33,14 +33,10 @@ class Button; class Item; class Label; +class ScrollArea; class ShopItems; class ShopListBox; - -namespace gcn -{ - class ScrollArea; - class Slider; -} +class Slider; /** * The sell dialog. @@ -136,10 +132,10 @@ class SellDialog final : public Window, Button *mIncreaseButton; Button *mDecreaseButton; ShopListBox *mShopItemList; - gcn::ScrollArea *mScrollArea; + ScrollArea *mScrollArea; Label *mMoneyLabel; Label *mQuantityLabel; - gcn::Slider *mSlider; + Slider *mSlider; ShopItems *mShopItems; int mPlayerMoney; |