From 7a3b2169612e5e6eb6d410543c49864406c1de09 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 23 Feb 2017 15:08:05 +0200 Subject: [PATCH] Gerrit: Minor de-noise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I5ed6fcd8f74b982a7b17d924234bffe7c1a8019b Reviewed-by: André Hartmann --- src/plugins/git/gerrit/gerritparameters.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/git/gerrit/gerritparameters.cpp b/src/plugins/git/gerrit/gerritparameters.cpp index d080c6b2871..3af36dd23b4 100644 --- a/src/plugins/git/gerrit/gerritparameters.cpp +++ b/src/plugins/git/gerrit/gerritparameters.cpp @@ -35,6 +35,8 @@ #include #include +using namespace Utils; + namespace Gerrit { namespace Internal { @@ -62,8 +64,8 @@ static inline QString detectSsh() QString ssh = QStandardPaths::findExecutable(defaultSsh); if (!ssh.isEmpty()) return ssh; - if (Utils::HostOsInfo::isWindowsHost()) { // Windows: Use ssh.exe from git if it cannot be found. - Utils::FileName path = GerritPlugin::gitBinDirectory(); + if (HostOsInfo::isWindowsHost()) { // Windows: Use ssh.exe from git if it cannot be found. + FileName path = GerritPlugin::gitBinDirectory(); if (!path.isEmpty()) ssh = path.appendPath(defaultSsh).toString(); } @@ -95,7 +97,7 @@ void GerritParameters::setPortFlagBySshType() { bool isPlink = false; if (!ssh.isEmpty()) { - const QString version = Utils::PathChooser::toolVersion(ssh, {"-V"}); + const QString version = PathChooser::toolVersion(ssh, {"-V"}); isPlink = version.contains("plink", Qt::CaseInsensitive); } portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag); @@ -129,7 +131,7 @@ bool GerritServer::fillFromRemote(const QString &remote, const QString &defaultU if (remote.isEmpty() || remote.startsWith('/') || remote.startsWith('.')) return false; // On Windows, local paths typically starts with : - if (Utils::HostOsInfo::isWindowsHost() && remote[1] == ':') + if (HostOsInfo::isWindowsHost() && remote[1] == ':') return false; QRegularExpressionMatch match = remotePattern.match(remote); if (!match.hasMatch())