diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-05-09 16:50:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:19 +0200 |
| commit | 00a46fa07bf87c6ffa0d60b4a98b51685fdc1ef5 (patch) | |
| tree | 0179cfadb7a1f1b37523a9687cf1c60b9ffda224 /src/qml/jsruntime/qv4debugging.cpp | |
| parent | 2eb5416f5465d0e9b4377b1f57d3b888201d519b (diff) | |
Convert Execution contexts to new constructor syntax
Change-Id: I4bc6a61b7a96139353e20871ff7ff007822c64c3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4debugging.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4debugging.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp index f2a95fc5fc..04422b9f5e 100644 --- a/src/qml/jsruntime/qv4debugging.cpp +++ b/src/qml/jsruntime/qv4debugging.cpp @@ -224,7 +224,7 @@ static inline CallContext *findContext(ExecutionContext *ctxt, int frame) { while (ctxt) { CallContext *cCtxt = ctxt->asCallContext(); - if (cCtxt && cCtxt->function) { + if (cCtxt && cCtxt->d()->function) { if (frame < 1) return cCtxt; --frame; @@ -327,7 +327,7 @@ void Debugger::collectLocalsInContext(Collector *collector, int frameNr, int sco QString qName; if (String *name = ctxt->variables()[i]) qName = name->toQString(); - v = ctxt->locals[i]; + v = ctxt->d()->locals[i]; collector->collect(qName, v); } } @@ -367,7 +367,7 @@ bool Debugger::collectThisInContext(Debugger::Collector *collector, int frame) ExecutionContext *ctxt = findContext(engine->currentContext(), frameNr); while (ctxt) { if (CallContext *cCtxt = ctxt->asCallContext()) - if (cCtxt->activation) + if (cCtxt->d()->activation) break; ctxt = ctxt->d()->outer; } @@ -376,7 +376,7 @@ bool Debugger::collectThisInContext(Debugger::Collector *collector, int frame) return false; Scope scope(engine); - ScopedObject o(scope, ctxt->asCallContext()->activation); + ScopedObject o(scope, ctxt->asCallContext()->d()->activation); collector->collect(o); return true; } @@ -517,7 +517,7 @@ Function *Debugger::getFunction() const { ExecutionContext *context = m_engine->currentContext(); if (CallContext *callCtx = context->asCallContext()) - return callCtx->function->function(); + return callCtx->d()->function->function(); else { Q_ASSERT(context->d()->type == QV4::ExecutionContext::Type_GlobalContext); return context->d()->engine->globalCode; |