Mercurial > octave

diff libgui/graphics/QtHandlesUtils.cc @ 25363:1f4ea87988a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert strings for Qt from UTF-8 instead of from system code page (bug #53870). * QtHandlesUtils.cc (fromStdString, toStdString): Use UTF-8 as Octave's internal character encoding.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 09 May 2018 20:29:36 +0200
parents 6652d3823428
children 36e0e5b428e7
line wrap: on
line diff
--- a/libgui/graphics/QtHandlesUtils.cc	Sun May 06 21:03:51 2018 +0200
+++ b/libgui/graphics/QtHandlesUtils.cc	Wed May 09 20:29:36 2018 +0200
@@ -50,13 +50,13 @@
     QString
     fromStdString (const std::string& s)
     {
-      return QString::fromLocal8Bit (s.c_str ());
+      return QString::fromUtf8 (s.c_str ());
     }
 
     std::string
     toStdString (const QString& s)
     {
-      return std::string (s.toLocal8Bit ().data ());
+      return std::string (s.toUtf8 ().data ());
     }
 
     QStringList