From 08350cb8aeb126ca5fb88ef0feacf79c56bcc811 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 11 May 2022 17:58:24 +0200
Subject: [PATCH] SshSharedConnection: Get rid of connectionOptions()

Change-Id: Ieb7da550183aa57db3dd6d0b714c1e66e46d38e6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/remotelinux/linuxdevice.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 2507e241db3..24d4fb6f09f 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -101,10 +101,6 @@ public:
         QTC_ASSERT(m_masterSocketDir, return QString());
         return m_masterSocketDir->path() + "/cs";
     }
-    QStringList connectionOptions(const Utils::FilePath &binary) const
-    {
-        return m_sshParameters.connectionOptions(binary) << "-o" << ("ControlPath=" + socketFilePath());
-    }
 
 signals:
     void connected(const QString &socketFilePath);
@@ -117,8 +113,7 @@ private:
     void emitError(QProcess::ProcessError processError, const QString &errorString);
     void emitDisconnected();
     QString fullProcessError() const;
-    QStringList connectionArgs(const FilePath &binary) const
-    { return connectionOptions(binary) << m_sshParameters.host(); }
+    QStringList connectionArgs(const FilePath &binary) const;
 
     const SshParameters m_sshParameters;
     std::unique_ptr<QtcProcess> m_masterProcess;
@@ -272,6 +267,12 @@ QString SshSharedConnection::fullProcessError() const
     return allErrors.join('\n');
 }
 
+QStringList SshSharedConnection::connectionArgs(const FilePath &binary) const
+{
+    return m_sshParameters.connectionOptions(binary) << "-o" << ("ControlPath=" + socketFilePath())
+                                                     << m_sshParameters.host();
+}
+
 // SshConnectionHandle
 
 class SshConnectionHandle : public QObject