From bb3062544be410f71186c2183b74451754801cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <capelle.mikael@gmail.com>
Date: Wed, 27 May 2020 13:16:39 +0200
Subject: [PATCH] Better marshalling functions.

---
 src/csharp_utils.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/csharp_utils.h b/src/csharp_utils.h
index fd98931..a816eda 100644
--- a/src/csharp_utils.h
+++ b/src/csharp_utils.h
@@ -22,13 +22,17 @@ namespace CSharp {
     return msclr::interop::marshal_as<std::wstring>(value);
   }
   inline QString to_qstring(System::String^ value) {
-    return QString::fromStdString(to_string(value));
+    msclr::interop::marshal_context ctx;
+    return QString::fromWCharArray(ctx.marshal_as<const wchar_t*>(value));
   }
 
   template <class Str>
   inline System::String^ from_string(Str const& string) {
     return msclr::interop::marshal_as<System::String^>(string);
   }
+  inline System::String^ from_string(QString const& string) {
+    return msclr::interop::marshal_as<System::String^>(string.toStdWString().c_str());
+  }
 
 }