Cleanup Object::define*Property API

Change-Id: I99125908a9bc1d41a2642c409af9704def7a0832
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 65 insertions, 65 deletions

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index ff7ad838f3..f84a6855dd 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -545,50 +545,50 @@ public:
     QQuickJSContext2DPrototype(QV4::ExecutionEngine *engine)
         : QV4::Object(engine)
     {
-        defineDefaultProperty(engine, QStringLiteral("quadraticCurveTo"), method_quadraticCurveTo, 0);
-        defineDefaultProperty(engine, QStringLiteral("restore"), method_restore, 0);
-        defineDefaultProperty(engine, QStringLiteral("moveTo"), method_moveTo, 0);
-        defineDefaultProperty(engine, QStringLiteral("lineTo"), method_lineTo, 0);
-        defineDefaultProperty(engine, QStringLiteral("caretBlinkRate"), method_caretBlinkRate, 0);
-        defineDefaultProperty(engine, QStringLiteral("clip"), method_clip, 0);
-        defineDefaultProperty(engine, QStringLiteral("setTransform"), method_setTransform, 0);
-        defineDefaultProperty(engine, QStringLiteral("text"), method_text, 0);
-        defineDefaultProperty(engine, QStringLiteral("roundedRect"), method_roundedRect, 0);
-        defineDefaultProperty(engine, QStringLiteral("createPattern"), method_createPattern, 0);
-        defineDefaultProperty(engine, QStringLiteral("stroke"), method_stroke, 0);
-        defineDefaultProperty(engine, QStringLiteral("arc"), method_arc, 0);
-        defineDefaultProperty(engine, QStringLiteral("createImageData"), method_createImageData, 0);
-        defineDefaultProperty(engine, QStringLiteral("measureText"), method_measureText, 0);
-        defineDefaultProperty(engine, QStringLiteral("ellipse"), method_ellipse, 0);
-        defineDefaultProperty(engine, QStringLiteral("fill"), method_fill, 0);
-        defineDefaultProperty(engine, QStringLiteral("save"), method_save, 0);
-        defineDefaultProperty(engine, QStringLiteral("scale"), method_scale, 0);
-        defineDefaultProperty(engine, QStringLiteral("drawImage"), method_drawImage, 0);
-        defineDefaultProperty(engine, QStringLiteral("transform"), method_transform, 0);
-        defineDefaultProperty(engine, QStringLiteral("fillText"), method_fillText, 0);
-        defineDefaultProperty(engine, QStringLiteral("strokeText"), method_strokeText, 0);
-        defineDefaultProperty(engine, QStringLiteral("translate"), method_translate, 0);
-        defineDefaultProperty(engine, QStringLiteral("createRadialGradient"), method_createRadialGradient, 0);
-        defineDefaultProperty(engine, QStringLiteral("shear"), method_shear, 0);
-        defineDefaultProperty(engine, QStringLiteral("isPointInPath"), method_isPointInPath, 0);
-        defineDefaultProperty(engine, QStringLiteral("bezierCurveTo"), method_bezierCurveTo, 0);
-        defineDefaultProperty(engine, QStringLiteral("resetTransform"), method_resetTransform, 0);
-        defineDefaultProperty(engine, QStringLiteral("arcTo"), method_arcTo, 0);
-        defineDefaultProperty(engine, QStringLiteral("fillRect"), method_fillRect, 0);
-        defineDefaultProperty(engine, QStringLiteral("createConicalGradient"), method_createConicalGradient, 0);
-        defineDefaultProperty(engine, QStringLiteral("drawFocusRing"), method_drawFocusRing, 0);
-        defineDefaultProperty(engine, QStringLiteral("beginPath"), method_beginPath, 0);
-        defineDefaultProperty(engine, QStringLiteral("clearRect"), method_clearRect, 0);
-        defineDefaultProperty(engine, QStringLiteral("rect"), method_rect, 0);
-        defineDefaultProperty(engine, QStringLiteral("reset"), method_reset, 0);
-        defineDefaultProperty(engine, QStringLiteral("rotate"), method_rotate, 0);
-        defineDefaultProperty(engine, QStringLiteral("setCaretSelectionRect"), method_setCaretSelectionRect, 0);
-        defineDefaultProperty(engine, QStringLiteral("putImageData"), method_putImageData, 0);
-        defineDefaultProperty(engine, QStringLiteral("getImageData"), method_getImageData, 0);
-        defineDefaultProperty(engine, QStringLiteral("createLinearGradient"), method_createLinearGradient, 0);
-        defineDefaultProperty(engine, QStringLiteral("strokeRect"), method_strokeRect, 0);
-        defineDefaultProperty(engine, QStringLiteral("closePath"), method_closePath, 0);
-        defineAccessorProperty(engine, QStringLiteral("canvas"), QQuickJSContext2DPrototype::method_get_canvas, 0);
+        defineDefaultProperty(QStringLiteral("quadraticCurveTo"), method_quadraticCurveTo, 0);
+        defineDefaultProperty(QStringLiteral("restore"), method_restore, 0);
+        defineDefaultProperty(QStringLiteral("moveTo"), method_moveTo, 0);
+        defineDefaultProperty(QStringLiteral("lineTo"), method_lineTo, 0);
+        defineDefaultProperty(QStringLiteral("caretBlinkRate"), method_caretBlinkRate, 0);
+        defineDefaultProperty(QStringLiteral("clip"), method_clip, 0);
+        defineDefaultProperty(QStringLiteral("setTransform"), method_setTransform, 0);
+        defineDefaultProperty(QStringLiteral("text"), method_text, 0);
+        defineDefaultProperty(QStringLiteral("roundedRect"), method_roundedRect, 0);
+        defineDefaultProperty(QStringLiteral("createPattern"), method_createPattern, 0);
+        defineDefaultProperty(QStringLiteral("stroke"), method_stroke, 0);
+        defineDefaultProperty(QStringLiteral("arc"), method_arc, 0);
+        defineDefaultProperty(QStringLiteral("createImageData"), method_createImageData, 0);
+        defineDefaultProperty(QStringLiteral("measureText"), method_measureText, 0);
+        defineDefaultProperty(QStringLiteral("ellipse"), method_ellipse, 0);
+        defineDefaultProperty(QStringLiteral("fill"), method_fill, 0);
+        defineDefaultProperty(QStringLiteral("save"), method_save, 0);
+        defineDefaultProperty(QStringLiteral("scale"), method_scale, 0);
+        defineDefaultProperty(QStringLiteral("drawImage"), method_drawImage, 0);
+        defineDefaultProperty(QStringLiteral("transform"), method_transform, 0);
+        defineDefaultProperty(QStringLiteral("fillText"), method_fillText, 0);
+        defineDefaultProperty(QStringLiteral("strokeText"), method_strokeText, 0);
+        defineDefaultProperty(QStringLiteral("translate"), method_translate, 0);
+        defineDefaultProperty(QStringLiteral("createRadialGradient"), method_createRadialGradient, 0);
+        defineDefaultProperty(QStringLiteral("shear"), method_shear, 0);
+        defineDefaultProperty(QStringLiteral("isPointInPath"), method_isPointInPath, 0);
+        defineDefaultProperty(QStringLiteral("bezierCurveTo"), method_bezierCurveTo, 0);
+        defineDefaultProperty(QStringLiteral("resetTransform"), method_resetTransform, 0);
+        defineDefaultProperty(QStringLiteral("arcTo"), method_arcTo, 0);
+        defineDefaultProperty(QStringLiteral("fillRect"), method_fillRect, 0);
+        defineDefaultProperty(QStringLiteral("createConicalGradient"), method_createConicalGradient, 0);
+        defineDefaultProperty(QStringLiteral("drawFocusRing"), method_drawFocusRing, 0);
+        defineDefaultProperty(QStringLiteral("beginPath"), method_beginPath, 0);
+        defineDefaultProperty(QStringLiteral("clearRect"), method_clearRect, 0);
+        defineDefaultProperty(QStringLiteral("rect"), method_rect, 0);
+        defineDefaultProperty(QStringLiteral("reset"), method_reset, 0);
+        defineDefaultProperty(QStringLiteral("rotate"), method_rotate, 0);
+        defineDefaultProperty(QStringLiteral("setCaretSelectionRect"), method_setCaretSelectionRect, 0);
+        defineDefaultProperty(QStringLiteral("putImageData"), method_putImageData, 0);
+        defineDefaultProperty(QStringLiteral("getImageData"), method_getImageData, 0);
+        defineDefaultProperty(QStringLiteral("createLinearGradient"), method_createLinearGradient, 0);
+        defineDefaultProperty(QStringLiteral("strokeRect"), method_strokeRect, 0);
+        defineDefaultProperty(QStringLiteral("closePath"), method_closePath, 0);
+        defineAccessorProperty(QStringLiteral("canvas"), QQuickJSContext2DPrototype::method_get_canvas, 0);
     }
 
     static QV4::ReturnedValue method_get_canvas(QV4::SimpleCallContext *ctx);
