1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtNetwork]

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2012-05-02 16:32:26 +02:00 committed by Qt by Nokia
parent 2883a6de40
commit dd5b373d41
10 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/network/dnslookup/dnslookup.cpp
View File

@ -137,7 +137,7 @@ void DnsManager::showResults()
foreach (const QDnsTextRecord &record, dns->textRecords()) { foreach (const QDnsTextRecord &record, dns->textRecords()) {
QStringList values; QStringList values;
foreach (const QByteArray &ba, record.values()) foreach (const QByteArray &ba, record.values())
values << "\"" + QString::fromAscii(ba) + "\""; values << "\"" + QString::fromLatin1(ba) + "\"";
printf("%s\t%i\tIN\tTXT\t%s\n", qPrintable(record.name()), record.timeToLive(), qPrintable(values.join(" "))); printf("%s\t%i\tIN\tTXT\t%s\n", qPrintable(record.name()), record.timeToLive(), qPrintable(values.join(" ")));
} }

4
src/network/access/qftp.cpp
View File

@ -938,7 +938,7 @@ void QFtpPI::readyRead()
while (commandSocket.canReadLine()) { while (commandSocket.canReadLine()) {
// read line with respect to line continuation // read line with respect to line continuation
QString line = QString::fromAscii(commandSocket.readLine()); QString line = QString::fromLatin1(commandSocket.readLine());
if (replyText.isEmpty()) { if (replyText.isEmpty()) {
if (line.length() < 3) { if (line.length() < 3) {
// protocol error // protocol error
@ -970,7 +970,7 @@ void QFtpPI::readyRead()
replyText += line; replyText += line;
if (!commandSocket.canReadLine()) if (!commandSocket.canReadLine())
return; return;
line = QString::fromAscii(commandSocket.readLine()); line = QString::fromLatin1(commandSocket.readLine());
lineLeft4 = line.left(4); lineLeft4 = line.left(4);
} }
replyText += line.mid(4); // strip reply code 'xyz ' replyText += line.mid(4); // strip reply code 'xyz '

14
src/network/access/qhttpnetworkconnection.cpp
View File

@ -300,15 +300,15 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
// one always. // one always.
value = request.headerField("accept-language"); value = request.headerField("accept-language");
if (value.isEmpty()) { if (value.isEmpty()) {
QString systemLocale = QLocale::system().name().replace(QChar::fromAscii('_'),QChar::fromAscii('-')); QString systemLocale = QLocale::system().name().replace(QChar::fromLatin1('_'),QChar::fromLatin1('-'));
QString acceptLanguage; QString acceptLanguage;
if (systemLocale == QLatin1String("C")) if (systemLocale == QLatin1String("C"))
acceptLanguage = QString::fromAscii("en,*"); acceptLanguage = QString::fromLatin1("en,*");
else if (systemLocale.startsWith(QLatin1String("en-"))) else if (systemLocale.startsWith(QLatin1String("en-")))
acceptLanguage = QString::fromAscii("%1,*").arg(systemLocale); acceptLanguage = QString::fromLatin1("%1,*").arg(systemLocale);
else else
acceptLanguage = QString::fromAscii("%1,en,*").arg(systemLocale); acceptLanguage = QString::fromLatin1("%1,en,*").arg(systemLocale);
request.setHeaderField("Accept-Language", acceptLanguage.toAscii()); request.setHeaderField("Accept-Language", acceptLanguage.toLatin1());
} }
// set the User Agent // set the User Agent
@ -322,9 +322,9 @@ void QHttpNetworkConnectionPrivate::prepareRequest(HttpMessagePair &messagePair)
QByteArray host; QByteArray host;
if (add.setAddress(hostName)) { if (add.setAddress(hostName)) {
if (add.protocol() == QAbstractSocket::IPv6Protocol) if (add.protocol() == QAbstractSocket::IPv6Protocol)
host = "[" + hostName.toAscii() + "]";//format the ipv6 in the standard way host = "[" + hostName.toLatin1() + "]";//format the ipv6 in the standard way
else else
host = hostName.toAscii(); host = hostName.toLatin1();
} else { } else {
host = QUrl::toAce(hostName); host = QUrl::toAce(hostName);

2
src/network/ssl/qsslsocket_openssl.cpp
View File

@ -1545,7 +1545,7 @@ QString QSslSocketBackendPrivate::getErrorsFromOpenSsl()
if (! errorString.isEmpty()) if (! errorString.isEmpty())
errorString.append(QLatin1String(", ")); errorString.append(QLatin1String(", "));
const char *error = q_ERR_error_string(errNum, NULL); const char *error = q_ERR_error_string(errNum, NULL);
errorString.append(QString::fromAscii(error)); // error is ascii according to man ERR_error_string errorString.append(QString::fromLatin1(error)); // error is ascii according to man ERR_error_string
} }
return errorString; return errorString;
} }

20
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -5783,9 +5783,9 @@ public slots:
client->readAll(); client->readAll();
client->write("HTTP/1.0 200 OK\n"); client->write("HTTP/1.0 200 OK\n");
if (serverSendsContentLength) if (serverSendsContentLength)
client->write(QString("Content-Length: " + QString::number(dataSize) + "\n").toAscii()); client->write(QString("Content-Length: " + QString::number(dataSize) + "\n").toLatin1());
if (chunkedEncoding) if (chunkedEncoding)
client->write(QString("Transfer-Encoding: chunked\n").toAscii()); client->write(QString("Transfer-Encoding: chunked\n").toLatin1());
client->write("Connection: close\n\n"); client->write("Connection: close\n\n");
} }
@ -5796,7 +5796,7 @@ public slots:
// chunked encoding: we have to send a last "empty" chunk // chunked encoding: we have to send a last "empty" chunk
if (chunkedEncoding) if (chunkedEncoding)
client->write(QString("0\r\n\r\n").toAscii()); client->write(QString("0\r\n\r\n").toLatin1());
client->disconnectFromHost(); client->disconnectFromHost();
server.close(); server.close();
@ -5810,9 +5810,9 @@ public slots:
QByteArray data(amount, '@'); QByteArray data(amount, '@');
if (chunkedEncoding) { if (chunkedEncoding) {
client->write(QString(QString("%1").arg(amount,0,16).toUpper() + "\r\n").toAscii()); client->write(QString(QString("%1").arg(amount,0,16).toUpper() + "\r\n").toLatin1());
client->write(data.constData(), amount); client->write(data.constData(), amount);
client->write(QString("\r\n").toAscii()); client->write(QString("\r\n").toLatin1());
} else { } else {
client->write(data.constData(), amount); client->write(data.constData(), amount);
} }
@ -5922,7 +5922,7 @@ void tst_QNetworkReply::getFromHttpIntoBufferCanReadLine()
{ {
QString header("HTTP/1.0 200 OK\r\nContent-Length: 7\r\n\r\nxxx\nxxx"); QString header("HTTP/1.0 200 OK\r\nContent-Length: 7\r\n\r\nxxx\nxxx");
MiniHttpServer server(header.toAscii()); MiniHttpServer server(header.toLatin1());
server.doClose = true; server.doClose = true;
QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort()))); QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
@ -5992,10 +5992,10 @@ void tst_QNetworkReply::qtbug12908compressedHttpReply()
// dd if=/dev/zero of=qtbug-12908 bs=16384 count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz // dd if=/dev/zero of=qtbug-12908 bs=16384 count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz
QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA"); QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA");
QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toAscii()); QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toLatin1());
QCOMPARE(decodedFile.size(), 63); QCOMPARE(decodedFile.size(), 63);
MiniHttpServer server(header.toAscii() + decodedFile); MiniHttpServer server(header.toLatin1() + decodedFile);
server.doClose = true; server.doClose = true;
QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort()))); QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
@ -6015,10 +6015,10 @@ void tst_QNetworkReply::compressedHttpReplyBrokenGzip()
// dd if=/dev/zero of=qtbug-12908 bs=16384 count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz // dd if=/dev/zero of=qtbug-12908 bs=16384 count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz
// Then change "BMQ" to "BMX" // Then change "BMQ" to "BMX"
QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMXEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA"); QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMXEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA");
QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toAscii()); QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toLatin1());
QCOMPARE(decodedFile.size(), 63); QCOMPARE(decodedFile.size(), 63);
MiniHttpServer server(header.toAscii() + decodedFile); MiniHttpServer server(header.toLatin1() + decodedFile);
server.doClose = true; server.doClose = true;
QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort()))); QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));

