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>

12 files changed, 4 insertions, 36 deletions

diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 1f4be24913..7182eb2a26 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -148,7 +148,7 @@ QT_BEGIN_NAMESPACE
     binary data (except for the NUL character). QProcessEnvironment will preserve
     such variables, but does not support manipulating variables whose names or
     values cannot be encoded by the current locale settings (see
-    QTextCodec::codecForLocale).
+    QString::toLocal8Bit).
 
     On Windows, the variable names are case-insensitive, but case-preserving.
     QProcessEnvironment behaves accordingly.
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 71ea124fbe..057a0bc65b 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE
 
 
 class QCoreApplicationPrivate;
-class QTextCodec;
 class QTranslator;
 class QPostEventList;
 class QStringList;
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index 32ec1ca7e3..344eff56b2 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -165,7 +165,7 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
     parameter: qSetFieldWidth(), qSetPadChar(), and
     qSetRealNumberPrecision().
 
-    \sa QDataStream, QIODevice, QFile, QBuffer, QTcpSocket, {Text Codecs Example}
+    \sa QDataStream, QIODevice, QFile, QBuffer, QTcpSocket
 */
 
 /*! \enum QTextStream::RealNumberNotation
diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h
index 7b8c6f35b3..2b164ce9b3 100644
--- a/src/corelib/serialization/qtextstream.h
+++ b/src/corelib/serialization/qtextstream.h
@@ -55,10 +55,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-class QTextCodec;
-class QTextDecoder;
-
 class QTextStreamPrivate;
 class Q_CORE_EXPORT QTextStream                                // text stream class
 {
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index 72ad4ee634..c26b0d11d2 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -45,9 +45,6 @@
 #include <qdebug.h>
 #include <qfile.h>
 #include <stdio.h>
-#if QT_CONFIG(textcodec)
-#include <qtextcodec.h>
-#endif
 #include <qstringconverter.h>
 #include <qstack.h>
 #include <qbuffer.h>
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index a7cafced31..28fb479788 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -75,7 +75,6 @@ class QRegularExpression;
 class QRegularExpressionMatch;
 class QString;
 class QStringList;
-class QTextCodec;
 class QStringRef;
 template <typename T> class QVector;
 
@@ -1021,7 +1020,6 @@ private:
     static qlonglong toIntegral_helper(const QChar *data, int len, bool *ok, int base);
     static qulonglong toIntegral_helper(const QChar *data, uint len, bool *ok, int base);
     void replace_helper(uint *indices, int nIndices, int blen, const QChar *after, int alen);
-    friend class QTextCodec;
     friend class QStringRef;
     friend class QStringView;
     friend class QByteArray;
diff --git a/src/platformsupport/input/libinput/qlibinputkeyboard.cpp b/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
index 6586b084f1..4961d8d530 100644
--- a/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
+++ b/src/platformsupport/input/libinput/qlibinputkeyboard.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qlibinputkeyboard_p.h"
-#include <QtCore/QTextCodec>
 #include <QtCore/QLoggingCategory>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qinputdevicemanager_p.h>
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index f8cc5e76ff..840d4c2d5b 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -42,7 +42,6 @@
 
 #include <QtGui/private/qinternalmimedata_p.h>
 #include <QtCore/qbytearraymatcher.h>
-#include <QtCore/qtextcodec.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qdir.h>
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index 76d9eec27a..10c3e11bf2 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -48,9 +48,6 @@
 #include <qsqlquery.h>
 #include <qsqlrecord.h>
 #include <qstringlist.h>
-#if QT_CONFIG(textcodec)
-#include <qtextcodec.h>
-#endif
 #include <qvector.h>
 #include <qfile.h>
 #include <qdebug.h>
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 8327dd5829..cb21277086 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -35,7 +35,6 @@
 #include <qdir.h>
 #include <qhashfunctions.h>
 #include <qtextstream.h>
-#include <qtextcodec.h>
 #include <qcoreapplication.h>
 #include <qcommandlineoption.h>
 #include <qcommandlineparser.h>
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index c09770db82..0f3e381859 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -52,9 +52,6 @@
 #if QT_CONFIG(regularexpression)
 #include <qregularexpression.h>
 #endif
-#if QT_CONFIG(textcodec)
-#include <qtextcodec.h>
-#endif
 #include <qtextstream.h>
 #include <qxml.h>
 #include <qvariant.h>
@@ -5942,7 +5939,7 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod
     const QDomNodePrivate* n = first;
 
     if(encUsed == QDomNode::EncodingFromDocument) {
-#if QT_CONFIG(textcodec) && QT_CONFIG(regularexpression)
+#if QT_CONFIG(regularexpression)
         const QDomNodePrivate* n = first;
 
         if (n && n->isProcessingInstruction() && n->nodeName() == QLatin1String("xml")) {
@@ -5977,11 +5974,7 @@ void QDomDocumentPrivate::saveDocument(QTextStream& s, const int indent, QDomNod
     else {
 
         // Write out the XML declaration.
-#if !QT_CONFIG(textcodec)
-        const QLatin1String codecName("UTF-8");
-#else
         const QByteArray codecName = QStringConverter::nameForEncoding(s.encoding());
-#endif
 
         s << "<?xml version=\"1.0\" encoding=\""
           << codecName
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
 }