From 0a1ac481ede9499e8cd86148c4195109e06d6431 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 29 Jul 2022 14:41:15 +0200
Subject: 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>
---
 src/plugins/subversion/subversionclient.cpp | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/plugins/subversion/subversionclient.cpp')

diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 93b92de83e..511f3ea757 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -39,10 +39,10 @@
 #include <diffeditor/diffutils.h>
 
 #include <utils/algorithm.h>
+#include <utils/commandline.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
-#include <utils/qtcprocess.h>
 #include <utils/shellcommand.h>
 
 #include <QDir>
@@ -83,18 +83,19 @@ bool SubversionClient::doCommit(const FilePath &repositoryRoot,
                                 const QString &commitMessageFile,
                                 const QStringList &extraOptions) const
 {
-    const QStringList svnExtraOptions =
-            QStringList(extraOptions)
-            << SubversionClient::addAuthenticationOptions(static_cast<SubversionSettings &>(settings()))
-            << QLatin1String(Constants::NON_INTERACTIVE_OPTION)
-            << QLatin1String("--encoding") << QLatin1String("UTF-8")
-            << QLatin1String("--file") << commitMessageFile;
-
-    QStringList args(vcsCommandString(CommitCommand));
-    QtcProcess proc;
-    vcsSynchronousExec(proc, repositoryRoot, args << svnExtraOptions << escapeFiles(files),
+    QStringList args;
+    args << vcsCommandString(CommitCommand)
+         << extraOptions
+         << SubversionClient::addAuthenticationOptions(static_cast<SubversionSettings &>(settings()))
+         << QLatin1String(Constants::NON_INTERACTIVE_OPTION)
+         << QLatin1String("--encoding")
+         << QLatin1String("UTF-8")
+         << QLatin1String("--file")
+         << commitMessageFile
+         << escapeFiles(files);
+    const CommandResult result = vcsSynchronousExec(repositoryRoot, args,
                        ShellCommand::ShowStdOut | ShellCommand::NoFullySync);
-    return proc.result() == ProcessResult::FinishedWithSuccess;
+    return result.result() == ProcessResult::FinishedWithSuccess;
 }
 
 void SubversionClient::commit(const FilePath &repositoryRoot,
@@ -151,12 +152,11 @@ QString SubversionClient::synchronousTopic(const FilePath &repository) const
     else
         svnVersionBinary = svnVersionBinary.left(pos + 1);
     svnVersionBinary.append(HostOsInfo::withExecutableSuffix("svnversion"));
-    QtcProcess proc;
-    vcsFullySynchronousExec(proc, repository, {FilePath::fromString(svnVersionBinary), args});
-    if (proc.result() != ProcessResult::FinishedWithSuccess)
-        return QString();
-
-    return proc.cleanedStdOut().trimmed();
+    const CommandResult result = vcsFullySynchronousExec(repository,
+                                 {FilePath::fromString(svnVersionBinary), args});
+    if (result.result() == ProcessResult::FinishedWithSuccess)
+        return result.cleanedStdOut().trimmed();
+    return {};
 }
 
 QString SubversionClient::escapeFile(const QString &file)
-- 
cgit v1.2.1