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/render/graphics.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/render/graphics.h')

diff --git a/src/render/graphics.h b/src/render/graphics.h
index 53eb4af12..2356d2d31 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -70,10 +70,11 @@
 
 #include "sdlshared.h"
 
+#include "gui/color.h"
+
 #include "render/renderers.h"
 
 #include "gui/base/cliprectangle.hpp"
-#include "gui/base/color.hpp"
 
 #ifdef USE_SDL2
 #include <SDL_render.h>
@@ -331,27 +332,27 @@ class Graphics
         virtual void initArrays()
         { }
 
-        virtual void setColor(const gcn::Color &color)
+        virtual void setColor(const Color &color)
         {
             mColor = color;
             mColor2 = color;
             mAlpha = (color.a != 255);
         }
 
-        void setColor2(const gcn::Color &color)
+        void setColor2(const Color &color)
         { mColor2 = color; }
 
-        void setColorAll(const gcn::Color &color, const gcn::Color &color2)
+        void setColorAll(const Color &color, const Color &color2)
         {
             mColor = color;
             mColor2 = color2;
             mAlpha = (color.a != 255);
         }
 
-        const gcn::Color &getColor() const
+        const Color &getColor() const
         { return mColor; }
 
-        const gcn::Color &getColor2() const
+        const Color &getColor2() const
         { return mColor2; }
 
 #ifdef DEBUG_DRAW_CALLS
@@ -534,8 +535,8 @@ class Graphics
         int mStartFreeMem;
         bool mSync;
         int mScale;
-        gcn::Color mColor;
-        gcn::Color mColor2;
+        Color mColor;
+        Color mColor2;
 };
 
 extern Graphics *mainGraphics;
-- 
cgit v1.2.3-60-g2f50