forked from qt-creator/qt-creator
Vcs: Move static functions out of VcsPlugin "namespace"
Plan is to split VcsPlugin in the pure IPlugin and a new class the remaining non-IPlugin bits of VcsPlugin, call it VcsPluginPrivate and use that d-ptr for VcsPlugin. VcsPlugin-derived classes can then use VcsPluginPrivate derived private, later pointer members of the *Privates can be made proper members, moving towards the otherwise predominant plugin setup pattern. Change-Id: I62db9269e8ca50633c24b6d1d735d59c8fa8e5a5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -73,7 +73,7 @@ VcsCommand::VcsCommand(const QString &workingDirectory,
|
||||
const QProcessEnvironment VcsCommand::processEnvironment() const
|
||||
{
|
||||
QProcessEnvironment env = Core::ShellCommand::processEnvironment();
|
||||
VcsBasePlugin::setProcessEnvironment(&env, flags() & ForceCLocale, VcsBasePlugin::sshPrompt());
|
||||
VcsBase::setProcessEnvironment(&env, flags() & ForceCLocale, VcsBase::sshPrompt());
|
||||
return env;
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ void VcsCommand::emitRepositoryChanged(const QString &workingDirectory)
|
||||
unsigned VcsCommand::processFlags() const
|
||||
{
|
||||
unsigned processFlags = 0;
|
||||
if (!VcsBasePlugin::sshPrompt().isEmpty() && (flags() & SshPasswordPrompt))
|
||||
if (!VcsBase::sshPrompt().isEmpty() && (flags() & SshPasswordPrompt))
|
||||
processFlags |= SynchronousProcess::UnixTerminalDisabled;
|
||||
return processFlags;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user