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:48:06 +0200 |
commit | fba4d96750523dcb64855715a981755761110ea5 (patch) | |
tree | 58e8cca632d26918597fea484b3b2c6bc612940c /tests/auto | |
parent | 276776f50369580f33ec01b22aa928e48358a0f7 (diff) |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [other]
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: Ib1eaf42679ab5db4005192c3d00ba79e43edfcca
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/tools/rcc/tst_rcc.cpp | 4 | ||||
-rw-r--r-- | tests/auto/tools/uic/tst_uic.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp index 8af85a6d09..d0806bd199 100644 --- a/tests/auto/tools/rcc/tst_rcc.cpp +++ b/tests/auto/tools/rcc/tst_rcc.cpp @@ -156,7 +156,7 @@ void tst_rcc::rcc() } const QChar cr = QLatin1Char('\r'); const QString err = QString::fromLocal8Bit(process.readAllStandardError()).remove(cr); - const QString out = QString::fromAscii(process.readAllStandardOutput()).remove(cr); + const QString out = QString::fromLatin1(process.readAllStandardOutput()).remove(cr); if (!err.isEmpty()) { qDebug() << "UNEXPECTED STDERR CONTENTS: " << err; @@ -167,7 +167,7 @@ void tst_rcc::rcc() const QStringList actualLines = out.split(nl); QVERIFY(expectedFile.open(QIODevice::ReadOnly|QIODevice::Text)); - const QStringList expectedLines = QString::fromAscii(expectedFile.readAll()).split(nl); + const QStringList expectedLines = QString::fromLatin1(expectedFile.readAll()).split(nl); const QString diff = doCompare(actualLines, expectedLines); if (diff.size()) diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp index 0ea22968db..f77d71e64e 100644 --- a/tests/auto/tools/uic/tst_uic.cpp +++ b/tests/auto/tools/uic/tst_uic.cpp @@ -93,7 +93,7 @@ void tst_uic::initTestCase() const QStringList outLines = out.split(QLatin1Char('\n')); // Print version QString msg = QString::fromLatin1("uic test built %1 running in '%2' using: "). - arg(QString::fromAscii(__DATE__), QDir::currentPath()); + arg(QString::fromLatin1(__DATE__), QDir::currentPath()); if (!outLines.empty()) msg += outLines.front(); qDebug() << msg; |