From 48646db55005a0da079bd2c945875dc8225e2f86 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Feb 2014 14:21:27 +0300
Subject: Move color into gui dir.

---
 src/gui/userpalette.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/userpalette.cpp')

diff --git a/src/gui/userpalette.cpp b/src/gui/userpalette.cpp
index 69125f8e2..74d47203f 100644
--- a/src/gui/userpalette.cpp
+++ b/src/gui/userpalette.cpp
@@ -237,7 +237,7 @@ UserPalette::~UserPalette()
 void UserPalette::setColor(const int type, const int r,
                            const int g, const int b)
 {
-    gcn::Color &color = mColors[type].color;
+    Color &color = mColors[type].color;
     color.r = r;
     color.g = g;
     color.b = b;
@@ -296,14 +296,14 @@ void UserPalette::rollback()
         if (i->grad != i->committedGrad)
             setGradient(i->type, i->committedGrad);
 
-        const gcn::Color &committedColor = i->committedColor;
+        const Color &committedColor = i->committedColor;
         setGradientDelay(i->type, i->committedDelay);
         setColor(i->type, committedColor.r,
                  committedColor.g, committedColor.b);
 
         if (i->grad == PULSE)
         {
-            gcn::Color &testColor = i->testColor;
+            Color &testColor = i->testColor;
             testColor.r = committedColor.r;
             testColor.g = committedColor.g;
             testColor.b = committedColor.b;
@@ -342,7 +342,7 @@ void UserPalette::addColor(const unsigned type, const unsigned rgb,
         rgbValue = atox(rgbString);
     else
         rgbValue = atoi(rgbString.c_str());
-    const gcn::Color &trueCol = gcn::Color(rgbValue);
+    const Color &trueCol = Color(rgbValue);
     grad = static_cast<GradientType>(config.getValue(configName + "Gradient",
                                      static_cast<int>(grad)));
     delay = config.getValueInt(configName + "Delay", delay);
-- 
cgit v1.2.3-60-g2f50