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:46:05 +0200 |
commit | dd5b373d41f99f06efd1a927a3323abada4fd6ef (patch) | |
tree | cc5f084b93a351df22a84b62dc3977df1e69caf1 /tests/auto/network/socket | |
parent | 2883a6de408c991ecf6184d7216c7d3de6fa4f4f (diff) |
Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtNetwork]
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: I94cc301ea75cc689bcb6e2d417120cf14e36808d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'tests/auto/network/socket')
-rw-r--r-- | tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index cab3d56d32..3060e51978 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -1036,12 +1036,12 @@ void tst_QUdpSocket::multicastTtlOption_data() addresses += QHostAddress(QHostAddress::AnyIPv6); foreach (const QHostAddress &address, addresses) { - QTest::newRow(QString("%1 0").arg(address.toString()).toAscii()) << address << 0 << 0; - QTest::newRow(QString("%1 1").arg(address.toString()).toAscii()) << address << 1 << 1; - QTest::newRow(QString("%1 2").arg(address.toString()).toAscii()) << address << 2 << 2; - QTest::newRow(QString("%1 128").arg(address.toString()).toAscii()) << address << 128 << 128; - QTest::newRow(QString("%1 255").arg(address.toString()).toAscii()) << address << 255 << 255; - QTest::newRow(QString("%1 1024").arg(address.toString()).toAscii()) << address << 1024 << 1; + QTest::newRow(QString("%1 0").arg(address.toString()).toLatin1()) << address << 0 << 0; + QTest::newRow(QString("%1 1").arg(address.toString()).toLatin1()) << address << 1 << 1; + QTest::newRow(QString("%1 2").arg(address.toString()).toLatin1()) << address << 2 << 2; + QTest::newRow(QString("%1 128").arg(address.toString()).toLatin1()) << address << 128 << 128; + QTest::newRow(QString("%1 255").arg(address.toString()).toLatin1()) << address << 255 << 255; + QTest::newRow(QString("%1 1024").arg(address.toString()).toLatin1()) << address << 1024 << 1; } } @@ -1077,13 +1077,13 @@ void tst_QUdpSocket::multicastLoopbackOption_data() addresses += QHostAddress(QHostAddress::AnyIPv6); foreach (const QHostAddress &address, addresses) { - QTest::newRow(QString("%1 0").arg(address.toString()).toAscii()) << address << 0 << 0; - QTest::newRow(QString("%1 1").arg(address.toString()).toAscii()) << address << 1 << 1; - QTest::newRow(QString("%1 2").arg(address.toString()).toAscii()) << address << 2 << 1; - QTest::newRow(QString("%1 0 again").arg(address.toString()).toAscii()) << address << 0 << 0; - QTest::newRow(QString("%1 2 again").arg(address.toString()).toAscii()) << address << 2 << 1; - QTest::newRow(QString("%1 0 last time").arg(address.toString()).toAscii()) << address << 0 << 0; - QTest::newRow(QString("%1 1 again").arg(address.toString()).toAscii()) << address << 1 << 1; + QTest::newRow(QString("%1 0").arg(address.toString()).toLatin1()) << address << 0 << 0; + QTest::newRow(QString("%1 1").arg(address.toString()).toLatin1()) << address << 1 << 1; + QTest::newRow(QString("%1 2").arg(address.toString()).toLatin1()) << address << 2 << 1; + QTest::newRow(QString("%1 0 again").arg(address.toString()).toLatin1()) << address << 0 << 0; + QTest::newRow(QString("%1 2 again").arg(address.toString()).toLatin1()) << address << 2 << 1; + QTest::newRow(QString("%1 0 last time").arg(address.toString()).toLatin1()) << address << 0 << 0; + QTest::newRow(QString("%1 1 again").arg(address.toString()).toLatin1()) << address << 1 << 1; } } @@ -1164,7 +1164,7 @@ void tst_QUdpSocket::setMulticastInterface_data() QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces(); foreach (const QNetworkInterface &iface, interfaces) { foreach (const QNetworkAddressEntry &entry, iface.addressEntries()) { - QTest::newRow(QString("%1:%2").arg(iface.name()).arg(entry.ip().toString()).toAscii()) + QTest::newRow(QString("%1:%2").arg(iface.name()).arg(entry.ip().toString()).toLatin1()) << iface << entry.ip(); } |