diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-28 18:15:54 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-14 07:50:19 +0200 |
| commit | 4d67b9dcfbb379d9d65a5a1fec74600273941637 (patch) | |
| tree | ae56788e3613bc164ec7bd3f8e38e8ba9c86d64f /tests/auto/corelib/serialization | |
| parent | 33bb695a2895fb7199b256a4fd76923c32a8587a (diff) | |
Get rid of QTextCodec in QTextStream
Use QStringConverter instead. Also change the default
encoding of QTextStream to utf8.
Change-Id: I30682e75fe0462d1a937539f773640c83a2d82e1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/serialization')
| -rw-r--r-- | tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp index 07960f1348..a79d1af314 100644 --- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp @@ -37,10 +37,10 @@ #include <QDebug> #include <QElapsedTimer> #include <QFile> +#include <QStringConverter> #include <QTcpSocket> #include <QTemporaryDir> #include <QTextStream> -#include <QTextCodec> #if QT_CONFIG(process) # include <QProcess> #endif @@ -245,7 +245,7 @@ private: void runOnExit() { QByteArray buffer; - QTextStream(&buffer) << "This will try to use QTextCodec::codecForLocale" << Qt::endl; + QTextStream(&buffer) << "This will try to use QStringConverter::Utf8" << Qt::endl; } Q_DESTRUCTOR_FUNCTION(runOnExit) @@ -277,8 +277,8 @@ void tst_QTextStream::getSetCheck() { // Initialize codecs QTextStream obj1; - // QTextCodec * QTextStream::encoding() - // void QTextStream::setEncoding() + // QTextStream::encoding() + // QTextStream::setEncoding() obj1.setEncoding(QStringConverter::Utf32BE); QCOMPARE(QStringConverter::Utf32BE, obj1.encoding()); obj1.setEncoding(QStringConverter::Utf8); @@ -402,7 +402,7 @@ void tst_QTextStream::cleanupTestCase() void tst_QTextStream::construction() { QTextStream stream; - QCOMPARE(stream.codec(), QTextCodec::codecForLocale()); + QCOMPARE(stream.encoding(), QStringConverter::Utf8); QCOMPARE(stream.device(), static_cast<QIODevice *>(0)); QCOMPARE(stream.string(), static_cast<QString *>(0)); @@ -1766,7 +1766,6 @@ void tst_QTextStream::utf8IncompleteAtBufferBoundary() QFile::remove(testFileName); QFile data(testFileName); - QTextCodec *utf8Codec = QTextCodec::codecForMib(106); QString lineContents = QString::fromUtf8("\342\200\223" // U+2013 EN DASH "\342\200\223" "\342\200\223" |