Vcs: Move vcsBinary and vcsTimeout into VcsBaseClientImpl

Change-Id: Ib14432c85f42606a0437f3848b9dfa2fe63fb2f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/git/gerrit/gerritplugin.cpp

@@ -404,12 +404,9 @@ void GerritPlugin::push()
 
 Utils::FileName GerritPlugin::gitBinary()
 {
-    bool ok;
+    const Utils::FileName git = gitClient()->vcsBinary();
-    const Utils::FileName git = gitClient()->vcsBinary(&ok);
+    if (git.isEmpty())
-    if (!ok) {
         VcsBase::VcsOutputWindow::appendError(tr("Git is not available."));
-        return Utils::FileName();
-    }
     return git;
 }
 

src/plugins/git/gitclient.cpp

@@ -2452,9 +2452,11 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
 }
 
 bool GitClient::launchGitGui(const QString &workingDirectory) {
-    bool success;
+    bool success = true;
-    FileName gitBinary = vcsBinary(&success);
+    FileName gitBinary = vcsBinary();
-    if (success) {
+    if (gitBinary.isEmpty()) {
+        success = false;
+    } else {
         success = QProcess::startDetached(gitBinary.toString(), QStringList(QLatin1String("gui")),
                                           workingDirectory);
     }
@@ -2483,14 +2485,13 @@ FileName GitClient::gitBinDirectory()
     return FileName::fromString(path);
 }
 
-FileName GitClient::vcsBinary(bool *ok, QString *errorMessage) const
+FileName GitClient::vcsBinary() const
 {
-    return static_cast<GitSettings &>(settings()).gitExecutable(ok, errorMessage);
+    bool ok;
-}
+    Utils::FileName binary = static_cast<GitSettings &>(settings()).gitExecutable(&ok);
-
+    if (!ok)
-int GitClient::vcsTimeout() const
+        return Utils::FileName();
-{
+    return binary;
-    return settings().intValue(GitSettings::timeoutKey);
 }
 
 QTextCodec *GitClient::encoding(const QString &workingDirectory, const QByteArray &configVar) const

src/plugins/git/gitclient.h

@@ -140,8 +140,7 @@ public:
 
     explicit GitClient();
 
-    Utils::FileName vcsBinary(bool *ok = 0, QString *errorMessage = 0) const;
+    Utils::FileName vcsBinary() const;
-    int vcsTimeout() const;
     unsigned gitVersion(QString *errorMessage = 0) const;
 
     QString findRepositoryForDirectory(const QString &dir) const;

src/plugins/git/gitversioncontrol.cpp

@@ -81,9 +81,7 @@ Core::Id GitVersionControl::id() const
 
 bool GitVersionControl::isConfigured() const
 {
-    bool ok = false;
+    return !m_client->vcsBinary().isEmpty();
-    m_client->vcsBinary(&ok);
-    return ok;
 }
 
 bool GitVersionControl::supportsOperation(Operation operation) const

src/plugins/vcsbase/vcsbaseclient.cpp

@@ -117,6 +117,16 @@ VcsBaseClientSettings &VcsBaseClientImpl::settings() const
     return *d->m_clientSettings;
 }
 
+Utils::FileName VcsBaseClientImpl::vcsBinary() const
+{
+    return settings().binaryPath();
+}
+
+int VcsBaseClientImpl::vcsTimeout() const
+{
+    return settings().intValue(VcsBaseClientSettings::timeoutKey);
+}
+
 void VcsBaseClientImpl::saveSettings()
 {
     settings().writeSettings(Core::ICore::settings());
@@ -610,16 +620,6 @@ void VcsBaseClient::resetCachedVcsInfo(const QString &workingDir)
     Core::VcsManager::resetVersionControlForDirectory(workingDir);
 }
 
-Utils::FileName VcsBaseClient::vcsBinary() const
-{
-    return settings().binaryPath();
-}
-
-int VcsBaseClient::vcsTimeout() const
-{
-    return settings().intValue(VcsBaseClientSettings::timeoutKey);
-}
-
 void VcsBaseClient::statusParser(const QString &text)
 {
     QList<VcsBaseClient::StatusItem> lineInfoList;

src/plugins/vcsbase/vcsbaseclient.h

@@ -73,6 +73,9 @@ public:
 
     VcsBaseClientSettings &settings() const;
 
+    virtual Utils::FileName vcsBinary() const;
+    int vcsTimeout() const;
+
 private:
     void saveSettings();
 
@@ -143,9 +146,6 @@ public:
 
     virtual QProcessEnvironment processEnvironment() const;
 
-    Utils::FileName vcsBinary() const;
-    int vcsTimeout() const;
-
 signals:
     void parsedStatus(const QList<VcsBase::VcsBaseClient::StatusItem> &statusList);
     // Passes on changed signals from VcsJob to Control