aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4context_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-30 15:41:24 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 16:07:33 +0200
commit1e454c8aa6ad0782eee1c8c94ac2780954a08351 (patch)
treee3be185e878972ff018e9610fea15248877ca499 /src/qml/jsruntime/qv4context_p.h
parent430dfd326cb9d8dab8ebd11e83dd52e6d55c4229 (diff)
Remove more uses of Value
Change-Id: I889e760f75b485a28e1f2a2c26b2337ae9bfafac Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4context_p.h')
-rw-r--r--src/qml/jsruntime/qv4context_p.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 7f9ef77b40..d368dc6c81 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -112,10 +112,10 @@ struct Q_QML_EXPORT ExecutionContext
interpreterInstructionPointer = 0;
}
- CallContext *newCallContext(void *stackSpace, Value *locals, FunctionObject *f, CallData *callData);
+ CallContext *newCallContext(void *stackSpace, SafeValue *locals, FunctionObject *f, CallData *callData);
CallContext *newCallContext(FunctionObject *f, CallData *callData);
WithContext *newWithContext(ObjectRef with);
- CatchContext *newCatchContext(String* exceptionVarName, const QV4::Value &exceptionValue);
+ CatchContext *newCatchContext(const StringRef exceptionVarName, const ValueRef exceptionValue);
CallContext *newQmlContext(FunctionObject *f, ObjectRef qml);
String * const *formals() const;
@@ -163,7 +163,7 @@ struct CallContext : public SimpleCallContext
void initQmlContext(ExecutionContext *parentContext, ObjectRef qml, QV4::FunctionObject *function);
bool needsOwnArguments() const;
- Value *locals;
+ SafeValue *locals;
Object *activation;
};
@@ -176,10 +176,10 @@ struct GlobalContext : public ExecutionContext
struct CatchContext : public ExecutionContext
{
- void initCatchContext(ExecutionContext *p, String *exceptionVarName, const QV4::Value &exceptionValue);
+ void initCatchContext(ExecutionContext *p, const StringRef exceptionVarName, const ValueRef exceptionValue);
- String *exceptionVarName;
- Value exceptionValue;
+ SafeString exceptionVarName;
+ SafeValue exceptionValue;
};
struct WithContext : public ExecutionContext