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

SshSharedConnection: Get rid of connectionOptions()

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2022-05-11 17:58:24 +02:00
parent 6b07b84bcd
commit 08350cb8ae
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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