summaryrefslogtreecommitdiff
path: root/src/gui/font.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/gui/font.h
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadmv-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
mv-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
mv-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
mv-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/gui/font.h')
-rw-r--r--src/gui/font.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/font.h b/src/gui/font.h
index 8740b4f3b..bdf81dadc 100644
--- a/src/gui/font.h
+++ b/src/gui/font.h
@@ -67,7 +67,7 @@
#ifndef GUI_FONT_H
#define GUI_FONT_H
-#include "gui/base/color.hpp"
+#include "gui/color.h"
#include <SDL_ttf.h>
@@ -84,8 +84,8 @@ const unsigned int CACHES_NUMBER = 256;
class SDLTextChunkSmall
{
public:
- SDLTextChunkSmall(const std::string &text0, const gcn::Color &color0,
- const gcn::Color &color1);
+ SDLTextChunkSmall(const std::string &text0, const Color &color0,
+ const Color &color1);
SDLTextChunkSmall(const SDLTextChunkSmall &old);
@@ -93,15 +93,15 @@ class SDLTextChunkSmall
bool operator<(const SDLTextChunkSmall &chunk) const;
std::string text;
- gcn::Color color;
- gcn::Color color2;
+ Color color;
+ Color color2;
};
class SDLTextChunk final
{
public:
- SDLTextChunk(const std::string &text0, const gcn::Color &color0,
- const gcn::Color &color1);
+ SDLTextChunk(const std::string &text0, const Color &color0,
+ const Color &color1);
A_DELETE_COPY(SDLTextChunk)
@@ -113,8 +113,8 @@ class SDLTextChunk final
Image *img;
std::string text;
- gcn::Color color;
- gcn::Color color2;
+ Color color;
+ Color color2;
SDLTextChunk *prev;
SDLTextChunk *next;
};