diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-07-29 14:41:15 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-07-29 14:52:02 +0000 |
commit | 0a1ac481ede9499e8cd86148c4195109e06d6431 (patch) | |
tree | 32110a5e96e09ad8dab7701d02578cbe65d29a0c /src/plugins/bazaar/bazaarclient.cpp | |
parent | 278f33d5210470cfcb82b9a1575722eb06ad2897 (diff) | |
download | qt-creator-0a1ac481ede9499e8cd86148c4195109e06d6431.tar.gz |
ShellCommand: Introduce CommandResult structure
Don't require QtcProcess instance when calling
ShellCommand::runCommand().
Change-Id: Ie0287d91c1807465eab12be7eaa2eac561179af7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/bazaar/bazaarclient.cpp')
-rw-r--r-- | src/plugins/bazaar/bazaarclient.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index ccd91a236f..5dc14d9f64 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -31,7 +31,7 @@ #include <vcsbase/vcsbaseeditorconfig.h> #include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> +#include <utils/shellcommand.h> #include <QDir> #include <QFileInfo> @@ -151,10 +151,9 @@ bool BazaarClient::synchronousUncommit(const FilePath &workingDir, << revisionSpec(revision) << extraOptions; - QtcProcess proc; - vcsFullySynchronousExec(proc, workingDir, args); - VcsOutputWindow::append(proc.cleanedStdOut()); - return proc.result() == ProcessResult::FinishedWithSuccess; + const CommandResult result = vcsFullySynchronousExec(workingDir, args); + VcsOutputWindow::append(result.cleanedStdOut()); + return result.result() == ProcessResult::FinishedWithSuccess; } void BazaarClient::commit(const FilePath &repositoryRoot, const QStringList &files, @@ -190,11 +189,10 @@ bool BazaarClient::managesFile(const FilePath &workingDirectory, const QString & QStringList args(QLatin1String("status")); args << fileName; - QtcProcess proc; - vcsFullySynchronousExec(proc, workingDirectory, args); - if (proc.result() != ProcessResult::FinishedWithSuccess) + const CommandResult result = vcsFullySynchronousExec(workingDirectory, args); + if (result.result() != ProcessResult::FinishedWithSuccess) return false; - return proc.rawStdOut().startsWith("unknown"); + return result.rawStdOut().startsWith("unknown"); } void BazaarClient::view(const QString &source, const QString &id, const QStringList &extraOptions) |