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_colors.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

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

diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index 89909ecce..6f3b8eafb 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -32,15 +32,11 @@
 class BrowserBox;
 class Label;
 class ListBox;
+class ScrollArea;
+class Slider;
 class TextField;
 class TextPreview;
 
-namespace gcn
-{
-    class ScrollArea;
-    class Slider;
-}
-
 class Setup_Colors final : public SetupTab,
                            public gcn::SelectionListener
 {
@@ -63,36 +59,36 @@ class Setup_Colors final : public SetupTab,
         static const std::string rawmsg;
 
         ListBox *mColorBox;
-        gcn::ScrollArea *mScroll;
+        ScrollArea *mScroll;
         BrowserBox *mPreview;
         TextPreview *mTextPreview;
-        gcn::ScrollArea *mPreviewBox;
+        ScrollArea *mPreviewBox;
         int mSelected;
 
         Label *mGradTypeLabel;
-        gcn::Slider *mGradTypeSlider;
+        Slider *mGradTypeSlider;
         Label *mGradTypeText;
 
         Label *mGradDelayLabel;
-        gcn::Slider *mGradDelaySlider;
+        Slider *mGradDelaySlider;
         TextField *mGradDelayText;
 
         Label *mRedLabel;
-        gcn::Slider *mRedSlider;
+        Slider *mRedSlider;
         TextField *mRedText;
         int mRedValue;
 
         Label *mGreenLabel;
-        gcn::Slider *mGreenSlider;
+        Slider *mGreenSlider;
         TextField *mGreenText;
         int mGreenValue;
 
         Label *mBlueLabel;
-        gcn::Slider *mBlueSlider;
+        Slider *mBlueSlider;
         TextField *mBlueText;
         int mBlueValue;
 
-        static void setEntry(gcn::Slider *const s, TextField *const t,
+        static void setEntry(Slider *const s, TextField *const t,
                              const int value);
         void updateColor();
         void updateGradType();
-- 
cgit v1.2.3-70-g09d2