From 10badd2c0e099c7611f6d23b3973e54f210bc172 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 19 Oct 2012 15:15:19 +0300
Subject: Fix namespace conflicts.

---
 src/gui/shopwindow.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/gui/shopwindow.h')

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;
-- 
cgit v1.2.3-70-g09d2