diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-24 22:55:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 11:13:48 +0100 |
| commit | a78a48c5328ea746dfd161599894a4a5b11041bd (patch) | |
| tree | 1e38f4334a8e3efdb5761d862baaa465141bf543 /src/qml/qml/qqmlvme.cpp | |
| parent | d96478044ae0dfbcc35113e3941aa79604ba83a0 (diff) | |
Cleanups
Remove SafeValue, it was used to port over to an exact GC. Since
we now have that, we can now safely merge it with QV4::Value
again. Also rename SafeString to StringValue for better naming
consistency.
Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index e60413327a..58d656a846 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -226,7 +226,7 @@ static QVariant variantFromString(const QString &string) return QQmlStringConverters::variantFromString(string); } -static QV4::ExecutionContext *qmlBindingContext(QQmlEngine *engine, QV4::ExecutionEngine *v4, QV4::SafeValue *qmlBindingWrappers, QQmlContextData *context, QObject *scope, int objIdx) +static QV4::ExecutionContext *qmlBindingContext(QQmlEngine *engine, QV4::ExecutionEngine *v4, QV4::Value *qmlBindingWrappers, QQmlContextData *context, QObject *scope, int objIdx) { QV4::Scope valueScope(v4); QV4::Scoped<QV4::QmlBindingWrapper> wrapper(valueScope, qmlBindingWrappers[objIdx]); @@ -355,7 +355,7 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, QV4::ExecutionEngine *v4 = ep->v4engine(); QV4::Scope valueScope(v4); QV4::ScopedValue tmpValue(valueScope); - QV4::SafeValue *qmlBindingWrappers = valueScope.alloc(objects.capacity()); + QV4::Value *qmlBindingWrappers = valueScope.alloc(objects.capacity()); std::fill(qmlBindingWrappers, qmlBindingWrappers + objects.capacity(), QV4::Primitive::undefinedValue()); int status = -1; // needed for dbus |