diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 16:32:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 12:45:47 +0200 |
commit | 712ca9d95a92d62eda809c959998313413516aa9 (patch) | |
tree | 369870135d815d3db5b5942e32a4604b64bde724 /tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | |
parent | 2376a5c4e0ea930d43d9377f4e93738a20659097 (diff) |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtCore]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: I38f97ad379deafebef02c75d611343ca15640c8a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp')
-rw-r--r-- | tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp index e84eb95447..9bb3506133 100644 --- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp @@ -197,9 +197,9 @@ QByteArray verifyZeroTermination(const QByteArray &ba) int baSize = ba.size(); char baTerminator = ba.constData()[baSize]; if ('\0' != baTerminator) - return QString::fromAscii( - "*** Result ('%1') not null-terminated: 0x%2 ***").arg(QString::fromAscii(ba)) - .arg(baTerminator, 2, 16, QChar('0')).toAscii(); + return QString::fromLatin1( + "*** Result ('%1') not null-terminated: 0x%2 ***").arg(QString::fromLatin1(ba)) + .arg(baTerminator, 2, 16, QChar('0')).toLatin1(); // Skip mutating checks on shared strings if (baDataPtr->ref.isShared()) @@ -210,12 +210,12 @@ QByteArray verifyZeroTermination(const QByteArray &ba) const_cast<char *>(baData)[baSize] = 'x'; if ('x' != ba.constData()[baSize]) { - return QString::fromAscii("*** Failed to replace null-terminator in " - "result ('%1') ***").arg(QString::fromAscii(ba)).toAscii(); + return QString::fromLatin1("*** Failed to replace null-terminator in " + "result ('%1') ***").arg(QString::fromLatin1(ba)).toLatin1(); } if (ba != baCopy) { - return QString::fromAscii( "*** Result ('%1') differs from its copy " - "after null-terminator was replaced ***").arg(QString::fromAscii(ba)).toAscii(); + return QString::fromLatin1( "*** Result ('%1') differs from its copy " + "after null-terminator was replaced ***").arg(QString::fromLatin1(ba)).toLatin1(); } const_cast<char *>(baData)[baSize] = '\0'; // Restore sanity |