SshRemoteProcess: Get rid of error arg from done() signal

Prepare for signal rename done() -> finished().

Change-Id: I81a7bd0a4826ce6200f4af47ba5868ceedb42206
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-02-28 14:11:49 +01:00
parent fc3b9b5ab3
commit 7b5dfcd6cd
11 changed files with 22 additions and 22 deletions

View File

@@ -58,14 +58,13 @@ SshRemoteProcess::SshRemoteProcess(const QString &command, const QStringList &co
m_connectionArgs = connectionArgs;
connect(this, &QtcProcess::finished, this, [this] {
QString error;
if (exitStatus() == QProcess::CrashExit)
error = tr("The ssh process crashed: %1").arg(errorString());
emit done(error);
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(errorString());
emit done();
});
}

View File

@@ -48,7 +48,7 @@ public:
static bool setupSshEnvironment(Utils::QtcProcess *process);
signals:
void done(const QString &error);
void done();
private:
QString m_remoteCommand;

View File

@@ -142,11 +142,11 @@ void SshRemoteProcessRunner::handleProcessStarted()
emit processStarted();
}
void SshRemoteProcessRunner::handleProcessFinished(const QString &error)
void SshRemoteProcessRunner::handleProcessFinished()
{
d->m_exitStatus = d->m_process->exitStatus();
d->m_exitCode = d->m_process->exitCode();
d->m_processErrorString = error;
d->m_processErrorString = d->m_process->errorString();
setState(Inactive);
emit processClosed(d->m_processErrorString);
}

View File

@@ -64,7 +64,7 @@ private:
void handleConnectionError();
void handleDisconnected();
void handleProcessStarted();
void handleProcessFinished(const QString &error);
void handleProcessFinished();
void runInternal(const QString &command, const QSsh::SshConnectionParameters &sshParams);
void setState(int newState);