summaryrefslogtreecommitdiff
path: root/src/gui/shopwindow.h
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/shopwindow.h
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadmv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/gui/shopwindow.h')
-rw-r--r--src/gui/shopwindow.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index dbf102f85..b04a3a474 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -33,16 +33,11 @@ class CheckBox;
class Item;
class Label;
class ListBox;
+class ScrollArea;
class ShopItem;
class ShopItems;
class ShopListBox;
-namespace gcn
-{
- class CheckBox;
- class ScrollArea;
-}
-
/**
* The buy dialog.
*
@@ -152,8 +147,8 @@ class ShopWindow final : public Window, public gcn::ActionListener,
ShopListBox *mBuyShopItemList;
ShopListBox *mSellShopItemList;
- gcn::ScrollArea *mBuyScrollArea;
- gcn::ScrollArea *mSellScrollArea;
+ ScrollArea *mBuyScrollArea;
+ ScrollArea *mSellScrollArea;
Label *mBuyLabel;
Label *mSellLabel;
Button *mBuyAddButton;