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

centralize entering the InferiorStartFailed state

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-10-12 18:23:54 +02:00
parent 1a27681c78
commit 973f607e64
4 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/gdb/attachgdbadapter.cpp
View File

@@ -111,7 +111,6 @@ void AttachGdbAdapter::handleAttach(const GdbResponse &response)
m_engine->updateAll(); m_engine->updateAll();
} else { } else {
QString msg = __(response.data.findChild("msg").data()); QString msg = __(response.data.findChild("msg").data());
setState(InferiorStartFailed);
emit inferiorStartFailed(msg); emit inferiorStartFailed(msg);
} }
} }

5
src/plugins/debugger/gdb/coregdbadapter.cpp
View File

@@ -121,7 +121,6 @@ void CoreGdbAdapter::handleTargetCore1(const GdbResponse &response)
int pos1 = console.data().indexOf('`'); int pos1 = console.data().indexOf('`');
int pos2 = console.data().indexOf('\''); int pos2 = console.data().indexOf('\'');
if (pos1 == -1 || pos2 == -1) { if (pos1 == -1 || pos2 == -1) {
setState(InferiorStartFailed);
emit inferiorStartFailed(tr("No binary found.")); emit inferiorStartFailed(tr("No binary found."));
} else { } else {
m_executable = console.data().mid(pos1 + 1, pos2 - pos1 - 1); m_executable = console.data().mid(pos1 + 1, pos2 - pos1 - 1);
@@ -134,7 +133,6 @@ void CoreGdbAdapter::handleTargetCore1(const GdbResponse &response)
} }
} else { } else {
const QByteArray msg = response.data.findChild("msg").data(); const QByteArray msg = response.data.findChild("msg").data();
setState(InferiorStartFailed);
emit inferiorStartFailed(msg); emit inferiorStartFailed(msg);
} }
} }
@@ -149,7 +147,6 @@ void CoreGdbAdapter::handleDetach1(const GdbResponse &response)
.arg(fi.absoluteFilePath()), CB(handleFileExecAndSymbols)); .arg(fi.absoluteFilePath()), CB(handleFileExecAndSymbols));
} else { } else {
const QByteArray msg = response.data.findChild("msg").data(); const QByteArray msg = response.data.findChild("msg").data();
setState(InferiorStartFailed);
emit inferiorStartFailed(msg); emit inferiorStartFailed(msg);
} }
} }
@@ -168,7 +165,6 @@ void CoreGdbAdapter::handleFileExecAndSymbols(const GdbResponse &response)
.arg(__(response.data.findChild("msg").data())); .arg(__(response.data.findChild("msg").data()));
setState(InferiorUnrunnable); setState(InferiorUnrunnable);
m_engine->updateAll(); m_engine->updateAll();
//setState(InferiorStartFailed);
// emit inferiorStartFailed(msg); // emit inferiorStartFailed(msg);
} }
} }
@@ -185,7 +181,6 @@ void CoreGdbAdapter::handleTargetCore2(const GdbResponse &response)
.arg(__(response.data.findChild("msg").data())); .arg(__(response.data.findChild("msg").data()));
setState(InferiorUnrunnable); setState(InferiorUnrunnable);
m_engine->updateAll(); m_engine->updateAll();
//setState(InferiorStartFailed);
// emit inferiorStartFailed(msg); // emit inferiorStartFailed(msg);
} }
} }

1
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4218,6 +4218,7 @@ void GdbEngine::handleInferiorStartFailed(const QString &msg)
{ {
debugMessage(_("INFERIOR START FAILED")); debugMessage(_("INFERIOR START FAILED"));
showMessageBox(QMessageBox::Critical, tr("Inferior start failed"), msg); showMessageBox(QMessageBox::Critical, tr("Inferior start failed"), msg);
setState(InferiorStartFailed);
shutdown(); shutdown();
} }

1
src/plugins/debugger/gdb/plaingdbadapter.cpp
View File

@@ -141,7 +141,6 @@ void PlainGdbAdapter::handleExecRun(const GdbResponse &response)
const QByteArray &msg = response.data.findChild("msg").data(); const QByteArray &msg = response.data.findChild("msg").data();
//QTC_ASSERT(status() == InferiorRunning, /**/); //QTC_ASSERT(status() == InferiorRunning, /**/);
//interruptInferior(); //interruptInferior();
setState(InferiorStartFailed);
emit inferiorStartFailed(msg); emit inferiorStartFailed(msg);
} }
} }