diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/resources/theme.h | |
parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
download | mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-client-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/resources/theme.h')
-rw-r--r-- | src/resources/theme.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/theme.h b/src/resources/theme.h index d6d660e2..57274291 100644 --- a/src/resources/theme.h +++ b/src/resources/theme.h @@ -183,12 +183,12 @@ class Theme : public Palette, public EventListener * * @return the requested color */ - inline static const gcn::Color &getThemeColor(int type, int alpha = 255) + static const gcn::Color &getThemeColor(int type, int alpha = 255) { return mInstance->getColor(type, alpha); } - const static gcn::Color &getThemeColor(char c, bool &valid) + static const gcn::Color &getThemeColor(char c, bool &valid) { return mInstance->getColor(c, valid); } |