From 907dfee6f7aa9d56e98c7d7f0677739ab18ed3cd Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 15 Apr 2022 17:44:04 +0200
Subject: [PATCH] Utilities: Use inconv with MSVC

---
 src/core/utilities.cpp | 20 +++-----------------
 src/core/utilities.h   |  2 +-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 51bb14bc..b3963eaf 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -786,23 +786,11 @@ QString DesktopEnvironment() {
 
 }
 
-QString UnicodeToAscii(QString unicode) {
+QString UnicodeToAscii(const QString &unicode) {
 
-#ifdef _MSC_VER
-
-  return unicode
-    .replace(QChar(229), "a")
-    .replace(QChar(197), 'A')
-    .replace(QChar(230), "ae")
-    .replace(QChar(198), "AE")
-    .replace(QChar(248), 'o')
-    .replace(QChar(216), 'O');
-
-#else
-
-#  ifdef LC_ALL
+#ifdef LC_ALL
   setlocale(LC_ALL, "");
-#  endif
+#endif
 
   iconv_t conv = iconv_open("ASCII//TRANSLIT", "UTF-8");
   if (conv == reinterpret_cast<iconv_t>(-1)) return unicode;
@@ -829,8 +817,6 @@ QString UnicodeToAscii(QString unicode) {
   delete[] output_ptr;
 
   return ret;
-
-#endif  // _MSC_VER
 }
 
 QString MacAddress() {
diff --git a/src/core/utilities.h b/src/core/utilities.h
index 595c10dd..444f3024 100644
--- a/src/core/utilities.h
+++ b/src/core/utilities.h
@@ -132,7 +132,7 @@ QString GetRandomString(const int len, const QString &UseCharacters);
 
 QString DesktopEnvironment();
 
-QString UnicodeToAscii(QString unicode);
+QString UnicodeToAscii(const QString &unicode);
 
 QString MacAddress();