From be0aa40520d8a133b1f975de8750b5b8e25da2be Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 10 Jun 2015 10:02:44 +0200 Subject: [PATCH] Gerrit: Remove method that is used only once Change-Id: I6a65cf7dcb2e5e0f0cff46fd11092799254023be Reviewed-by: Friedemann Kleint Reviewed-by: Orgad Shaneh --- src/plugins/git/gerrit/gerritplugin.cpp | 14 ++++---------- src/plugins/git/gerrit/gerritplugin.h | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 33d99276edf..ea635022486 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -397,14 +397,6 @@ void GerritPlugin::push() push(GitPlugin::instance()->currentState().topLevel()); } -Utils::FileName GerritPlugin::gitBinary() -{ - const Utils::FileName git = gitClient()->vcsBinary(); - if (git.isEmpty()) - VcsBase::VcsOutputWindow::appendError(tr("Git is not available.")); - return git; -} - Utils::FileName GerritPlugin::gitBinDirectory() { return gitClient()->gitBinDirectory(); @@ -434,9 +426,11 @@ void GerritPlugin::fetchCheckout(const QSharedPointer &change) void GerritPlugin::fetch(const QSharedPointer &change, int mode) { // Locate git. - const Utils::FileName git = gitBinary(); - if (git.isEmpty()) + const Utils::FileName git = gitClient()->vcsBinary(); + if (git.isEmpty()) { + VcsBase::VcsOutputWindow::appendError(tr("Git is not available.")); return; + } GitClient *client = gitClient(); diff --git a/src/plugins/git/gerrit/gerritplugin.h b/src/plugins/git/gerrit/gerritplugin.h index 18e72835500..08db0587601 100644 --- a/src/plugins/git/gerrit/gerritplugin.h +++ b/src/plugins/git/gerrit/gerritplugin.h @@ -64,7 +64,6 @@ public: bool initialize(Core::ActionContainer *ac); - static Utils::FileName gitBinary(); static Utils::FileName gitBinDirectory(); static QString branch(const QString &repository); void addToLocator(Core::CommandLocator *locator);