Ssh: Use base QtcProcess' useTerminal for SshRemoteProcess

Still trying to ramp down non-QtcProcess interfaces.

Change-Id: I6b4ae6788f5021959ff3eb35bbade2157a6d67fa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2021-11-22 10:22:48 +01:00
parent e64ce914f9
commit 8cb5c3cfdd
6 changed files with 11 additions and 12 deletions

View File

@@ -57,7 +57,6 @@ struct SshRemoteProcess::SshRemoteProcessPrivate
QString remoteCommand; QString remoteCommand;
QStringList connectionArgs; QStringList connectionArgs;
QString displayName; QString displayName;
bool useTerminal = false;
}; };
SshRemoteProcess::SshRemoteProcess(const QString &command, const QStringList &connectionArgs, SshRemoteProcess::SshRemoteProcess(const QString &command, const QStringList &connectionArgs,
@@ -101,11 +100,6 @@ SshRemoteProcess::~SshRemoteProcess()
delete d; delete d;
} }
void SshRemoteProcess::requestTerminal()
{
d->useTerminal = true;
}
void SshRemoteProcess::requestX11Forwarding(const QString &displayName) void SshRemoteProcess::requestX11Forwarding(const QString &displayName)
{ {
d->displayName = displayName; d->displayName = displayName;
@@ -122,7 +116,7 @@ Utils::CommandLine SshRemoteProcess::fullLocalCommandLine() const
if (!d->displayName.isEmpty()) if (!d->displayName.isEmpty())
cmd.addArg("-X"); cmd.addArg("-X");
if (d->useTerminal) if (useTerminal())
cmd.addArg("-tt"); cmd.addArg("-tt");
cmd.addArg("-q"); cmd.addArg("-q");

View File

@@ -43,7 +43,6 @@ class QSSH_EXPORT SshRemoteProcess : public SshProcess
public: public:
~SshRemoteProcess(); ~SshRemoteProcess();
void requestTerminal();
void requestX11Forwarding(const QString &displayName); void requestX11Forwarding(const QString &displayName);
void start(); void start();

View File

@@ -128,8 +128,7 @@ void SshRemoteProcessRunner::handleConnected()
this, &SshRemoteProcessRunner::handleStdout); this, &SshRemoteProcessRunner::handleStdout);
connect(d->m_process.get(), &SshRemoteProcess::readyReadStandardError, connect(d->m_process.get(), &SshRemoteProcess::readyReadStandardError,
this, &SshRemoteProcessRunner::handleStderr); this, &SshRemoteProcessRunner::handleStderr);
if (d->m_runInTerminal) d->m_process->setUseTerminal(d->m_runInTerminal);
d->m_process->requestTerminal();
d->m_process->start(); d->m_process->start();
} }

View File

@@ -824,6 +824,11 @@ void QtcProcess::setUseTerminal(bool on)
d->m_process->setUseTerminal(on); d->m_process->setUseTerminal(on);
} }
bool QtcProcess::useTerminal() const
{
return d->m_process->useTerminal();
}
void QtcProcess::setRunAsRoot(bool on) void QtcProcess::setRunAsRoot(bool on)
{ {
d->m_process->setRunAsRoot(on); d->m_process->setRunAsRoot(on);

View File

@@ -104,9 +104,11 @@ public:
void setUseCtrlCStub(bool enabled); void setUseCtrlCStub(bool enabled);
void setLowPriority(); void setLowPriority();
void setDisableUnixTerminal(); void setDisableUnixTerminal();
void setUseTerminal(bool on);
void setRunAsRoot(bool on); void setRunAsRoot(bool on);
void setUseTerminal(bool on);
bool useTerminal() const;
void start(); void start();
void terminate(); void terminate();
void interrupt(); void interrupt();

View File

@@ -194,7 +194,7 @@ void SshDeviceProcess::handleConnected()
if (!display.isEmpty()) if (!display.isEmpty())
d->process->requestX11Forwarding(display); d->process->requestX11Forwarding(display);
if (runInTerminal()) { if (runInTerminal()) {
d->process->requestTerminal(); d->process->setUseTerminal(true);
connect(&d->consoleProcess, &ConsoleProcess::errorOccurred, connect(&d->consoleProcess, &ConsoleProcess::errorOccurred,
this, &DeviceProcess::error); this, &DeviceProcess::error);
connect(&d->consoleProcess, &ConsoleProcess::processStarted, connect(&d->consoleProcess, &ConsoleProcess::processStarted,