From 34cb5e4b16c1b1f5d3263dd01848b24ab0b9b354 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 31 May 2015 18:46:22 +0300 Subject: Convert ThemeColorId enum into strong typed enum. --- src/gui/theme.cpp | 121 +++++++++++++++++++++++++++++------------------------- 1 file changed, 65 insertions(+), 56 deletions(-) (limited to 'src/gui/theme.cpp') diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index c0a4e7bf7..9735fc05b 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -70,7 +70,7 @@ static void initDefaultThemePath() } Theme::Theme() : - Palette(ThemeColorId::THEME_COLORS_END * THEME_PALETTES), + Palette(static_cast(ThemeColorId::THEME_COLORS_END) * THEME_PALETTES), mSkins(), mMinimumOpacity(-1.0F), mProgressColors(ProgressColors(static_cast( @@ -80,56 +80,62 @@ Theme::Theme() : config.addListener("guialpha", this); - mColors[ThemeColorId::HIGHLIGHT].ch = 'H'; - mColors[ThemeColorId::CHAT].ch = 'C'; - mColors[ThemeColorId::GM].ch = 'G'; - mColors[ThemeColorId::GLOBAL].ch = 'g'; - mColors[ThemeColorId::PLAYER].ch = 'Y'; - mColors[ThemeColorId::WHISPER_TAB].ch = 'W'; - mColors[ThemeColorId::WHISPER_TAB_OFFLINE].ch = 'w'; - mColors[ThemeColorId::IS].ch = 'I'; - mColors[ThemeColorId::PARTY_CHAT_TAB].ch = 'P'; - mColors[ThemeColorId::GUILD_CHAT_TAB].ch = 'U'; - mColors[ThemeColorId::SERVER].ch = 'S'; - mColors[ThemeColorId::LOGGER].ch = 'L'; - mColors[ThemeColorId::HYPERLINK].ch = '<'; - mColors[ThemeColorId::SELFNICK].ch = 's'; - mColors[ThemeColorId::OLDCHAT].ch = 'o'; - mColors[ThemeColorId::AWAYCHAT].ch = 'a'; - mCharColors['H'] = ThemeColorId::HIGHLIGHT; - mCharColors['C'] = ThemeColorId::CHAT; - mCharColors['G'] = ThemeColorId::GM; - mCharColors['g'] = ThemeColorId::GLOBAL; - mCharColors['Y'] = ThemeColorId::PLAYER; - mCharColors['W'] = ThemeColorId::WHISPER_TAB; - mCharColors['w'] = ThemeColorId::WHISPER_TAB_OFFLINE; - mCharColors['I'] = ThemeColorId::IS; - mCharColors['P'] = ThemeColorId::PARTY_CHAT_TAB; - mCharColors['U'] = ThemeColorId::GUILD_CHAT_TAB; - mCharColors['S'] = ThemeColorId::SERVER; - mCharColors['L'] = ThemeColorId::LOGGER; - mCharColors['<'] = ThemeColorId::HYPERLINK; - mCharColors['s'] = ThemeColorId::SELFNICK; - mCharColors['o'] = ThemeColorId::OLDCHAT; - mCharColors['a'] = ThemeColorId::AWAYCHAT; + mColors[static_cast(ThemeColorId::HIGHLIGHT)].ch = 'H'; + mColors[static_cast(ThemeColorId::CHAT)].ch = 'C'; + mColors[static_cast(ThemeColorId::GM)].ch = 'G'; + mColors[static_cast(ThemeColorId::GLOBAL)].ch = 'g'; + mColors[static_cast(ThemeColorId::PLAYER)].ch = 'Y'; + mColors[static_cast(ThemeColorId::WHISPER_TAB)].ch = 'W'; + mColors[static_cast(ThemeColorId::WHISPER_TAB_OFFLINE)].ch = 'w'; + mColors[static_cast(ThemeColorId::IS)].ch = 'I'; + mColors[static_cast(ThemeColorId::PARTY_CHAT_TAB)].ch = 'P'; + mColors[static_cast(ThemeColorId::GUILD_CHAT_TAB)].ch = 'U'; + mColors[static_cast(ThemeColorId::SERVER)].ch = 'S'; + mColors[static_cast(ThemeColorId::LOGGER)].ch = 'L'; + mColors[static_cast(ThemeColorId::HYPERLINK)].ch = '<'; + mColors[static_cast(ThemeColorId::SELFNICK)].ch = 's'; + mColors[static_cast(ThemeColorId::OLDCHAT)].ch = 'o'; + mColors[static_cast(ThemeColorId::AWAYCHAT)].ch = 'a'; + mCharColors['H'] = static_cast(ThemeColorId::HIGHLIGHT); + mCharColors['C'] = static_cast(ThemeColorId::CHAT); + mCharColors['G'] = static_cast(ThemeColorId::GM); + mCharColors['g'] = static_cast(ThemeColorId::GLOBAL); + mCharColors['Y'] = static_cast(ThemeColorId::PLAYER); + mCharColors['W'] = static_cast(ThemeColorId::WHISPER_TAB); + mCharColors['w'] = static_cast(ThemeColorId::WHISPER_TAB_OFFLINE); + mCharColors['I'] = static_cast(ThemeColorId::IS); + mCharColors['P'] = static_cast(ThemeColorId::PARTY_CHAT_TAB); + mCharColors['U'] = static_cast(ThemeColorId::GUILD_CHAT_TAB); + mCharColors['S'] = static_cast(ThemeColorId::SERVER); + mCharColors['L'] = static_cast(ThemeColorId::LOGGER); + mCharColors['<'] = static_cast(ThemeColorId::HYPERLINK); + mCharColors['s'] = static_cast(ThemeColorId::SELFNICK); + mCharColors['o'] = static_cast(ThemeColorId::OLDCHAT); + mCharColors['a'] = static_cast(ThemeColorId::AWAYCHAT); // here need use outlined colors - mCharColors['H' | 0x80] = ThemeColorId::HIGHLIGHT_OUTLINE; - mCharColors['C' | 0x80] = ThemeColorId::CHAT_OUTLINE; - mCharColors['G' | 0x80] = ThemeColorId::GM_OUTLINE; - mCharColors['g' | 0x80] = ThemeColorId::GLOBAL_OUTLINE; - mCharColors['Y' | 0x80] = ThemeColorId::PLAYER_OUTLINE; - mCharColors['W' | 0x80] = ThemeColorId::WHISPER_TAB_OUTLINE; - mCharColors['w' | 0x80] = ThemeColorId::WHISPER_TAB_OFFLINE_OUTLINE; - mCharColors['I' | 0x80] = ThemeColorId::IS_OUTLINE; - mCharColors['P' | 0x80] = ThemeColorId::PARTY_CHAT_TAB_OUTLINE; - mCharColors['U' | 0x80] = ThemeColorId::GUILD_CHAT_TAB_OUTLINE; - mCharColors['S' | 0x80] = ThemeColorId::SERVER_OUTLINE; - mCharColors['L' | 0x80] = ThemeColorId::LOGGER_OUTLINE; - mCharColors['<' | 0x80] = ThemeColorId::HYPERLINK_OUTLINE; - mCharColors['s' | 0x80] = ThemeColorId::SELFNICK_OUTLINE; - mCharColors['o' | 0x80] = ThemeColorId::OLDCHAT_OUTLINE; - mCharColors['a' | 0x80] = ThemeColorId::AWAYCHAT_OUTLINE; + mCharColors['H' | 0x80] + = static_cast(ThemeColorId::HIGHLIGHT_OUTLINE); + mCharColors['C' | 0x80] = static_cast(ThemeColorId::CHAT_OUTLINE); + mCharColors['G' | 0x80] = static_cast(ThemeColorId::GM_OUTLINE); + mCharColors['g' | 0x80] = static_cast(ThemeColorId::GLOBAL_OUTLINE); + mCharColors['Y' | 0x80] = static_cast(ThemeColorId::PLAYER_OUTLINE); + mCharColors['W' | 0x80] + = static_cast(ThemeColorId::WHISPER_TAB_OUTLINE); + mCharColors['w' | 0x80] + = static_cast(ThemeColorId::WHISPER_TAB_OFFLINE_OUTLINE); + mCharColors['I' | 0x80] = static_cast(ThemeColorId::IS_OUTLINE); + mCharColors['P' | 0x80] + = static_cast(ThemeColorId::PARTY_CHAT_TAB_OUTLINE); + mCharColors['U' | 0x80] + = static_cast(ThemeColorId::GUILD_CHAT_TAB_OUTLINE); + mCharColors['S' | 0x80] = static_cast(ThemeColorId::SERVER_OUTLINE); + mCharColors['L' | 0x80] = static_cast(ThemeColorId::LOGGER_OUTLINE); + mCharColors['<' | 0x80] + = static_cast(ThemeColorId::HYPERLINK_OUTLINE); + mCharColors['s' | 0x80] = static_cast(ThemeColorId::SELFNICK_OUTLINE); + mCharColors['o' | 0x80] = static_cast(ThemeColorId::OLDCHAT_OUTLINE); + mCharColors['a' | 0x80] = static_cast(ThemeColorId::AWAYCHAT_OUTLINE); } Theme::~Theme() @@ -644,7 +650,8 @@ ImageSet *Theme::getImageSetFromTheme(const std::string &path, static int readColorType(const std::string &type) { - static const std::string colors[ThemeColorId::THEME_COLORS_END] = + static const std::string colors[static_cast( + ThemeColorId::THEME_COLORS_END)] = { "BROWSERBOX", "BROWSERBOX_OUTLINE", @@ -871,7 +878,7 @@ static int readColorType(const std::string &type) if (type.empty()) return -1; - for (int i = 0; i < ThemeColorId::THEME_COLORS_END; i++) + for (int i = 0; i < static_cast(ThemeColorId::THEME_COLORS_END); i++) { if (compareStrI(type, colors[i]) == 0) return i; @@ -1029,7 +1036,8 @@ void Theme::loadColors(std::string file) const Color color = readColor(temp); const GradientTypeT grad = readColorGradient( XML::getProperty(node, "effect", "")); - mColors[paletteId * ThemeColorId::THEME_COLORS_END + type].set( + mColors[paletteId * static_cast( + ThemeColorId::THEME_COLORS_END) + type].set( type, color, grad, 10); if (!findLast(id, "_OUTLINE")) @@ -1037,7 +1045,8 @@ void Theme::loadColors(std::string file) const int type2 = readColorType(id + "_OUTLINE"); if (type2 < 0) continue; - const int idx = paletteId * ThemeColorId::THEME_COLORS_END; + const int idx = paletteId + * static_cast(ThemeColorId::THEME_COLORS_END); mColors[idx + type2] = mColors[idx + type]; } } @@ -1216,15 +1225,15 @@ ThemeInfo *Theme::loadInfo(const std::string &themeName) return info; } -int Theme::getIdByChar(const signed char c, bool &valid) const +ThemeColorIdT Theme::getIdByChar(const signed char c, bool &valid) const { const CharColors::const_iterator it = mCharColors.find(c); if (it != mCharColors.end()) { valid = true; - return (*it).second; + return static_cast((*it).second); } valid = false; - return 0; + return ThemeColorId::BROWSERBOX; } -- cgit v1.2.3-70-g09d2