diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-11 16:27:33 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-12 20:39:44 +0200 |
| commit | cfb232eba952369579a83eb989d75ff637eed0d6 (patch) | |
| tree | 52e753c2ac8f1425fb5b7c139a11ecc4cfea00f1 /src/plugins/debugger/cdb | |
| parent | 322a8481a754109b7dd8306598fce39f49e57ad9 (diff) | |
| download | qt-creator-cfb232eba952369579a83eb989d75ff637eed0d6.tar.gz | |
ConsoleProcess: undo pointless processError() => processMessage(bool error) change
Diffstat (limited to 'src/plugins/debugger/cdb')
| -rw-r--r-- | src/plugins/debugger/cdb/cdbengine.cpp | 24 | ||||
| -rw-r--r-- | src/plugins/debugger/cdb/cdbengine.h | 2 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 3cfd53c22b..c1b3d2c8cd 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -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() diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 8e0b1d3c3e..ec3a6d8579 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -160,7 +160,7 @@ private slots: void postCommandSequence(unsigned mask); void operateByInstructionTriggered(bool); - void consoleStubMessage(const QString &, bool); + void consoleStubError(const QString &); void consoleStubProcessStarted(); void consoleStubExited(); |