From c00bd8d6776e95283831db1c14b7d23ac6be5840 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 18 May 2012 20:00:23 +0200 Subject: [PATCH] Use QStringList::join(QChar) overload where applicable [QtCore] This is an automated change performing the following replacements: join\("(.)"\) -> join('\1') join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1')) join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1')) Change-Id: I81c378ef6aeeada5e116f1394cc9fc67f901ffd6 Reviewed-by: Marc Mutz --- src/corelib/io/qdir.cpp | 6 +++--- src/corelib/io/qiodevice.cpp | 2 +- src/corelib/io/qsettings_mac.cpp | 2 +- tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 2 +- tests/auto/corelib/tools/qsharedpointer/externaltests.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index dd3c10d..5463ada 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -2255,7 +2255,7 @@ QDebug operator<<(QDebug debug, QDir::Filters filters) if (filters & QDir::System) flags << QLatin1String("System"); if (filters & QDir::CaseSensitive) flags << QLatin1String("CaseSensitive"); } - debug << "QDir::Filters(" << qPrintable(flags.join(QLatin1String("|"))) << ')'; + debug << "QDir::Filters(" << qPrintable(flags.join(QLatin1Char('|'))) << ')'; return debug; } @@ -2278,7 +2278,7 @@ static QDebug operator<<(QDebug debug, QDir::SortFlags sorting) if (sorting & QDir::Type) flags << QLatin1String("Type"); debug << "QDir::SortFlags(" << qPrintable(type) << '|' - << qPrintable(flags.join(QLatin1String("|"))) << ')'; + << qPrintable(flags.join(QLatin1Char('|'))) << ')'; } return debug; } @@ -2287,7 +2287,7 @@ QDebug operator<<(QDebug debug, const QDir &dir) { debug.maybeSpace() << "QDir(" << dir.path() << ", nameFilters = {" - << qPrintable(dir.nameFilters().join(QLatin1String(","))) + << qPrintable(dir.nameFilters().join(QLatin1Char(','))) << "}, " << dir.sorting() << ',' diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index aee240b..6901bff 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1687,7 +1687,7 @@ QDebug operator<<(QDebug debug, QIODevice::OpenMode modes) modeList << QLatin1String("Unbuffered"); } qSort(modeList); - debug << modeList.join(QLatin1String("|")); + debug << modeList.join(QLatin1Char('|')); debug << ')'; return debug; } diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index 8957b1b..4f6902d 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -399,7 +399,7 @@ QMacSettingsPrivate::QMacSettingsPrivate(QSettings::Scope scope, const QString & const QString &bundle_identifier_component = bundle_identifier_components.at(i); bundle_identifier_components_reversed.push_front(bundle_identifier_component); } - domainName = bundle_identifier_components_reversed.join(QLatin1String(".")); + domainName = bundle_identifier_components_reversed.join(QLatin1Char('.')); } } } diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index f71ff32..b731eaf 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -581,7 +581,7 @@ void tst_QMimeDatabase::suffixes() expectedPatterns.sort(); QStringList mimePatterns = mime.globPatterns(); mimePatterns.sort(); - QCOMPARE(mimePatterns.join(QLatin1String(";")), expectedPatterns.join(QLatin1String(";"))); + QCOMPARE(mimePatterns.join(QLatin1Char(';')), expectedPatterns.join(QLatin1Char(';'))); QCOMPARE(mime.preferredSuffix(), preferredSuffix); } diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp index c6a068d..c229441 100644 --- a/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp +++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.cpp @@ -488,7 +488,7 @@ namespace QTest { projectFile.write("\nCONFIG += release\n"); #endif - QByteArray extraSources = QFile::encodeName(extraProgramSources.join(" ")); + QByteArray extraSources = QFile::encodeName(extraProgramSources.join(' ')); if (!extraSources.isEmpty()) { projectFile.write("SOURCES += "); projectFile.write(extraSources); -- 2.7.4