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

debugger: simplify updateLocals() parameters

Browse Source 
Change-Id: I7da344c8eeade5153fb0b98a45e139654a2119dd
Reviewed-on: http://codereview.qt.nokia.com/177
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-05-26 15:13:37 +02:00
committed by hjk
parent 30fd098d9f
commit cdfcbcd0e0
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3628,16 +3628,15 @@ bool GdbEngine::setToolTipExpression(const QPoint &mousePos,
qDebug() << "GdbEngine::setToolTipExpression2 " << exp << (*m_toolTipContext);
if (isSynchronous()) {
updateLocals(QVariant());
return true;
updateLocalsPython(true, tooltipIName(exp));
} else {
WatchData toolTip;
toolTip.exp = exp.toLatin1();
toolTip.name = exp;
toolTip.iname = tooltipIName(exp);
watchHandler()->removeData(toolTip.iname);
watchHandler()->insertData(toolTip);
}
WatchData toolTip;
toolTip.exp = exp.toLatin1();
toolTip.name = exp;
toolTip.iname = tooltipIName(exp);
watchHandler()->removeData(toolTip.iname);
watchHandler()->insertData(toolTip);
return true;
}
@@ -3715,10 +3714,7 @@ void GdbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &f
&& m_pendingWatchRequests == 0
&& m_pendingBreakpointRequests == 0;
if (tryPartial)
updateLocalsPython(true, data.iname);
else
updateLocals();
updateLocalsPython(tryPartial, data.iname);
#endif
} else {
// Bump requests to avoid model rebuilding during the nested
@@ -3846,14 +3842,12 @@ void GdbEngine::handleDebuggingHelperSetup(const GdbResponse &response)
}
}
void GdbEngine::updateLocals(const QVariant &cookie)
void GdbEngine::updateLocals()
{
m_pendingWatchRequests = 0;
m_pendingBreakpointRequests = 0;
if (hasPython())
updateLocalsPython(false, QByteArray());
else
updateLocalsClassic(cookie);
updateLocalsClassic();
}
// Parse a local variable from GdbMi.