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

Utils: Drop Utils::SkipEmptyParts again

Browse Source 
We require Qt 5.14 nowadays.

Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-21 10:19:36 +02:00
parent c41847ce5d
commit 43b658e9e7
67 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/branchmodel.cpp
View File

@@ -648,7 +648,7 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx)
VcsOutputWindow::appendError(errorMessage);
}
const QStringList lines = output.split('\n', Utils::SkipEmptyParts);
const QStringList lines = output.split('\n', Qt::SkipEmptyParts);
for (const QString &l : lines) {
QString currentBranch = l.mid(2); // remove first letters (those are either
// " " or "* " depending on whether it is

2
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -291,7 +291,7 @@ QString GerritPushDialog::pushTarget() const
if (!topic.isEmpty())
target += '/' + topic;
const QStringList reviewersInput = reviewers().split(',', Utils::SkipEmptyParts);
const QStringList reviewersInput = reviewers().split(',', Qt::SkipEmptyParts);
for (const QString &reviewer : reviewersInput)
options << "r=" + reviewer;

6
src/plugins/git/gitclient.cpp
View File

@@ -851,7 +851,7 @@ QStringList GitClient::unmanagedFiles(const QString &workingDirectory,
if (response.result != SynchronousProcessResponse::Finished)
return filePaths;
const QStringList managedFilePaths
= transform(response.stdOut().split('\0', Utils::SkipEmptyParts),
= transform(response.stdOut().split('\0', Qt::SkipEmptyParts),
[&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
return filtered(filePaths, [&managedFilePaths](const QString &fp) {
return !managedFilePaths.contains(fp);
@@ -3243,7 +3243,7 @@ void GitClient::push(const QString &workingDirectory, const QStringList &pushArg
command->setCookie(NoRemoteBranch);
if (command->cookie().toInt() == NoRemoteBranch) {
const QStringList lines = text.split('\n', Utils::SkipEmptyParts);
const QStringList lines = text.split('\n', Qt::SkipEmptyParts);
for (const QString &line : lines) {
/* Extract the suggested command from the git output which
* should be similar to the following:
@@ -3293,7 +3293,7 @@ void GitClient::push(const QString &workingDirectory, const QStringList &pushArg
QMessageBox::No) == QMessageBox::Yes) {
const QStringList fallbackCommandParts =
m_pushFallbackCommand.split(' ', Utils::SkipEmptyParts);
m_pushFallbackCommand.split(' ', Qt::SkipEmptyParts);
VcsCommand *rePushCommand = vcsExec(workingDirectory,
fallbackCommandParts.mid(1),
nullptr, true, VcsCommand::ShowSuccessMessage);