diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:24:13 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:15 +0100 |
commit | 84aae25c0b3003fb846568cf26a2c7150db14d9d (patch) | |
tree | 53a78f1a54f6605008668a1bbe21f81bec3e13e4 /src/qml/jsruntime/qv4debugging.cpp | |
parent | ec8f1f68d623ae68cc7d79e19067884532e3db6f (diff) | |
download | qtdeclarative-84aae25c0b3003fb846568cf26a2c7150db14d9d.tar.gz |
Refactor ExecutionContexts
Move the Data class out into the Heap namespace.
Change-Id: I2b798deb53812a08155c92a0e6ef2dcd2ea137b8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4debugging.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4debugging.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4debugging.cpp b/src/qml/jsruntime/qv4debugging.cpp index c001b60295..64027ff6e4 100644 --- a/src/qml/jsruntime/qv4debugging.cpp +++ b/src/qml/jsruntime/qv4debugging.cpp @@ -465,15 +465,15 @@ void Debugger::collectReturnedValue(Collector *collector) const collector->collect(o); } -QVector<ExecutionContext::ContextType> Debugger::getScopeTypes(int frame) const +QVector<Heap::ExecutionContext::ContextType> Debugger::getScopeTypes(int frame) const { - QVector<ExecutionContext::ContextType> types; + QVector<Heap::ExecutionContext::ContextType> types; if (state() != Paused) return types; CallContext *sctxt = findContext(m_engine->currentContext(), frame); - if (!sctxt || sctxt->d()->type < ExecutionContext::Type_SimpleCallContext) + if (!sctxt || sctxt->d()->type < Heap::ExecutionContext::Type_SimpleCallContext) return types; CallContext *ctxt = static_cast<CallContext *>(sctxt); @@ -575,7 +575,7 @@ Function *Debugger::getFunction() const if (CallContext *callCtx = context->asCallContext()) return callCtx->d()->function->function(); else { - Q_ASSERT(context->d()->type == QV4::ExecutionContext::Type_GlobalContext); + Q_ASSERT(context->d()->type == QV4::Heap::ExecutionContext::Type_GlobalContext); return context->d()->engine->globalCode; } } |