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

qtestcase.cpp: s/QString::fromLatin1/QLatin1String/ where viable

Browse Source 
Now that QL1S has its own arg(), we can use that directly instead of
going via QString before calling arg(). Only works in most cases, as
the QL1S::arg() overload set is more limited.

Change-Id: Ie4c566c5998538b1b8a953b1ba4481e0f1663bf7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Edward Welbourne 2022-04-05 16:16:07 +02:00
parent adad2a468d
commit f3184770e2
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/testlib/qtestcase.cpp
View File

@ -446,7 +446,7 @@ static void qPrintTestSlots(FILE *stream, const char *filter = nullptr)
QMetaMethod sl = QTest::currentTestObject->metaObject()->method(i); QMetaMethod sl = QTest::currentTestObject->metaObject()->method(i);
if (isValidSlot(sl)) { if (isValidSlot(sl)) {
const QByteArray signature = sl.methodSignature(); const QByteArray signature = sl.methodSignature();
if (!filter || QString::fromLatin1(signature).contains(QLatin1String(filter), Qt::CaseInsensitive)) if (!filter || QLatin1String(signature).contains(QLatin1String(filter), Qt::CaseInsensitive))
fprintf(stream, "%s\n", signature.constData()); fprintf(stream, "%s\n", signature.constData());
} }
} }
@ -2379,8 +2379,8 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
else if (QTestLog::verboseLevel() >= 2) { else if (QTestLog::verboseLevel() >= 2) {
const QString candidate = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/') + base); const QString candidate = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/') + base);
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found relative to test binary [%2]; " QLatin1String("testdata %1 not found relative to test binary [%2]; "
"checking next location").arg(base, candidate)), "checking next location").arg(base, candidate)),
file, line); file, line);
} }
} }
@ -2390,14 +2390,14 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
const char *testObjectName = QTestResult::currentTestObjectName(); const char *testObjectName = QTestResult::currentTestObjectName();
if (testObjectName) { if (testObjectName) {
const QString testsPath = QLibraryInfo::path(QLibraryInfo::TestsPath); const QString testsPath = QLibraryInfo::path(QLibraryInfo::TestsPath);
const QString candidate = QString::fromLatin1("%1/%2/%3") const QString candidate = QLatin1String("%1/%2/%3")
.arg(testsPath, QFile::decodeName(testObjectName).toLower(), base); .arg(testsPath, QFile::decodeName(testObjectName).toLower(), base);
if (QFileInfo::exists(candidate)) { if (QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) { } else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in tests install path [%2]; " QLatin1String("testdata %1 not found in tests install path [%2]; "
"checking next location") "checking next location")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
@ -2416,12 +2416,12 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
} }
const QString canonicalPath = srcdir.canonicalFilePath(); const QString canonicalPath = srcdir.canonicalFilePath();
const QString candidate = QString::fromLatin1("%1/%2").arg(canonicalPath, base); const QString candidate = QLatin1String("%1/%2").arg(canonicalPath, base);
if (!canonicalPath.isEmpty() && QFileInfo::exists(candidate)) { if (!canonicalPath.isEmpty() && QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) { } else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found relative to source path [%2]") QLatin1String("testdata %1 not found relative to source path [%2]")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
@ -2429,12 +2429,12 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
// 4. Try resources // 4. Try resources
if (found.isEmpty()) { if (found.isEmpty()) {
const QString candidate = QString::fromLatin1(":/%1").arg(base); const QString candidate = QLatin1String(":/%1").arg(base);
if (QFileInfo::exists(candidate)) { if (QFileInfo::exists(candidate)) {
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) { } else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in resources [%2]") QLatin1String("testdata %1 not found in resources [%2]")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
@ -2447,7 +2447,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) { } else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in current directory [%2]") QLatin1String("testdata %1 not found in current directory [%2]")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
@ -2460,7 +2460,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) { } else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in main source directory [%2]") QLatin1String("testdata %1 not found in main source directory [%2]")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
@ -2473,7 +2473,7 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
found = candidate; found = candidate;
} else if (QTestLog::verboseLevel() >= 2) { } else if (QTestLog::verboseLevel() >= 2) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 not found in supplied source directory [%2]") QLatin1String("testdata %1 not found in supplied source directory [%2]")
.arg(base, QDir::toNativeSeparators(candidate))), .arg(base, QDir::toNativeSeparators(candidate))),
file, line); file, line);
} }
@ -2482,11 +2482,11 @@ QString QTest::qFindTestData(const QString& base, const char *file, int line, co
if (found.isEmpty()) { if (found.isEmpty()) {
QTestLog::warn(qPrintable( QTestLog::warn(qPrintable(
QString::fromLatin1("testdata %1 could not be located!").arg(base)), QLatin1String("testdata %1 could not be located!").arg(base)),
file, line); file, line);
} else if (QTestLog::verboseLevel() >= 1) { } else if (QTestLog::verboseLevel() >= 1) {
QTestLog::info(qPrintable( QTestLog::info(qPrintable(
QString::fromLatin1("testdata %1 was located at %2").arg(base, QDir::toNativeSeparators(found))), QLatin1String("testdata %1 was located at %2").arg(base, QDir::toNativeSeparators(found))),
file, line); file, line);
} }