aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-10-13 16:58:04 +0200
committerhjk <hjk@theqtcompany.com>2015-10-14 13:38:07 +0000
commit23f3fcbabc4959c5d05d821b25776f6344d9b42b (patch)
tree30f749073da023dfac58e3216c83275ac5509e56 /src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
parent4f3379352a265bab00a7265f85ffc38a9ca4ffe4 (diff)
QmlDebug: Split QV4::Debugging::Debugger
... into a pure interface and a QV4::Debugging::V4Debugger implementation. This is in preparation of a second implementation of this interface to be used with 'native mixed' debugging. Change-Id: I3078dcfe4bdee392a2d13ef43a55ca993e7b88d8 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp')
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
index db8c1feb92..4cca1900de 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
@@ -208,13 +208,13 @@ QV4DataCollector::Ref QV4DataCollector::addScriptRef(const QString &scriptName)
return ref;
}
-void QV4DataCollector::collectScope(QJsonObject *dict, QV4::Debugging::Debugger *debugger,
+void QV4DataCollector::collectScope(QJsonObject *dict, QV4::Debugging::V4Debugger *debugger,
int frameNr, int scopeNr)
{
QStringList names;
Refs refs;
- if (debugger->state() == QV4::Debugging::Debugger::Paused) {
+ if (debugger->state() == QV4::Debugging::V4Debugger::Paused) {
RefHolder holder(this, &refs);
ArgumentCollectJob argumentsJob(m_engine, this, &names, frameNr, scopeNr);
debugger->runInEngine(&argumentsJob);
@@ -359,7 +359,8 @@ void GatherSourcesJob::run()
sources.append(fileName);
}
- QV4::Debugging::Debugger *debugger = engine->debugger;
+ QV4::Debugging::V4Debugger *debugger
+ = static_cast<QV4::Debugging::V4Debugger *>(engine->debugger);
emit debugger->sourcesCollected(debugger, sources, seq);
}