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

Added StringView type (similar to std::string_view)

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-21 19:29:42 +02:00
parent 6a299dfe41
commit 1a0e17221b
9 changed files with 153 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/action/value.cpp
+6 -6
View File
@@ -153,18 +153,18 @@ unique_ptr<TextValueAction> toggle_format_action(const TextValueP& value, const
// Are we inside the tag we are toggling?
if (!is_in_tag(str, _("<") + tag, start_i, end_i)) {
// we are not inside this tag, add it
new_value = str.substr(0, start_i);
new_value = substr(str, 0, start_i);
new_value += _("<") + tag + _(">");
new_value += str.substr(start_i, end_i - start_i);
new_value += substr(str, start_i, end_i - start_i);
new_value += _("</") + tag + _(">");
new_value += str.substr(end_i);
new_value += substr(str, end_i);
} else {
// we are inside this tag, 'remove' it
new_value = str.substr(0, start_i);
new_value = substr(str, 0, start_i);
new_value += _("</") + tag + _(">");
new_value += str.substr(start_i, end_i - start_i);
new_value += substr(str, start_i, end_i - start_i);
new_value += _("<") + tag + _(">");
new_value += str.substr(end_i);
new_value += substr(str, end_i);
}
// Build action
if (start != end) {
src/data/keyword.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ void read_compat(Reader& handler, Keyword* k) {
size_t start = separator.find_first_of('[');
size_t end = separator.find_first_of(']');
if (start != String::npos && end != String::npos) {
k->match += separator.substr(start + 1, end - start - 1);
k->match += substr(separator, start + 1, end - start - 1);
}
if (parameter == _("no parameter")) {
parameter.clear(); // was used for magic to indicate absence of parameter