From 55ba10be38767ba5d59170e51b212fef8e2653a4 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 8 Dec 2022 00:09:04 +0100 Subject: [PATCH] RemoteLinux: Pass context object to lambda connections Change-Id: I025c588e7d32be0f940b74acf9421965073cff5c Reviewed-by: Christian Kandeler Reviewed-by: --- src/plugins/remotelinux/filesystemaccess_test.cpp | 2 +- src/plugins/remotelinux/linuxdevice.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/remotelinux/filesystemaccess_test.cpp b/src/plugins/remotelinux/filesystemaccess_test.cpp index 5074abd1a58..a01ddb689fa 100644 --- a/src/plugins/remotelinux/filesystemaccess_test.cpp +++ b/src/plugins/remotelinux/filesystemaccess_test.cpp @@ -257,7 +257,7 @@ void FileSystemAccessTest::testFileTransfer() ProcessResultData result; QEventLoop loop; - connect(&fileTransfer, &FileTransfer::done, [&result, &loop] + connect(&fileTransfer, &FileTransfer::done, this, [&result, &loop] (const ProcessResultData &resultData) { result = resultData; loop.quit(); diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index db6057ba486..425c6b44e52 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -164,7 +164,7 @@ void SshSharedConnection::connectToHost() SshParameters::setupSshEnvironment(m_masterProcess.get()); m_timer.setSingleShot(true); 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(); if (reply == "\n") emitConnected(); @@ -172,7 +172,7 @@ void SshSharedConnection::connectToHost() }); // 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 - connect(m_masterProcess.get(), &QtcProcess::done, [this] { + connect(m_masterProcess.get(), &QtcProcess::done, this, [this] { const ProcessResult result = m_masterProcess->result(); const ProcessResultData resultData = m_masterProcess->resultData(); if (result == ProcessResult::StartFailed) { @@ -959,7 +959,7 @@ LinuxDevice::LinuxDevice() setOpenTerminal([this](const Environment &env, const FilePath &workingDir) { QtcProcess * const proc = new QtcProcess; 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) { const QString errorString = proc->errorString(); QString message;