diff options
| author | hjk <hjk@qt.io> | 2021-08-12 08:23:23 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-08-17 07:52:42 +0000 |
| commit | 632b7258216a8555748b75c163db20d66a8df40c (patch) | |
| tree | 3297728a617ffb8f08958d529f8975f7fb06b929 /src/plugins/git/gerrit/gerritserver.cpp | |
| parent | bbde6ac9bf1ac3cee0d87ff526783fd9a50c91a7 (diff) | |
| download | qt-creator-632b7258216a8555748b75c163db20d66a8df40c.tar.gz | |
Git: Proliferate FilePath use in GerritModel a bit
Plus some code cosmetics.
Change-Id: Idc07e881c09cbc7347396ef1bb60cce00539250c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gerrit/gerritserver.cpp')
| -rw-r--r-- | src/plugins/git/gerrit/gerritserver.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp index 8e10ec3443..efc1d02520 100644 --- a/src/plugins/git/gerrit/gerritserver.cpp +++ b/src/plugins/git/gerrit/gerritserver.cpp @@ -161,7 +161,7 @@ bool GerritServer::fillFromRemote(const QString &remote, return true; } curlBinary = parameters.curl; - if (curlBinary.isEmpty() || !QFile::exists(curlBinary)) + if (curlBinary.isEmpty() || !curlBinary.exists()) return false; const StoredHostValidity validity = forceReload ? Invalid : loadSettings(); switch (validity) { @@ -245,7 +245,7 @@ int GerritServer::testConnection() static GitClient *const client = GitClient::instance(); const QStringList arguments = curlArguments() << (url(RestUrl) + accountUrlC); QtcProcess proc; - client->vcsFullySynchronousExec(proc, {}, {FilePath::fromString(curlBinary), arguments}, + client->vcsFullySynchronousExec(proc, {}, {curlBinary, arguments}, Core::ShellCommand::NoOutput); if (proc.result() == QtcProcess::FinishedWithSuccess) { QString output = proc.stdOut(); @@ -346,15 +346,14 @@ void GerritServer::resolveVersion(const GerritParameters &p, bool forceReload) if (port) arguments << p.portFlag << QString::number(port); arguments << hostArgument() << "gerrit" << "version"; - client->vcsFullySynchronousExec(proc, {}, {FilePath::fromString(p.ssh), arguments}, - Core::ShellCommand::NoOutput); + client->vcsFullySynchronousExec(proc, {}, {p.ssh, arguments}, Core::ShellCommand::NoOutput); QString stdOut = proc.stdOut().trimmed(); stdOut.remove("gerrit version "); version = stdOut; } else { const QStringList arguments = curlArguments() << (url(RestUrl) + versionUrlC); QtcProcess proc; - client->vcsFullySynchronousExec(proc, {}, {FilePath::fromString(curlBinary), arguments}, + client->vcsFullySynchronousExec(proc, {}, {curlBinary, arguments}, Core::ShellCommand::NoOutput); // REST endpoint for version is only available from 2.8 and up. Do not consider invalid // if it fails. |