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

debugger: replace artificial "{console,log}streamoutput" member in GdbMi

Browse Source 
Use proper QByteArray member in GdbResponse instead. Less magic, and
does not break array-style reponses where all children are assumed to
be of the same "type".

Change-Id: Ief1efdeb0412f59836e1b2d6f4cb751ddef3216e
Reviewed-on: http://codereview.qt.nokia.com/1184
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
hjk
2011-07-05 17:57:57 +02:00
committed by hjk
parent 1070da91c5
commit 78b1b042e3
8 changed files with 39 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,8 +676,7 @@ static bool isAccessSpecifier(const QByteArray &ba)
// reads a MI-encoded item frome the consolestream
static bool parseConsoleStream(const GdbResponse &response, GdbMi *contents)
{
GdbMi output = response.data.findChild("consolestreamoutput");
QByteArray out = output.data();
QByteArray out = response.consoleStreamOutput;
int markerPos = out.indexOf('"') + 1; // position of 'success marker'
if (markerPos == 0 || out.at(markerPos) == 'f') { // 't' or 'f'
@@ -1016,7 +1015,7 @@ void GdbEngine::handleDebuggingHelperValue3Classic(const GdbResponse &response)
{
if (response.resultClass == GdbResultDone) {
WatchData data = response.cookie.value<WatchData>();
QByteArray out = response.data.findChild("consolestreamoutput").data();
QByteArray out = response.consoleStreamOutput;
while (out.endsWith(' ') || out.endsWith('\n'))
out.chop(1);
QList<QByteArray> list = out.split(' ');