From 0dfcc97a3efba6de446e0c58b02d1f37a0d7b278 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 28 Feb 2022 15:19:42 +0100 Subject: [PATCH] SshRemoteProcess: Rename done() -> finished() Change-Id: I9c22d075f50b0a2a171cbda11c7579e4735f3f4e Reviewed-by: hjk Reviewed-by: --- src/libs/ssh/sshremoteprocess.cpp | 22 +++++++++++-------- src/libs/ssh/sshremoteprocess.h | 5 +++-- src/libs/ssh/sshremoteprocessrunner.cpp | 2 +- .../devicesupport/sshdeviceprocess.cpp | 2 +- .../genericdirectuploadservice.cpp | 4 ++-- src/plugins/remotelinux/linuxdevicetester.cpp | 2 +- src/plugins/remotelinux/rsyncdeploystep.cpp | 2 +- tests/auto/ssh/tst_ssh.cpp | 4 ++-- tests/manual/ssh/shell/shell.cpp | 2 +- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp index 98cbcf9600b..e58cf5750d2 100644 --- a/src/libs/ssh/sshremoteprocess.cpp +++ b/src/libs/ssh/sshremoteprocess.cpp @@ -56,16 +56,20 @@ SshRemoteProcess::SshRemoteProcess(const QString &command, const QStringList &co setupSshEnvironment(this); m_remoteCommand = command; m_connectionArgs = connectionArgs; +} - connect(this, &QtcProcess::finished, this, [this] { - if (exitStatus() == QProcess::CrashExit) - setErrorString(tr("The ssh process crashed: %1").arg(errorString())); - emit done(); - }); - connect(this, &QtcProcess::errorOccurred, [this](QProcess::ProcessError error) { - if (error == QProcess::FailedToStart) - emit done(); - }); +void SshRemoteProcess::emitFinished() +{ + if (exitStatus() == QProcess::CrashExit) + setErrorString(tr("The ssh process crashed: %1").arg(errorString())); + emit finished(); +} + +void SshRemoteProcess::emitErrorOccurred(QProcess::ProcessError error) +{ + if (error == QProcess::FailedToStart) + emit finished(); + emit errorOccurred(error); } void SshRemoteProcess::start() diff --git a/src/libs/ssh/sshremoteprocess.h b/src/libs/ssh/sshremoteprocess.h index 4f9deab6b35..2f811c1fc33 100644 --- a/src/libs/ssh/sshremoteprocess.h +++ b/src/libs/ssh/sshremoteprocess.h @@ -47,8 +47,9 @@ public: static bool setupSshEnvironment(Utils::QtcProcess *process); -signals: - void done(); +protected: + void emitFinished() override; + void emitErrorOccurred(QProcess::ProcessError error) override; private: QString m_remoteCommand; diff --git a/src/libs/ssh/sshremoteprocessrunner.cpp b/src/libs/ssh/sshremoteprocessrunner.cpp index 73626e6a414..000bc39c9e1 100644 --- a/src/libs/ssh/sshremoteprocessrunner.cpp +++ b/src/libs/ssh/sshremoteprocessrunner.cpp @@ -111,7 +111,7 @@ void SshRemoteProcessRunner::handleConnected() d->m_process = d->m_connection->createRemoteProcess(d->m_command); connect(d->m_process.get(), &SshRemoteProcess::started, this, &SshRemoteProcessRunner::handleProcessStarted); - connect(d->m_process.get(), &SshRemoteProcess::done, + connect(d->m_process.get(), &SshRemoteProcess::finished, this, &SshRemoteProcessRunner::handleProcessFinished); connect(d->m_process.get(), &SshRemoteProcess::readyReadStandardOutput, this, &SshRemoteProcessRunner::readyReadStandardOutput); diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp index 554839cd06a..8235818121c 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp @@ -193,7 +193,7 @@ void SshDeviceProcess::handleConnected() } else { connect(d->remoteProcess.get(), &QSsh::SshRemoteProcess::started, this, &SshDeviceProcess::handleProcessStarted); - connect(d->remoteProcess.get(), &QSsh::SshRemoteProcess::done, this, [this] { + connect(d->remoteProcess.get(), &QSsh::SshRemoteProcess::finished, this, [this] { handleProcessFinished(d->remoteProcess->errorString()); }); connect(d->remoteProcess.get(), &QSsh::SshRemoteProcess::readyReadStandardOutput, diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index 0a129b2a60b..e1f95e1c56b 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -200,7 +200,7 @@ void GenericDirectUploadService::runStat(const DeployableFile &file) const QString statCmd = "stat -t " + Utils::ProcessArgs::quoteArgUnix(file.remoteFilePath()); SshRemoteProcess * const statProc = connection()->createRemoteProcess(statCmd).release(); statProc->setParent(this); - connect(statProc, &SshRemoteProcess::done, this, [this, statProc, state = d->state] { + connect(statProc, &SshRemoteProcess::finished, this, [this, statProc, state = d->state] { QTC_ASSERT(d->state == state, return); const DeployableFile file = d->getFileForProcess(statProc); QTC_ASSERT(file.isValid(), return); @@ -341,7 +341,7 @@ void GenericDirectUploadService::chmod() SshRemoteProcess * const chmodProc = connection()->createRemoteProcess(command).release(); chmodProc->setParent(this); - connect(chmodProc, &SshRemoteProcess::done, this, [this, chmodProc, state = d->state] { + connect(chmodProc, &SshRemoteProcess::finished, this, [this, chmodProc, state = d->state] { QTC_ASSERT(state == d->state, return); const DeployableFile file = d->getFileForProcess(chmodProc); QTC_ASSERT(file.isValid(), return); diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 9640f2c2789..641e250219d 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -126,7 +126,7 @@ void GenericLinuxDeviceTester::handleConnected() QTC_ASSERT(d->state == Connecting, return); d->process = d->connection->createRemoteProcess("uname -rsm"); - connect(d->process.get(), &SshRemoteProcess::done, + connect(d->process.get(), &SshRemoteProcess::finished, this, &GenericLinuxDeviceTester::handleProcessFinished); emit progressMessage(tr("Checking kernel version...")); diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 7f7842b56af..49d032d26ad 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -103,7 +103,7 @@ void RsyncDeployService::createRemoteDirectories() remoteDirs.removeDuplicates(); m_mkdir = connection()->createRemoteProcess("mkdir -p " + ProcessArgs::createUnixArgs(remoteDirs).toString()); - connect(m_mkdir.get(), &SshRemoteProcess::done, this, [this] { + connect(m_mkdir.get(), &SshRemoteProcess::finished, this, [this] { QString userError; const QString error = m_mkdir->errorString(); if (!error.isEmpty()) diff --git a/tests/auto/ssh/tst_ssh.cpp b/tests/auto/ssh/tst_ssh.cpp index abf89f257c7..4dc2e03e975 100644 --- a/tests/auto/ssh/tst_ssh.cpp +++ b/tests/auto/ssh/tst_ssh.cpp @@ -299,7 +299,7 @@ void tst_Ssh::remoteProcessChannels() SshRemoteProcessPtr echoProcess = connection.createRemoteProcess("printf " + QString::fromUtf8(testString) + " >&2"); QEventLoop loop; - connect(echoProcess.get(), &SshRemoteProcess::done, &loop, &QEventLoop::quit); + connect(echoProcess.get(), &SshRemoteProcess::finished, &loop, &QEventLoop::quit); connect(echoProcess.get(), &Utils::QtcProcess::readyReadStandardError, [&remoteData, p = echoProcess.get()] { remoteData += p->readAllStandardError(); }); connect(echoProcess.get(), &SshRemoteProcess::readyReadStandardOutput, @@ -334,7 +334,7 @@ void tst_Ssh::remoteProcessInput() catProcess->setProcessMode(Utils::ProcessMode::Writer); QEventLoop loop; connect(catProcess.get(), &SshRemoteProcess::started, &loop, &QEventLoop::quit); - connect(catProcess.get(), &SshRemoteProcess::done, &loop, &QEventLoop::quit); + connect(catProcess.get(), &SshRemoteProcess::finished, &loop, &QEventLoop::quit); QTimer timer; QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit); timer.setSingleShot(true); diff --git a/tests/manual/ssh/shell/shell.cpp b/tests/manual/ssh/shell/shell.cpp index d2faf448ffb..e7e96174fd6 100644 --- a/tests/manual/ssh/shell/shell.cpp +++ b/tests/manual/ssh/shell/shell.cpp @@ -75,7 +75,7 @@ void Shell::handleConnected() this, &Shell::handleRemoteStdout); connect(m_shell.get(), &SshRemoteProcess::readyReadStandardError, this, &Shell::handleRemoteStderr); - connect(m_shell.get(), &SshRemoteProcess::done, this, &Shell::handleChannelClosed); + connect(m_shell.get(), &SshRemoteProcess::finished, this, &Shell::handleChannelClosed); m_shell->start(); }