From ccf4fe9a5ff8762d19aefc8d4140cfe41a5e6da9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 5 Oct 2009 17:58:25 +0200
Subject: [PATCH] use gdb's target stream output

at least in theory, this is the output of a remote debuggee
---
 src/plugins/debugger/gdb/gdbengine.cpp | 8 +-------
 src/plugins/debugger/gdb/gdbengine.h   | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 624f20652fc..e2c11155c1b 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -284,7 +284,6 @@ void GdbEngine::initializeVariables()
     m_customOutputForToken.clear();
 
     m_pendingConsoleStreamOutput.clear();
-    m_pendingTargetStreamOutput.clear();
     m_pendingLogStreamOutput.clear();
 
     m_inbuffer.clear();
@@ -514,8 +513,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
         }
 
         case '@': {
-            QByteArray data = GdbMi::parseCString(from, to);
-            m_pendingTargetStreamOutput += data;
+            readDebugeeOutput(GdbMi::parseCString(from, to));
             break;
         }
 
@@ -570,12 +568,9 @@ void GdbEngine::handleResponse(const QByteArray &buff)
             }
 
             //qDebug() << "\nLOG STREAM:" + m_pendingLogStreamOutput;
-            //qDebug() << "\nTARGET STREAM:" + m_pendingTargetStreamOutput;
             //qDebug() << "\nCONSOLE STREAM:" + m_pendingConsoleStreamOutput;
             response.data.setStreamOutput("logstreamoutput",
                 m_pendingLogStreamOutput);
-            response.data.setStreamOutput("targetstreamoutput",
-                m_pendingTargetStreamOutput);
             response.data.setStreamOutput("consolestreamoutput",
                 m_pendingConsoleStreamOutput);
             QByteArray custom = m_customOutputForToken[token];
@@ -584,7 +579,6 @@ void GdbEngine::handleResponse(const QByteArray &buff)
                     '{' + custom + '}');
             //m_customOutputForToken.remove(token);
             m_pendingLogStreamOutput.clear();
-            m_pendingTargetStreamOutput.clear();
             m_pendingConsoleStreamOutput.clear();
 
             handleResultRecord(response);
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index e6edf2b5934..37a0442600f 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -287,7 +287,6 @@ private:
     QHash<int, QByteArray> m_customOutputForToken;
 
     QByteArray m_pendingConsoleStreamOutput;
-    QByteArray m_pendingTargetStreamOutput;
     QByteArray m_pendingLogStreamOutput;
 
     // contains the first token number for the current round