chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Switched from std::wstring.compare() to wcscmp().

Browse Source
This commit is contained in:
spx
2011-11-27 08:30:39 +00:00
parent e56273113d
commit 34005f14a4
10 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Meter.cpp
View File

@ -282,11 +282,10 @@ void CMeter::ReadConfig(CConfigParser& parser, const WCHAR* section)
std::wstring oldStyleX = m_StyleX;
std::wstring oldStyleY = m_StyleY;
std::wstring oldStyleHidden = m_StyleHidden;
std::wstring coord = parser.ReadString(section, L"X", L"0");
m_StyleX = parser.GetLastUsedStyle();
if (!m_Initialized || parser.GetLastReplaced() || !parser.GetLastDefaultUsed() && m_StyleX != oldStyleX)
if (!m_Initialized || parser.GetLastReplaced() || !parser.GetLastDefaultUsed() && wcscmp(m_StyleX.c_str(), oldStyleX.c_str()) != 0)
{
if (!coord.empty())
{
@ -325,7 +324,7 @@ void CMeter::ReadConfig(CConfigParser& parser, const WCHAR* section)
coord = parser.ReadString(section, L"Y", L"0");
m_StyleY = parser.GetLastUsedStyle();
if (!m_Initialized || parser.GetLastReplaced() || !parser.GetLastDefaultUsed() && m_StyleY != oldStyleY)
if (!m_Initialized || parser.GetLastReplaced() || !parser.GetLastDefaultUsed() && wcscmp(m_StyleY.c_str(), oldStyleY.c_str()) != 0)
{
if (!coord.empty())
{
@ -376,9 +375,11 @@ void CMeter::ReadConfig(CConfigParser& parser, const WCHAR* section)
}
else
{
std::wstring oldStyleHidden = m_StyleHidden;
const std::wstring& result = parser.ReadString(section, L"Hidden", L"0");
m_StyleHidden = parser.GetLastUsedStyle();
if (parser.GetLastReplaced() || !parser.GetLastDefaultUsed() && m_StyleHidden != oldStyleHidden)
if (parser.GetLastReplaced() || !parser.GetLastDefaultUsed() && wcscmp(m_StyleHidden.c_str(), oldStyleHidden.c_str()) != 0)
{
m_Hidden = 0!=parser.ParseInt(result.c_str(), 0);
}