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

Core: Use Qt::SplitBehavior in preference to QString::SplitBehavior

Browse Source 
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.

Change-Id: I446f9ddc8f8de4a0b79b09edb44f7c1496fbc33f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Edward Welbourne 2020-02-25 17:18:29 +01:00
parent 8c613ed74b
commit 00f0863cbe
17 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qdir.cpp
View File

@ -867,8 +867,8 @@ QString QDir::relativeFilePath(const QString &fileName) const
#endif #endif
QString result; QString result;
QVector<QStringRef> dirElts = dir.splitRef(QLatin1Char('/'), QString::SkipEmptyParts); QVector<QStringRef> dirElts = dir.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts);
QVector<QStringRef> fileElts = file.splitRef(QLatin1Char('/'), QString::SkipEmptyParts); QVector<QStringRef> fileElts = file.splitRef(QLatin1Char('/'), Qt::SkipEmptyParts);
int i = 0; int i = 0;
while (i < dirElts.size() && i < fileElts.size() && while (i < dirElts.size() && i < fileElts.size() &&

2
src/corelib/io/qfileselector.cpp
View File

@ -324,7 +324,7 @@ void QFileSelectorPrivate::updateSelectors()
QLatin1Char pathSep(','); QLatin1Char pathSep(',');
QStringList envSelectors = QString::fromLatin1(qgetenv("QT_FILE_SELECTORS")) QStringList envSelectors = QString::fromLatin1(qgetenv("QT_FILE_SELECTORS"))
.split(pathSep, QString::SkipEmptyParts); .split(pathSep, Qt::SkipEmptyParts);
if (envSelectors.count()) if (envSelectors.count())
sharedData->staticSelectors << envSelectors; sharedData->staticSelectors << envSelectors;

2
src/corelib/io/qfilesystemengine_win.cpp
View File

@ -394,7 +394,7 @@ static QString readLink(const QFileSystemEntry &link)
static bool uncShareExists(const QString &server) static bool uncShareExists(const QString &server)
{ {
// This code assumes the UNC path is always like \\?\UNC\server... // This code assumes the UNC path is always like \\?\UNC\server...
const QVector<QStringRef> parts = server.splitRef(QLatin1Char('\\'), QString::SkipEmptyParts); const QVector<QStringRef> parts = server.splitRef(QLatin1Char('\\'), Qt::SkipEmptyParts);
if (parts.count() >= 3) { if (parts.count() >= 3) {
QStringList shares; QStringList shares;
if (QFileSystemEngine::uncListSharesOnServer(QLatin1String("\\\\") + parts.at(2), &shares)) if (QFileSystemEngine::uncListSharesOnServer(QLatin1String("\\\\") + parts.at(2), &shares))

2
src/corelib/io/qfilesystemiterator_win.cpp
View File

@ -101,7 +101,7 @@ bool QFileSystemIterator::advance(QFileSystemEntry &fileEntry, QFileSystemMetaDa
FINDEX_SEARCH_OPS(searchOps), 0, dwAdditionalFlags); FINDEX_SEARCH_OPS(searchOps), 0, dwAdditionalFlags);
if (findFileHandle == INVALID_HANDLE_VALUE) { if (findFileHandle == INVALID_HANDLE_VALUE) {
if (nativePath.startsWith(QLatin1String("\\\\?\\UNC\\"))) { if (nativePath.startsWith(QLatin1String("\\\\?\\UNC\\"))) {
const QVector<QStringRef> parts = nativePath.splitRef(QLatin1Char('\\'), QString::SkipEmptyParts); const QVector<QStringRef> parts = nativePath.splitRef(QLatin1Char('\\'), Qt::SkipEmptyParts);
if (parts.count() == 4 && QFileSystemEngine::uncListSharesOnServer( if (parts.count() == 4 && QFileSystemEngine::uncListSharesOnServer(
QLatin1String("\\\\") + parts.at(2), &uncShares)) { QLatin1String("\\\\") + parts.at(2), &uncShares)) {
if (uncShares.isEmpty()) if (uncShares.isEmpty())

2
src/corelib/io/qsettings_winrt.cpp
View File

@ -646,7 +646,7 @@ IApplicationDataContainer *QWinRTSettingsPrivate::getContainer(IApplicationDataC
IApplicationDataContainer *current = parent; IApplicationDataContainer *current = parent;
if (group.isEmpty()) if (group.isEmpty())
return current; return current;
const QStringList groupPath = group.split(QLatin1Char('/'), QString::SkipEmptyParts); const QStringList groupPath = group.split(QLatin1Char('/'), Qt::SkipEmptyParts);
for (const QString &subGroup : groupPath) { for (const QString &subGroup : groupPath) {
ComPtr<IApplicationDataContainer> sub = subContainer(current, subGroup); ComPtr<IApplicationDataContainer> sub = subContainer(current, subGroup);

3
src/corelib/io/qstandardpaths.cpp
View File

@ -510,7 +510,8 @@ QString QStandardPaths::findExecutable(const QString &executableName, const QStr
} }
// Remove trailing slashes, which occur on Windows. // Remove trailing slashes, which occur on Windows.
const QStringList rawPaths = QString::fromLocal8Bit(pEnv.constData()).split(QDir::listSeparator(), QString::SkipEmptyParts); const QStringList rawPaths = QString::fromLocal8Bit(pEnv.constData()).split(
QDir::listSeparator(), Qt::SkipEmptyParts);
searchPaths.reserve(rawPaths.size()); searchPaths.reserve(rawPaths.size());
for (const QString &rawPath : rawPaths) { for (const QString &rawPath : rawPaths) {
QString cleanPath = QDir::cleanPath(rawPath); QString cleanPath = QDir::cleanPath(rawPath);

2
src/corelib/io/qstandardpaths_unix.cpp
View File

@ -283,7 +283,7 @@ static QStringList xdgDataDirs()
dirs.append(QString::fromLatin1("/usr/local/share")); dirs.append(QString::fromLatin1("/usr/local/share"));
dirs.append(QString::fromLatin1("/usr/share")); dirs.append(QString::fromLatin1("/usr/share"));
} else { } else {
const auto parts = xdgDataDirsEnv.splitRef(QLatin1Char(':'), QString::SkipEmptyParts); const auto parts = xdgDataDirsEnv.splitRef(QLatin1Char(':'), Qt::SkipEmptyParts);
// Normalize paths, skip relative paths // Normalize paths, skip relative paths
for (const QStringRef &dir : parts) { for (const QStringRef &dir : parts) {

2
src/corelib/io/qtldurl.cpp
View File

@ -95,7 +95,7 @@ static bool containsTLDEntry(QStringView entry, TLDMatchType match)
Q_CORE_EXPORT QString qTopLevelDomain(const QString &domain) Q_CORE_EXPORT QString qTopLevelDomain(const QString &domain)
{ {
const QString domainLower = domain.toLower(); const QString domainLower = domain.toLower();
QVector<QStringRef> sections = domainLower.splitRef(QLatin1Char('.'), QString::SkipEmptyParts); QVector<QStringRef> sections = domainLower.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts);
if (sections.isEmpty()) if (sections.isEmpty())
return QString(); return QString();

2
src/corelib/kernel/qcoreapplication.cpp
View File

@ -2693,7 +2693,7 @@ QStringList QCoreApplication::libraryPathsLocked()
auto setPathsFromEnv = [&](QString libPathEnv) { auto setPathsFromEnv = [&](QString libPathEnv) {
if (!libPathEnv.isEmpty()) { if (!libPathEnv.isEmpty()) {
QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts);
for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
QString canonicalPath = QDir(*it).canonicalPath(); QString canonicalPath = QDir(*it).canonicalPath();
if (!canonicalPath.isEmpty() if (!canonicalPath.isEmpty()

2
src/corelib/plugin/qsystemlibrary.cpp
View File

@ -109,7 +109,7 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect
if (!onlySystemDirectory) { if (!onlySystemDirectory) {
const QString PATH(QLatin1String(qgetenv("PATH").constData())); const QString PATH(QLatin1String(qgetenv("PATH").constData()));
searchOrder << PATH.split(QLatin1Char(';'), QString::SkipEmptyParts); searchOrder << PATH.split(QLatin1Char(';'), Qt::SkipEmptyParts);
} }
QString fileName = QString::fromWCharArray(libraryName); QString fileName = QString::fromWCharArray(libraryName);
fileName.append(QLatin1String(".dll")); fileName.append(QLatin1String(".dll"));

4
src/corelib/time/qdatetime.cpp
View File

@ -1686,7 +1686,7 @@ QT_WARNING_POP
return rfcDateImpl(string).date; return rfcDateImpl(string).date;
default: default:
case Qt::TextDate: { case Qt::TextDate: {
QVector<QStringRef> parts = string.splitRef(QLatin1Char(' '), QString::SkipEmptyParts); QVector<QStringRef> parts = string.splitRef(QLatin1Char(' '), Qt::SkipEmptyParts);
if (parts.count() != 4) if (parts.count() != 4)
return QDate(); return QDate();
@ -5341,7 +5341,7 @@ QT_WARNING_POP
return QDateTime(date, time, spec, offset); return QDateTime(date, time, spec, offset);
} }
case Qt::TextDate: { case Qt::TextDate: {
QVector<QStringRef> parts = string.splitRef(QLatin1Char(' '), QString::SkipEmptyParts); QVector<QStringRef> parts = string.splitRef(QLatin1Char(' '), Qt::SkipEmptyParts);
if ((parts.count() < 5) || (parts.count() > 6)) if ((parts.count() < 5) || (parts.count() > 6))
return QDateTime(); return QDateTime();

4
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -1786,9 +1786,9 @@ void tst_QDir::searchPaths()
{ {
QFETCH(QString, filename); QFETCH(QString, filename);
QFETCH(QString, searchPathPrefixes); QFETCH(QString, searchPathPrefixes);
QStringList searchPathPrefixList = searchPathPrefixes.split(";", QString::SkipEmptyParts); QStringList searchPathPrefixList = searchPathPrefixes.split(";", Qt::SkipEmptyParts);
QFETCH(QString, searchPaths); QFETCH(QString, searchPaths);
QStringList searchPathsList = searchPaths.split(";", QString::SkipEmptyParts); QStringList searchPathsList = searchPaths.split(";", Qt::SkipEmptyParts);
QFETCH(QString, expectedAbsolutePath); QFETCH(QString, expectedAbsolutePath);
bool exists = !expectedAbsolutePath.isEmpty(); bool exists = !expectedAbsolutePath.isEmpty();

4
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -2439,7 +2439,7 @@ void tst_QProcess::finishProcessBeforeReadingDone()
QVERIFY(process.waitForStarted()); QVERIFY(process.waitForStarted());
loop.exec(); loop.exec();
QStringList lines = QString::fromLocal8Bit(process.readAllStandardOutput()).split( QStringList lines = QString::fromLocal8Bit(process.readAllStandardOutput()).split(
QRegExp(QStringLiteral("[\r\n]")), QString::SkipEmptyParts); QRegExp(QStringLiteral("[\r\n]")), Qt::SkipEmptyParts);
QVERIFY(!lines.isEmpty()); QVERIFY(!lines.isEmpty());
QCOMPARE(lines.last(), QStringLiteral("10239 -this is a number")); QCOMPARE(lines.last(), QStringLiteral("10239 -this is a number"));
QCOMPARE(process.exitStatus(), QProcess::NormalExit); QCOMPARE(process.exitStatus(), QProcess::NormalExit);
@ -2671,7 +2671,7 @@ void tst_QProcess::finishProcessBeforeReadingDone_deprecated()
QVERIFY(process.waitForStarted()); QVERIFY(process.waitForStarted());
loop.exec(); loop.exec();
QStringList lines = QString::fromLocal8Bit(process.readAllStandardOutput()).split( QStringList lines = QString::fromLocal8Bit(process.readAllStandardOutput()).split(
QRegExp(QStringLiteral("[\r\n]")), QString::SkipEmptyParts); QRegExp(QStringLiteral("[\r\n]")), Qt::SkipEmptyParts);
QVERIFY(!lines.isEmpty()); QVERIFY(!lines.isEmpty());
QCOMPARE(lines.last(), QStringLiteral("10239 -this is a number")); QCOMPARE(lines.last(), QStringLiteral("10239 -this is a number"));
QCOMPARE(process.exitStatus(), QProcess::NormalExit); QCOMPARE(process.exitStatus(), QProcess::NormalExit);

2
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
View File

@ -360,7 +360,7 @@ static inline QFileInfo findSh()
QLatin1String sh("/sh"); QLatin1String sh("/sh");
QByteArray pEnv = qgetenv("PATH"); QByteArray pEnv = qgetenv("PATH");
const QLatin1Char pathSep(':'); const QLatin1Char pathSep(':');
const QStringList rawPaths = QString::fromLocal8Bit(pEnv.constData()).split(pathSep, QString::SkipEmptyParts); const QStringList rawPaths = QString::fromLocal8Bit(pEnv.constData()).split(pathSep, Qt::SkipEmptyParts);
foreach (const QString &path, rawPaths) { foreach (const QString &path, rawPaths) {
if (QFile::exists(path + sh)) if (QFile::exists(path + sh))
return path + sh; return path + sh;

4
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
View File

@ -427,7 +427,7 @@ void tst_QMimeDatabase::listAliases()
QFETCH(QString, inputMime); QFETCH(QString, inputMime);
QFETCH(QString, expectedAliases); QFETCH(QString, expectedAliases);
QMimeDatabase db; QMimeDatabase db;
QStringList expectedAliasesList = expectedAliases.split(',', QString::SkipEmptyParts); QStringList expectedAliasesList = expectedAliases.split(',', Qt::SkipEmptyParts);
expectedAliasesList.sort(); expectedAliasesList.sort();
QMimeType mime = db.mimeTypeForName(inputMime); QMimeType mime = db.mimeTypeForName(inputMime);
QVERIFY(mime.isValid()); QVERIFY(mime.isValid());
@ -715,7 +715,7 @@ void tst_QMimeDatabase::findByFileName_data()
continue; continue;
QString string = QString::fromLatin1(line.constData(), len - 1).trimmed(); QString string = QString::fromLatin1(line.constData(), len - 1).trimmed();
QStringList list = string.split(QLatin1Char(' '), QString::SkipEmptyParts); QStringList list = string.split(QLatin1Char(' '), Qt::SkipEmptyParts);
QVERIFY(list.size() >= 2); QVERIFY(list.size() >= 2);
QString filePath = list.at(0); QString filePath = list.at(0);

8
tests/auto/corelib/text/qstringref/tst_qstringref.cpp
View File

@ -2161,18 +2161,18 @@ void tst_QStringRef::split()
QVERIFY(list == result); QVERIFY(list == result);
} }
list = ref.split(sep, QString::KeepEmptyParts); list = ref.split(sep, Qt::KeepEmptyParts);
QVERIFY(list == result); QVERIFY(list == result);
if (sep.size() == 1) { if (sep.size() == 1) {
list = ref.split(sep.at(0), QString::KeepEmptyParts); list = ref.split(sep.at(0), Qt::KeepEmptyParts);
QVERIFY(list == result); QVERIFY(list == result);
} }
result.removeAll(""); result.removeAll("");
list = ref.split(sep, QString::SkipEmptyParts); list = ref.split(sep, Qt::SkipEmptyParts);
QVERIFY(list == result); QVERIFY(list == result);
if (sep.size() == 1) { if (sep.size() == 1) {
list = ref.split(sep.at(0), QString::SkipEmptyParts); list = ref.split(sep.at(0), Qt::SkipEmptyParts);
QVERIFY(list == result); QVERIFY(list == result);
} }
} }

4
tests/auto/corelib/text/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
View File

@ -124,7 +124,7 @@ static void generateDataFromFile(const QString &fname)
QString testString; QString testString;
QList<int> expectedBreakPositions; QList<int> expectedBreakPositions;
foreach (const QString &part, test.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts)) { foreach (const QString &part, test.simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts)) {
if (part.size() == 1) { if (part.size() == 1) {
if (part.at(0).unicode() == 0xf7) if (part.at(0).unicode() == 0xf7)
expectedBreakPositions.append(testString.size()); expectedBreakPositions.append(testString.size());
@ -146,7 +146,7 @@ static void generateDataFromFile(const QString &fname)
QVERIFY(!expectedBreakPositions.isEmpty()); QVERIFY(!expectedBreakPositions.isEmpty());
if (!comments.isEmpty()) { if (!comments.isEmpty()) {
const QStringList lst = comments.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts); const QStringList lst = comments.simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts);
comments.clear(); comments.clear();
foreach (const QString &part, lst) { foreach (const QString &part, lst) {
if (part.size() == 1) { if (part.size() == 1) {