Uniform ApplicationLauncher API: get rid of reportError()

Use existing error() signal instead.
Implement errorString() and processError() in non-local case.

Change-Id: Ibdd6cec19ffa5efa0dad330515988da80e86e35b
Reviewed-by: hjk <hjk@qt.io>

src/plugins/boot2qt/qdbdevice.cpp

@@ -79,8 +79,8 @@ public:
     {
         connect(&m_appRunner, &ApplicationLauncher::appendMessage, this,
                 &DeviceApplicationObserver::handleAppendMessage);
-        connect(&m_appRunner, &ApplicationLauncher::reportError, this,
+        connect(&m_appRunner, &ApplicationLauncher::error, this,
-                &DeviceApplicationObserver::handleError);
+                [this] { m_error = m_appRunner.errorString(); });
         connect(&m_appRunner, &ApplicationLauncher::finished, this,
                 &DeviceApplicationObserver::handleFinished);
 
@@ -102,7 +102,6 @@ private:
         else if (format == Utils::StdErrFormat)
             m_stderr += data;
     }
-    void handleError(const QString &message) { m_error = message; }
 
     void handleFinished(bool success)
     {

src/plugins/boot2qt/qdbstopapplicationservice.cpp

@@ -88,8 +88,8 @@ void QdbStopApplicationService::handleAppendMessage(const QString &message, Util
 
 void QdbStopApplicationService::doDeploy()
 {
-    connect(&d->applicationLauncher, &ProjectExplorer::ApplicationLauncher::reportError,
+    connect(&d->applicationLauncher, &ProjectExplorer::ApplicationLauncher::error,
-            this, &QdbStopApplicationService::stdErrData);
+            this, [this] { emit stdErrData(d->applicationLauncher.errorString()); });
     connect(&d->applicationLauncher, &ProjectExplorer::ApplicationLauncher::finished,
             this, &QdbStopApplicationService::handleProcessFinished);
     connect(&d->applicationLauncher, &ProjectExplorer::ApplicationLauncher::appendMessage,

src/plugins/projectexplorer/applicationlauncher.cpp

@@ -88,7 +88,8 @@ public:
     bool isRunning() const;
 
     // Remote
-    void doReportError(const QString &message);
+    void doReportError(const QString &message,
+                       QProcess::ProcessError error = QProcess::FailedToStart);
     void handleRemoteStderr();
     void handleRemoteStdout();
     void handleApplicationFinished();
@@ -116,6 +117,8 @@ public:
 
     // Remote
     DeviceProcess *m_deviceProcess = nullptr;
+    QString m_remoteErrorString;
+    QProcess::ProcessError m_remoteError = QProcess::UnknownError;
     State m_state = Inactive;
     bool m_stopRequested = false;
     bool m_success = false;
@@ -258,18 +261,16 @@ qint64 ApplicationLauncherPrivate::applicationPID() const
 
 QString ApplicationLauncher::errorString() const
 {
-    if (d->m_useTerminal)
+    if (d->m_isLocal)
-        return d->m_consoleProcess.errorString();
+        return d->m_useTerminal ? d->m_consoleProcess.errorString() : d->m_guiProcess.errorString();
-    else
+    return d->m_remoteErrorString;
-        return d->m_guiProcess.errorString();
 }
 
 QProcess::ProcessError ApplicationLauncher::processError() const
 {
-    if (d->m_useTerminal)
+    if (d->m_isLocal)
-        return d->m_consoleProcess.error();
+        return d->m_useTerminal ? d->m_consoleProcess.error() : d->m_guiProcess.error();
-    else
+    return d->m_remoteError;
-        return d->m_guiProcess.error();
 }
 
 void ApplicationLauncherPrivate::localGuiProcessError()
@@ -469,11 +470,12 @@ void ApplicationLauncherPrivate::handleApplicationFinished()
     QTC_ASSERT(m_state == Run, return);
 
     if (m_deviceProcess->exitStatus() == QProcess::CrashExit) {
-        doReportError(m_deviceProcess->errorString());
+        doReportError(m_deviceProcess->errorString(), QProcess::Crashed);
     } else {
         const int exitCode = m_deviceProcess->exitCode();
         if (exitCode != 0) {
-            doReportError(ApplicationLauncher::tr("Application finished with exit code %1.").arg(exitCode));
+            doReportError(ApplicationLauncher::tr("Application finished with exit code %1.")
+                          .arg(exitCode), QProcess::UnknownError);
         } else {
             emit q->appendMessage(ApplicationLauncher::tr("Application finished with exit code 0."),
                                   Utils::NormalMessageFormat);
@@ -496,10 +498,12 @@ void ApplicationLauncherPrivate::handleRemoteStderr()
     emit q->appendMessage(QString::fromUtf8(output), Utils::StdErrFormat, false);
 }
 
-void ApplicationLauncherPrivate::doReportError(const QString &message)
+void ApplicationLauncherPrivate::doReportError(const QString &message, QProcess::ProcessError error)
 {
+    m_remoteErrorString = message;
+    m_remoteError = error;
     m_success = false;
-    emit q->reportError(message);
+    emit q->error(error);
 }
 
 } // namespace ProjectExplorer

src/plugins/projectexplorer/applicationlauncher.h

@@ -74,7 +74,6 @@ signals:
     void processExited(int exitCode, QProcess::ExitStatus);
     void error(QProcess::ProcessError error);
 
-    void reportError(const QString &errorOutput);
     void finished(bool success);
 
 private:

src/plugins/projectexplorer/runcontrol.cpp

@@ -1252,9 +1252,8 @@ void SimpleTargetRunner::doStart(const Runnable &runnable, const IDevice::ConstP
 
     } else {
 
-        connect(&m_launcher, &ApplicationLauncher::reportError,
+        connect(&m_launcher, &ApplicationLauncher::error, this, [this] {
-                this, [this](const QString &msg) {
+            reportFailure(m_launcher.errorString());
-                    reportFailure(msg);
         });
 
         connect(&m_launcher, &ApplicationLauncher::finished,