Cleanup naming of Stack frame structures

Change-Id: I0b392040b6726e6d93f237ccccc9f053256ed819
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 7 insertions, 8 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index 76d5315004..0097fed0d6 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 QV4::Heap::CallContext *QV4DataCollector::findContext(int frame)
 {
-    QV4::EngineBase::StackFrame *f = engine()->currentStackFrame;
+    QV4::CppStackFrame *f = engine()->currentStackFrame;
     while (f && frame) {
         --frame;
         f = f->parent;
@@ -99,7 +99,6 @@ int QV4DataCollector::encodeScopeType(QV4::Heap::ExecutionContext::ContextType s
         return 4;
     case QV4::Heap::ExecutionContext::Type_WithContext:
         return 2;
-    case QV4::Heap::ExecutionContext::Type_SimpleCallContext:
     case QV4::Heap::ExecutionContext::Type_CallContext:
         return 1;
     case QV4::Heap::ExecutionContext::Type_QmlContext:
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
index b2200c47fc..42f4534015 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugger.h
@@ -150,7 +150,7 @@ private:
     void runJobUnpaused();
 
     QV4::ExecutionEngine *m_engine;
-    QV4::EngineBase::StackFrame *m_currentFrame = 0;
+    QV4::CppStackFrame *m_currentFrame = 0;
     QMutex m_lock;
     QWaitCondition m_runningCondition;
     State m_state;
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
index 09ed9ac98c..316fd87dd4 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp
@@ -79,7 +79,7 @@ void QV4DebuggerAgent::debuggerPaused(QV4Debugger *debugger, QV4Debugger::PauseR
     case QV4Debugger::PauseRequest:
     case QV4Debugger::BreakPointHit: {
         event.insert(QStringLiteral("event"), QStringLiteral("break"));
-        QV4::EngineBase::StackFrame *frame = debugger->engine()->currentStackFrame;
+        QV4::CppStackFrame *frame = debugger->engine()->currentStackFrame;
         if (!frame)
             break;
 
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index 45af1f44a5..625095b340 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -67,7 +67,7 @@ void JavaScriptJob::run()
     QObject scopeObject;
 
     if (frameNr > 0) {
-        QV4::EngineBase::StackFrame *f = engine->currentStackFrame;
+        QV4::CppStackFrame *f = engine->currentStackFrame;
         for (int i = 0; i < frameNr; ++i)
             f = f->parent;
         ctx = static_cast<QV4::ExecutionContext *>(&f->jsFrame->context);
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index 32c67b3986..167083155c 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -229,7 +229,7 @@ private:
 
     QV4::ExecutionEngine *m_engine;
     QQmlNativeDebugServiceImpl *m_service;
-    QV4::EngineBase::StackFrame *m_currentFrame = 0;
+    QV4::CppStackFrame *m_currentFrame = 0;
     Speed m_stepping;
     bool m_pauseRequested;
     bool m_runningJob;
@@ -332,7 +332,7 @@ void NativeDebugger::handleBacktrace(QJsonObject *response, const QJsonObject &a
     int limit = arguments.value(QLatin1String("limit")).toInt(0);
 
     QJsonArray frameArray;
-    QV4::EngineBase::StackFrame *f= m_engine->currentStackFrame;
+    QV4::CppStackFrame *f= m_engine->currentStackFrame;
     for (int i  = 0; i < limit && f; ++i) {
         QV4::Function *function = f->v4Function;
 
@@ -677,7 +677,7 @@ void NativeDebugger::pauseAndWait()
 
     event.insert(QStringLiteral("event"), QStringLiteral("break"));
     event.insert(QStringLiteral("language"), QStringLiteral("js"));
-    if (QV4::EngineBase::StackFrame *frame = m_engine->currentStackFrame) {
+    if (QV4::CppStackFrame *frame = m_engine->currentStackFrame) {
         QV4::Function *function = frame->v4Function;
         event.insert(QStringLiteral("file"), function->sourceFile());
         int line = frame->line;