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/jsruntime/qv4context_p.h | |
| 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/jsruntime/qv4context_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4context_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h index 2d782f9a31..b5c9736725 100644 --- a/src/qml/jsruntime/qv4context_p.h +++ b/src/qml/jsruntime/qv4context_p.h @@ -174,7 +174,7 @@ struct CallContext : public ExecutionContext FunctionObject *function; int realArgumentCount; - SafeValue *locals; + Value *locals; Object *activation; inline ReturnedValue argument(int i); @@ -192,8 +192,8 @@ struct CatchContext : public ExecutionContext { CatchContext(ExecutionEngine *engine, const StringRef exceptionVarName, const ValueRef exceptionValue); - SafeString exceptionVarName; - SafeValue exceptionValue; + StringValue exceptionVarName; + Value exceptionValue; }; struct WithContext : public ExecutionContext |