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

GitBaseDiffEditorController: Use cleanedStdOut()

Browse Source 
Instead of connecting to stdOutText() signal.

Change-Id: Ia9d1d38934e254a8824620947a409fc52f7f531f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-09-19 08:57:24 +02:00
parent 3978cdde6c
commit eda8a4244f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ void GitBaseDiffEditorController::updateBranchList()
VcsCommand *command = m_instance->vcsExec(baseDirectory(), VcsCommand *command = m_instance->vcsExec(baseDirectory(),
{"branch", noColorOption, "-a", "--contains", revision}); {"branch", noColorOption, "-a", "--contains", revision});
connect(command, &VcsCommand::stdOutText, this, [this](const QString &text) { connect(command, &VcsCommand::finished, this, [this, command] {
const QString remotePrefix = "remotes/"; const QString remotePrefix = "remotes/";
const QString localPrefix = "<Local>"; const QString localPrefix = "<Local>";
const int prefixLength = remotePrefix.length(); const int prefixLength = remotePrefix.length();
@@ -328,7 +328,7 @@ void GitBaseDiffEditorController::updateBranchList()
QStringList branches; QStringList branches;
QString previousRemote = localPrefix; QString previousRemote = localPrefix;
bool first = true; bool first = true;
for (const QString &branch : text.split('\n')) { for (const QString &branch : command->cleanedStdOut().split('\n')) {
const QString b = branch.mid(2).trimmed(); const QString b = branch.mid(2).trimmed();
if (b.isEmpty()) if (b.isEmpty())
continue; continue;