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

Debugger: Use unified locals update in the cdbengine.

Browse Source 
Change-Id: I94c8bd554e9e5ee157fd2bc80d3889558d08a8f0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
David Schulz
2015-05-20 10:56:24 +02:00
parent 0218abf1d0
commit 8c1579bf64
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1831,29 +1831,20 @@ void CdbEngine::handleLocals(const CdbResponse &response, bool newFrame)
watchHandler()->notifyUpdateFinished(); watchHandler()->notifyUpdateFinished();
if (boolSetting(VerboseLog)) if (boolSetting(VerboseLog))
showMessage(QLatin1String("Locals: ") + QString::fromLatin1(response.extensionReply), LogDebug); showMessage(QLatin1String("Locals: ") + QString::fromLatin1(response.extensionReply), LogDebug);
WatchHandler *handler = watchHandler();
GdbMi data;
data.fromString(response.extensionReply);
QTC_ASSERT(data.type() == GdbMi::List, return);
data.m_name = "data";
GdbMi partial;
partial.m_name = "partial";
partial.m_data = QByteArray::number(newFrame ? 0 : 1);
GdbMi all; GdbMi all;
all.fromString(response.extensionReply); all.m_children.push_back(data);
QTC_ASSERT(all.type() == GdbMi::List, return); all.m_children.push_back(partial);
updateLocalsView(all);
QSet<QByteArray> toDelete;
if (newFrame) {
foreach (WatchItem *item, handler->model()->itemsAtLevel<WatchItem *>(2))
toDelete.insert(item->iname);
}
foreach (const GdbMi &child, all.children()) {
WatchItem *item = new WatchItem(child);
handler->insertItem(item);
toDelete.remove(item->iname);
}
handler->purgeOutdatedItems(toDelete);
if (newFrame) {
emit stackFrameCompleted();
DebuggerToolTipManager::updateEngine(this);
}
} else { } else {
showMessage(QString::fromLatin1(response.errorMessage), LogWarning); showMessage(QString::fromLatin1(response.errorMessage), LogWarning);
} }