From 2b8863a98c912806fd4e47bd2f2a6d81ec1d71b9 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 29 Apr 2020 18:00:13 +0200
Subject: Get rid of some QTextCodec leftovers

There's no real dependency to QTextCodec in those files anymore.

Change-Id: Ifaf19ab554fd108fa26095db4e2bd4a3e9ea427f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/xml/sax/qxml.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/xml/sax')

diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index e98c86979b..1898f4fbe8 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -39,10 +39,8 @@
 
 #include "qxml.h"
 #include "qxml_p.h"
-#if QT_CONFIG(textcodec)
-#include "qtextcodec.h"
-#endif
 #include "qbuffer.h"
+#include "qstringconverter.h"
 #if QT_CONFIG(regularexpression)
 #include "qregularexpression.h"
 #endif
@@ -1301,7 +1299,6 @@ void QXmlInputSource::fetchData()
     }
 }
 
-#if QT_CONFIG(textcodec)
 static QString extractEncodingDecl(const QString &text, bool *needMoreText)
 {
     *needMoreText = false;
@@ -1343,7 +1340,6 @@ static QString extractEncodingDecl(const QString &text, bool *needMoreText)
 
     return encoding;
 }
-#endif // textcodec
 
 /*!
     This function reads the XML file from \a data and tries to
@@ -1358,10 +1354,6 @@ static QString extractEncodingDecl(const QString &text, bool *needMoreText)
 */
 QString QXmlInputSource::fromRawData(const QByteArray &data, bool beginning)
 {
-#if !QT_CONFIG(textcodec)
-    Q_UNUSED(beginning);
-    return QString::fromLatin1(data.constData(), data.size());
-#else
     if (data.size() == 0)
         return QString();
     if (beginning) {
@@ -1443,7 +1435,6 @@ QString QXmlInputSource::fromRawData(const QByteArray &data, bool beginning)
     }
 
     return input;
-#endif
 }
 
 
-- 
cgit v1.2.3