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/qv4objectproto.cpp | |
| 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/qv4objectproto.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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(); |