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

debugger: introduce the concept of a 'Location', used by gotoLocation

Browse Source
This commit is contained in:
hjk
2010-12-16 19:06:33 +01:00
parent 39c145bf93
commit 9757e22113
14 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,23 +176,12 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters)
QmlEngine::~QmlEngine()
{}
void QmlEngine::gotoLocation(const QString &fileName, int lineNumber, bool setMarker)
void QmlEngine::gotoLocation(const Location &loc0)
{
QString processedFilename = fileName;
Location loc = loc0;
if (isShadowBuildProject())
processedFilename = fromShadowBuildFilename(fileName);
DebuggerEngine::gotoLocation(processedFilename, lineNumber, setMarker);
}
void QmlEngine::gotoLocation(const StackFrame &frame, bool setMarker)
{
StackFrame adjustedFrame = frame;
if (isShadowBuildProject())
adjustedFrame.file = fromShadowBuildFilename(frame.file);
DebuggerEngine::gotoLocation(adjustedFrame, setMarker);
loc.setFileName(fromShadowBuildFilename(loc0.fileName()));
DebuggerEngine::gotoLocation(loc);
}
void QmlEngine::setupInferior()
@@ -469,7 +458,7 @@ void QmlEngine::activateFrame(int index)
<< index;
logMessage(LogSend, QString("%1 %2").arg(QString(cmd), QString::number(index)));
sendMessage(reply);
gotoLocation(stackHandler()->frames().value(index), true);
gotoLocation(stackHandler()->frames().value(index));
}
void QmlEngine::selectThread(int index)
@@ -703,7 +692,7 @@ void QmlEngine::messageReceived(const QByteArray &message)
for (int i = 0; i != stackFrames.size(); ++i)
stackFrames[i].level = i + 1;
gotoLocation(stackFrames.value(0), true);
gotoLocation(stackFrames.value(0));
stackHandler()->setFrames(stackFrames);
watchHandler()->beginCycle();