From a637a5ae29447980459865468e74cd1356d04da5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 2 May 2012 16:32:26 +0200 Subject: Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtDBus] 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: I052a3412a568ad639f2bf169b4491b56dddff1c7 Reviewed-by: Thiago Macieira --- src/dbus/qdbusextratypes.h | 2 +- tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp | 2 +- tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index c1b8cffc792..51b3da55e23 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -123,7 +123,7 @@ private: }; inline QDBusSignature::QDBusSignature(const char *dBusSignature) - : m_signature(QString::fromAscii(dBusSignature)) + : m_signature(QString::fromLatin1(dBusSignature)) { doCheck(); } inline QDBusSignature::QDBusSignature(const QLatin1String &dBusSignature) diff --git a/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp b/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp index 5510c656e1d..23ef811b3f8 100644 --- a/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp +++ b/tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp @@ -153,7 +153,7 @@ void tst_qdbuscpp2xml::qdbuscpp2xml() } 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; diff --git a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp index fe9e37c5d5c..bea59d808aa 100644 --- a/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp +++ b/tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp @@ -168,13 +168,13 @@ void tst_QDBusPerformance::oneWay_data() QByteArray ba(256, 'a'); while (ba.size() < 8193) { - QTest::newRow(QString("%1-byteArray").arg(ba.size()).toAscii()) << QVariant::fromValue(ba) << ba.size(); + QTest::newRow(QString("%1-byteArray").arg(ba.size()).toLatin1()) << QVariant::fromValue(ba) << ba.size(); ba += ba; } QString s(256, QLatin1Char('a')); while (s.size() < 8193) { - QTest::newRow(QString("%1-string").arg(s.size()).toAscii()) << QVariant::fromValue(s) << s.size(); + QTest::newRow(QString("%1-string").arg(s.size()).toLatin1()) << QVariant::fromValue(s) << s.size(); s += s; } } -- cgit v1.2.3