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

RemoteLinux: Pass context object to lambda connections

Browse Source 
Change-Id: I025c588e7d32be0f940b74acf9421965073cff5c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-12-08 00:09:04 +01:00
parent b67201c410
commit 55ba10be38
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/remotelinux/filesystemaccess_test.cpp
View File

@@ -257,7 +257,7 @@ void FileSystemAccessTest::testFileTransfer()
ProcessResultData result; ProcessResultData result;
QEventLoop loop; QEventLoop loop;
connect(&fileTransfer, &FileTransfer::done, [&result, &loop] connect(&fileTransfer, &FileTransfer::done, this, [&result, &loop]
(const ProcessResultData &resultData) { (const ProcessResultData &resultData) {
result = resultData; result = resultData;
loop.quit(); loop.quit();

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

@@ -164,7 +164,7 @@ void SshSharedConnection::connectToHost()
SshParameters::setupSshEnvironment(m_masterProcess.get()); SshParameters::setupSshEnvironment(m_masterProcess.get());
m_timer.setSingleShot(true); m_timer.setSingleShot(true);
connect(&m_timer, &QTimer::timeout, this, &SshSharedConnection::autoDestructRequested); connect(&m_timer, &QTimer::timeout, this, &SshSharedConnection::autoDestructRequested);
connect(m_masterProcess.get(), &QtcProcess::readyReadStandardOutput, [this] { connect(m_masterProcess.get(), &QtcProcess::readyReadStandardOutput, this, [this] {
const QByteArray reply = m_masterProcess->readAllStandardOutput(); const QByteArray reply = m_masterProcess->readAllStandardOutput();
if (reply == "\n") if (reply == "\n")
emitConnected(); emitConnected();
@@ -172,7 +172,7 @@ void SshSharedConnection::connectToHost()
}); });
// TODO: in case of refused connection we are getting the following on stdErr: // TODO: in case of refused connection we are getting the following on stdErr:
// ssh: connect to host 127.0.0.1 port 22: Connection refused\r\n // ssh: connect to host 127.0.0.1 port 22: Connection refused\r\n
connect(m_masterProcess.get(), &QtcProcess::done, [this] { connect(m_masterProcess.get(), &QtcProcess::done, this, [this] {
const ProcessResult result = m_masterProcess->result(); const ProcessResult result = m_masterProcess->result();
const ProcessResultData resultData = m_masterProcess->resultData(); const ProcessResultData resultData = m_masterProcess->resultData();
if (result == ProcessResult::StartFailed) { if (result == ProcessResult::StartFailed) {
@@ -959,7 +959,7 @@ LinuxDevice::LinuxDevice()
setOpenTerminal([this](const Environment &env, const FilePath &workingDir) { setOpenTerminal([this](const Environment &env, const FilePath &workingDir) {
QtcProcess * const proc = new QtcProcess; QtcProcess * const proc = new QtcProcess;
d->m_terminals.append(proc); d->m_terminals.append(proc);
QObject::connect(proc, &QtcProcess::done, [this, proc] { QObject::connect(proc, &QtcProcess::done, proc, [this, proc] {
if (proc->error() != QProcess::UnknownError) { if (proc->error() != QProcess::UnknownError) {
const QString errorString = proc->errorString(); const QString errorString = proc->errorString();
QString message; QString message;