From a8d78fc28c844d88b44c1fe54c9ed85d4688bdbf Mon Sep 17 00:00:00 2001
From: Twan van Laarhoven <twanvl@gmail.com>
Date: Thu, 16 Apr 2020 00:32:11 +0200
Subject: [PATCH] Fix errors about string iteration on gcc/linux builds

---
 src/util/string.cpp        | 7 ++-----
 src/util/tagged_string.cpp | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/util/string.cpp b/src/util/string.cpp
index b716453d..a7e17015 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -174,7 +174,7 @@ String canonical_name_form(const String& str) {
   bool leading = true;
   FOR_EACH_CONST(c, str) {
     if ((c == _('_') || c == _(' '))) {
-      ret += leading ? c : _(' ');
+      ret += leading ? c : wxUniChar(' ');
     } else {
       ret += c;
       leading = false;
@@ -367,10 +367,7 @@ bool smart_equal(const String& sa, const String& sb) {
 
 bool starts_with(const String& str, const String& start) {
   if (str.size() < start.size()) return false;
-  FOR_EACH_2_CONST(a, str, b, start) {
-    if (a != b) return false;
-  }
-  return true;
+  return equal(start.begin(), start.end(), str.begin());
 }
 
 bool is_substr(const String& str, size_t pos, const Char* cmp) {
diff --git a/src/util/tagged_string.cpp b/src/util/tagged_string.cpp
index 263650a2..e08a0509 100644
--- a/src/util/tagged_string.cpp
+++ b/src/util/tagged_string.cpp
@@ -634,7 +634,7 @@ bool is_space_like(Char c) {
 
 String curly_quotes(String str, bool curl) {
   bool open = true, in_tag = false;
-  FOR_EACH(c, str) {
+  for (wxUniCharRef c : str) {
     if (c == _('\'') || c == LEFT_SINGLE_QUOTE || c == RIGHT_SINGLE_QUOTE) {
       c = curl ? (open ? LEFT_SINGLE_QUOTE : RIGHT_SINGLE_QUOTE) : _('\'');
     } else if (c == _('\"') || c == LEFT_DOUBLE_QUOTE || c == RIGHT_DOUBLE_QUOTE) {