summaryrefslogtreecommitdiff
path: root/src/gui/theme.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 19:51:57 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-20 13:55:42 +0300
commitdbba47eabe087d503426b5c5862aaa9263861ea5 (patch)
tree3255ae8f5522368e3380f23f9733f2943bf7c438 /src/gui/theme.h
parent45210c4fd718e75ba47171fc6b28da04df668ef9 (diff)
downloadplus-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.gz
plus-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.bz2
plus-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.xz
plus-dbba47eabe087d503426b5c5862aaa9263861ea5.zip
Fix possible shadow methods in palette class.
Diffstat (limited to 'src/gui/theme.h')
-rw-r--r--src/gui/theme.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 680fe63bd..26d4ba99d 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -290,9 +290,9 @@ class Theme final : public Palette, public ConfigListener
const int alpha = 255)
{ return mInstance->getColor(type, alpha); }
- static const gcn::Color &getThemeColor(const signed char c,
+ static const gcn::Color &getThemeCharColor(const signed char c,
bool &valid)
- { return mInstance->getColor(c, valid); }
+ { return mInstance->getCharColor(c, valid); }
static gcn::Color getProgressColor(const int type,
const float progress);