Move color into gui dir.

28 files changed, 125 insertions, 130 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 298ab657a..a71051b5d 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -154,7 +154,7 @@ void AvatarListBox::draw(Graphics *graphics)
             }
             if (parent && a->getMaxHp())
             {
-                gcn::Color color = Theme::getProgressColor(
+                Color color = Theme::getProgressColor(
                         Theme::PROG_HP, static_cast<float>(a->getHp())
                         / static_cast<float>(a->getMaxHp()));
                 color.a = 80;
@@ -180,8 +180,7 @@ void AvatarListBox::draw(Graphics *graphics)
 
             if (parent)
             {
-                gcn::Color color = Theme::getProgressColor(Theme::PROG_HP,
-                        1);
+                Color color = Theme::getProgressColor(Theme::PROG_HP, 1);
 
                 color.a = 80;
                 graphics->setColor(color);
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index cc83d2b83..b6644cbc1 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -534,8 +534,8 @@ int BrowserBox::calcHeight()
     const char *const hyphen = "~";
     const int hyphenWidth = font->getWidth(hyphen);
 
-    gcn::Color selColor[2] = {mForegroundColor, mForegroundColor2};
-    const gcn::Color textColor[2] = {mForegroundColor, mForegroundColor2};
+    Color selColor[2] = {mForegroundColor, mForegroundColor2};
+    const Color textColor[2] = {mForegroundColor, mForegroundColor2};
     ResourceManager *const resman = ResourceManager::getInstance();
 
     mLineParts.clear();
@@ -581,7 +581,7 @@ int BrowserBox::calcHeight()
             continue;
         }
 
-        gcn::Color prevColor[2];
+        Color prevColor[2];
         prevColor[0] = selColor[0];
         prevColor[1] = selColor[1];
         bold = false;
@@ -621,7 +621,7 @@ int BrowserBox::calcHeight()
                     const signed char c = row.at(start + 2);
 
                     bool valid(false);
-                    const gcn::Color col[2] =
+                    const Color col[2] =
                     {
                         getThemeCharColor(c, valid),
                         getThemeCharColor(c | 0x80, valid)
@@ -897,8 +897,8 @@ std::string BrowserBox::getTextAtPos(const int x, const int y) const
     return str;
 }
 
-void BrowserBox::setForegroundColorAll(const gcn::Color &color1,
-                                       const gcn::Color &color2)
+void BrowserBox::setForegroundColorAll(const Color &color1,
+                                       const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 1f09dd0b1..a33c69698 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -58,8 +58,8 @@ struct BrowserLink final
 class LinePart final
 {
     public:
-        LinePart(const int x, const int y, const gcn::Color &color,
-                 const gcn::Color &color2, const std::string &text,
+        LinePart(const int x, const int y, const Color &color,
+                 const Color &color2, const std::string &text,
                  const bool bold) :
             mX(x),
             mY(y),
@@ -72,8 +72,8 @@ class LinePart final
         {
         }
 
-        LinePart(const int x, const int y, const gcn::Color &color,
-                 const gcn::Color &color2, Image *const image) :
+        LinePart(const int x, const int y, const Color &color,
+                 const Color &color2, Image *const image) :
             mX(x),
             mY(y),
             mColor(color),
@@ -88,8 +88,8 @@ class LinePart final
         ~LinePart();
 
         int mX, mY;
-        gcn::Color mColor;
-        gcn::Color mColor2;
+        Color mColor;
+        Color mColor2;
         std::string mText;
         unsigned char mType;
         Image *mImage;
@@ -228,8 +228,8 @@ class BrowserBox final : public gcn::Widget,
         int getPadding() const A_WARN_UNUSED
         { return mPadding; }
 
-        void setForegroundColorAll(const gcn::Color &color1,
-                                   const gcn::Color &color2);
+        void setForegroundColorAll(const Color &color1,
+                                   const Color &color2);
 
         int getDataWidth() const
         { return mDataWidth; }
@@ -266,9 +266,9 @@ class BrowserBox final : public gcn::Widget,
         int mItemPadding;
         unsigned int mDataWidth;
 
-        gcn::Color mHighlightColor;
-        gcn::Color mHyperLinkColor;
-        gcn::Color mColors[2][COLORS_MAX];
+        Color mHighlightColor;
+        Color mHyperLinkColor;
+        Color mColors[2][COLORS_MAX];
 
         bool mOpaque;
         bool mUseLinksAndUserColors;
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 4f2e9fd89..039475150 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -165,14 +165,14 @@ class Button final : public gcn::Button,
 
         std::string mDescription;
         ImageCollection *mVertexes2;
-        gcn::Color mEnabledColor;
-        gcn::Color mEnabledColor2;
-        gcn::Color mDisabledColor;
-        gcn::Color mDisabledColor2;
-        gcn::Color mHighlightedColor;
-        gcn::Color mHighlightedColor2;
-        gcn::Color mPressedColor;
-        gcn::Color mPressedColor2;
+        Color mEnabledColor;
+        Color mEnabledColor2;
+        Color mDisabledColor;
+        Color mDisabledColor2;
+        Color mHighlightedColor;
+        Color mHighlightedColor2;
+        Color mPressedColor;
+        Color mPressedColor2;
         Image **mImages;
         ImageSet *mImageSet;
         unsigned mClickCount;
diff --git a/src/gui/widgets/colormodel.cpp b/src/gui/widgets/colormodel.cpp
index 7e59553e3..3a71a93cc 100644
--- a/src/gui/widgets/colormodel.cpp
+++ b/src/gui/widgets/colormodel.cpp
@@ -56,8 +56,8 @@ const ColorPair *ColorModel::getColorAt(const int i) const
     return &mColors[i];
 }
 
-void ColorModel::add(const std::string &name, const gcn::Color *const color1,
-                     const gcn::Color *const color2)
+void ColorModel::add(const std::string &name, const Color *const color1,
+                     const Color *const color2)
 {
     mNames.push_back(name);
     mColors.push_back(ColorPair(color1, color2));
diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h
index c019d9aac..7386a856b 100644
--- a/src/gui/widgets/colormodel.h
+++ b/src/gui/widgets/colormodel.h
@@ -27,23 +27,19 @@
 
 #include "localconsts.h"
 
+class Color;
 class Widget2;
 
-namespace gcn
-{
-    class Color;
-}
-
 struct ColorPair
 {
-    ColorPair(const gcn::Color* c1, const gcn::Color* c2) :
+    ColorPair(const Color* c1, const Color* c2) :
         color1(c1),
         color2(c2)
     {
     }
 
-    const gcn::Color* color1;
-    const gcn::Color* color2;
+    const Color* color1;
+    const Color* color2;
 };
 
 class ColorModel : public gcn::ListModel
@@ -67,8 +63,8 @@ class ColorModel : public gcn::ListModel
         size_t size() A_WARN_UNUSED
         { return mNames.size(); }
 
-        void add(const std::string &name, const gcn::Color *const color1,
-                 const gcn::Color *const color2);
+        void add(const std::string &name, const Color *const color1,
+                 const Color *const color2);
 
         static ColorModel *createDefault(const Widget2 *const widget);
 
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index ad07b0ff8..f0fd500ea 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -72,8 +72,8 @@ class Desktop final : public Container,
         Image *mWallpaper;
         Label *mVersionLabel;
         Skin *mSkin;
-        gcn::Color mBackgroundColor;
-        gcn::Color mBackgroundGrayColor;
+        Color mBackgroundColor;
+        Color mBackgroundGrayColor;
         bool mShowBackground;
 };
 
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 9bb459d45..815e4a85d 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -144,8 +144,8 @@ class DropDown final : public ActionListener,
         void drawButton(Graphics *graphics);
 
         PopupList *mPopup;
-        gcn::Color mShadowColor;
-        gcn::Color mHighlightColor;
+        Color mShadowColor;
+        Color mHighlightColor;
         int mPadding;
         int mImagePadding;
         int mSpacing;
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 236415b32..1888292de 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -79,10 +79,10 @@ class DropShortcutContainer final : public ShortcutContainer
         bool mItemClicked;
 
         ItemPopup *mItemPopup;
-        gcn::Color mEquipedColor;
-        gcn::Color mEquipedColor2;
-        gcn::Color mUnEquipedColor;
-        gcn::Color mUnEquipedColor2;
+        Color mEquipedColor;
+        Color mEquipedColor2;
+        Color mUnEquipedColor;
+        Color mUnEquipedColor2;
 };
 
 #endif  // GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 96f2a9532..b2c7c5620 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -188,7 +188,7 @@ private:
     /**
      * Holds the background color of the table.
      */
-    gcn::Color mHighlightColor;
+    Color mHighlightColor;
 
     int mSelectedRow;
     int mSelectedColumn;
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index ab813b08f..32daa459b 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -181,10 +181,10 @@ class ItemContainer final : public gcn::Widget,
         ItemPopup *mItemPopup;
         int *mShowMatrix;
         Skin *mSkin;
-        gcn::Color mEquipedColor;
-        gcn::Color mEquipedColor2;
-        gcn::Color mUnEquipedColor;
-        gcn::Color mUnEquipedColor2;
+        Color mEquipedColor;
+        Color mEquipedColor2;
+        Color mUnEquipedColor;
+        Color mUnEquipedColor2;
         typedef std::list<SelectionListener*> SelectionListenerList;
         typedef SelectionListenerList::iterator SelectionListenerIterator;
         SelectionListenerList mSelectionListeners;
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index dd95851a6..07c3ef822 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -83,10 +83,10 @@ class ItemShortcutContainer final : public ShortcutContainer
 
         ItemPopup *mItemPopup;
         SpellPopup *mSpellPopup;
-        gcn::Color mEquipedColor;
-        gcn::Color mEquipedColor2;
-        gcn::Color mUnEquipedColor;
-        gcn::Color mUnEquipedColor2;
+        Color mEquipedColor;
+        Color mEquipedColor2;
+        Color mUnEquipedColor;
+        Color mUnEquipedColor2;
 };
 
 #endif  // GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 0c19d03c3..c02f37adb 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -114,14 +114,14 @@ void Label::adjustSize()
     setHeight(font->getHeight() + pad2);
 }
 
-void Label::setForegroundColor(const gcn::Color &color)
+void Label::setForegroundColor(const Color &color)
 {
     mForegroundColor = color;
     mForegroundColor2 = color;
 }
 
-void Label::setForegroundColorAll(const gcn::Color &color1,
-                                  const gcn::Color &color2)
+void Label::setForegroundColorAll(const Color &color1,
+                                  const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index b63c9b10e..616f6cc79 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -62,10 +62,10 @@ class Label final : public gcn::Label
 
         void adjustSize();
 
-        void setForegroundColor(const gcn::Color &color);
+        void setForegroundColor(const Color &color);
 
-        void setForegroundColorAll(const gcn::Color &color1,
-                                   const gcn::Color &color2);
+        void setForegroundColorAll(const Color &color1,
+                                   const Color &color2);
 
         void resizeTo(const int maxSize, const int minSize);
 
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 625f21085..61e1596f7 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_LISTBOX_H
 #define GUI_WIDGETS_LISTBOX_H
 
-#include "gui/base/color.hpp"
+#include "gui/color.h"
 
 #include "gui/base/widgets/listbox.hpp"
 
@@ -115,9 +115,9 @@ class ListBox : public gcn::ListBox
         { mRowHeight = n; }
 
     protected:
-        gcn::Color mHighlightColor;
-        gcn::Color mForegroundSelectedColor;
-        gcn::Color mForegroundSelectedColor2;
+        Color mHighlightColor;
+        Color mForegroundSelectedColor;
+        Color mForegroundSelectedColor2;
         int mOldSelected;
         int mPadding;
         int mPressedIndex;
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index b44b6a1a0..7d2d00ad4 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -184,7 +184,7 @@ void ProgressBar::setProgressPalette(const int progressPalette)
     }
 }
 
