diff options
author | Oleg Shparber <trollixx@gmail.com> | 2014-12-31 10:34:52 -0800 |
---|---|---|
committer | Oleg Shparber <trollixx@gmail.com> | 2015-01-02 21:29:09 +0100 |
commit | 29c0102adb8b800f4947e4e7962ca414fe576866 (patch) | |
tree | 7e5e35bc688f05337f080315336cd80864144620 /src/qml/jsruntime | |
parent | d0db6dc2b7ceb04f2bc1815ac3216a09add8fd3d (diff) |
Use QV4::ScopedString typedef instead of actual type
Change-Id: I64ecbf6cea463387a70e909ecc5f9165d22a7b0f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 4 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4globalobject.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4lookup.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 12 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index fc004f5de5..e1e57f9c2d 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -456,7 +456,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) globalObject()->defineDefaultProperty(QStringLiteral("escape"), GlobalFunctions::method_escape, 1); globalObject()->defineDefaultProperty(QStringLiteral("unescape"), GlobalFunctions::method_unescape, 1); - Scoped<String> name(scope, newString(QStringLiteral("thrower"))); + ScopedString name(scope, newString(QStringLiteral("thrower"))); thrower = BuiltinFunction::create(global, name, ::throwTypeError); } @@ -1085,7 +1085,7 @@ ReturnedValue ExecutionEngine::throwTypeError(const QString &message) ReturnedValue ExecutionEngine::throwReferenceError(const ValueRef value) { Scope scope(this); - Scoped<String> s(scope, value->toString(this)); + ScopedString s(scope, value->toString(this)); QString msg = s->toQString() + QStringLiteral(" is not defined"); Scoped<Object> error(scope, newReferenceErrorObject(msg)); return throwError(error); diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index a6f1b43e0d..c9d61f7c03 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -516,7 +516,7 @@ ReturnedValue GlobalFunctions::method_parseFloat(CallContext *ctx) Scope scope(ctx); // [15.1.2.3] step by step: - Scoped<String> inputString(scope, ctx->argument(0), Scoped<String>::Convert); + ScopedString inputString(scope, ctx->argument(0), ScopedString::Convert); if (scope.engine->hasException) return Encode::undefined(); diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index abb769b171..8a9a6c39e1 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -602,7 +602,7 @@ ReturnedValue Lookup::globalGetterGeneric(Lookup *l, ExecutionEngine *engine) } } Scope scope(engine); - Scoped<String> n(scope, engine->currentContext()->compilationUnit->runtimeStrings[l->nameIndex]); + ScopedString n(scope, engine->currentContext()->compilationUnit->runtimeStrings[l->nameIndex]); return engine->throwReferenceError(n); } diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index eb44d4a1af..9f53a9b2d5 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -156,7 +156,7 @@ void Object::defineAccessorProperty(const QString &name, ReturnedValue (*getter) { ExecutionEngine *e = engine(); Scope scope(e); - Scoped<String> s(scope, e->newIdentifier(name)); + ScopedString s(scope, e->newIdentifier(name)); defineAccessorProperty(s, getter, setter); } diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 31e65d4e43..3a6ddee55b 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -137,7 +137,7 @@ ReturnedValue ObjectPrototype::method_getOwnPropertyDescriptor(CallContext *ctx) Scoped<ArgumentsObject>(scope, O)->fullyCreate(); ScopedValue v(scope, ctx->argument(1)); - Scoped<String> name(scope, v->toString(scope.engine)); + ScopedString name(scope, v->toString(scope.engine)); if (scope.hasException()) return Encode::undefined(); PropertyAttributes attrs; @@ -181,7 +181,7 @@ ReturnedValue ObjectPrototype::method_defineProperty(CallContext *ctx) if (!O) return ctx->engine()->throwTypeError(); - Scoped<String> name(scope, ctx->argument(1), Scoped<String>::Convert); + ScopedString name(scope, ctx->argument(1), ScopedString::Convert); if (scope.engine->hasException) return Encode::undefined(); @@ -425,7 +425,7 @@ ReturnedValue ObjectPrototype::method_valueOf(CallContext *ctx) ReturnedValue ObjectPrototype::method_hasOwnProperty(CallContext *ctx) { Scope scope(ctx); - Scoped<String> P(scope, ctx->argument(0), Scoped<String>::Convert); + ScopedString P(scope, ctx->argument(0), ScopedString::Convert); if (scope.engine->hasException) return Encode::undefined(); Scoped<Object> O(scope, ctx->d()->callData->thisObject, Scoped<Object>::Convert); @@ -459,7 +459,7 @@ ReturnedValue ObjectPrototype::method_isPrototypeOf(CallContext *ctx) ReturnedValue ObjectPrototype::method_propertyIsEnumerable(CallContext *ctx) { Scope scope(ctx); - Scoped<String> p(scope, ctx->argument(0), Scoped<String>::Convert); + ScopedString p(scope, ctx->argument(0), ScopedString::Convert); if (scope.engine->hasException) return Encode::undefined(); @@ -481,7 +481,7 @@ ReturnedValue ObjectPrototype::method_defineGetter(CallContext *ctx) if (!f) return ctx->engine()->throwTypeError(); - Scoped<String> prop(scope, ctx->argument(0), Scoped<String>::Convert); + ScopedString prop(scope, ctx->argument(0), ScopedString::Convert); if (scope.engine->hasException) return Encode::undefined(); @@ -509,7 +509,7 @@ ReturnedValue ObjectPrototype::method_defineSetter(CallContext *ctx) if (!f) return ctx->engine()->throwTypeError(); - Scoped<String> prop(scope, ctx->argument(0), Scoped<String>::Convert); + ScopedString prop(scope, ctx->argument(0), ScopedString::Convert); if (scope.engine->hasException) return Encode::undefined(); |