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/setup_relations.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index 8e83cf22c..83b72ba97 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -35,12 +35,12 @@ class DropDown;
 class EditDialog;
 class GuiTable;
 class PlayerTableModel;
+class ScrollArea;
 class StaticTableModel;
 
 namespace gcn
 {
     class ListModel;
-    class ScrollArea;
 }
 
 class Setup_Relations final : public SetupTab,
@@ -72,7 +72,7 @@ private:
     PlayerTableModel *mPlayerTableModel;
     GuiTable *mPlayerTable;
     GuiTable *mPlayerTitleTable;
-    gcn::ScrollArea *mPlayerScrollArea;
+    ScrollArea *mPlayerScrollArea;
 
     CheckBox *mDefaultTrading;
     CheckBox *mDefaultWhisper;
-- 
cgit v1.2.3-60-g2f50