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

BareMetal: Remove last uses of the remote setup sub-statemachinery

Browse Source 
Change-Id: I295f1fda6dc82c74769bc78f2074480b83dd7a0a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-06-19 12:51:46 +02:00
parent 4322990926
commit 107df0a7c1
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/baremetal/baremetaldebugsupport.cpp
View File

@@ -33,7 +33,6 @@
#include <debugger/debuggerruncontrol.h> #include <debugger/debuggerruncontrol.h>
#include <debugger/debuggerkitinformation.h> #include <debugger/debuggerkitinformation.h>
#include <debugger/analyzer/analyzermanager.h>
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildsteplist.h> #include <projectexplorer/buildsteplist.h>
@@ -175,7 +174,7 @@ void BareMetalDebugSupport::remoteErrorOutputMessage(const QByteArray &output)
void BareMetalDebugSupport::remoteProcessStarted() void BareMetalDebugSupport::remoteProcessStarted()
{ {
QTC_ASSERT(m_state == StartingRunner, return); QTC_ASSERT(m_state == StartingRunner, return);
adapterSetupDone(); m_state = Running;
} }
void BareMetalDebugSupport::appRunnerFinished(bool success) void BareMetalDebugSupport::appRunnerFinished(bool success)
@@ -187,10 +186,7 @@ void BareMetalDebugSupport::appRunnerFinished(bool success)
if (!success) if (!success)
notifyInferiorIll(); notifyInferiorIll();
} else if (m_state == StartingRunner) { } else if (m_state == StartingRunner) {
Debugger::RemoteSetupResult result; reportFailure(tr("Debugging failed."));
result.success = false;
result.reason = tr("Debugging failed.");
notifyEngineRemoteSetupFinished(result);
} }
reset(); reset();
@@ -211,22 +207,10 @@ void BareMetalDebugSupport::appRunnerError(const QString &error)
} }
} }
void BareMetalDebugSupport::adapterSetupDone()
{
m_state = Running;
Debugger::RemoteSetupResult result;
result.success = true;
notifyEngineRemoteSetupFinished(result);
}
void BareMetalDebugSupport::adapterSetupFailed(const QString &error) void BareMetalDebugSupport::adapterSetupFailed(const QString &error)
{ {
debuggingFinished(); debuggingFinished();
reportFailure(tr("Initial setup failed: %1").arg(error));
Debugger::RemoteSetupResult result;
result.success = false;
result.reason = tr("Initial setup failed: %1").arg(error);
notifyEngineRemoteSetupFinished(result);
} }
void BareMetalDebugSupport::setFinished() void BareMetalDebugSupport::setFinished()

1
src/plugins/baremetal/baremetaldebugsupport.h
View File

@@ -53,7 +53,6 @@ private:
void progressReport(const QString &progressOutput); void progressReport(const QString &progressOutput);
void appRunnerError(const QString &error); void appRunnerError(const QString &error);
void adapterSetupDone();
void adapterSetupFailed(const QString &error); void adapterSetupFailed(const QString &error);
void startExecution(); void startExecution();