-void ProgressBar::setBackgroundColor(const gcn::Color &color)
+void ProgressBar::setBackgroundColor(const Color &color)
 {
     mRedraw = true;
     mBackgroundColorToGo = color;
@@ -193,7 +193,7 @@ void ProgressBar::setBackgroundColor(const gcn::Color &color)
         mBackgroundColor = color;
 }
 
-void ProgressBar::setColor(const gcn::Color &color1, const gcn::Color &color2)
+void ProgressBar::setColor(const Color &color1, const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
@@ -269,7 +269,7 @@ void ProgressBar::render(Graphics *graphics)
     // The label
     if (!mText.empty())
     {
-        const gcn::Color oldColor = graphics->getColor();
+        const Color oldColor = graphics->getColor();
 
         Font *const font = gui->getFont();
         const int textX = mDimension.width / 2;
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index a2c55e077..a4862882e 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -93,14 +93,14 @@ class ProgressBar final : public gcn::Widget,
         /**
          * Change the color of the progress bar.
          */
-        void setBackgroundColor(const gcn::Color &color);
+        void setBackgroundColor(const Color &color);
 
-        void setColor(const gcn::Color &color1, const gcn::Color &color2);
+        void setColor(const Color &color1, const Color &color2);
 
         /**
          * Returns the color of the progress bar.
          */
-        const gcn::Color &getBackgroundColor() const A_WARN_UNUSED
+        const Color &getBackgroundColor() const A_WARN_UNUSED
         { return mBackgroundColor; }
 
         /**
@@ -145,7 +145,7 @@ class ProgressBar final : public gcn::Widget,
         float mProgress;
         float mProgressToGo;
 
-        gcn::Color mBackgroundColorToGo;
+        Color mBackgroundColorToGo;
 
         std::string mText;
         ImageCollection *mVertexes;
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 85ff90261..59ae1059e 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -106,8 +106,8 @@ void ShopListBox::draw(Graphics *graphics)
          ++i, y += mRowHeight)
     {
         bool needDraw(false);
-        gcn::Color temp;
-        gcn::Color* backgroundColor = &mBackgroundColor;
+        Color temp;
+        Color* backgroundColor = &mBackgroundColor;
 
         ShopItem *const item = mShopItems->at(i);
         if (item && ((mShopItems && mPlayerMoney < item->getPrice()
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 1cf628cca..38e209c33 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -94,8 +94,8 @@ class ShopListBox final : public ListBox
 
         ItemPopup *mItemPopup;
 
-        gcn::Color mBackgroundColor;
-        gcn::Color mWarningColor;
+        Color mBackgroundColor;
+        Color mWarningColor;
 
         bool mPriceCheck;
         bool mProtectItems;
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index a201f3274..f9baec6cc 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SKILLINFO_H
 #define GUI_WIDGETS_SKILLINFO_H
 
-#include "gui/base/color.hpp"
+#include "gui/color.h"
 
 #include <vector>
 #include <map>
@@ -43,7 +43,7 @@ struct SkillInfo final
     std::string skillLevel;
     std::string skillExp;
     float progress;
-    gcn::Color color;
+    Color color;
     SkillDataMap dataMap;
     SkillModel *model;
     SkillData *data;
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 9e78133f5..61219fa98 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -253,7 +253,7 @@ void Setup_Colors::valueChanged(const SelectionEvent &event A_UNUSED)
 
     mSelected = mColorBox->getSelected();
     const int type = userPalette->getColorTypeAt(mSelected);
-    const gcn::Color *col = &userPalette->getColor(type);
+    const Color *col = &userPalette->getColor(type);
     const Palette::GradientType grad = userPalette->getGradientType(type);
     const int delay = userPalette->getGradientDelay(type);
 
@@ -383,7 +383,7 @@ void Setup_Colors::cancel()
 
     userPalette->rollback();
     const int type = userPalette->getColorTypeAt(mSelected);
-    const gcn::Color *const col = &userPalette->getColor(type);
+    const Color *const col = &userPalette->getColor(type);
     mGradTypeSlider->setValue2(userPalette->getGradientType(type));
     const int delay = userPalette->getGradientDelay(type);
     setEntry(mGradDelaySlider, mGradDelayText, delay);
@@ -444,7 +444,7 @@ void Setup_Colors::updateColor()
     }
     else if (grad == Palette::PULSE)
     {
-        userPalette->setTestColor(type, gcn::Color(
+        userPalette->setTestColor(type, Color(
                 static_cast<int>(mRedSlider->getValue()),
                 static_cast<int>(mGreenSlider->getValue()),
                 static_cast<int>(mBlueSlider->getValue())));
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 463a6b668..1f52cde88 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -114,8 +114,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the normal color for the tab's text.
          */
-        void setTabColor(const gcn::Color *const color1,
-                         const gcn::Color *const color2)
+        void setTabColor(const Color *const color1,
+                         const Color *const color2)
         {
             mTabColor = color1;
             mTabOutlineColor = color2;
@@ -124,8 +124,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the highlighted color for the tab's text.
          */
-        void setHighlightedTabColor(const gcn::Color *const color1,
-                                    const gcn::Color *const color2)
+        void setHighlightedTabColor(const Color *const color1,
+                                    const Color *const color2)
         {
             mTabHighlightedColor = color1;
             mTabHighlightedOutlineColor = color2;
@@ -134,8 +134,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the selected color for the tab's text.
          */
-        void setSelectedTabColor(const gcn::Color *const color1,
-                                 const gcn::Color *const color2)
+        void setSelectedTabColor(const Color *const color1,
+                                 const Color *const color2)
         {
             mTabSelectedColor = color1;
             mTabSelectedOutlineColor = color2;
@@ -144,8 +144,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the flash color for the tab's text.
          */
-        void setFlashTabColor(const gcn::Color *const color1,
-                              const gcn::Color *const color2)
+        void setFlashTabColor(const Color *const color1,
+                              const Color *const color2)
         {
             mFlashColor = color1;
             mFlashOutlineColor = color2;
@@ -154,8 +154,8 @@ class Tab : public gcn::BasicContainer,
         /**
          * Set the player flash color for the tab's text.
          */
-        void setPlayerFlashTabColor(const gcn::Color *const color1,
-                                    const gcn::Color *const color2)
+        void setPlayerFlashTabColor(const Color *const color1,
+                                    const Color *const color2)
         {
             mPlayerFlashColor = color1;
             mPlayerFlashOutlineColor = color2;
@@ -214,16 +214,16 @@ class Tab : public gcn::BasicContainer,
         static int mInstances;           /**< Number of tab instances */
         static float mAlpha;
 
-        const gcn::Color *mTabColor;
-        const gcn::Color *mTabOutlineColor;
-        const gcn::Color *mTabHighlightedColor;
-        const gcn::Color *mTabHighlightedOutlineColor;
-        const gcn::Color *mTabSelectedColor;
-        const gcn::Color *mTabSelectedOutlineColor;
-        const gcn::Color *mFlashColor;
-        const gcn::Color *mFlashOutlineColor;
-        const gcn::Color *mPlayerFlashColor;
-        const gcn::Color *mPlayerFlashOutlineColor;
+        const Color *mTabColor;
+        const Color *mTabOutlineColor;
+        const Color *mTabHighlightedColor;
+        const Color *mTabHighlightedOutlineColor;
+        const Color *mTabSelectedColor;
+        const Color *mTabSelectedOutlineColor;
+        const Color *mFlashColor;
+        const Color *mFlashOutlineColor;
+        const Color *mPlayerFlashColor;
+        const Color *mPlayerFlashOutlineColor;
         int mFlash;
         ImageCollection *mVertexes;
         Image *mImage;
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index ec0d09a26..e0327e670 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -379,14 +379,14 @@ void TextBox::draw(Graphics* graphics)
     BLOCK_END("TextBox::draw")
 }
 
-void TextBox::setForegroundColor(const gcn::Color &color)
+void TextBox::setForegroundColor(const Color &color)
 {
     mForegroundColor = color;
     mForegroundColor2 = color;
 }
 
-void TextBox::setForegroundColorAll(const gcn::Color &color1,
-                                    const gcn::Color &color2)
+void TextBox::setForegroundColorAll(const Color &color1,
+                                    const Color &color2)
 {
     mForegroundColor = color1;
     mForegroundColor2 = color2;
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 24dd57adb..3f78fd247 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -61,10 +61,10 @@ class TextBox final : public gcn::TextBox
 
         void draw(Graphics* graphics) override final;
 
-        void setForegroundColor(const gcn::Color &color);
+        void setForegroundColor(const Color &color);
 
-        void setForegroundColorAll(const gcn::Color &color1,
-                                   const gcn::Color &color2);
+        void setForegroundColorAll(const Color &color1,
+                                   const Color &color2);
 
     private:
         int mMinWidth;
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index b05a498dc..ccc1b16d6 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -159,7 +159,7 @@ class TextField : public gcn::TextField,
         static Skin *mSkin;
 
     private:
-        const gcn::Color *mCaretColor;
+        const Color *mCaretColor;
         PopupMenu *mPopupMenu;
         static int instances;
         static float mAlpha;
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 1344c647a..462ba17d9 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -89,7 +89,7 @@ void TextPreview::draw(Graphics* graphics)
 
     if (mOpaque)
     {
-        graphics->setColor(gcn::Color(static_cast<int>(mBGColor->r),
+        graphics->setColor(Color(static_cast<int>(mBGColor->r),
                     static_cast<int>(mBGColor->g),
                     static_cast<int>(mBGColor->b),
                     static_cast<int>(mAlpha * 255.0F)));
@@ -105,7 +105,7 @@ void TextPreview::draw(Graphics* graphics)
                 + 2 * ((mOutline || mShadow) ? 1 :0);
             const int y = mFont->getHeight() + 1
                 + 2 * ((mOutline || mShadow) ? 1 : 0);
-            graphics->setColor(gcn::Color(static_cast<int>(mTextBGColor->r),
+            graphics->setColor(Color(static_cast<int>(mTextBGColor->r),
                 static_cast<int>(mTextBGColor->g),
                 static_cast<int>(mTextBGColor->b),
                 intAlpha));
@@ -113,9 +113,9 @@ void TextPreview::draw(Graphics* graphics)
         }
     }
 
-    graphics->setColorAll(gcn::Color(mTextColor->r,
+    graphics->setColorAll(Color(mTextColor->r,
         mTextColor->g, mTextColor->b, alpha),
-        gcn::Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha));
+        Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha));
 
     if (mOutline && mTextColor != mTextColor2)
         graphics->setColor2(Theme::getThemeColor(Theme::OUTLINE));
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 31f64f545..31768fa66 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -40,10 +40,10 @@ class TextPreview final : public gcn::Widget
 
         ~TextPreview();
 
-        inline void setTextColor(const gcn::Color *color)
+        inline void setTextColor(const Color *color)
         { mTextColor = color; adjustSize(); }
 
-        inline void setTextColor2(const gcn::Color *color)
+        inline void setTextColor2(const Color *color)
         { mTextColor2 = color; adjustSize(); }
 
         /**
@@ -60,7 +60,7 @@ class TextPreview final : public gcn::Widget
          *
          * @param color the color to set
          */
-        inline void setTextBGColor(const gcn::Color *color)
+        inline void setTextBGColor(const Color *color)
         { mTextBGColor = color; }
 
         /**
@@ -68,7 +68,7 @@ class TextPreview final : public gcn::Widget
          *
          * @param color the color to set
          */
-        inline void setBGColor(const gcn::Color *color)
+        inline void setBGColor(const Color *color)
         { mBGColor = color; }
 
         /**
@@ -123,10 +123,10 @@ class TextPreview final : public gcn::Widget
     private:
         Font *mFont;
         std::string mText;
-        const gcn::Color *mTextColor;
-        const gcn::Color *mTextColor2;
-        const gcn::Color *mBGColor;
-        const gcn::Color *mTextBGColor;
+        const Color *mTextColor;
+        const Color *mTextColor2;
+        const Color *mBGColor;
+        const Color *mTextBGColor;
         int mPadding;
         static int instances;
         static float mAlpha;
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index c6317702f..ff565815f 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -32,16 +32,16 @@ class Widget2
         {
         }
 
-        inline const gcn::Color &getThemeColor(const int type,
-                                               const int alpha = 255)
-                                               const A_WARN_UNUSED
+        inline const Color &getThemeColor(const int type,
+                                          const int alpha = 255)
+                                          const A_WARN_UNUSED
         {
             return Theme::getThemeColor(mPaletteOffset + type, alpha);
         }
 
-        inline const gcn::Color &getThemeCharColor(const signed char c,
-                                                   bool &valid)
-                                                   const A_WARN_UNUSED
+        inline const Color &getThemeCharColor(const signed char c,
+                                              bool &valid)
+                                              const A_WARN_UNUSED
         {
             const int colorId = Theme::getThemeIdByChar(c, valid);
             if (valid)
@@ -71,7 +71,7 @@ class Widget2
             }
         }
 
-        void setForegroundColor2(const gcn::Color &color)
+        void setForegroundColor2(const Color &color)
         {
             mForegroundColor2 = color;
         }
@@ -85,7 +85,7 @@ class Widget2
         }
 
         int mPaletteOffset;
-        gcn::Color mForegroundColor2;
+        Color mForegroundColor2;
 };
 
 extern RenderType openGLMode;