diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-12 09:23:34 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:44 +0200 |
commit | 7d4e61dd824706984030c58684fa844ff9cde251 (patch) | |
tree | 08a044f35ad179edeea98b9bc8d36a2f5d183f07 /src/qml | |
parent | a245f60c6a2f6586567f1332a99e0d70e6b15f4d (diff) |
Rename BuiltinFunctionOld to BuiltinFunction
This is the correct abstraction for a builtin method.
Time to get rid of the 'old' in the name.
Change-Id: Ia386d2cc8ef0e6c269ab24da6fc8ebfac52d7f69
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 10 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4functionobject_p.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 638609de37..eaea2bbddc 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -340,7 +340,7 @@ ExecutionContext *ExecutionEngine::pushGlobalContext() FunctionObject *ExecutionEngine::newBuiltinFunction(ExecutionContext *scope, String *name, Value (*code)(SimpleCallContext *)) { - BuiltinFunctionOld *f = new (memoryManager) BuiltinFunctionOld(scope, name, code); + BuiltinFunction *f = new (memoryManager) BuiltinFunction(scope, name, code); return f; } diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 6feca33f58..66d0dfd63e 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -569,9 +569,9 @@ ReturnedValue SimpleScriptFunction::call(Managed *that, CallData *callData) -DEFINE_MANAGED_VTABLE(BuiltinFunctionOld); +DEFINE_MANAGED_VTABLE(BuiltinFunction); -BuiltinFunctionOld::BuiltinFunctionOld(ExecutionContext *scope, String *name, Value (*code)(SimpleCallContext *)) +BuiltinFunction::BuiltinFunction(ExecutionContext *scope, String *name, Value (*code)(SimpleCallContext *)) : FunctionObject(scope, name) , code(code) { @@ -579,15 +579,15 @@ BuiltinFunctionOld::BuiltinFunctionOld(ExecutionContext *scope, String *name, Va isBuiltinFunction = true; } -ReturnedValue BuiltinFunctionOld::construct(Managed *f, CallData *) +ReturnedValue BuiltinFunction::construct(Managed *f, CallData *) { f->engine()->current->throwTypeError(); return Value::undefinedValue().asReturnedValue(); } -ReturnedValue BuiltinFunctionOld::call(Managed *that, CallData *callData) +ReturnedValue BuiltinFunction::call(Managed *that, CallData *callData) { - BuiltinFunctionOld *f = static_cast<BuiltinFunctionOld *>(that); + BuiltinFunction *f = static_cast<BuiltinFunction *>(that); ExecutionEngine *v4 = f->engine(); ExecutionContext *context = v4->current; diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index 8869083d08..5526568690 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -164,10 +164,10 @@ struct FunctionPrototype: FunctionObject static Value method_bind(SimpleCallContext *ctx); }; -struct BuiltinFunctionOld: FunctionObject { +struct BuiltinFunction: FunctionObject { Value (*code)(SimpleCallContext *); - BuiltinFunctionOld(ExecutionContext *scope, String *name, Value (*code)(SimpleCallContext *)); + BuiltinFunction(ExecutionContext *scope, String *name, Value (*code)(SimpleCallContext *)); static ReturnedValue construct(Managed *, CallData *); static ReturnedValue call(Managed *that, CallData *callData); |