From 10badd2c0e099c7611f6d23b3973e54f210bc172 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 19 Oct 2012 15:15:19 +0300 Subject: Fix namespace conflicts. --- src/gui/selldialog.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/gui/selldialog.h') 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; -- cgit v1.2.3-70-g09d2