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>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 64a1dc92d2..d1fc56adad 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -111,7 +111,7 @@ struct Q_QML_EXPORT FunctionObject: Object {
     };
 
     ExecutionContext *scope;
-    SafeString name;
+    StringValue name;
     unsigned int formalParameterCount;
     unsigned int varCount;
     Function *function;
@@ -228,10 +228,10 @@ struct SimpleScriptFunction: FunctionObject {
 struct BoundFunction: FunctionObject {
     V4_OBJECT
     FunctionObject *target;
-    SafeValue boundThis;
-    QVector<SafeValue> boundArgs;
+    Value boundThis;
+    QVector<Value> boundArgs;
 
-    BoundFunction(ExecutionContext *scope, FunctionObjectRef target, const ValueRef boundThis, const QVector<SafeValue> &boundArgs);
+    BoundFunction(ExecutionContext *scope, FunctionObjectRef target, const ValueRef boundThis, const QVector<Value> &boundArgs);
     ~BoundFunction() {}