diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-04-06 13:41:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-02 14:18:06 +0000 |
| commit | b58711804e9cca641927dbdebe281488e475352b (patch) | |
| tree | cb7671cb6edc52e5e744a370704ec068c7ab45eb /src/plugins | |
| parent | 238b1cb1cb8915995b6dfe4e404f1771c62b3169 (diff) | |
Use Identifier by value and don't new them anymore
Change-Id: Ib25c08027013217657beb2675dafa9a8c85cbaf9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp index 2d7141937f..9ed96d560f 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp @@ -272,7 +272,7 @@ bool QV4DataCollector::collectScope(QJsonObject *dict, int frameNr, int scopeNr) QV4::ScopedValue v(scope); QV4::Heap::InternalClass *ic = ctxt->internalClass(); for (uint i = 0; i < ic->size; ++i) { - QString name = scope.engine->identifierTable->stringFromIdentifier(ic->nameMap[i])->toQString(); + QString name = scope.engine->identifierTable->stringForId(ic->nameMap[i])->toQString(); names.append(name); v = ctxt->d()->locals[i]; collectedRefs.append(collect(v)); diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp index 5071f4602f..0f064d8371 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp @@ -497,7 +497,7 @@ void NativeDebugger::handleVariables(QJsonObject *response, const QJsonObject &a QV4::Heap::InternalClass *ic = callContext->internalClass(); QV4::ScopedValue v(scope); for (uint i = 0; i < ic->size; ++i) { - QString name = scope.engine->identifierTable->stringFromIdentifier(ic->nameMap[i])->toQString(); + QString name = scope.engine->identifierTable->stringForId(ic->nameMap[i])->toQString(); v = callContext->d()->locals[i]; collector.collect(&output, QString(), name, v); } |