AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QStringList::join(QChar) overload where applicable [QtNetwork]

Browse Source 
This is an automated change performing the following replacements:
                    join\("(.)"\) -> join('\1')
  join\(QLatin1String\("(.)"\)\)  -> join(QLatin1Char('\1'))
  join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1'))

Change-Id: I5b75877ba192fa1357e67fee70dff7c0475991e8
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
This commit is contained in:
Marc Mutz 2012-05-18 20:00:23 +02:00 committed by Qt by Nokia
parent 781b642671
commit 1f8d570d5f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/kernel/qnetworkproxy.cpp
View File

@ -1610,7 +1610,7 @@ QDebug operator<<(QDebug debug, const QNetworkProxy &proxy)
scaps << QStringLiteral("Caching"); scaps << QStringLiteral("Caching");
if (caps & QNetworkProxy::HostNameLookupCapability) if (caps & QNetworkProxy::HostNameLookupCapability)
scaps << QStringLiteral("NameLookup"); scaps << QStringLiteral("NameLookup");
debug << "[" << scaps.join(QStringLiteral(" ")) << "]"; debug << "[" << scaps.join(QLatin1Char(' ')) << "]";
return debug; return debug;
} }
#endif #endif

8
tests/auto/network/kernel/qdnslookup/tst_qdnslookup.cpp
View File

@ -168,7 +168,7 @@ void tst_QDnsLookup::lookup()
addresses << record.value().toString().toLower(); addresses << record.value().toString().toLower();
} }
addresses.sort(); addresses.sort();
QCOMPARE(addresses.join(" "), host); QCOMPARE(addresses.join(' '), host);
// mail exchanges // mail exchanges
QStringList mailExchanges; QStringList mailExchanges;
@ -176,7 +176,7 @@ void tst_QDnsLookup::lookup()
QCOMPARE(record.name(), domain); QCOMPARE(record.name(), domain);
mailExchanges << QString("%1 %2").arg(QString::number(record.preference()), record.exchange()); mailExchanges << QString("%1 %2").arg(QString::number(record.preference()), record.exchange());
} }
QCOMPARE(mailExchanges.join(" "), mx); QCOMPARE(mailExchanges.join(' '), mx);
// name servers // name servers
QStringList nameServers; QStringList nameServers;
@ -186,7 +186,7 @@ void tst_QDnsLookup::lookup()
nameServers << record.value(); nameServers << record.value();
} }
nameServers.sort(); nameServers.sort();
QCOMPARE(nameServers.join(" "), ns); QCOMPARE(nameServers.join(' '), ns);
// pointers // pointers
if (!ptr.isEmpty()) { if (!ptr.isEmpty()) {
@ -208,7 +208,7 @@ void tst_QDnsLookup::lookup()
QString::number(record.port()), QString::number(record.port()),
record.target()); record.target());
} }
QCOMPARE(services.join(" "), srv); QCOMPARE(services.join(' '), srv);
// text // text
if (!txt.isEmpty()) { if (!txt.isEmpty()) {

6
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -302,7 +302,7 @@ void tst_QHostInfo::lookupIPv4()
QStringList expected = addresses.split(' '); QStringList expected = addresses.split(' ');
expected.sort(); expected.sort();
QCOMPARE(tmp.join(" "), expected.join(" ")); QCOMPARE(tmp.join(' '), expected.join(' '));
} }
void tst_QHostInfo::lookupIPv6_data() void tst_QHostInfo::lookupIPv6_data()
@ -349,7 +349,7 @@ void tst_QHostInfo::lookupIPv6()
QStringList expected = addresses.split(' '); QStringList expected = addresses.split(' ');
expected.sort(); expected.sort();
QCOMPARE(tmp.join(" ").toLower(), expected.join(" ").toLower()); QCOMPARE(tmp.join(' ').toLower(), expected.join(' ').toLower());
} }
void tst_QHostInfo::reverseLookup_data() void tst_QHostInfo::reverseLookup_data()
@ -414,7 +414,7 @@ void tst_QHostInfo::blockingLookup()
QStringList expected = addresses.split(' '); QStringList expected = addresses.split(' ');
expected.sort(); expected.sort();
QCOMPARE(tmp.join(" ").toUpper(), expected.join(" ").toUpper()); QCOMPARE(tmp.join(' ').toUpper(), expected.join(' ').toUpper());
} }
void tst_QHostInfo::raceCondition() void tst_QHostInfo::raceCondition()