diff options
| author | hjk <hjk@qt.io> | 2019-06-07 15:27:50 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-06-11 11:01:16 +0000 |
| commit | 00b692e67e5fcfb4946d1da8094b05c9bf5f35ad (patch) | |
| tree | 0f426c84a628cc3474b8ac85ee8a74eb04cc8fff /src/plugins/git/gerrit | |
| parent | 749eaaad81145072181a42aaf007ada71816cf3b (diff) | |
Utils: Use CommandLine in ShellCommand
... and adapt users.
Change-Id: I218523ffe34720d5fe199aa0ca6892a8dc2985fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gerrit')
| -rw-r--r-- | src/plugins/git/gerrit/gerritmodel.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritserver.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index ea3e311b525..0e6fcac3d5d 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -315,7 +315,7 @@ void QueryContext::start() m_progress.reportStarted(); // Order: synchronous call to error handling if something goes wrong. VcsOutputWindow::appendCommand( - m_process.workingDirectory(), Utils::FilePath::fromString(m_binary), m_arguments); + m_process.workingDirectory(), {Utils::FilePath::fromString(m_binary), m_arguments}); m_timer.start(); m_process.start(m_binary, m_arguments); m_process.closeWriteChannel(); diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 7dfdc5de61f..f0aebf59d89 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -170,7 +170,7 @@ void FetchContext::start() m_progress.reportStarted(); // Order: initialize future before starting the process in case error handling is invoked. const QStringList args = m_change->gitFetchArguments(m_server); - VcsBase::VcsOutputWindow::appendCommand(m_repository, m_git, args); + VcsBase::VcsOutputWindow::appendCommand(m_repository, {m_git, args}); m_process.start(m_git.toString(), args); m_process.closeWriteChannel(); } diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp index c07f22adcc2..327ccf565b4 100644 --- a/src/plugins/git/gerrit/gerritserver.cpp +++ b/src/plugins/git/gerrit/gerritserver.cpp @@ -243,7 +243,7 @@ int GerritServer::testConnection() static GitClient *const client = GitPlugin::client(); const QStringList arguments = curlArguments() << (url(RestUrl) + accountUrlC); const SynchronousProcessResponse resp = client->vcsFullySynchronousExec( - QString(), FilePath::fromString(curlBinary), arguments, + QString(), {FilePath::fromString(curlBinary), arguments}, Core::ShellCommand::NoOutput); if (resp.result == SynchronousProcessResponse::Finished) { QString output = resp.stdOut(); @@ -345,7 +345,7 @@ void GerritServer::resolveVersion(const GerritParameters &p, bool forceReload) arguments << p.portFlag << QString::number(port); arguments << hostArgument() << "gerrit" << "version"; const SynchronousProcessResponse resp = client->vcsFullySynchronousExec( - QString(), FilePath::fromString(p.ssh), arguments, + QString(), {FilePath::fromString(p.ssh), arguments}, Core::ShellCommand::NoOutput); QString stdOut = resp.stdOut().trimmed(); stdOut.remove("gerrit version "); @@ -353,7 +353,7 @@ void GerritServer::resolveVersion(const GerritParameters &p, bool forceReload) } else { const QStringList arguments = curlArguments() << (url(RestUrl) + versionUrlC); const SynchronousProcessResponse resp = client->vcsFullySynchronousExec( - QString(), FilePath::fromString(curlBinary), arguments, + QString(), {FilePath::fromString(curlBinary), arguments}, Core::ShellCommand::NoOutput); // REST endpoint for version is only available from 2.8 and up. Do not consider invalid // if it fails. |