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

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

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: I052a3412a568ad639f2bf169b4491b56dddff1c7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Thiago Macieira 2012-05-02 16:32:26 +02:00 committed by Qt by Nokia
parent f28ba2be97
commit a637a5ae29
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbus/qdbusextratypes.h
View File

@ -123,7 +123,7 @@ private:
}; };
inline QDBusSignature::QDBusSignature(const char *dBusSignature) inline QDBusSignature::QDBusSignature(const char *dBusSignature)
: m_signature(QString::fromAscii(dBusSignature)) : m_signature(QString::fromLatin1(dBusSignature))
{ doCheck(); } { doCheck(); }
inline QDBusSignature::QDBusSignature(const QLatin1String &dBusSignature) inline QDBusSignature::QDBusSignature(const QLatin1String &dBusSignature)

2
tests/auto/tools/qdbuscpp2xml/tst_qdbuscpp2xml.cpp
View File

@ -153,7 +153,7 @@ void tst_qdbuscpp2xml::qdbuscpp2xml()
} }
const QChar cr = QLatin1Char('\r'); const QChar cr = QLatin1Char('\r');
const QString err = QString::fromLocal8Bit(process.readAllStandardError()).remove(cr); 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()) { if (!err.isEmpty()) {
qDebug() << "UNEXPECTED STDERR CONTENTS: " << err; qDebug() << "UNEXPECTED STDERR CONTENTS: " << err;

4
tests/benchmarks/dbus/qdbusperformance/tst_qdbusperformance.cpp
View File

@ -168,13 +168,13 @@ void tst_QDBusPerformance::oneWay_data()
QByteArray ba(256, 'a'); QByteArray ba(256, 'a');
while (ba.size() < 8193) { 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; ba += ba;
} }
QString s(256, QLatin1Char('a')); QString s(256, QLatin1Char('a'));
while (s.size() < 8193) { 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; s += s;
} }
} }