diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index 04ff749c1fa..4acfc68d394 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -257,7 +257,6 @@ void ShellCommand::run(QFutureInterface &future) else future.setProgressRange(0, 1); const int count = d->m_jobs.size(); - int lastExecExitCode = -1; bool lastExecSuccess = true; for (int j = 0; j < count; j++) { const Internal::ShellCommandPrivate::Job &job = d->m_jobs.at(j); @@ -267,7 +266,6 @@ void ShellCommand::run(QFutureInterface &future) runCommand(proc, job.command, job.workingDirectory); stdOut += proc.cleanedStdOut(); stdErr += proc.cleanedStdErr(); - lastExecExitCode = proc.exitCode(); lastExecSuccess = proc.result() == ProcessResult::FinishedWithSuccess; if (!lastExecSuccess) break; @@ -280,7 +278,7 @@ void ShellCommand::run(QFutureInterface &future) emit stdErrText(stdErr); } - emit finished(lastExecSuccess, lastExecExitCode, cookie()); + emit finished(lastExecSuccess, cookie()); if (lastExecSuccess) { emit success(cookie()); future.setProgressValue(future.progressMaximum()); diff --git a/src/libs/utils/shellcommand.h b/src/libs/utils/shellcommand.h index a766f6a05b0..f188fd4b4b2 100644 --- a/src/libs/utils/shellcommand.h +++ b/src/libs/utils/shellcommand.h @@ -143,7 +143,7 @@ signals: void stdOutText(const QString &); void stdErrText(const QString &); void started(); - void finished(bool ok, int exitCode, const QVariant &cookie); + void finished(bool success, const QVariant &cookie); void success(const QVariant &cookie); void terminate(); // Internal diff --git a/src/libs/utils/shellcommandpage.cpp b/src/libs/utils/shellcommandpage.cpp index 423fe646230..3d8e49225bc 100644 --- a/src/libs/utils/shellcommandpage.cpp +++ b/src/libs/utils/shellcommandpage.cpp @@ -103,11 +103,10 @@ void ShellCommandPage::start(ShellCommand *command) wizard()->button(QWizard::BackButton)->setEnabled(false); } -void ShellCommandPage::slotFinished(bool ok, int exitCode, const QVariant &) +void ShellCommandPage::slotFinished(bool success, const QVariant &) { QTC_ASSERT(m_state == Running, return); - const bool success = (ok && exitCode == 0); QString message; QPalette palette; diff --git a/src/libs/utils/shellcommandpage.h b/src/libs/utils/shellcommandpage.h index 55a7980d057..40dd07743fb 100644 --- a/src/libs/utils/shellcommandpage.h +++ b/src/libs/utils/shellcommandpage.h @@ -62,7 +62,7 @@ signals: void finished(bool success); private: - void slotFinished(bool ok, int exitCode, const QVariant &cookie); + void slotFinished(bool success, const QVariant &cookie); QPlainTextEdit *m_logPlainTextEdit; OutputFormatter *m_formatter; diff --git a/src/plugins/gitlab/gitlabclonedialog.cpp b/src/plugins/gitlab/gitlabclonedialog.cpp index 3797badcec1..101c7ce5782 100644 --- a/src/plugins/gitlab/gitlabclonedialog.cpp +++ b/src/plugins/gitlab/gitlabclonedialog.cpp @@ -194,9 +194,8 @@ static Utils::FilePaths scanDirectoryForFiles(const Utils::FilePath &directory) return result; } -void GitLabCloneDialog::cloneFinished(bool ok, int exitCode) +void GitLabCloneDialog::cloneFinished(bool success) { - const bool success = (ok && exitCode == 0); m_commandRunning = false; delete m_command; m_command = nullptr; diff --git a/src/plugins/gitlab/gitlabclonedialog.h b/src/plugins/gitlab/gitlabclonedialog.h index c144f1587e2..75bc20b9826 100644 --- a/src/plugins/gitlab/gitlabclonedialog.h +++ b/src/plugins/gitlab/gitlabclonedialog.h @@ -56,7 +56,7 @@ private: void updateUi(); void cloneProject(); void cancel(); - void cloneFinished(bool ok, int exitCode); + void cloneFinished(bool success); QComboBox * m_repositoryCB = nullptr; QCheckBox *m_submodulesCB = nullptr; diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 14fb533e19f..ab8abed121a 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1232,12 +1232,10 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const return rc; } -void VcsBaseEditorWidget::reportCommandFinished(bool ok, int exitCode, const QVariant &data) +void VcsBaseEditorWidget::reportCommandFinished(bool success, const QVariant &data) { - Q_UNUSED(exitCode) - hideProgressIndicator(); - if (!ok) { + if (!success) { textDocument()->setPlainText(tr("Failed to retrieve data.")); } else if (data.type() == QVariant::Int) { const int line = data.toInt(); diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index 51f6f572083..2b573f649cd 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -228,7 +228,7 @@ signals: void diffChunkReverted(const VcsBase::DiffChunk &dc); public slots: - void reportCommandFinished(bool ok, int exitCode, const QVariant &data); + void reportCommandFinished(bool success, const QVariant &data); protected: void contextMenuEvent(QContextMenuEvent *e) override;