Ssh: Drop ProcessMode from c'tors and creator methods

Change-Id: I2db51f26d9a841f60d5ab3722fa82b3a89d57146
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>

src/libs/ssh/sftpsession.cpp

@@ -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";

src/libs/ssh/sshconnection.cpp

@@ -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()),
+                                                    d->connectionArgs(SshSettings::sshFilePath())));
-                                                    processMode));
 }
 
-SshRemoteProcessPtr SshConnection::createRemoteShell(ProcessMode processMode)
+SshRemoteProcessPtr SshConnection::createRemoteShell()
 {
-    return createRemoteProcess({}, processMode);
+    return createRemoteProcess({});
 }
 
 SftpTransferPtr SshConnection::createUpload(const FilesToTransfer &files,

src/libs/ssh/sshconnection.h

@@ -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
+    SshRemoteProcessPtr createRemoteProcess(const QString &command);
-                                            = Utils::ProcessMode::Reader);
+    SshRemoteProcessPtr createRemoteShell();
-    SshRemoteProcessPtr createRemoteShell(Utils::ProcessMode processMode
-                                          = Utils::ProcessMode::Reader);
     SftpTransferPtr createUpload(const FilesToTransfer &files,
                                  FileTransferErrorHandling errorHandlingMode);
     SftpTransferPtr createDownload(const FilesToTransfer &files,

src/libs/ssh/sshprocess.cpp

@@ -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());

src/libs/ssh/sshprocess.h

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

src/libs/ssh/sshremoteprocess.cpp

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

src/libs/ssh/sshremoteprocess.h

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

src/plugins/remotelinux/linuxdevice.cpp

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

tests/auto/ssh/tst_ssh.cpp

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