From 5df94d89033e7bbb3f41840a4c07a628ed66b4d5 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 25 Jun 2012 12:01:46 +1000 Subject: Rename speed -> velocity in the particle system Matches the convention set in the QtQuick module, for example by ListView and Flickable. Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d Reviewed-by: Bea Lam --- tests/auto/particles/qquickage/data/jump.qml | 2 +- tests/auto/particles/qquickage/data/kill.qml | 2 +- tests/auto/particles/qquickage/data/onceoff.qml | 2 +- tests/auto/particles/qquickage/data/sustained.qml | 2 +- tests/auto/particles/qquickangleddirection/data/basic.qml | 2 +- .../auto/particles/qquickcumulativedirection/data/basic.qml | 2 +- tests/auto/particles/qquickcustomaffector/data/move.qml | 2 +- tests/auto/particles/qquickfriction/data/basic.qml | 4 ++-- tests/auto/particles/qquickfriction/data/threshold.qml | 4 ++-- tests/auto/particles/qquickfriction/tst_qquickfriction.cpp | 2 +- tests/auto/particles/qquickimageparticle/data/deformed.qml | 2 +- .../qquickimageparticle/tst_qquickimageparticle.cpp | 12 ++++++------ tests/auto/particles/qquickpointdirection/data/basic.qml | 2 +- tests/auto/particles/qquicktargetdirection/data/basic.qml | 2 +- tests/auto/particles/qquicktrailemitter/data/basic.qml | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) (limited to 'tests/auto/particles') diff --git a/tests/auto/particles/qquickage/data/jump.qml b/tests/auto/particles/qquickage/data/jump.qml index 909e903258..29a06e0d52 100644 --- a/tests/auto/particles/qquickage/data/jump.qml +++ b/tests/auto/particles/qquickage/data/jump.qml @@ -64,7 +64,7 @@ Rectangle { size: 32 emitRate: 1000 lifeSpan: 500 - speed: PointDirection{ x: 500; y: 500 } + velocity: PointDirection{ x: 500; y: 500 } } } } diff --git a/tests/auto/particles/qquickage/data/kill.qml b/tests/auto/particles/qquickage/data/kill.qml index 2223498ad0..d60468e686 100644 --- a/tests/auto/particles/qquickage/data/kill.qml +++ b/tests/auto/particles/qquickage/data/kill.qml @@ -60,7 +60,7 @@ Rectangle { size: 32 emitRate: 1000 lifeSpan: 500 - speed: PointDirection{ x: 1000; y: 1000 } + velocity: PointDirection{ x: 1000; y: 1000 } } } } diff --git a/tests/auto/particles/qquickage/data/onceoff.qml b/tests/auto/particles/qquickage/data/onceoff.qml index 2a29476e13..14a0a2ca29 100644 --- a/tests/auto/particles/qquickage/data/onceoff.qml +++ b/tests/auto/particles/qquickage/data/onceoff.qml @@ -63,7 +63,7 @@ Rectangle { size: 32 emitRate: 1000 lifeSpan: 500 - speed: PointDirection{ x: 500; y: 500 } + velocity: PointDirection{ x: 500; y: 500 } } } } diff --git a/tests/auto/particles/qquickage/data/sustained.qml b/tests/auto/particles/qquickage/data/sustained.qml index 31c4c377e3..8c6e2c4f8f 100644 --- a/tests/auto/particles/qquickage/data/sustained.qml +++ b/tests/auto/particles/qquickage/data/sustained.qml @@ -63,7 +63,7 @@ Rectangle { size: 32 emitRate: 1000 lifeSpan: 500 - speed: PointDirection{ x: 500; y: 500 } + velocity: PointDirection{ x: 500; y: 500 } } } } diff --git a/tests/auto/particles/qquickangleddirection/data/basic.qml b/tests/auto/particles/qquickangleddirection/data/basic.qml index 93406c44cd..90e9697b92 100644 --- a/tests/auto/particles/qquickangleddirection/data/basic.qml +++ b/tests/auto/particles/qquickangleddirection/data/basic.qml @@ -61,7 +61,7 @@ Rectangle { size: 32 emitRate: 1000 lifeSpan: 500 - speed: AngleDirection { angle: 45; magnitude: 500 } + velocity: AngleDirection { angle: 45; magnitude: 500 } acceleration: AngleDirection { angle: 45; angleVariation: 22; magnitude: 250; magnitudeVariation: 249} } } diff --git a/tests/auto/particles/qquickcumulativedirection/data/basic.qml b/tests/auto/particles/qquickcumulativedirection/data/basic.qml index a2957b70eb..4bf5565fb8 100644 --- a/tests/auto/particles/qquickcumulativedirection/data/basic.qml +++ b/tests/auto/particles/qquickcumulativedirection/data/basic.qml @@ -61,7 +61,7 @@ Rectangle { size: 32 emitRate: 1000 lifeSpan: 500 - speed: CumulativeDirection { + velocity: CumulativeDirection { PointDirection { x: 100; y: -100 } PointDirection { x: -100; y: 100 } } diff --git a/tests/auto/particles/qquickcustomaffector/data/move.qml b/tests/auto/particles/qquickcustomaffector/data/move.qml index 3b259f5780..19e578d0b6 100644 --- a/tests/auto/particles/qquickcustomaffector/data/move.qml +++ b/tests/auto/particles/qquickcustomaffector/data/move.qml @@ -67,7 +67,7 @@ Rectangle { once: false relative: false position: PointDirection { x: 50; y: 50; } - speed: PointDirection { x: 50; y: 50; } + velocity: PointDirection { x: 50; y: 50; } acceleration: PointDirection { x: 50; y: 50; } } } diff --git a/tests/auto/particles/qquickfriction/data/basic.qml b/tests/auto/particles/qquickfriction/data/basic.qml index 5d27f2a2b3..59d8939ec6 100644 --- a/tests/auto/particles/qquickfriction/data/basic.qml +++ b/tests/auto/particles/qquickfriction/data/basic.qml @@ -63,7 +63,7 @@ Rectangle { Emitter{ //0,0 position - speed: PointDirection{x:100} + velocity: PointDirection{x:100} size: 32 emitRate: 1000 lifeSpan: 500 @@ -78,7 +78,7 @@ Rectangle { //0,0 position group: "notdefault" y:200 - speed: PointDirection{x:100} + velocity: PointDirection{x:100} size: 32 emitRate: 1000 lifeSpan: 500 diff --git a/tests/auto/particles/qquickfriction/data/threshold.qml b/tests/auto/particles/qquickfriction/data/threshold.qml index 60386f9f24..01320f35c5 100644 --- a/tests/auto/particles/qquickfriction/data/threshold.qml +++ b/tests/auto/particles/qquickfriction/data/threshold.qml @@ -58,13 +58,13 @@ Rectangle { } Friction { - factor: 1000 //speed limit 50 + factor: 1000 //velocity limit 50 threshold: 50 } Emitter{ //0,0 position - speed: PointDirection{x:1000} + velocity: PointDirection{x:1000} size: 32 emitRate: 1000 lifeSpan: 500 diff --git a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp index c3559fa2d0..2beccd7e8f 100644 --- a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp +++ b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp @@ -114,7 +114,7 @@ void tst_qquickfriction::test_threshold() QQuickParticleSystem* system = view->rootObject()->findChild("system"); ensureAnimTime(600, system->m_animation); - //Speed capped at 50, but it might take a frame or two to get there + //Velocity capped at 50, but it might take a frame or two to get there QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10)); foreach (QQuickParticleData *d, system->groupData[0]->data) { if (d->t == -1.0f) diff --git a/tests/auto/particles/qquickimageparticle/data/deformed.qml b/tests/auto/particles/qquickimageparticle/data/deformed.qml index c4ad331868..51cae4d56a 100644 --- a/tests/auto/particles/qquickimageparticle/data/deformed.qml +++ b/tests/auto/particles/qquickimageparticle/data/deformed.qml @@ -55,7 +55,7 @@ Rectangle { ImageParticle { source: "../../shared/star.png" rotation: 90 - rotationSpeed: 90 + rotationVelocity: 90 autoRotation: true yVector: PointDirection{x: 0.5; y: 0.5} xVector: PointDirection{x: 0.5; y: 0.5} diff --git a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp index cbc09fdb53..52a30753e7 100644 --- a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp +++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp @@ -108,7 +108,7 @@ void tst_qquickimageparticle::test_basic() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -152,7 +152,7 @@ void tst_qquickimageparticle::test_colored() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -197,7 +197,7 @@ void tst_qquickimageparticle::test_colorVariance() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -241,7 +241,7 @@ void tst_qquickimageparticle::test_deformed() QCOMPARE(d->yy, 0.5f); QCOMPARE(d->yx, 0.5f); QCOMPARE(d->rotation, 90.0f * (float)CONV_FACTOR); - QCOMPARE(d->rotationSpeed, 90.0f * (float)CONV_FACTOR); + QCOMPARE(d->rotationVelocity, 90.0f * (float)CONV_FACTOR); QCOMPARE(d->autoRotate, 1.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -285,7 +285,7 @@ void tst_qquickimageparticle::test_tabled() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QCOMPARE(d->animX, 0.0f); QCOMPARE(d->animY, 0.0f); @@ -330,7 +330,7 @@ void tst_qquickimageparticle::test_sprite() QCOMPARE(d->yy, 1.0f); QCOMPARE(d->yx, 0.0f); QCOMPARE(d->rotation, 0.0f); - QCOMPARE(d->rotationSpeed, 0.0f); + QCOMPARE(d->rotationVelocity, 0.0f); QCOMPARE(d->autoRotate, 0.0f); QVERIFY(myFuzzyCompare(d->frameDuration, 120.f)); QCOMPARE(d->frameCount, 6.0f); diff --git a/tests/auto/particles/qquickpointdirection/data/basic.qml b/tests/auto/particles/qquickpointdirection/data/basic.qml index 930ba1ddc1..298f33d37d 100644 --- a/tests/auto/particles/qquickpointdirection/data/basic.qml +++ b/tests/auto/particles/qquickpointdirection/data/basic.qml @@ -59,7 +59,7 @@ Rectangle { Emitter{ //0,0 position size: 32 - speed: PointDirection{ x: 100; y: 100 } + velocity: PointDirection{ x: 100; y: 100 } acceleration: PointDirection{ x: 100; xVariation: 100; y: 100; yVariation: 100 } emitRate: 1000 lifeSpan: 500 diff --git a/tests/auto/particles/qquicktargetdirection/data/basic.qml b/tests/auto/particles/qquicktargetdirection/data/basic.qml index 97ce724583..f5c53e4a97 100644 --- a/tests/auto/particles/qquicktargetdirection/data/basic.qml +++ b/tests/auto/particles/qquicktargetdirection/data/basic.qml @@ -58,7 +58,7 @@ Rectangle { Emitter{ //0,0 position - speed: TargetDirection{ targetItem: sys; proportionalMagnitude: true; magnitude: 1 } + velocity: TargetDirection{ targetItem: sys; proportionalMagnitude: true; magnitude: 1 } size: 32 emitRate: 1000 lifeSpan: 500 diff --git a/tests/auto/particles/qquicktrailemitter/data/basic.qml b/tests/auto/particles/qquicktrailemitter/data/basic.qml index 77058f0785..5ffd0abc64 100644 --- a/tests/auto/particles/qquicktrailemitter/data/basic.qml +++ b/tests/auto/particles/qquicktrailemitter/data/basic.qml @@ -64,7 +64,7 @@ Rectangle { size: 32 emitRatePerParticle: 2 lifeSpan: 500 - speed: PointDirection{ x: 500; y: 500 } + velocity: PointDirection{ x: 500; y: 500 } } Emitter{ x: 4 -- cgit v1.2.3