4
tests/auto/network/bearer/qnetworksession/lackey/main.cpp
View File

@ -123,7 +123,7 @@ int main(int argc, char** argv)
session = new QNetworkSession(config); session = new QNetworkSession(config);
QString output = QString("Starting session for %1\n").arg(config.identifier()); QString output = QString("Starting session for %1\n").arg(config.identifier());
oopSocket.write(output.toAscii()); oopSocket.write(output.toLatin1());
oopSocket.waitForBytesWritten(); oopSocket.waitForBytesWritten();
session->open(); session->open();
session->waitForOpened(); session->waitForOpened();
@ -141,7 +141,7 @@ int main(int argc, char** argv)
} }
QString output = QString("Started session for %1\n").arg(session->configuration().identifier()); QString output = QString("Started session for %1\n").arg(session->configuration().identifier());
oopSocket.write(output.toAscii()); oopSocket.write(output.toLatin1());
oopSocket.waitForBytesWritten(); oopSocket.waitForBytesWritten();
oopSocket.waitForReadyRead(); oopSocket.waitForReadyRead();

28
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
View File

@ -1036,12 +1036,12 @@ void tst_QUdpSocket::multicastTtlOption_data()
addresses += QHostAddress(QHostAddress::AnyIPv6); addresses += QHostAddress(QHostAddress::AnyIPv6);
foreach (const QHostAddress &address, addresses) { foreach (const QHostAddress &address, addresses) {
QTest::newRow(QString("%1 0").arg(address.toString()).toAscii()) << address << 0 << 0; QTest::newRow(QString("%1 0").arg(address.toString()).toLatin1()) << address << 0 << 0;
QTest::newRow(QString("%1 1").arg(address.toString()).toAscii()) << address << 1 << 1; QTest::newRow(QString("%1 1").arg(address.toString()).toLatin1()) << address << 1 << 1;
QTest::newRow(QString("%1 2").arg(address.toString()).toAscii()) << address << 2 << 2; QTest::newRow(QString("%1 2").arg(address.toString()).toLatin1()) << address << 2 << 2;
QTest::newRow(QString("%1 128").arg(address.toString()).toAscii()) << address << 128 << 128; QTest::newRow(QString("%1 128").arg(address.toString()).toLatin1()) << address << 128 << 128;
QTest::newRow(QString("%1 255").arg(address.toString()).toAscii()) << address << 255 << 255; QTest::newRow(QString("%1 255").arg(address.toString()).toLatin1()) << address << 255 << 255;
QTest::newRow(QString("%1 1024").arg(address.toString()).toAscii()) << address << 1024 << 1; 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); addresses += QHostAddress(QHostAddress::AnyIPv6);
foreach (const QHostAddress &address, addresses) { foreach (const QHostAddress &address, addresses) {
QTest::newRow(QString("%1 0").arg(address.toString()).toAscii()) << address << 0 << 0; QTest::newRow(QString("%1 0").arg(address.toString()).toLatin1()) << address << 0 << 0;
QTest::newRow(QString("%1 1").arg(address.toString()).toAscii()) << address << 1 << 1; QTest::newRow(QString("%1 1").arg(address.toString()).toLatin1()) << address << 1 << 1;
QTest::newRow(QString("%1 2").arg(address.toString()).toAscii()) << address << 2 << 1; QTest::newRow(QString("%1 2").arg(address.toString()).toLatin1()) << address << 2 << 1;
QTest::newRow(QString("%1 0 again").arg(address.toString()).toAscii()) << address << 0 << 0; QTest::newRow(QString("%1 0 again").arg(address.toString()).toLatin1()) << address << 0 << 0;
QTest::newRow(QString("%1 2 again").arg(address.toString()).toAscii()) << address << 2 << 1; QTest::newRow(QString("%1 2 again").arg(address.toString()).toLatin1()) << address << 2 << 1;
QTest::newRow(QString("%1 0 last time").arg(address.toString()).toAscii()) << address << 0 << 0; QTest::newRow(QString("%1 0 last time").arg(address.toString()).toLatin1()) << address << 0 << 0;
QTest::newRow(QString("%1 1 again").arg(address.toString()).toAscii()) << address << 1 << 1; 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(); QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
foreach (const QNetworkInterface &iface, interfaces) { foreach (const QNetworkInterface &iface, interfaces) {
foreach (const QNetworkAddressEntry &entry, iface.addressEntries()) { 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 << iface
<< entry.ip(); << entry.ip();
} }

2
tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
View File

@ -383,7 +383,7 @@ void tst_QSslCertificate::subjectAlternativeNames()
else else
QFAIL("unsupported alternative name type"); QFAIL("unsupported alternative name type");
QString entry = QString("%1:%2").arg(type).arg(it.value()); QString entry = QString("%1:%2").arg(type).arg(it.value());
QVERIFY(fileContents.contains(entry.toAscii())); QVERIFY(fileContents.contains(entry.toLatin1()));
} }
// verify that each entry in fileContents is present in subjAltNames // verify that each entry in fileContents is present in subjAltNames

10
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -386,9 +386,9 @@ public slots:
client->readAll(); client->readAll();
client->write("HTTP/1.0 200 OK\n"); client->write("HTTP/1.0 200 OK\n");
if (serverSendsContentLength) if (serverSendsContentLength)
client->write(QString("Content-Length: " + QString::number(dataSize) + "\n").toAscii()); client->write(QString("Content-Length: " + QString::number(dataSize) + "\n").toLatin1());
if (chunkedEncoding) if (chunkedEncoding)
client->write(QString("Transfer-Encoding: chunked\n").toAscii()); client->write(QString("Transfer-Encoding: chunked\n").toLatin1());
client->write("Connection: close\n\n"); client->write("Connection: close\n\n");
} }
@ -399,7 +399,7 @@ public slots:
// chunked encoding: we have to send a last "empty" chunk // chunked encoding: we have to send a last "empty" chunk
if (chunkedEncoding) if (chunkedEncoding)
client->write(QString("0\r\n\r\n").toAscii()); client->write(QString("0\r\n\r\n").toLatin1());
client->disconnectFromHost(); client->disconnectFromHost();
server.close(); server.close();
@ -413,9 +413,9 @@ public slots:
QByteArray data(amount, '@'); QByteArray data(amount, '@');
if (chunkedEncoding) { if (chunkedEncoding) {
client->write(QString(QString("%1").arg(amount,0,16).toUpper() + "\r\n").toAscii()); client->write(QString(QString("%1").arg(amount,0,16).toUpper() + "\r\n").toLatin1());
client->write(data.constData(), amount); client->write(data.constData(), amount);
client->write(QString("\r\n").toAscii()); client->write(QString("\r\n").toLatin1());
} else { } else {
client->write(data.constData(), amount); client->write(data.constData(), amount);
} }

2
tests/manual/bearerex/datatransferer.cpp
View File

@ -115,7 +115,7 @@ void DataTransfererQTcp::readyRead()
// QDataStream in(&m_qsocket); // QDataStream in(&m_qsocket);
QByteArray array = m_qsocket.readAll(); QByteArray array = m_qsocket.readAll();
QString data = QString::fromAscii(array); QString data = QString::fromLatin1(array);
// in >> data; // in >> data;