1 files changed, 53 insertions, 53 deletions

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index ecb5f2b4d5..8a7cd75a7b 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -135,18 +135,18 @@ public:
 
     GlobalContext *rootContext;
 
-    SafeValue *jsStackTop;
-    SafeValue *jsStackLimit;
+    Value *jsStackTop;
+    Value *jsStackLimit;
     quintptr cStackLimit;
 
     WTF::BumpPointerAllocator *bumperPointerAllocator; // Used by Yarr Regex engine.
 
     enum { JSStackLimit = 4*1024*1024 };
     WTF::PageAllocation *jsStack;
-    SafeValue *jsStackBase;
+    Value *jsStackBase;
 
-    SafeValue *stackPush(uint nValues) {
-        SafeValue *ptr = jsStackTop;
+    Value *stackPush(uint nValues) {
+        Value *ptr = jsStackTop;
         jsStackTop = ptr + nValues;
         return ptr;
     }
@@ -174,22 +174,22 @@ public:
 
     QV8Engine *v8Engine;
 
-    SafeValue objectCtor;
-    SafeValue stringCtor;
-    SafeValue numberCtor;
-    SafeValue booleanCtor;
-    SafeValue arrayCtor;
-    SafeValue functionCtor;
-    SafeValue dateCtor;
-    SafeValue regExpCtor;
-    SafeValue errorCtor;
-    SafeValue evalErrorCtor;
-    SafeValue rangeErrorCtor;
-    SafeValue referenceErrorCtor;
-    SafeValue syntaxErrorCtor;
-    SafeValue typeErrorCtor;
-    SafeValue uRIErrorCtor;
-    SafeValue sequencePrototype;
+    Value objectCtor;
+    Value stringCtor;
+    Value numberCtor;
+    Value booleanCtor;
+    Value arrayCtor;
+    Value functionCtor;
+    Value dateCtor;
+    Value regExpCtor;
+    Value errorCtor;
+    Value evalErrorCtor;
+    Value rangeErrorCtor;
+    Value referenceErrorCtor;
+    Value syntaxErrorCtor;
+    Value typeErrorCtor;
+    Value uRIErrorCtor;
+    Value sequencePrototype;
 
     QQmlJS::MemoryPool classPool;
     InternalClass *emptyClass;
@@ -228,36 +228,36 @@ public:
 
     QVector<Property> argumentsAccessors;
 
-    SafeString id_undefined;
-    SafeString id_null;
-    SafeString id_true;
-    SafeString id_false;
-    SafeString id_boolean;
-    SafeString id_number;
-    SafeString id_string;
-    SafeString id_object;
-    SafeString id_function;
-    SafeString id_length;
-    SafeString id_prototype;
-    SafeString id_constructor;
-    SafeString id_arguments;
-    SafeString id_caller;
-    SafeString id_callee;
-    SafeString id_this;
-    SafeString id___proto__;
-    SafeString id_enumerable;
-    SafeString id_configurable;
-    SafeString id_writable;
-    SafeString id_value;
-    SafeString id_get;
-    SafeString id_set;
-    SafeString id_eval;
-    SafeString id_uintMax;
-    SafeString id_name;
-    SafeString id_index;
-    SafeString id_input;
-    SafeString id_toString;
-    SafeString id_valueOf;
+    StringValue id_undefined;
+    StringValue id_null;
+    StringValue id_true;
+    StringValue id_false;
+    StringValue id_boolean;
+    StringValue id_number;
+    StringValue id_string;
+    StringValue id_object;
+    StringValue id_function;
+    StringValue id_length;
+    StringValue id_prototype;
+    StringValue id_constructor;
+    StringValue id_arguments;
+    StringValue id_caller;
+    StringValue id_callee;
+    StringValue id_this;
+    StringValue id___proto__;
+    StringValue id_enumerable;
+    StringValue id_configurable;
+    StringValue id_writable;
+    StringValue id_value;
+    StringValue id_get;
+    StringValue id_set;
+    StringValue id_eval;
+    StringValue id_uintMax;
+    StringValue id_name;
+    StringValue id_index;
+    StringValue id_input;
+    StringValue id_toString;
+    StringValue id_valueOf;
 
     QSet<CompiledData::CompilationUnit*> compilationUnits;
     QMap<quintptr, QV4::Function*> allFunctions;
@@ -295,7 +295,7 @@ public:
     ExecutionContext *popContext();
 
     Returned<FunctionObject> *newBuiltinFunction(ExecutionContext *scope, const StringRef name, ReturnedValue (*code)(CallContext *));
-    Returned<BoundFunction> *newBoundFunction(ExecutionContext *scope, FunctionObjectRef target, const ValueRef boundThis, const QVector<SafeValue> &boundArgs);
+    Returned<BoundFunction> *newBoundFunction(ExecutionContext *scope, FunctionObjectRef target, const ValueRef boundThis, const QVector<Value> &boundArgs);
 
     Returned<Object> *newObject();
     Returned<Object> *newObject(InternalClass *internalClass);
@@ -352,7 +352,7 @@ public:
     bool recheckCStackLimits();
 
     // Exception handling
-    SafeValue exceptionValue;
+    Value exceptionValue;
     quint32 hasException;
     StackTrace exceptionStackTrace;