Git: Rename gitBinaryPath => gitExecutable

Avoid confusion with gitBinDirectory

Change-Id: I335cf6bc82284e02e0652b057f0b80f292d6ddc0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

src/plugins/git/changeselectiondialog.cpp

@@ -58,7 +58,7 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
     , m_command(NoCommand)
 {
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    m_gitBinaryPath = GitPlugin::instance()->gitClient()->gitBinaryPath();
+    m_gitExecutable = GitPlugin::instance()->gitClient()->gitExecutable();
     m_ui->setupUi(this);
     m_ui->workingDirectoryEdit->setText(workingDirectory);
     m_gitEnvironment = GitPlugin::instance()->gitClient()->processEnvironment();
@@ -257,7 +257,7 @@ void ChangeSelectionDialog::recalculateDetails()
 
     connect(m_process, SIGNAL(finished(int)), this, SLOT(setDetails(int)));
 
-    m_process->start(m_gitBinaryPath, args);
+    m_process->start(m_gitExecutable, args);
     m_process->closeWriteChannel();
     if (!m_process->waitForStarted())
         m_ui->detailsText->setPlainText(tr("Error: Could not start Git."));

src/plugins/git/changeselectiondialog.h

@@ -87,7 +87,7 @@ private:
     Ui::ChangeSelectionDialog *m_ui;
 
     QProcess *m_process;
-    QString m_gitBinaryPath;
+    QString m_gitExecutable;
     QProcessEnvironment m_gitEnvironment;
     ChangeCommand m_command;
     QStringListModel *m_changeModel;

src/plugins/git/clonewizardpage.cpp

@@ -119,7 +119,7 @@ VcsBase::Command *CloneWizardPage::createCheckoutJob(Utils::FileName *checkoutPa
      if (d->recursiveCheckBox->isChecked())
          args << QLatin1String("--recursive");
      args << QLatin1String("--progress") << repository() << checkoutDir;
-     VcsBase::Command *command = new VcsBase::Command(client->gitBinaryPath(), workingDirectory,
+     VcsBase::Command *command = new VcsBase::Command(client->gitExecutable(), workingDirectory,
                                                       client->processEnvironment());
      command->addFlags(VcsBase::VcsBasePlugin::MergeOutputChannels);
      command->addJob(args, -1);

src/plugins/git/gerrit/gerritplugin.cpp

@@ -391,7 +391,7 @@ void GerritPlugin::push()
 QString GerritPlugin::gitBinary()
 {
     bool ok;
-    const QString git = gitClient()->gitBinaryPath(&ok);
+    const QString git = gitClient()->gitExecutable(&ok);
     if (!ok) {
         VcsBase::VcsBaseOutputWindow::instance()->appendError(tr("Git is not available."));
         return QString();

src/plugins/git/gitclient.cpp

@@ -305,7 +305,7 @@ QProcessEnvironment GitDiffHandler::processEnvironment() const
 
 QString GitDiffHandler::gitPath() const
 {
-    return m_gitClient->gitBinaryPath();
+    return m_gitClient->gitExecutable();
 }
 
 /////////////////////////////////////
@@ -1753,7 +1753,7 @@ void GitClient::branchesForCommit(const QString &revision)
     DiffEditor::DiffEditorController *controller
             = qobject_cast<DiffEditor::DiffEditorController *>(sender());
     QString workingDirectory = controller->workingDirectory();
-    VcsBase::Command *command = new VcsBase::Command(gitBinaryPath(), workingDirectory,
+    VcsBase::Command *command = new VcsBase::Command(gitExecutable(), workingDirectory,
                                                      processEnvironment());
     command->setCodec(getSourceCodec(currentDocumentPath()));
 
@@ -2157,7 +2157,7 @@ VcsBase::Command *GitClient::createCommand(const QString &workingDirectory,
                                            bool useOutputToWindow,
                                            int editorLineNumber)
 {
-    VcsBase::Command *command = new VcsBase::Command(gitBinaryPath(), workingDirectory, processEnvironment());
+    VcsBase::Command *command = new VcsBase::Command(gitExecutable(), workingDirectory, processEnvironment());
     command->setCodec(getSourceCodec(currentDocumentPath()));
     command->setCookie(QVariant(editorLineNumber));
     if (editor) {
@@ -2252,7 +2252,7 @@ Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &worki
                                                             unsigned flags,
                                                             QTextCodec *outputCodec)
 {
-    return VcsBasePlugin::runVcs(workingDirectory, gitBinaryPath(), gitArguments,
+    return VcsBasePlugin::runVcs(workingDirectory, gitExecutable(), gitArguments,
                                  settings()->intValue(GitSettings::timeoutKey) * 1000,
                                  flags, outputCodec, processEnvironment());
 }
@@ -2263,7 +2263,7 @@ bool GitClient::fullySynchronousGit(const QString &workingDirectory,
                                     QByteArray* errorText,
                                     unsigned flags) const
 {
-    VcsBase::Command command(gitBinaryPath(), workingDirectory, processEnvironment());
+    VcsBase::Command command(gitExecutable(), workingDirectory, processEnvironment());
     command.addFlags(flags);
     return command.runFullySynchronous(gitArguments,
                                        settings()->intValue(GitSettings::timeoutKey) * 1000,
@@ -2543,7 +2543,7 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR
 
 void GitClient::launchGitK(const QString &workingDirectory, const QString &fileName)
 {
-    const QFileInfo binaryInfo(gitBinaryPath());
+    const QFileInfo binaryInfo(gitExecutable());
     QDir foundBinDir(binaryInfo.dir());
     const bool foundBinDirIsCmdDir = foundBinDir.dirName() == QLatin1String("cmd");
     QProcessEnvironment env = processEnvironment();
@@ -2625,7 +2625,7 @@ bool GitClient::tryLauchingGitK(const QProcessEnvironment &env,
 
 bool GitClient::launchGitGui(const QString &workingDirectory) {
     bool success;
-    QString gitBinary = gitBinaryPath(&success);
+    QString gitBinary = gitExecutable(&success);
     if (success)
         success = QProcess::startDetached(gitBinary, QStringList(QLatin1String("gui")),
                                           workingDirectory);
@@ -2638,7 +2638,7 @@ bool GitClient::launchGitGui(const QString &workingDirectory) {
 
 Utils::FileName GitClient::gitBinDirectory()
 {
-    const QString git = gitBinaryPath();
+    const QString git = gitExecutable();
     if (git.isEmpty())
         return Utils::FileName();
 
@@ -2654,9 +2654,9 @@ Utils::FileName GitClient::gitBinDirectory()
     return Utils::FileName::fromString(path);
 }
 
-QString GitClient::gitBinaryPath(bool *ok, QString *errorMessage) const
+QString GitClient::gitExecutable(bool *ok, QString *errorMessage) const
 {
-    return settings()->gitBinaryPath(ok, errorMessage);
+    return settings()->gitExecutable(ok, errorMessage);
 }
 
 QTextCodec *GitClient::encoding(const QString &workingDirectory, const QByteArray &configVar) const
@@ -3524,7 +3524,7 @@ GitSettings *GitClient::settings() const
 // determine version as '(major << 16) + (minor << 8) + patch' or 0.
 unsigned GitClient::gitVersion(QString *errorMessage) const
 {
-    const QString newGitBinary = gitBinaryPath();
+    const QString newGitBinary = gitExecutable();
     if (m_gitVersionForBinary != newGitBinary && !newGitBinary.isEmpty()) {
         // Do not execute repeatedly if that fails (due to git
         // not being installed) until settings are changed.
@@ -3537,7 +3537,7 @@ unsigned GitClient::gitVersion(QString *errorMessage) const
 // determine version as '(major << 16) + (minor << 8) + patch' or 0.
 unsigned GitClient::synchronousGitVersion(QString *errorMessage) const
 {
-    if (gitBinaryPath().isEmpty())
+    if (gitExecutable().isEmpty())
         return 0;
 
     // run git --version

src/plugins/git/gitclient.h

@@ -136,7 +136,7 @@ public:
     explicit GitClient(GitSettings *settings);
     ~GitClient();
 
-    QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
+    QString gitExecutable(bool *ok = 0, QString *errorMessage = 0) const;
     unsigned gitVersion(QString *errorMessage = 0) const;
 
     QString findRepositoryForDirectory(const QString &dir);

src/plugins/git/gitsettings.cpp

@@ -70,7 +70,7 @@ GitSettings::GitSettings()
     declareKey(lastResetIndexKey, 0);
 }
 
-QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const
+QString GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
 {
     // Locate binary in path if one is specified, otherwise default
     // to pathless binary

src/plugins/git/gitsettings.h

@@ -62,7 +62,7 @@ public:
     static const QLatin1String graphLogKey;
     static const QLatin1String lastResetIndexKey;
 
-    QString gitBinaryPath(bool *ok = 0, QString *errorMessage = 0) const;
+    QString gitExecutable(bool *ok = 0, QString *errorMessage = 0) const;
 
     GitSettings &operator = (const GitSettings &s);
 };

src/plugins/git/gitversioncontrol.cpp

@@ -81,7 +81,7 @@ Core::Id GitVersionControl::id() const
 bool GitVersionControl::isConfigured() const
 {
     bool ok = false;
-    m_client->gitBinaryPath(&ok);
+    m_client->gitExecutable(&ok);
     return ok;
 }
 

src/plugins/git/mergetool.cpp

@@ -98,7 +98,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
     }
     m_process = new MergeToolProcess(this);
     m_process->setWorkingDirectory(workingDirectory);
-    const QString binary = m_gitClient->gitBinaryPath();
+    const QString binary = m_gitClient->gitExecutable();
     VcsBase::VcsBaseOutputWindow::instance()->appendCommand(workingDirectory, binary, arguments);
     m_process->start(binary, arguments);
     if (m_process->waitForStarted()) {

src/plugins/git/settingspage.cpp

@@ -115,7 +115,7 @@ void SettingsPage::apply()
     if (m_widget->isVisible()) {
         bool gitFoundOk;
         QString errorMessage;
-        newSettings.gitBinaryPath(&gitFoundOk, &errorMessage);
+        newSettings.gitExecutable(&gitFoundOk, &errorMessage);
         if (!gitFoundOk)
             QMessageBox::warning(m_widget, tr("Git Settings"), errorMessage);
     }