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 [other]

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: Ib1eaf42679ab5db4005192c3d00ba79e43edfcca
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Thiago Macieira 2012-05-02 16:32:26 +02:00 committed by Qt by Nokia
parent 276776f503
commit fba4d96750
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/tools/rcc/tst_rcc.cpp
View File

@ -156,7 +156,7 @@ void tst_rcc::rcc()
}
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;
@ -167,7 +167,7 @@ void tst_rcc::rcc()
const QStringList actualLines = out.split(nl);
QVERIFY(expectedFile.open(QIODevice::ReadOnly|QIODevice::Text));
const QStringList expectedLines = QString::fromAscii(expectedFile.readAll()).split(nl);
const QStringList expectedLines = QString::fromLatin1(expectedFile.readAll()).split(nl);
const QString diff = doCompare(actualLines, expectedLines);
if (diff.size())

2
tests/auto/tools/uic/tst_uic.cpp
View File

@ -93,7 +93,7 @@ void tst_uic::initTestCase()
const QStringList outLines = out.split(QLatin1Char('\n'));
// Print version
QString msg = QString::fromLatin1("uic test built %1 running in '%2' using: ").
arg(QString::fromAscii(__DATE__), QDir::currentPath());
arg(QString::fromLatin1(__DATE__), QDir::currentPath());
if (!outLines.empty())
msg += outLines.front();
qDebug() << msg;

28
util/xkbdatagen/main.cpp
View File

@ -476,26 +476,26 @@ int main(int argc, char **argv)
lang = "C";
printf(" // name = %s, description = %s\n"
" { \"%s\", \"\", %s, QLocale::%s, QLocale::%s },\n",
l.name.toAscii().constData(),
l.description.toAscii().constData(),
l.name.toAscii().constData(),
mapDirection(lang).toAscii().constData(),
lang.toAscii().constData(),
country.toAscii().constData());
l.name.toLatin1().constData(),
l.description.toLatin1().constData(),
l.name.toLatin1().constData(),
mapDirection(lang).toLatin1().constData(),
lang.toLatin1().constData(),
country.toLatin1().constData());
foreach (const QString &v, l.variants) {
QString vlang = mapLanguage(l.name + ":" + v);
if (vlang.isEmpty())
vlang = "C";
printf(" // name = %s:%s, description = %s\n"
" { \"%s\", \"%s\", %s, QLocale::%s, QLocale::%s },\n",
l.name.toAscii().constData(),
v.toAscii().constData(),
l.description.toAscii().constData(),
l.name.toAscii().constData(),
v.toAscii().constData(),
mapDirection(vlang).toAscii().constData(),
vlang.toAscii().constData(),
country.toAscii().constData());
l.name.toLatin1().constData(),
v.toLatin1().constData(),
l.description.toLatin1().constData(),
l.name.toLatin1().constData(),
v.toLatin1().constData(),
mapDirection(vlang).toLatin1().constData(),
vlang.toLatin1().constData(),
country.toLatin1().constData());
}
}