diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 74edfd3dd34..def2e06702b 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -725,17 +725,6 @@ FilePath findRepositoryForFile(const FilePath &fileOrDir, const QString &checkFi return {}; } -// Is SSH prompt configured? -QString sshPrompt() -{ - return Internal::VcsPlugin::instance()->settings().sshPasswordPrompt.value(); -} - -bool isSshPromptConfigured() -{ - return !sshPrompt().isEmpty(); -} - static const char SOURCE_PROPERTY[] = "qtcreator_source"; void setSource(IDocument *document, const QString &source) @@ -749,14 +738,15 @@ QString source(IDocument *document) return document->property(SOURCE_PROPERTY).toString(); } -void setProcessEnvironment(Environment *e, bool forceCLocale, const QString &sshPromptBinary) +void setProcessEnvironment(Environment *e, bool forceCLocale) { if (forceCLocale) { e->set("LANG", "C"); e->set("LANGUAGE", "C"); } - if (!sshPromptBinary.isEmpty()) - e->set("SSH_ASKPASS", sshPromptBinary); + const QString prompt = Internal::VcsPlugin::instance()->settings().sshPasswordPrompt.value(); + if (!prompt.isEmpty()) + e->set("SSH_ASKPASS", prompt); } } // namespace VcsBase diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 03f70603df1..7a035b82a5e 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -126,18 +126,12 @@ private: VCSBASE_EXPORT Utils::FilePath findRepositoryForFile(const Utils::FilePath &fileOrDir, const QString &checkFile); -// Returns SSH prompt configured in settings. -VCSBASE_EXPORT QString sshPrompt(); -// Returns whether an SSH prompt is configured. -VCSBASE_EXPORT bool isSshPromptConfigured(); - // Set up the environment for a version control command line call. // Sets up SSH graphical password prompting (note that the latter // requires a terminal-less process) and sets LANG to 'C' to force English // (suppress LOCALE warnings/parse commands output) if desired. VCSBASE_EXPORT void setProcessEnvironment(Utils::Environment *e, - bool forceCLocale, - const QString &sshPasswordPrompt = sshPrompt()); + bool forceCLocale); // Sets the source of editor contents, can be directory or file. VCSBASE_EXPORT void setSource(Core::IDocument *document, const QString &source); // Returns the source of editor contents. diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp index 1bd49cdafea..e2d8ed77950 100644 --- a/src/plugins/vcsbase/vcscommand.cpp +++ b/src/plugins/vcsbase/vcscommand.cpp @@ -55,7 +55,6 @@ VcsCommand::VcsCommand(const FilePath &workingDirectory, const Environment &envi VcsOutputWindow::setRepository(workingDirectory.toString()); setDisableUnixTerminal(); - m_sshPrompt = VcsBase::sshPrompt(); connect(this, &VcsCommand::started, this, [this] { if (flags() & ExpectRepoChanges) @@ -79,7 +78,7 @@ VcsCommand::VcsCommand(const FilePath &workingDirectory, const Environment &envi Environment VcsCommand::environment() const { Environment env = ShellCommand::environment(); - VcsBase::setProcessEnvironment(&env, flags() & ForceCLocale, m_sshPrompt); + VcsBase::setProcessEnvironment(&env, flags() & ForceCLocale); return env; } diff --git a/src/plugins/vcsbase/vcscommand.h b/src/plugins/vcsbase/vcscommand.h index ebb3e271fd1..a59eba10680 100644 --- a/src/plugins/vcsbase/vcscommand.h +++ b/src/plugins/vcsbase/vcscommand.h @@ -60,7 +60,6 @@ private: void emitRepositoryChanged(const Utils::FilePath &workingDirectory); QPointer m_progress; - QString m_sshPrompt; bool m_preventRepositoryChanged; };