Move color into gui dir.

6 files changed, 15 insertions, 14 deletions

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;
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index f665f743b..0b9cd83e2 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -127,7 +127,7 @@ class MobileOpenGLGraphics final : public Graphics
         bool mTexture;
 
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         GLuint mImageCached;
         float mFloatColor;
         int mMaxVertices;
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 882ff5ed8..214954e3c 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -143,7 +143,7 @@ class NormalOpenGLGraphics final : public Graphics
         bool mTexture;
 
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         GLuint mImageCached;
         float mFloatColor;
         int mMaxVertices;
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index cbab0614d..ee2a5d189 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -130,7 +130,7 @@ class NullOpenGLGraphics final : public Graphics
         bool mTexture;
 
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         float mFloatColor;
         int mMaxVertices;
         bool mColorAlpha;
diff --git a/src/render/openglgraphicsdef.hpp b/src/render/openglgraphicsdef.hpp
index 89f8e63a9..99bf8e82a 100644
--- a/src/render/openglgraphicsdef.hpp
+++ b/src/render/openglgraphicsdef.hpp
@@ -92,14 +92,14 @@
 
         void popClipArea() override final;
 
-        void setColor(const gcn::Color &color) override final
+        void setColor(const Color &color) override final
         {
             mColor = color;
             mColor2 = color;
             mColorAlpha = (color.a != 255);
         }
 
-        void setColorAll(const gcn::Color &color, const gcn::Color &color2)
+        void setColorAll(const Color &color, const Color &color2)
         {
             mColor = color;
             mColor2 = color2;
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 28d61b59a..fbb156c6c 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -90,7 +90,7 @@ class SafeOpenGLGraphics final : public Graphics
 
         bool mTexture;
         bool mIsByteColor;
-        gcn::Color mByteColor;
+        Color mByteColor;
         float mFloatColor;
         bool mColorAlpha;
         FBOInfo mFbo;