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.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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