From 02d23d1ff04018e6fa614aa6a5683a2bb9e5bd1a Mon Sep 17 00:00:00 2001 From: elexis Date: Tue, 13 Aug 2019 15:42:14 +0000 Subject: [PATCH] Remove useless proxy GUI::ParseColor, refs 31f0e62c83, 2c14d94559. Tested on: clang 8. This was SVN commit r22662. --- source/gui/CChart.cpp | 2 +- source/gui/CGUI.cpp | 5 ++--- source/gui/GUIutil.cpp | 6 ------ source/gui/GUIutil.h | 2 -- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/source/gui/CChart.cpp b/source/gui/CChart.cpp index 112d75811a..7409b15fc6 100644 --- a/source/gui/CChart.cpp +++ b/source/gui/CChart.cpp @@ -196,7 +196,7 @@ void CChart::UpdateSeries() { CChartData& data = m_Series[i]; - if (i < pSeriesColor->m_Items.size() && !GUI::ParseColor(pSeriesColor->m_Items[i].GetOriginalString(), data.m_Color, 0)) + if (i < pSeriesColor->m_Items.size() && !data.m_Color.ParseString(pSeriesColor->m_Items[i].GetOriginalString().ToUTF8(), 0)) LOGWARNING("GUI: Error parsing 'series_color' (\"%s\")", utf8_from_wstring(pSeriesColor->m_Items[i].GetOriginalString())); data.m_Points = pSeries->m_Series[i]; diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp index dfd5813f69..4f471b01f3 100644 --- a/source/gui/CGUI.cpp +++ b/source/gui/CGUI.cpp @@ -1568,13 +1568,12 @@ void CGUI::Xeromyces_ReadEffects(XMBElement Element, CXeromyces* pFile, SGUIImag for (XMBAttribute attr : Element.GetAttributes()) { CStr attr_name(pFile->GetAttributeString(attr.Name)); - CStrW attr_value(attr.Value.FromUTF8()); if (attr_name == "add_color") { CGUIColor color; - if (!GUI::ParseColor(attr_value, color, 0)) - LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, utf8_from_wstring(attr_value)); + if (!color.ParseString(attr.Value, 0)) + LOGERROR("GUI: Error parsing '%s' (\"%s\")", attr_name, attr.Value); else effects.m_AddColor = color; } else if (attr_name == "grayscale") diff --git a/source/gui/GUIutil.cpp b/source/gui/GUIutil.cpp index 6359d77c4c..668e130c9e 100644 --- a/source/gui/GUIutil.cpp +++ b/source/gui/GUIutil.cpp @@ -133,12 +133,6 @@ bool __ParseString(const CStrW& Value, CClientArea& Output) return Output.SetClientArea(Value.ToUTF8()); } -template <> -bool GUI::ParseColor(const CStrW& Value, CGUIColor& Output, int DefaultAlpha) -{ - return Output.ParseString(Value.ToUTF8(), DefaultAlpha); -} - template <> bool __ParseString(const CStrW& Value, CGUIColor& Output) { diff --git a/source/gui/GUIutil.h b/source/gui/GUIutil.h index aeb31fed5f..7773a8f33d 100644 --- a/source/gui/GUIutil.h +++ b/source/gui/GUIutil.h @@ -211,8 +211,6 @@ public: return __ParseString(Value, tOutput); } - static bool ParseColor(const CStrW& Value, CGUIColor& tOutput, int DefaultAlpha); - private: /**