Clean up QV4DataCollector

We don't need to pass engines around as the data collector already has
all the necessary information. Also, the exception collect job is only
used in the test case, so we don't need to define it in the collector.

Change-Id: I9e9f092a10295e3dc970f7b5f440e8f242ea1d54
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 1 insertions, 19 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index d60db6cf82..a2d2fff72b 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -173,7 +173,7 @@ void ScopeJob::run()
 
     if (success) {
         QVector<QV4::Heap::ExecutionContext::ContextType> scopeTypes =
-                QV4DataCollector::getScopeTypes(collector->engine(), frameNr);
+                collector->getScopeTypes(frameNr);
         result[QLatin1String("type")] = QV4DataCollector::encodeScopeType(scopeTypes[scopeNr]);
     } else {
         result[QLatin1String("type")] = -1;
@@ -270,24 +270,6 @@ const QStringList &GatherSourcesJob::result() const
     return sources;
 }
 
-ExceptionCollectJob::ExceptionCollectJob(QV4::ExecutionEngine *engine, QV4DataCollector *collector)
-    : engine(engine)
-    , collector(collector)
-    , exception(QV4DataCollector::s_invalidRef)
-{}
-
-void ExceptionCollectJob::run()
-{
-    QV4::Scope scope(engine);
-    QV4::ScopedValue v(scope, *engine->exceptionValue);
-    exception = collector->collect(v);
-}
-
-QV4DataCollector::Ref ExceptionCollectJob::exceptionValue() const
-{
-    return exception;
-}
-
 EvalJob::EvalJob(QV4::ExecutionEngine *engine, const QString &script) :
     JavaScriptJob(engine, /*frameNr*/-1, script), result(false)
 {}