From dbba47eabe087d503426b5c5862aaa9263861ea5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 19 Oct 2012 19:51:57 +0300
Subject: Fix possible shadow methods in palette class.

---
 src/gui/palette.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/palette.cpp')

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())
-- 
cgit v1.2.3-70-g09d2