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

Move EscapeRegExp into StringUtil

Browse Source
This commit is contained in:
Birunthan Mohanathas
2014-01-04 19:01:21 +02:00
parent ce847ac12e
commit 9b5871f4dc
5 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Library/ConfigParser.cpp
View File

@ -296,7 +296,7 @@ bool ConfigParser::GetSectionVariable(std::wstring& strVariable, std::wstring& s
if (valueType == ValueType::EscapeRegExp)
{
strValue = measure->GetStringValue();
EscapeRegExp(strValue);
StringUtil::EscapeRegExp(strValue);
return true;
}
@ -310,7 +310,7 @@ bool ConfigParser::GetSectionVariable(std::wstring& strVariable, std::wstring& s
if (*selectorSz == L'%') // Percentual
{
if (valueType == ValueType::Max || valueType == ValueType::Min)
if (valueType == ValueType::Max || valueType == ValueType::Min)
{
// '%' cannot be used with Max/Min values.
return false;
@ -379,20 +379,6 @@ bool ConfigParser::GetSectionVariable(std::wstring& strVariable, std::wstring& s
return false;
}
/*
** Escapes reserved PCRE regex metacharacters.
**
*/
void ConfigParser::EscapeRegExp(std::wstring& str)
{
size_t start = 0;
while ((start = str.find_first_of(L"\\^$|()[{.+*?", start)) != std::wstring::npos)
{
str.insert(start, L"\\");
start += 2;
}
}
void ConfigParser::ResetMonitorVariables(MeterWindow* meterWindow)
{
// Set the SCREENAREA/WORKAREA variables