Uniform ApplicationLauncher API: get rid of finished()

Use existing processExited() signal instead.

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

3 files changed, 1 insertions, 44 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index 4e570b2b05e..83f98cc71bb 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -121,8 +121,6 @@ void CallgrindController::run(Option option)
             this, &CallgrindController::controllerProcessFinished);
     connect(m_controllerProcess, &ApplicationLauncher::error,
             this, &CallgrindController::handleControllerProcessError);
-    connect(m_controllerProcess, &ApplicationLauncher::finished,
-            this, &CallgrindController::controllerProcessClosed);
 
     Runnable controller = m_valgrindRunnable;
     controller.command.setExecutable(FilePath::fromString(CALLGRIND_CONTROL_BINARY));
@@ -185,24 +183,6 @@ void CallgrindController::controllerProcessFinished(int rc, QProcess::ExitStatus
     m_lastOption = Unknown;
 }
 
-void CallgrindController::controllerProcessClosed(bool success)
-{
-    Q_UNUSED(success)
-    //    QTC_ASSERT(m_remote.m_process, return);
-
-//    m_remote.m_errorString = m_remote.m_process->errorString();
-//    if (status == QSsh::SshRemoteProcess::FailedToStart) {
-//        m_remote.m_error = QProcess::FailedToStart;
-//        emit ValgrindProcessX::error(QProcess::FailedToStart);
-//    } else if (status == QSsh::SshRemoteProcess::NormalExit) {
-//        emit finished(m_remote.m_process->exitCode(), QProcess::NormalExit);
-//    } else if (status == QSsh::SshRemoteProcess::CrashExit) {
-//        m_remote.m_error = QProcess::Crashed;
-//        emit finished(m_remote.m_process->exitCode(), QProcess::CrashExit);
-//    }
-     controllerProcessFinished(0, QProcess::NormalExit);
-}
-
 void CallgrindController::getLocalDataFile()
 {
     cleanupTempFile();
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.h b/src/plugins/valgrind/callgrind/callgrindcontroller.h
index 30e2b6c0f0a..def88ffda23 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.h
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.h
@@ -78,7 +78,6 @@ private:
 
     void controllerProcessFinished(int, QProcess::ExitStatus);
     void controllerProcessError(QProcess::ProcessError);
-    void controllerProcessClosed(bool success);
 
     ProjectExplorer::ApplicationLauncher *m_controllerProcess = nullptr;
     ProjectExplorer::Runnable m_valgrindRunnable;
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index d29a2fd917a..95cfcc0faf5 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -48,7 +48,6 @@ public:
 
     bool run();
 
-    void closed(bool success);
     void processStarted();
     void localProcessStarted();
     void remoteProcessStarted();
@@ -116,15 +115,13 @@ bool ValgrindRunner::Private::run()
     // -q as suggested by valgrind manual
 
     connect(&m_valgrindProcess, &ApplicationLauncher::processExited,
-            this, &ValgrindRunner::Private::closed);
+            q, &ValgrindRunner::processFinished);
     connect(&m_valgrindProcess, &ApplicationLauncher::processStarted,
             this, &ValgrindRunner::Private::processStarted);
     connect(&m_valgrindProcess, &ApplicationLauncher::error,
             q, &ValgrindRunner::processError);
     connect(&m_valgrindProcess, &ApplicationLauncher::appendMessage,
             q, &ValgrindRunner::processOutputReceived);
-    connect(&m_valgrindProcess, &ApplicationLauncher::finished,
-            q, &ValgrindRunner::finished);
 
     if (HostOsInfo::isMacHost())
         // May be slower to start but without it we get no filenames for symbols.
@@ -218,25 +215,6 @@ void ValgrindRunner::Private::findPidOutputReceived(const QString &out, Utils::O
     }
 }
 
-void ValgrindRunner::Private::closed(bool success)
-{
-    Q_UNUSED(success)
-//    QTC_ASSERT(m_remote.m_process, return);
-
-//    m_remote.m_errorString = m_remote.m_process->errorString();
-//    if (status == QSsh::SshRemoteProcess::FailedToStart) {
-//        m_remote.m_error = QProcess::FailedToStart;
-//        q->processError(QProcess::FailedToStart);
-//    } else if (status == QSsh::SshRemoteProcess::NormalExit) {
-//        q->processFinished(m_remote.m_process->exitCode(), QProcess::NormalExit);
-//    } else if (status == QSsh::SshRemoteProcess::CrashExit) {
-//        m_remote.m_error = QProcess::Crashed;
-//        q->processFinished(m_remote.m_process->exitCode(), QProcess::CrashExit);
-//    }
-     q->processFinished(0, QProcess::NormalExit);
-}
-
-
 ValgrindRunner::ValgrindRunner(QObject *parent)
     : QObject(parent), d(new Private(this))
 {