abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove useless proxy GUI<int>::ParseColor, refs 31f0e62c83, 2c14d94559.

Browse Source 
Tested on: clang 8.

This was SVN commit r22662.
This commit is contained in:
elexis 2019-08-13 15:42:14 +00:00
parent 64e80471d0
commit 02d23d1ff0
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/gui/CChart.cpp
View File

@ -196,7 +196,7 @@ void CChart::UpdateSeries()
{
CChartData& data = m_Series[i];
if (i < pSeriesColor->m_Items.size() && !GUI<int>::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];

5
source/gui/CGUI.cpp
View File

@ -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<int>::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")

6
source/gui/GUIutil.cpp
View File

@ -133,12 +133,6 @@ bool __ParseString<CClientArea>(const CStrW& Value, CClientArea& Output)
return Output.SetClientArea(Value.ToUTF8());
}
template <>
bool GUI<int>::ParseColor(const CStrW& Value, CGUIColor& Output, int DefaultAlpha)
{
return Output.ParseString(Value.ToUTF8(), DefaultAlpha);
}
template <>
bool __ParseString<CGUIColor>(const CStrW& Value, CGUIColor& Output)
{

2
source/gui/GUIutil.h
View File

@ -211,8 +211,6 @@ public:
return __ParseString<T>(Value, tOutput);
}
static bool ParseColor(const CStrW& Value, CGUIColor& tOutput, int DefaultAlpha);
private:
/**