From bb6a7c3c6c2deb6c7df0c74373dab526b4e04cc0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 20 Apr 2010 10:31:40 +0200
Subject: [PATCH] Debugger[CDB]: Wire stderr/stdout output.
---
src/plugins/debugger/cdb/cdbdebugengine.cpp | 8 ++++----
src/plugins/debugger/cdb/cdbdebugeventcallback.cpp | 2 +-
src/plugins/debugger/cdb/cdbdebugoutput.cpp | 4 ++--
src/plugins/debugger/cdb/cdbdebugoutput.h | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index d5a72cf4543..a81472ac656 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -152,10 +152,10 @@ bool CdbDebugEnginePrivate::init(QString *errorMessage)
manager(), SLOT(showDebuggerOutput(int,QString)));
connect(output, SIGNAL(debuggerInputPrompt(int,QString)),
manager(), SLOT(showDebuggerInput(int,QString)));
- connect(output, SIGNAL(debuggeeOutput(QString)),
- manager(), SLOT(showApplicationOutput(QString)));
- connect(output, SIGNAL(debuggeeInputPrompt(QString)),
- manager(), SLOT(showApplicationOutput(QString)));
+ connect(output, SIGNAL(debuggeeOutput(QString,bool)),
+ manager(), SLOT(showApplicationOutput(QString,bool)));
+ connect(output, SIGNAL(debuggeeInputPrompt(QString,bool)),
+ manager(), SLOT(showApplicationOutput(QString,bool)));
setDebugEventCallback(DebugEventCallbackBasePtr(new CdbDebugEventCallback(m_engine)));
updateCodeLevel();
diff --git a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
index a7ad1107fd4..833bdb2d258 100644
--- a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
@@ -79,7 +79,7 @@ STDMETHODIMP CdbDebugEventCallback::Exception(
const bool fatal = isFatalException(Exception->ExceptionCode);
if (debugCDB)
qDebug() << Q_FUNC_INFO << "\nex=" << Exception->ExceptionCode << " fatal=" << fatal << msg;
- m_pEngine->manager()->showApplicationOutput(msg);
+ m_pEngine->manager()->showApplicationOutput(msg, true);
m_pEngine->manager()->showDebuggerOutput(LogMisc, msg);
m_pEngine->m_d->notifyException(Exception->ExceptionCode, fatal, msg);
return S_OK;
diff --git a/src/plugins/debugger/cdb/cdbdebugoutput.cpp b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
index 9e040042129..0b7dd4eb711 100644
--- a/src/plugins/debugger/cdb/cdbdebugoutput.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
@@ -81,10 +81,10 @@ void CdbDebugOutput::output(ULONG mask, const QString &msg)
emit debuggerInputPrompt(logChannel(mask), msg);
break;
case DebuggeeOutput:
- emit debuggeeOutput(msg);
+ emit debuggeeOutput(msg, true);
break;
case DebuggeePromptOutput:
- emit debuggeeInputPrompt(msg);
+ emit debuggeeInputPrompt(msg, false);
break;
}
}
diff --git a/src/plugins/debugger/cdb/cdbdebugoutput.h b/src/plugins/debugger/cdb/cdbdebugoutput.h
index 647eaedf11f..989c937ca54 100644
--- a/src/plugins/debugger/cdb/cdbdebugoutput.h
+++ b/src/plugins/debugger/cdb/cdbdebugoutput.h
@@ -50,8 +50,8 @@ protected:
signals:
void debuggerOutput(int channel, const QString &message);
void debuggerInputPrompt(int channel, const QString &message);
- void debuggeeOutput(const QString &message);
- void debuggeeInputPrompt(const QString &message);
+ void debuggeeOutput(const QString &message, bool onStderr);
+ void debuggeeInputPrompt(const QString &message, bool onStderr);
};
} // namespace Internal
--
GitLab