diff --git a/src/libs/ssh/sshremoteprocessrunner.cpp b/src/libs/ssh/sshremoteprocessrunner.cpp index a6cc6b6ba0d..d0e23b6a4b3 100644 --- a/src/libs/ssh/sshremoteprocessrunner.cpp +++ b/src/libs/ssh/sshremoteprocessrunner.cpp @@ -139,7 +139,7 @@ void SshRemoteProcessRunner::handleProcessStarted() QTC_ASSERT(d->m_state == Connected, return); setState(ProcessRunning); - emit processStarted(); + emit started(); } void SshRemoteProcessRunner::handleProcessFinished() @@ -148,7 +148,7 @@ void SshRemoteProcessRunner::handleProcessFinished() d->m_exitCode = d->m_process->exitCode(); d->m_errorString = d->m_process->errorString(); setState(Inactive); - emit processClosed(); + emit finished(); } void SshRemoteProcessRunner::setState(int newState) diff --git a/src/libs/ssh/sshremoteprocessrunner.h b/src/libs/ssh/sshremoteprocessrunner.h index c4174007ab0..2d9fe590c93 100644 --- a/src/libs/ssh/sshremoteprocessrunner.h +++ b/src/libs/ssh/sshremoteprocessrunner.h @@ -54,10 +54,10 @@ public: signals: void connectionError(); - void processStarted(); + void started(); + void finished(); void readyReadStandardOutput(); void readyReadStandardError(); - void processClosed(); private: void handleConnected(); diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp index dcd1dbc7794..2e3c71197d8 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp +++ b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp @@ -89,7 +89,7 @@ void QdbMakeDefaultAppService::handleProcessFinished() void QdbMakeDefaultAppService::doDeploy() { d->processRunner = new QSsh::SshRemoteProcessRunner; - connect(d->processRunner, &QSsh::SshRemoteProcessRunner::processClosed, + connect(d->processRunner, &QSsh::SshRemoteProcessRunner::finished, this, &QdbMakeDefaultAppService::handleProcessFinished); connect(d->processRunner, &QSsh::SshRemoteProcessRunner::readyReadStandardError, this, &QdbMakeDefaultAppService::handleStdErr); diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp index 5d8ecb6cc96..0928c2463d9 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp @@ -53,7 +53,7 @@ void SshDeviceProcessList::doUpdate() { connect(&d->process, &SshRemoteProcessRunner::connectionError, this, &SshDeviceProcessList::handleConnectionError); - connect(&d->process, &SshRemoteProcessRunner::processClosed, + connect(&d->process, &SshRemoteProcessRunner::finished, this, &SshDeviceProcessList::handleListProcessFinished); d->process.run(listProcessesCommandLine(), device()->sshParameters()); } diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index a63ef4046bc..8c479574346 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -91,7 +91,7 @@ QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr & m_processRunner = new QSsh::SshRemoteProcessRunner(this); connect(m_processRunner, &QSsh::SshRemoteProcessRunner::connectionError, this, &QnxDeployQtLibrariesDialog::handleRemoteProcessError); - connect(m_processRunner, &QSsh::SshRemoteProcessRunner::processClosed, + connect(m_processRunner, &QSsh::SshRemoteProcessRunner::finished, this, &QnxDeployQtLibrariesDialog::handleRemoteProcessCompleted); connect(m_ui->deployButton, &QAbstractButton::clicked, diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp index 5b328ec5643..06af90dc786 100644 --- a/src/plugins/qnx/qnxdevicetester.cpp +++ b/src/plugins/qnx/qnxdevicetester.cpp @@ -50,7 +50,7 @@ QnxDeviceTester::QnxDeviceTester(QObject *parent) m_processRunner = new QSsh::SshRemoteProcessRunner(this); connect(m_processRunner, &QSsh::SshRemoteProcessRunner::connectionError, this, &QnxDeviceTester::handleConnectionError); - connect(m_processRunner, &QSsh::SshRemoteProcessRunner::processClosed, + connect(m_processRunner, &QSsh::SshRemoteProcessRunner::finished, this, &QnxDeviceTester::handleProcessFinished); m_commandsToTest << QLatin1String("awk") diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp index 41613633ba8..15b8d0fe7bd 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp @@ -87,7 +87,7 @@ void RemoteLinuxCustomCommandDeployService::doDeploy() this, &RemoteLinuxCustomCommandDeployService::handleStdout); connect(d->runner, &SshRemoteProcessRunner::readyReadStandardError, this, &RemoteLinuxCustomCommandDeployService::handleStderr); - connect(d->runner, &SshRemoteProcessRunner::processClosed, + connect(d->runner, &SshRemoteProcessRunner::finished, this, &RemoteLinuxCustomCommandDeployService::handleProcessClosed); emit progressMessage(tr("Starting remote command \"%1\"...").arg(d->commandLine)); diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp index 69ad1b0eb3f..75a36ea2012 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp @@ -71,7 +71,7 @@ void AbstractRemoteLinuxPackageInstaller::installPackage(const IDevice::ConstPtr this, &AbstractRemoteLinuxPackageInstaller::handleInstallerOutput); connect(d->installer, &SshRemoteProcessRunner::readyReadStandardError, this, &AbstractRemoteLinuxPackageInstaller::handleInstallerErrorOutput); - connect(d->installer, &SshRemoteProcessRunner::processClosed, + connect(d->installer, &SshRemoteProcessRunner::finished, this, &AbstractRemoteLinuxPackageInstaller::handleInstallationFinished); QString cmdLine = installCommandLine(packageFilePath); diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp index 6328a478809..115391d3045 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp @@ -53,7 +53,7 @@ void RemoteLinuxSignalOperation::run(const QString &command) { QTC_ASSERT(!m_runner, return); m_runner = new QSsh::SshRemoteProcessRunner(); - connect(m_runner, &QSsh::SshRemoteProcessRunner::processClosed, + connect(m_runner, &QSsh::SshRemoteProcessRunner::finished, this, &RemoteLinuxSignalOperation::runnerProcessFinished); connect(m_runner, &QSsh::SshRemoteProcessRunner::connectionError, this, &RemoteLinuxSignalOperation::runnerConnectionError); diff --git a/src/plugins/remotelinux/sshkeydeployer.cpp b/src/plugins/remotelinux/sshkeydeployer.cpp index 89fc2b4f07b..d5a81799d9d 100644 --- a/src/plugins/remotelinux/sshkeydeployer.cpp +++ b/src/plugins/remotelinux/sshkeydeployer.cpp @@ -66,7 +66,7 @@ void SshKeyDeployer::deployPublicKey(const SshConnectionParameters &sshParams, connect(&d->deployProcess, &SshRemoteProcessRunner::connectionError, this, &SshKeyDeployer::handleConnectionFailure); - connect(&d->deployProcess, &SshRemoteProcessRunner::processClosed, + connect(&d->deployProcess, &SshRemoteProcessRunner::finished, this, &SshKeyDeployer::handleKeyUploadFinished); const QString command = "test -d .ssh " "|| mkdir -p ~/.ssh && chmod 0700 .ssh && echo '" diff --git a/tests/auto/ssh/tst_ssh.cpp b/tests/auto/ssh/tst_ssh.cpp index bc70dd586ea..2f1a236b5fc 100644 --- a/tests/auto/ssh/tst_ssh.cpp +++ b/tests/auto/ssh/tst_ssh.cpp @@ -242,8 +242,8 @@ void tst_Ssh::remoteProcess() SshRemoteProcessRunner runner; QEventLoop loop; connect(&runner, &SshRemoteProcessRunner::connectionError, &loop, &QEventLoop::quit); - connect(&runner, &SshRemoteProcessRunner::processStarted, &loop, &QEventLoop::quit); - connect(&runner, &SshRemoteProcessRunner::processClosed, &loop, &QEventLoop::quit); + connect(&runner, &SshRemoteProcessRunner::started, &loop, &QEventLoop::quit); + connect(&runner, &SshRemoteProcessRunner::finished, &loop, &QEventLoop::quit); connect(&runner, &SshRemoteProcessRunner::readyReadStandardOutput, [&remoteStdout, &runner] { remoteStdout += runner.readAllStandardOutput(); }); connect(&runner, &SshRemoteProcessRunner::readyReadStandardError,