From 9232ad0125d0f4df5bab11ed4138db6188d86244 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Tue, 9 Jul 2024 15:56:07 +0200
Subject: [PATCH] TagReaderTagLib: Use QString for converting TagLib::String

Converting directly to std::string does not seem to work correctly.
---
 ext/libstrawberry-tagreader/tagreadertaglib.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ext/libstrawberry-tagreader/tagreadertaglib.h b/ext/libstrawberry-tagreader/tagreadertaglib.h
index f85d221d..e97ccb86 100644
--- a/ext/libstrawberry-tagreader/tagreadertaglib.h
+++ b/ext/libstrawberry-tagreader/tagreadertaglib.h
@@ -23,8 +23,6 @@
 
 #include <string>
 
-#include <boost/algorithm/string/trim.hpp>
-
 #include <QByteArray>
 #include <QString>
 
@@ -77,9 +75,9 @@ class TagReaderTagLib : public TagReaderBase {
 
   static inline void AssignTagLibStringToStdString(const TagLib::String &tstr, std::string *output) {
 
-    std::string stdstr = TagLibStringToStdString(tstr);
-    boost::trim(stdstr);
-    output->assign(stdstr);
+    const QString qstr = TagLibStringToQString(tstr).trimmed();
+    const QByteArray data = qstr.toUtf8();
+    output->assign(data.constData(), data.size());
 
   }