amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Regex::replace_all to actually do something

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-20 21:18:40 +02:00
parent a5b2b77d2a
commit b0180547ae
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/regex.cpp
+2 -4
View File
@@ -24,10 +24,8 @@ void Regex::assign(const String& code) {
}
}
void Regex::replace_all(String* input, const String& format) {
wxStdString std_string = toStdString(*input);
regex_replace(std_string, regex, toStdString(format), boost::format_sed);
*input = std_string;
String Regex::replace_all(const String& input, const String& format) const {
return regex_replace(toStdString(input), regex, toStdString(format), boost::format_sed);
}
#else // USE_BOOST_REGEX
src/util/regex.hpp
+1 -1
View File
@@ -85,7 +85,7 @@
inline bool matches(Results& results, const String::const_iterator& begin, const String::const_iterator& end) const {
return regex_search(begin, end, results, regex);
}
void replace_all(String* input, const String& format);
String replace_all(const String& input, const String& format) const;
inline bool empty() const {
return regex.empty();