diff options
author | hjk <qtc-committer@nokia.com> | 2010-03-26 10:29:19 +0100 |
---|---|---|
committer | hjk <qtc-committer@nokia.com> | 2010-03-26 10:29:58 +0100 |
commit | 0f1b7183593c96ea89ca23ad4f7bb3b0463d674b (patch) | |
tree | 8f29378fb60dded86398b45f0cd0a9733ca98aa3 /src/plugins/debugger/script/scriptengine.cpp | |
parent | 68f916b752cbd4c40f870a2e3a58e1f003484103 (diff) | |
download | qt-creator-0f1b7183593c96ea89ca23ad4f7bb3b0463d674b.tar.gz |
debugger: move breakpoint marker to the line where the breakpoint will be
actually hit
Diffstat (limited to 'src/plugins/debugger/script/scriptengine.cpp')
-rw-r--r-- | src/plugins/debugger/script/scriptengine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index 0eabcda399..d4588f6520 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -425,9 +425,9 @@ void ScriptEngine::attemptBreakpointSynchronization() data->bpNumber = QByteArray::number(index + 1); updateNeeded = true; } - if (!data->fileName.isEmpty() && data->markerFileName.isEmpty()) { - data->markerFileName = data->fileName; - data->markerLineNumber = data->lineNumber.toInt(); + if (!data->fileName.isEmpty() && data->markerFileName().isEmpty()) { + data->setMarkerFileName(data->fileName); + data->setMarkerLineNumber(data->lineNumber.toInt()); updateNeeded = true; } } @@ -597,8 +597,8 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction) if (byFunction && functionName.isEmpty()) return false; BreakpointData *data = byFunction ? - findBreakPointByFunction(manager()->breakHandler(), functionName) : - findBreakPointByFileName(manager()->breakHandler(), lineNumber, fileName); + findBreakPointByFunction(manager()->breakHandler(), functionName) : + findBreakPointByFileName(manager()->breakHandler(), lineNumber, fileName); if (!data) return false; @@ -607,8 +607,8 @@ bool ScriptEngine::checkForBreakCondition(bool byFunction) data->bpLineNumber = QByteArray::number(lineNumber); data->bpFileName = fileName; data->bpFuncName = functionName; - data->markerLineNumber = lineNumber; - data->markerFileName = fileName; + data->setMarkerLineNumber(lineNumber); + data->setMarkerFileName(fileName); data->pending = false; data->updateMarker(); } |