1 files changed, 10 insertions, 11 deletions
diff --git a/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp
index fad8889fa..5a9a26913 100644
--- a/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp
+++ b/sources/shiboken6/ApiExtractor/xmlutils_libxslt.cpp
@@ -40,8 +40,6 @@ static void ensureInitialized()
     }
 }
 
-namespace {
-
 // RAI Helpers for cleaning up libxml2/libxslt data
 
 struct XmlDocDeleter // for std::unique_ptr<xmlDoc>
@@ -64,8 +62,6 @@ struct XmlXPathContextDeleter
     void operator()(xmlXPathContextPtr xPathContext) { xmlXPathFreeContext(xPathContext); }
 };
 
-} // namespace
-
 using XmlDocUniquePtr = std::unique_ptr<xmlDoc, XmlDocDeleter>;
 using XmlPathObjectUniquePtr = std::unique_ptr<xmlXPathObject, XmlXPathObjectDeleter>;
 using XmlStyleSheetUniquePtr = std::unique_ptr<xsltStylesheet, XmlStyleSheetDeleter>;
@@ -141,9 +137,10 @@ QString LibXmlXQuery::doEvaluate(const QString &xPathExpression, QString *errorM
     return result;
 }
 
-QSharedPointer<XQuery> libXml_createXQuery(const QString &focus, QString *errorMessage)
+std::shared_ptr<XQuery> libXml_createXQuery(const QString &focus, QString *errorMessage)
 {
-    XmlDocUniquePtr doc(xmlParseFile(QFile::encodeName(focus).constData()));
+    XmlDocUniquePtr doc(xmlReadFile(QFile::encodeName(focus).constData(),
+                        "utf-8", XML_PARSE_NOENT));
     if (!doc) {
         *errorMessage = u"libxml2: Cannot set focus to "_s + QDir::toNativeSeparators(focus);
         return {};
@@ -153,25 +150,27 @@ QSharedPointer<XQuery> libXml_createXQuery(const QString &focus, QString *errorM
         *errorMessage = u"libxml2: xmlXPathNewContext() failed"_s;
         return {};
     }
-    return QSharedPointer<XQuery>(new LibXmlXQuery(doc, xpathContext));
+    return std::shared_ptr<XQuery>(new LibXmlXQuery(doc, xpathContext));
 }
 
 // XSLT transformation
 
-static const char xsltPrefix[] = R"(<?xml version="1.0" encoding="UTF-8" ?>
+static constexpr auto xsltPrefix = R"(<?xml version="1.0" encoding="UTF-8" ?>
     <xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-)";
+)"_L1;
 
 QString libXslt_transform(const QString &xml, QString xsl, QString *errorMessage)
 {
     ensureInitialized();
     // Read XML data
     if (!xsl.startsWith(u"<?xml")) {
-        xsl.prepend(QLatin1StringView(xsltPrefix));
+        xsl.prepend(xsltPrefix);
         xsl.append(u"</xsl:transform>"_s);
     }
     const QByteArray xmlData = xml.toUtf8();
-    XmlDocUniquePtr xmlDoc(xmlParseMemory(xmlData.constData(), xmlData.size()));
+
+    XmlDocUniquePtr xmlDoc(xmlReadMemory(xmlData.constData(), int(xmlData.size()),
+                                         "", "utf-8", XML_PARSE_NOENT));
     if (!xmlDoc) {
         *errorMessage = u"xmlParseMemory() failed for XML."_s;
         return xml;