summaryrefslogtreecommitdiff
path: root/src/gui/userpalette.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/userpalette.h
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
ManaVerse-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/gui/userpalette.h')
-rw-r--r--src/gui/userpalette.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index fbba415b8..e37eee0ca 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -100,8 +100,8 @@ class UserPalette final : public Palette, public gcn::ListModel
*
* @return the requested committed color
*/
- inline const gcn::Color &getCommittedColor(const int type)
- const A_WARN_UNUSED
+ inline const Color &getCommittedColor(const int type)
+ const A_WARN_UNUSED
{
return mColors[type].committedColor;
}
@@ -113,8 +113,7 @@ class UserPalette final : public Palette, public gcn::ListModel
*
* @return the requested test color
*/
- inline const gcn::Color &getTestColor(const int type)
- const A_WARN_UNUSED
+ inline const Color &getTestColor(const int type) const A_WARN_UNUSED
{ return mColors[type].testColor; }
/**
@@ -123,7 +122,7 @@ class UserPalette final : public Palette, public gcn::ListModel
* @param type the color type requested
* @param color the color that should be tested
*/
- inline void setTestColor(const int type, const gcn::Color &color)
+ inline void setTestColor(const int type, const Color &color)
{ mColors[type].testColor = color; }
/**