@@ -891,9 +891,9 @@ struct QQuickJSContext2DImageData : public QV4::Object
     {
         vtbl = &static_vtbl;
 
-        defineAccessorProperty(engine, QStringLiteral("width"), method_get_width, 0);
-        defineAccessorProperty(engine, QStringLiteral("height"), method_get_height, 0);
-        defineAccessorProperty(engine, QStringLiteral("data"), method_get_data, 0);
+        defineAccessorProperty(QStringLiteral("width"), method_get_width, 0);
+        defineAccessorProperty(QStringLiteral("height"), method_get_height, 0);
+        defineAccessorProperty(QStringLiteral("data"), method_get_data, 0);
     }
 
     static QV4::ReturnedValue method_get_width(QV4::SimpleCallContext *ctx);
@@ -4155,27 +4155,27 @@ QQuickContext2DEngineData::QQuickContext2DEngineData(QV8Engine *engine)
     QV4::Scope scope(v4);
 
     QV4::Scoped<QV4::Object> proto(scope, new (v4->memoryManager) QQuickJSContext2DPrototype(v4));
-    proto->defineAccessorProperty(v4, QStringLiteral("strokeStyle"), QQuickJSContext2D::method_get_strokeStyle, QQuickJSContext2D::method_set_strokeStyle);
-    proto->defineAccessorProperty(v4, QStringLiteral("font"), QQuickJSContext2D::method_get_font, QQuickJSContext2D::method_set_font);
-    proto->defineAccessorProperty(v4, QStringLiteral("fillRule"), QQuickJSContext2D::method_get_fillRule, QQuickJSContext2D::method_set_fillRule);
-    proto->defineAccessorProperty(v4, QStringLiteral("globalAlpha"), QQuickJSContext2D::method_get_globalAlpha, QQuickJSContext2D::method_set_globalAlpha);
-    proto->defineAccessorProperty(v4, QStringLiteral("lineCap"), QQuickJSContext2D::method_get_lineCap, QQuickJSContext2D::method_set_lineCap);
-    proto->defineAccessorProperty(v4, QStringLiteral("shadowOffsetX"), QQuickJSContext2D::method_get_shadowOffsetX, QQuickJSContext2D::method_set_shadowOffsetX);
-    proto->defineAccessorProperty(v4, QStringLiteral("shadowOffsetY"), QQuickJSContext2D::method_get_shadowOffsetY, QQuickJSContext2D::method_set_shadowOffsetY);
-    proto->defineAccessorProperty(v4, QStringLiteral("globalCompositeOperation"), QQuickJSContext2D::method_get_globalCompositeOperation, QQuickJSContext2D::method_set_globalCompositeOperation);
-    proto->defineAccessorProperty(v4, QStringLiteral("miterLimit"), QQuickJSContext2D::method_get_miterLimit, QQuickJSContext2D::method_set_miterLimit);
-    proto->defineAccessorProperty(v4, QStringLiteral("fillStyle"), QQuickJSContext2D::method_get_fillStyle, QQuickJSContext2D::method_set_fillStyle);
-    proto->defineAccessorProperty(v4, QStringLiteral("shadowColor"), QQuickJSContext2D::method_get_shadowColor, QQuickJSContext2D::method_set_shadowColor);
-    proto->defineAccessorProperty(v4, QStringLiteral("textBaseline"), QQuickJSContext2D::method_get_textBaseline, QQuickJSContext2D::method_set_textBaseline);
-    proto->defineAccessorProperty(v4, QStringLiteral("path"), QQuickJSContext2D::method_get_path, QQuickJSContext2D::method_set_path);
-    proto->defineAccessorProperty(v4, QStringLiteral("lineJoin"), QQuickJSContext2D::method_get_lineJoin, QQuickJSContext2D::method_set_lineJoin);
-    proto->defineAccessorProperty(v4, QStringLiteral("lineWidth"), QQuickJSContext2D::method_get_lineWidth, QQuickJSContext2D::method_set_lineWidth);
-    proto->defineAccessorProperty(v4, QStringLiteral("textAlign"), QQuickJSContext2D::method_get_textAlign, QQuickJSContext2D::method_set_textAlign);
-    proto->defineAccessorProperty(v4, QStringLiteral("shadowBlur"), QQuickJSContext2D::method_get_shadowBlur, QQuickJSContext2D::method_set_shadowBlur);
+    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);
+    proto->defineAccessorProperty(QStringLiteral("globalAlpha"), QQuickJSContext2D::method_get_globalAlpha, QQuickJSContext2D::method_set_globalAlpha);
+    proto->defineAccessorProperty(QStringLiteral("lineCap"), QQuickJSContext2D::method_get_lineCap, QQuickJSContext2D::method_set_lineCap);
+    proto->defineAccessorProperty(QStringLiteral("shadowOffsetX"), QQuickJSContext2D::method_get_shadowOffsetX, QQuickJSContext2D::method_set_shadowOffsetX);
+    proto->defineAccessorProperty(QStringLiteral("shadowOffsetY"), QQuickJSContext2D::method_get_shadowOffsetY, QQuickJSContext2D::method_set_shadowOffsetY);
+    proto->defineAccessorProperty(QStringLiteral("globalCompositeOperation"), QQuickJSContext2D::method_get_globalCompositeOperation, QQuickJSContext2D::method_set_globalCompositeOperation);
+    proto->defineAccessorProperty(QStringLiteral("miterLimit"), QQuickJSContext2D::method_get_miterLimit, QQuickJSContext2D::method_set_miterLimit);
+    proto->defineAccessorProperty(QStringLiteral("fillStyle"), QQuickJSContext2D::method_get_fillStyle, QQuickJSContext2D::method_set_fillStyle);
+    proto->defineAccessorProperty(QStringLiteral("shadowColor"), QQuickJSContext2D::method_get_shadowColor, QQuickJSContext2D::method_set_shadowColor);
+    proto->defineAccessorProperty(QStringLiteral("textBaseline"), QQuickJSContext2D::method_get_textBaseline, QQuickJSContext2D::method_set_textBaseline);
+    proto->defineAccessorProperty(QStringLiteral("path"), QQuickJSContext2D::method_get_path, QQuickJSContext2D::method_set_path);
+    proto->defineAccessorProperty(QStringLiteral("lineJoin"), QQuickJSContext2D::method_get_lineJoin, QQuickJSContext2D::method_set_lineJoin);
+    proto->defineAccessorProperty(QStringLiteral("lineWidth"), QQuickJSContext2D::method_get_lineWidth, QQuickJSContext2D::method_set_lineWidth);
+    proto->defineAccessorProperty(QStringLiteral("textAlign"), QQuickJSContext2D::method_get_textAlign, QQuickJSContext2D::method_set_textAlign);
+    proto->defineAccessorProperty(QStringLiteral("shadowBlur"), QQuickJSContext2D::method_get_shadowBlur, QQuickJSContext2D::method_set_shadowBlur);
     contextPrototype = proto;
 
     proto = v4->newObject();
-    proto->defineDefaultProperty(v4, QStringLiteral("addColorStop"), QQuickContext2DStyle::gradient_proto_addColorStop, 0);
+    proto->defineDefaultProperty(QStringLiteral("addColorStop"), QQuickContext2DStyle::gradient_proto_addColorStop, 0);
     gradientProto = proto;
 
     proto = v4->newObject();