diff options
| author | Oleg Shparber <trollixx@gmail.com> | 2014-12-31 10:37:47 -0800 |
|---|---|---|
| committer | Oleg Shparber <trollixx@gmail.com> | 2015-01-03 23:29:57 +0100 |
| commit | 2fe82c505d09fdf372f1d4c5992a3a0b0dc98f33 (patch) | |
| tree | 3961702f98d9f553e4c90e9eb074a8096c48ad05 /src/quick/items/context2d/qquickcontext2d.cpp | |
| parent | 4a9ed3de7d92809cf575f245f55d4f422b4983c3 (diff) | |
Use QV4::ScopedObject typedef instead of actual type
Change-Id: I0b68c534ea513a7c230b12114f6b42b069f9864b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/items/context2d/qquickcontext2d.cpp')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 205cf74a67..bed9fb3b2f 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -2829,7 +2829,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_measureText(QV4::CallConte if (ctx->d()->callData->argc >= 1) { QFontMetrics fm(r->d()->context->state.font); uint width = fm.width(ctx->d()->callData->args[0].toQStringNoThrow()); - QV4::Scoped<QV4::Object> tm(scope, scope.engine->newObject()); + QV4::ScopedObject tm(scope, scope.engine->newObject()); tm->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("width"))).getPointer(), QV4::ScopedValue(scope, QV4::Primitive::fromDouble(width))); return tm.asReturnedValue(); @@ -4208,7 +4208,7 @@ QQuickContext2DEngineData::QQuickContext2DEngineData(QV8Engine *engine) QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); QV4::Scope scope(v4); - QV4::Scoped<QV4::Object> proto(scope, QQuickJSContext2DPrototype::create(v4)); + QV4::ScopedObject proto(scope, QQuickJSContext2DPrototype::create(v4)); proto->defineAccessorProperty(QStringLiteral("strokeStyle"), QQuickJSContext2D::method_get_strokeStyle, QQuickJSContext2D::method_set_strokeStyle); proto->defineAccessorProperty(QStringLiteral("font"), QQuickJSContext2D::method_get_font, QQuickJSContext2D::method_set_font); proto->defineAccessorProperty(QStringLiteral("fillRule"), QQuickJSContext2D::method_get_fillRule, QQuickJSContext2D::method_set_fillRule); |