summaryrefslogtreecommitdiff
path: root/src
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
parent45210c4fd718e75ba47171fc6b28da04df668ef9 (diff)
downloadmv-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.gz
mv-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.bz2
mv-dbba47eabe087d503426b5c5862aaa9263861ea5.tar.xz
mv-dbba47eabe087d503426b5c5862aaa9263861ea5.zip
Fix possible shadow methods in palette class.
Diffstat (limited to 'src')
-rw-r--r--src/gui/palette.cpp2
-rw-r--r--src/gui/palette.h2
-rw-r--r--src/gui/theme.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 558a977b5..092a0daae 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -64,7 +64,7 @@ Palette::~Palette()
mInstances.erase(this);
}
-const gcn::Color& Palette::getColor(const signed char c, bool &valid)
+const gcn::Color& Palette::getCharColor(const signed char c, bool &valid)
{
const CharColors::const_iterator it = mCharColors.find(c);
if (it != mCharColors.end())
diff --git a/src/gui/palette.h b/src/gui/palette.h
index ed9b14e22..51c60cb8f 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -67,7 +67,7 @@ class Palette
*
* @return the requested color or Palette::BLACK
*/
- const gcn::Color &getColor(const signed char c, bool &valid);
+ const gcn::Color &getCharColor(const signed char c, bool &valid);
/**
* Gets the color associated with the type. Sets the alpha channel
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);