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

Minor tweaks.

Browse Source
This commit is contained in:
spx
2011-07-14 00:26:53 +00:00
parent 6ceacb0d98
commit fdad6fb036
8 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Library/ConfigParser.cpp
View File

@ -600,17 +600,13 @@ const std::wstring& CConfigParser::ReadString(LPCTSTR section, LPCTSTR key, LPCT
{
if ((*iter).size() > 0)
{
std::wstring strSection = (*iter);
std::wstring::size_type pos = strSection.find_first_not_of(L" \t\r\n");
std::wstring::size_type pos = (*iter).find_first_not_of(L" \t\r\n");
if (pos != std::wstring::npos)
{
std::wstring::size_type lastPos = strSection.find_last_not_of(L" \t\r\n");
if (pos != 0 || lastPos != (strSection.length() - 1))
{
// Trim white-space
strSection.swap(std::wstring(strSection, pos, lastPos - pos + 1));
}
std::wstring::size_type lastPos = (*iter).find_last_not_of(L" \t\r\n");
// Trim white-space
std::wstring strSection((*iter), pos, lastPos - pos + 1);
const std::wstring& strStyle = GetValue(strSection, key, strDefault);
@ -1147,7 +1143,7 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
if (sep != std::wstring::npos && sep != 0)
{
std::wstring value = key.substr(sep + 1, len - sep);
key.resize(sep);
key.erase(sep);
std::wstring lowerKey = StrToLower(key);
if (foundKeys.insert(lowerKey).second)
@ -1159,7 +1155,7 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
(value[0] == L'\'' && value[valueLen - 1] == L'\'')))
{
valueLen -= 2;
value.swap(value.substr(1, valueLen));
value.assign(value, 1, valueLen);
}
if (wcsncmp(lowerKey.c_str(), L"@include", 8) == 0)