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

ProjectExplorer: Rename DeviceProcess::error to errorOccured

Browse Source 
That's what QProcess favors nowadays and QtcProcess uses.

Change-Id: Ie9492ae62f23e35a8a70f72196c3d1b6bc50cbdc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-01-27 10:55:39 +01:00
parent a386725c6c
commit 4e34921451
13 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
View File

@@ -194,7 +194,7 @@ void SshDeviceProcess::handleConnected()
if (runInTerminal()) {
d->process->setUseTerminal(true);
connect(&d->consoleProcess, &QtcProcess::errorOccurred,
this, &DeviceProcess::error);
this, &DeviceProcess::errorOccurred);
connect(&d->consoleProcess, &QtcProcess::started,
this, &SshDeviceProcess::handleProcessStarted);
connect(&d->consoleProcess, &QtcProcess::finished,
@@ -231,7 +231,7 @@ void SshDeviceProcess::handleDisconnected()
switch (oldState) {
case SshDeviceProcessPrivate::Connecting:
case SshDeviceProcessPrivate::Connected:
emit error(QProcess::FailedToStart);
emit errorOccurred(QProcess::FailedToStart);
break;
case SshDeviceProcessPrivate::ProcessRunning:
d->exitStatus = QProcess::CrashExit;
@@ -317,7 +317,7 @@ void SshDeviceProcess::SshDeviceProcessPrivate::doSignal(Signal signal)
case SshDeviceProcessPrivate::Connecting:
errorMessage = tr("Terminated by request.");
setState(SshDeviceProcessPrivate::Inactive);
emit q->error(QProcess::FailedToStart);
emit q->errorOccurred(QProcess::FailedToStart);
break;
case SshDeviceProcessPrivate::Connected:
case SshDeviceProcessPrivate::ProcessRunning: