diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 14:21:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 14:21:27 +0300 |
| commit | 48646db55005a0da079bd2c945875dc8225e2f86 (patch) | |
| tree | 4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/gui/theme.h | |
| parent | 9c12fcdfe590f34543fcecc2691b625c408f1746 (diff) | |
| download | manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2 manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz manaverse-48646db55005a0da079bd2c945875dc8225e2f86.zip | |
Move color into gui dir.
Diffstat (limited to 'src/gui/theme.h')
| -rw-r--r-- | src/gui/theme.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/theme.h b/src/gui/theme.h index 826902004..86543ea64 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -450,21 +450,21 @@ class Theme final : public Palette, public ConfigListener * * @return the requested color */ - inline static const gcn::Color &getThemeColor(const int type, - const int alpha = 255) - A_WARN_UNUSED + inline static const Color &getThemeColor(const int type, + const int alpha = 255) + A_WARN_UNUSED { return mInstance->getColor(type, alpha); } - static const gcn::Color &getThemeCharColor(const signed char c, - bool &valid) A_WARN_UNUSED + static const Color &getThemeCharColor(const signed char c, + bool &valid) A_WARN_UNUSED { return mInstance->getCharColor(c, valid); } static int getThemeIdByChar(const signed char c, bool &valid) A_WARN_UNUSED { return mInstance->getIdByChar(c, valid); } - static gcn::Color getProgressColor(const int type, - const float progress) A_WARN_UNUSED; + static Color getProgressColor(const int type, + const float progress) A_WARN_UNUSED; /** * Loads a skin. |