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

debugger: remove dead code

Browse Source
This commit is contained in:
hjk
2011-04-08 15:00:26 +02:00
parent 556359f539
commit 77fc753903
1 changed files with 3 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/debugger/gdb/pythongdbengine.cpp
View File

@@ -56,9 +56,8 @@ void GdbEngine::updateLocalsPython(bool tryPartial, const QByteArray &varList)
{ {
PRECONDITION; PRECONDITION;
m_processedNames.clear(); m_processedNames.clear();
watchHandler()->beginCycle(!tryPartial);
//m_toolTipExpression.clear();
WatchHandler *handler = watchHandler(); WatchHandler *handler = watchHandler();
handler->beginCycle(!tryPartial);
QByteArray expanded = "expanded:" + handler->expansionRequests() + ' '; QByteArray expanded = "expanded:" + handler->expansionRequests() + ' ';
expanded += "typeformats:" + handler->typeFormatRequests() + ' '; expanded += "typeformats:" + handler->typeFormatRequests() + ' ';
@@ -68,8 +67,8 @@ void GdbEngine::updateLocalsPython(bool tryPartial, const QByteArray &varList)
const QString fileName = stackHandler()->currentFrame().file; const QString fileName = stackHandler()->currentFrame().file;
const QString function = stackHandler()->currentFrame().function; const QString function = stackHandler()->currentFrame().function;
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
QStringList expressions = QStringList expressions = DebuggerToolTipManager::instance()
DebuggerToolTipManager::instance()->treeWidgetExpressions(fileName, objectName(), function); ->treeWidgetExpressions(fileName, objectName(), function);
const QString currentExpression = tooltipExpression(); const QString currentExpression = tooltipExpression();
if (!currentExpression.isEmpty() && !expressions.contains(currentExpression)) if (!currentExpression.isEmpty() && !expressions.contains(currentExpression))
expressions.push_back(currentExpression); expressions.push_back(currentExpression);
@@ -132,11 +131,9 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
PRECONDITION; PRECONDITION;
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultDone) {
const bool partial = response.cookie.toBool(); const bool partial = response.cookie.toBool();
//qDebug() << "READING " << (partial ? "PARTIAL" : "FULL");
QByteArray out = response.data.findChild("consolestreamoutput").data(); QByteArray out = response.data.findChild("consolestreamoutput").data();
while (out.endsWith(' ') || out.endsWith('\n')) while (out.endsWith(' ') || out.endsWith('\n'))
out.chop(1); out.chop(1);
//qDebug() << "SECOND CHUNK: " << out;
int pos = out.indexOf("data="); int pos = out.indexOf("data=");
if (pos != 0) { if (pos != 0) {
showMessage(_("DISCARDING JUNK AT BEGIN OF RESPONSE: " showMessage(_("DISCARDING JUNK AT BEGIN OF RESPONSE: "
@@ -145,7 +142,6 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
} }
GdbMi all; GdbMi all;
all.fromStringMultiple(out); all.fromStringMultiple(out);
//qDebug() << "ALL: " << all.toString();
GdbMi data = all.findChild("data"); GdbMi data = all.findChild("data");
QList<WatchData> list; QList<WatchData> list;
@@ -160,48 +156,9 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
} else { } else {
dummy.name = _(child.findChild("name").data()); dummy.name = _(child.findChild("name").data());
} }
//qDebug() << "CHILD: " << child.toString();
parseWatchData(watchHandler()->expandedINames(), dummy, child, &list); parseWatchData(watchHandler()->expandedINames(), dummy, child, &list);
} }
watchHandler()->insertBulkData(list); watchHandler()->insertBulkData(list);
//for (int i = 0; i != list.size(); ++i)
// qDebug() << "LOCAL: " << list.at(i).toString();
#if 0
data = all.findChild("bkpts");
if (data.isValid()) {
BreakHandler *handler = breakHandler();
foreach (const GdbMi &child, data.children()) {
int bpNumber = child.findChild("number").data().toInt();
int found = handler->findBreakpoint(bpNumber);
if (found != -1) {
BreakpointData *bp = handler->at(found);
GdbMi addr = child.findChild("addr");
if (addr.isValid()) {
bp->bpAddress = child.findChild("addr").data();
bp->pending = false;
} else {
bp->bpAddress = "<PENDING>";
bp->pending = true;
}
bp->bpFuncName = child.findChild("func").data();
bp->bpLineNumber = child.findChild("line").data();
bp->bpFileName = child.findChild("file").data();
bp->markerLineNumber = bp->bpLineNumber.toInt();
bp->markerFileName = bp->bpFileName;
// Happens with moved/symlinked sources.
if (!bp->fileName.isEmpty()
&& !bp->bpFileName.isEmpty()
&& bp->fileName != bp->bpFileName)
bp->markerFileName = bp->fileName;
} else {
QTC_ASSERT(false, qDebug() << child.toString() << bpNumber);
//bp->bpNumber = "<unavailable>";
}
}
handler->updateMarkers();
}
#endif
//PENDING_DEBUG("AFTER handleStackFrame()"); //PENDING_DEBUG("AFTER handleStackFrame()");
// FIXME: This should only be used when updateLocals() was // FIXME: This should only be used when updateLocals() was