diff options
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 28 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4runtimeapi_p.h | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index 4298d64d20..5d0c91d9ef 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -540,34 +540,6 @@ QV4::ReturnedValue RuntimeHelpers::addHelper(ExecutionEngine *engine, const Valu return Encode(x + y); } -QV4::ReturnedValue Runtime::method_addString(ExecutionEngine *engine, const Value &left, const Value &right) -{ - Q_ASSERT(left.isString() || right.isString()); - - Scope scope(engine); - ScopedValue pleft(scope, left); - ScopedValue pright(scope, right); - String *sleft = pleft->stringValue(); - String *sright = pright->stringValue(); - - if (!sleft) { - pleft = convert_to_string_add(engine, pleft); - sleft = static_cast<String *>(pleft.ptr); - } - if (!sright) { - pright = convert_to_string_add(engine, pright); - sright = static_cast<String *>(pright.ptr); - } - if (scope.engine->hasException) - return Encode::undefined(); - if (!sleft->d()->length()) - return pright->asReturnedValue(); - if (!sright->d()->length()) - return pleft->asReturnedValue(); - MemoryManager *mm = engine->memoryManager; - return (mm->alloc<String>(sleft->d(), sright->d()))->asReturnedValue(); -} - bool Runtime::method_storeProperty(ExecutionEngine *engine, const Value &object, int nameIndex, const Value &value) { Scope scope(engine); diff --git a/src/qml/jsruntime/qv4runtimeapi_p.h b/src/qml/jsruntime/qv4runtimeapi_p.h index 963dffe0c9..d5814abf36 100644 --- a/src/qml/jsruntime/qv4runtimeapi_p.h +++ b/src/qml/jsruntime/qv4runtimeapi_p.h @@ -150,7 +150,6 @@ struct ExceptionCheck<void (*)(QV4::NoThrowEngine *, A, B, C)> { F(ReturnedValue, instanceof, (ExecutionEngine *engine, const Value &left, const Value &right)) \ F(ReturnedValue, in, (ExecutionEngine *engine, const Value &left, const Value &right)) \ F(ReturnedValue, add, (ExecutionEngine *engine, const Value &left, const Value &right)) \ - F(ReturnedValue, addString, (ExecutionEngine *engine, const Value &left, const Value &right)) \ F(ReturnedValue, sub, (const Value &left, const Value &right)) \ F(ReturnedValue, mul, (const Value &left, const Value &right)) \ F(ReturnedValue, div, (const Value &left, const Value &right)) \ |