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

debugger: split BreakpointIndex into plugin and debugger specific part

Browse Source 
Change-Id: I21d10cf42eb039c74475e106537b6e107d155196
Reviewed-on: http://codereview.qt.nokia.com/745
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-06-24 16:25:30 +02:00
committed by hjk
parent c4713f5ab2
commit c041286753
34 changed files with 563 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -578,14 +578,14 @@ void QmlEngine::attemptBreakpointSynchronization()
{
BreakHandler *handler = breakHandler();
foreach (BreakpointId id, handler->unclaimedBreakpointIds()) {
foreach (BreakpointModelId id, handler->unclaimedBreakpointIds()) {
// Take ownership of the breakpoint. Requests insertion.
if (acceptsBreakpoint(id))
handler->setEngine(id, this);
}
JSAgentBreakpoints breakpoints;
foreach (BreakpointId id, handler->engineBreakpointIds(this)) {
foreach (BreakpointModelId id, handler->engineBreakpointIds(this)) {
if (handler->state(id) == BreakpointRemoveRequested) {
handler->notifyBreakpointRemoveProceeding(id);
handler->notifyBreakpointRemoveOk(id);
@@ -620,7 +620,7 @@ void QmlEngine::attemptBreakpointSynchronization()
sendMessage(reply);
}
bool QmlEngine::acceptsBreakpoint(BreakpointId id) const
bool QmlEngine::acceptsBreakpoint(BreakpointModelId id) const
{
return !DebuggerEngine::isCppBreakpoint(breakHandler()->breakpointData(id));
}
@@ -890,7 +890,7 @@ void QmlEngine::messageReceived(const QByteArray &message)
}
BreakHandler *handler = breakHandler();
foreach (BreakpointId id, handler->engineBreakpointIds(this)) {
foreach (BreakpointModelId id, handler->engineBreakpointIds(this)) {
QString processedFilename = handler->fileName(id);
if (processedFilename == file && handler->lineNumber(id) == line) {
QTC_ASSERT(handler->state(id) == BreakpointInserted,/**/);