Debugger: Merge two remote setup communication paths

Success and failure paths are very similar.

Change-Id: Iebf218f64401884c014f1f7745d504183018addd
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 5 insertions, 14 deletions

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 439d4bf31c..492b31c85c 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -744,22 +744,13 @@ void QmlCppEngine::slaveEngineStateChanged
     }
 }
 
-void QmlCppEngine::notifyEngineRemoteSetupDone(int gdbServerPort, int qmlPort)
+void QmlCppEngine::notifyEngineRemoteSetupFinished(const RemoteSetupResult &result)
 {
-    EDEBUG("MASTER REMOTE SETUP DONE");
-    DebuggerEngine::notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
+    EDEBUG("MASTER REMOTE SETUP FINISHED");
+    DebuggerEngine::notifyEngineRemoteSetupFinished(result);
 
-    cppEngine()->notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
-    qmlEngine()->notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
-}
-
-void QmlCppEngine::notifyEngineRemoteSetupFailed(const QString &message)
-{
-    EDEBUG("MASTER REMOTE SETUP FAILED");
-    DebuggerEngine::notifyEngineRemoteSetupFailed(message);
-
-    cppEngine()->notifyEngineRemoteSetupFailed(message);
-    qmlEngine()->notifyEngineRemoteSetupFailed(message);
+    cppEngine()->notifyEngineRemoteSetupFinished(result);
+    qmlEngine()->notifyEngineRemoteSetupFinished(result);
 }
 
 void QmlCppEngine::showMessage(const QString &msg, int channel, int timeout) const