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

Rename EscapeUrl to EncodeUrl

Browse Source
This commit is contained in:
Birunthan Mohanathas 2014-01-04 21:47:45 +02:00
parent 39c6c62abd
commit 27164b8e75
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/StringUtil.cpp
View File

@ -78,7 +78,7 @@ void EscapeRegExp(std::wstring& str)
/*
** Escapes reserved URL characters.
*/
void EscapeUrl(std::wstring& str)
void EncodeUrl(std::wstring& str)
{
size_t pos = 0;
while ((pos = str.find_first_of(L" !*'();:@&=+$,/?#[]", pos)) != std::wstring::npos)

2
Common/StringUtil.h
View File

@ -38,7 +38,7 @@ inline std::wstring WidenUTF8(const std::string& str) { return Widen(str.c_str()
void EscapeRegExp(std::wstring& str);
void EscapeUrl(std::wstring& str);
void EncodeUrl(std::wstring& str);
} // namespace StringUtil

4
Common/StringUtil_Test.cpp
View File

@ -47,10 +47,10 @@ public:
Assert::AreEqual(L"\\\\\\^\\$\\|\\(test\\)\\[\\{\\. ing\\+\\*\\?", str.c_str());
}
TEST_METHOD(TestEscapeUrl)
TEST_METHOD(TestEncodeUrl)
{
std::wstring str = L" !*'();:@test&=+$,/?#[ing]";
EscapeUrl(str);
EncodeUrl(str);
Assert::AreEqual(L"%20%21%2A%27%28%29%3B%3A%40test%26%3D%2B%24%2C%2F%3F%23%5Bing%5D", str.c_str());
}
};

10
Library/ConfigParser.cpp
View File

@ -238,7 +238,7 @@ bool ConfigParser::GetSectionVariable(std::wstring& strVariable, std::wstring& s
Max,
Min,
EscapeRegExp,
EscapeUrl
EncodeUrl
} valueType = ValueType::Raw;
if (isKeySelector)
@ -255,9 +255,9 @@ bool ConfigParser::GetSectionVariable(std::wstring& strVariable, std::wstring& s
{
valueType = ValueType::EscapeRegExp;
}
else if (_wcsicmp(selectorSz, L"EscapeUrl") == 0)
else if (_wcsicmp(selectorSz, L"EncodeUrl") == 0)
{
valueType = ValueType::EscapeUrl;
valueType = ValueType::EncodeUrl;
}
else
{
@ -304,10 +304,10 @@ bool ConfigParser::GetSectionVariable(std::wstring& strVariable, std::wstring& s
StringUtil::EscapeRegExp(strValue);
return true;
}
else if (valueType == ValueType::EscapeUrl)
else if (valueType == ValueType::EncodeUrl)
{
strValue = measure->GetStringValue();
StringUtil::EscapeUrl(strValue);
StringUtil::EncodeUrl(strValue);
return true;
}