feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Utils::SkipEmptyParts instead of the deprecated one in QString

Browse Source 
- Qt 5.14 introduced Qt::Keep/SkipEmptyParts and deprecated these in
QString namespace.
- Qt Creator defined Utils::SkipEmptyParts conditional on the Qt version,
so we use that for flexibility.
- Remove any explicit references to QString::KeepEmptyParts, as it's a
default value.

Change-Id: I72c65e4901ebc4c5422d4835e63fe23fb6ef28ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Artur Shepilko
2020-07-18 11:52:03 -05:00
parent a8c30c9253
commit 1e3721c874
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/fossil/fossilclient.cpp
View File

@@ -39,6 +39,7 @@
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/utilsicons.h>
#include <QSyntaxHighlighter>
@@ -282,7 +283,7 @@ QList<BranchInfo> FossilClient::branchListFromOutput(const QString &output, cons
// Branch list format:
// " branch-name"
// "* current-branch"
return Utils::transform(output.split('\n', QString::SkipEmptyParts), [=](const QString& l) {
return Utils::transform(output.split('\n', Utils::SkipEmptyParts), [=](const QString& l) {
const QString &name = l.mid(2);
QTC_ASSERT(!name.isEmpty(), return BranchInfo());
const BranchInfo::BranchFlags flags = (l.startsWith("* ") ? defaultFlags | BranchInfo::Current : defaultFlags);
@@ -395,7 +396,7 @@ RevisionInfo FossilClient::synchronousRevisionQuery(const QString &workingDirect
const QString hashToken =
QString::fromUtf8(supportedFeatures().testFlag(InfoHashFeature) ? "hash: " : "uuid: ");
for (const QString &l : output.split('\n', QString::SkipEmptyParts)) {
for (const QString &l : output.split('\n', Utils::SkipEmptyParts)) {
if (l.startsWith("checkout: ", Qt::CaseInsensitive)
|| l.startsWith(hashToken, Qt::CaseInsensitive)) {
const QRegularExpressionMatch idMatch = idRx.match(l);
@@ -446,7 +447,7 @@ QStringList FossilClient::synchronousTagQuery(const QString &workingDirectory, c
const QString output = sanitizeFossilOutput(response.stdOut());
return output.split('\n', QString::SkipEmptyParts);
return output.split('\n', Utils::SkipEmptyParts);
}
RepositorySettings FossilClient::synchronousSettingsQuery(const QString &workingDirectory)
@@ -468,12 +469,12 @@ RepositorySettings FossilClient::synchronousSettingsQuery(const QString &working
const QString output = sanitizeFossilOutput(response.stdOut());
for (const QString &line : output.split('\n', QString::SkipEmptyParts)) {
for (const QString &line : output.split('\n', Utils::SkipEmptyParts)) {
// parse settings line:
// <property> <(local|global)> <value>
// Fossil properties are case-insensitive; force them to lower-case.
// Values may be in mixed-case; force lower-case for fixed values.
const QStringList fields = line.split(' ', QString::SkipEmptyParts);
const QStringList fields = line.split(' ', Utils::SkipEmptyParts);
const QString property = fields.at(0).toLower();
const QString value = (fields.size() >= 3 ? fields.at(2) : QString());