# HG changeset patch
# User Chris Cannam
# Date 1590073786 -3600
# Node ID 9219834e39a4f8e4259d176b13713da3d1ff01d1
# Parent  edc2d0e635dccedb43e26babbef6c1930fe7e588# Parent  4c5736a517e07d72c5523e5e5f2c358f233f6858
Merge

diff -r edc2d0e635dc -r 9219834e39a4 data/fileio/TextTest.cpp
--- a/data/fileio/TextTest.cpp	Thu May 21 16:09:10 2020 +0100
+++ b/data/fileio/TextTest.cpp	Thu May 21 16:09:46 2020 +0100
@@ -40,7 +40,7 @@
 
     QByteArray bytes = file.read(200);
 
-    if (StringBits::isValidUtf8(bytes.toStdString(), true)) {
+    if (StringBits::isValidUtf8(std::string(bytes.data()), true)) {
         SVDEBUG << "NOTE: TextTest::isApparentTextDocument: Document appears to be UTF-8" << endl;
         return true; // good enough to be worth trying to parse
     }