feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Ssh: Drop ProcessMode from c'tors and creator methods

Browse Source 
Change-Id: I2db51f26d9a841f60d5ab3722fa82b3a89d57146
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-18 10:06:56 +01:00
parent a056aa8f95
commit 97264e0591
9 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/ssh/sftpsession.cpp
View File

@@ -58,7 +58,7 @@ struct Command
struct SftpSession::SftpSessionPrivate
{
SshProcess sftpProc = {ProcessMode::Writer};
SshProcess sftpProc;
QStringList connectionArgs;
QByteArray output;
QQueue<Command> pendingCommands;
@@ -111,6 +111,7 @@ static QByteArray prompt() { return "sftp> "; }
SftpSession::SftpSession(const QStringList &connectionArgs) : d(new SftpSessionPrivate)
{
d->sftpProc.setProcessMode(ProcessMode::Writer);
d->connectionArgs = connectionArgs;
connect(&d->sftpProc, &QtcProcess::started, [this] {
qCDebug(sshLog) << "sftp process started";

9
src/libs/ssh/sshconnection.cpp
View File

@@ -307,17 +307,16 @@ SshConnection::~SshConnection()
delete d;
}
SshRemoteProcessPtr SshConnection::createRemoteProcess(const QString &command, ProcessMode processMode)
SshRemoteProcessPtr SshConnection::createRemoteProcess(const QString &command)
{
QTC_ASSERT(state() == Connected, return SshRemoteProcessPtr());
return SshRemoteProcessPtr(new SshRemoteProcess(command,
d->connectionArgs(SshSettings::sshFilePath()),
processMode));
d->connectionArgs(SshSettings::sshFilePath())));
}
SshRemoteProcessPtr SshConnection::createRemoteShell(ProcessMode processMode)
SshRemoteProcessPtr SshConnection::createRemoteShell()
{
return createRemoteProcess({}, processMode);
return createRemoteProcess({});
}
SftpTransferPtr SshConnection::createUpload(const FilesToTransfer &files,

7
src/libs/ssh/sshconnection.h
View File

@@ -29,7 +29,6 @@
#include "ssh_global.h"
#include <utils/filepath.h>
#include <utils/processutils.h>
#include <QFlags>
#include <QHostAddress>
@@ -115,10 +114,8 @@ public:
bool sharingEnabled() const;
~SshConnection();
SshRemoteProcessPtr createRemoteProcess(const QString &command, Utils::ProcessMode processMode
= Utils::ProcessMode::Reader);
SshRemoteProcessPtr createRemoteShell(Utils::ProcessMode processMode
= Utils::ProcessMode::Reader);
SshRemoteProcessPtr createRemoteProcess(const QString &command);
SshRemoteProcessPtr createRemoteShell();
SftpTransferPtr createUpload(const FilesToTransfer &files,
FileTransferErrorHandling errorHandlingMode);
SftpTransferPtr createDownload(const FilesToTransfer &files,

4
src/libs/ssh/sshprocess.cpp
View File

@@ -31,10 +31,8 @@
namespace QSsh {
SshProcess::SshProcess(Utils::ProcessMode processMode)
SshProcess::SshProcess()
{
setProcessMode(processMode);
Utils::Environment env = Utils::Environment::systemEnvironment();
if (SshSettings::askpassFilePath().exists()) {
env.set("SSH_ASKPASS", SshSettings::askpassFilePath().toUserOutput());

2
src/libs/ssh/sshprocess.h
View File

@@ -34,7 +34,7 @@ namespace QSsh {
class QSSH_EXPORT SshProcess : public Utils::QtcProcess
{
public:
SshProcess(Utils::ProcessMode processMode = Utils::ProcessMode::Reader);
SshProcess();
};
} // namespace QSsh

5
src/libs/ssh/sshremoteprocess.cpp
View File

@@ -49,9 +49,8 @@ using namespace QSsh::Internal;
namespace QSsh {
SshRemoteProcess::SshRemoteProcess(const QString &command, const QStringList &connectionArgs,
Utils::ProcessMode processMode)
: SshProcess(processMode)
SshRemoteProcess::SshRemoteProcess(const QString &command, const QStringList &connectionArgs)
: SshProcess()
{
m_remoteCommand = command;
m_connectionArgs = connectionArgs;

3
src/libs/ssh/sshremoteprocess.h
View File

@@ -37,8 +37,7 @@ class QSSH_EXPORT SshRemoteProcess : public SshProcess
Q_OBJECT
public:
SshRemoteProcess(const QString &command, const QStringList &connectionArgs,
Utils::ProcessMode processMode = Utils::ProcessMode::Reader);
SshRemoteProcess(const QString &command, const QStringList &connectionArgs);
void requestX11Forwarding(const QString &displayName);
void start();

4
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -209,8 +209,8 @@ public:
// connect to it
// wait for connected
m_shell = new SshRemoteProcess("/bin/sh",
parameters.connectionOptions(SshSettings::sshFilePath()) << parameters.host(),
ProcessMode::Writer);
parameters.connectionOptions(SshSettings::sshFilePath()) << parameters.host());
m_shell->setProcessMode(ProcessMode::Writer);
m_shell->start();
const bool startOK = m_shell->waitForStarted();
if (!startOK)

4
tests/auto/ssh/tst_ssh.cpp
View File

@@ -330,8 +330,8 @@ void tst_Ssh::remoteProcessInput()
SshConnection connection(params);
QVERIFY(waitForConnection(connection));
SshRemoteProcessPtr catProcess = connection.createRemoteProcess("/bin/cat",
Utils::ProcessMode::Writer);
SshRemoteProcessPtr catProcess = connection.createRemoteProcess("/bin/cat");
catProcess->setProcessMode(Utils::ProcessMode::Writer);
QEventLoop loop;
connect(catProcess.get(), &SshRemoteProcess::started, &loop, &QEventLoop::quit);
connect(catProcess.get(), &SshRemoteProcess::done, &loop, &QEventLoop::quit);