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

ConsoleProcess: undo pointless processError() => processMessage(bool error) change

Browse Source
This commit is contained in:
Oswald Buddenhagen
2011-05-11 16:27:33 +02:00
parent 322a8481a7
commit cfb232eba9
9 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -614,8 +614,8 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe
qDebug("startConsole %s", qPrintable(sp.executable));
m_consoleStub.reset(new Utils::ConsoleProcess);
m_consoleStub->setMode(Utils::ConsoleProcess::Suspend);
connect(m_consoleStub.data(), SIGNAL(processMessage(QString, bool)),
SLOT(consoleStubMessage(QString, bool)));
connect(m_consoleStub.data(), SIGNAL(processError(QString)),
SLOT(consoleStubError(QString)));
connect(m_consoleStub.data(), SIGNAL(processStarted()),
SLOT(consoleStubProcessStarted()));
connect(m_consoleStub.data(), SIGNAL(wrapperStopped()),
@@ -630,22 +630,18 @@ bool CdbEngine::startConsole(const DebuggerStartParameters &sp, QString *errorMe
return true;
}
void CdbEngine::consoleStubMessage(const QString &msg, bool isError)
void CdbEngine::consoleStubError(const QString &msg)
{
if (debug)
qDebug("consoleStubProcessMessage() in %s error=%d %s", stateName(state()), isError, qPrintable(msg));
if (isError) {
if (state() == EngineSetupRequested) {
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyEngineSetupFailed")
notifyEngineSetupFailed();
} else {
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyEngineIll")
notifyEngineIll();
}
nonModalMessageBox(QMessageBox::Critical, tr("Debugger Error"), msg);
qDebug("consoleStubProcessMessage() in %s %s", stateName(state()), qPrintable(msg));
if (state() == EngineSetupRequested) {
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyEngineSetupFailed")
notifyEngineSetupFailed();
} else {
showMessage(msg, AppOutput);
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyEngineIll")
notifyEngineIll();
}
nonModalMessageBox(QMessageBox::Critical, tr("Debugger Error"), msg);
}
void CdbEngine::consoleStubProcessStarted()