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/being/being.cpp |  2 +-
 src/being/being.h   | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/being')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index 76af509d3..485b439af 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -542,7 +542,7 @@ void Being::takeDamage(Being *const attacker, const int amount,
     // TRANSLATORS: hit or miss message in attacks
     const std::string damage = amount ? toString(amount) : type == FLEE ?
             _("dodge") : _("miss");
-    const gcn::Color *color;
+    const Color *color;
 
     if (gui)
         font = gui->getInfoParticleFont();
diff --git a/src/being/being.h b/src/being/being.h
index 4ef40d9fd..e427612f0 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -41,6 +41,7 @@ static const int DEFAULT_BEING_HEIGHT = 32;
 
 class AnimatedSprite;
 class BeingCacheEntry;
+class Color;
 class Equipment;
 class FlashText;
 class Guild;
@@ -52,11 +53,6 @@ class Text;
 
 struct ParticleInfo;
 
-namespace gcn
-{
-    class Color;
-}
-
 extern volatile int cur_time;
 
 enum Gender
@@ -969,7 +965,7 @@ class Being : public ActorSprite, public ConfigListener
          * Holds a text object when the being displays it's name, 0 otherwise
          */
         FlashText *mDispName;
-        const gcn::Color *mNameColor;
+        const Color *mNameColor;
 
         /** Engine-related infos about weapon. */
         const ItemInfo *mEquippedWeapon;
@@ -979,7 +975,7 @@ class Being : public ActorSprite, public ConfigListener
 
         Path mPath;
         Text *mText;
-        const gcn::Color *mTextColor;
+        const Color *mTextColor;
 
         Vector mDest;  /**< destination coordinates. */
 
-- 
cgit v1.2.3-70-g09d2