Renamed 'source' property from SpringFollow to 'to'

16 files changed, 64 insertions, 56 deletions

diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
index 838b346..db43182 100644
--- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
@@ -8,8 +8,8 @@ Item { id:block
     property int targetX: 0
     property int targetY: 0
 
-    SpringFollow on x { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
-    SpringFollow on y { source: targetY; spring: 2; damping: 0.2 }
+    SpringFollow on x { enabled: spawned; to: targetX; spring: 2; damping: 0.2 }
+    SpringFollow on y { to: targetY; spring: 2; damping: 0.2 }
 
     Image { id: img
         source: {
diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml
index 6a9d215..fe5cc53 100644
--- a/doc/src/snippets/declarative/listview/highlight.qml
+++ b/doc/src/snippets/declarative/listview/highlight.qml
@@ -45,7 +45,7 @@ Rectangle {
             width: 180; height: 40
             color: "lightsteelblue"; radius: 5
             SpringFollow on y {
-                source: list.currentItem.y
+                to: list.currentItem.y
                 spring: 3
                 damping: 0.2
             }
diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml
index 97f4791..63fc9c6 100644
--- a/examples/declarative/aspectratio/face_fit_animated.qml
+++ b/examples/declarative/aspectratio/face_fit_animated.qml
@@ -19,8 +19,8 @@ Rectangle {
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
         SpringFollow on scale {
-            source: Math.max(Math.min(face.parent.width/face.width*1.333,face.parent.height/face.height),
-                        Math.min(face.parent.width/face.width,face.parent.height/face.height*1.333))
+            to: Math.max(Math.min(face.parent.width/face.width*1.333,face.parent.height/face.height),
+                         Math.min(face.parent.width/face.width,face.parent.height/face.height*1.333))
             spring: 1
             damping: 0.05
         }
diff --git a/examples/declarative/clocks/content/Clock.qml b/examples/declarative/clocks/content/Clock.qml
index a315ccc..c853174 100644
--- a/examples/declarative/clocks/content/Clock.qml
+++ b/examples/declarative/clocks/content/Clock.qml
@@ -36,7 +36,7 @@ Item {
             origin.x: 7.5; origin.y: 73; angle: 0
             SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
-                source: (clock.hours * 30) + (clock.minutes * 0.5)
+                to: (clock.hours * 30) + (clock.minutes * 0.5)
             }
         }
     }
@@ -50,7 +50,7 @@ Item {
             origin.x: 6.5; origin.y: 83; angle: 0
             SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
-                source: clock.minutes * 6
+                to: clock.minutes * 6
             }
         }
     }
@@ -64,7 +64,7 @@ Item {
             origin.x: 2.5; origin.y: 80; angle: 0
             SpringFollow on angle {
                 spring: 5; damping: 0.25; modulus: 360
-                source: clock.seconds * 6
+                to: clock.seconds * 6
             }
         }
     }
diff --git a/examples/declarative/dial/content/Dial.qml b/examples/declarative/dial/content/Dial.qml
index 7fd638a..f9ab3e3 100644
--- a/examples/declarative/dial/content/Dial.qml
+++ b/examples/declarative/dial/content/Dial.qml
@@ -29,7 +29,7 @@ Item {
             SpringFollow on angle {
                 spring: 1.4
                 damping: .15
-                source: Math.min(Math.max(-130, root.value*2.6 - 130), 133)
+                to: Math.min(Math.max(-130, root.value*2.6 - 130), 133)
             }
         }
     }
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml
index 5493f99..2b54dd8 100644
--- a/examples/declarative/listview/highlight.qml
+++ b/examples/declarative/listview/highlight.qml
@@ -44,7 +44,7 @@ Rectangle {
         id: petHighlight
         Rectangle {
             width: 200; height: 50; color: "#FFFF88"
-            SpringFollow on y { source: list1.currentItem.y; spring: 3; damping: 0.1 }
+            SpringFollow on y { to: list1.currentItem.y; spring: 3; damping: 0.1 }
         }
     }
     ListView {
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
index 3ebbeab..ce1dd69 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
@@ -20,7 +20,7 @@ Rectangle {
             origin.x: 7.5; origin.y: 73; angle: 0
             SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
-                source: (clock.hours * 30) + (clock.minutes * 0.5)
+                to: (clock.hours * 30) + (clock.minutes * 0.5)
             }
         }
     }
@@ -34,7 +34,7 @@ Rectangle {
             origin.x: 6.5; origin.y: 83; angle: 0
             SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
-                source: clock.minutes * 6
+                to: clock.minutes * 6
             }
         }
     }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
index b598b3f..243df75 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
@@ -9,8 +9,8 @@ Item { id:block
     property int targetX: 0
     property int targetY: 0
 
-    SpringFollow on x { source: targetX; spring: 2; damping: 0.2; enabled: spawned }
-    SpringFollow on y { source: targetY; spring: 2; damping: 0.2 }
+    SpringFollow on x { to: targetX; spring: 2; damping: 0.2; enabled: spawned }
+    SpringFollow on y { to: targetY; spring: 2; damping: 0.2 }
     //![1]
 
     //![2]
diff --git a/examples/declarative/tvtennis/tvtennis.qml b/examples/declarative/tvtennis/tvtennis.qml
index 7c98c69..240183f 100644
--- a/examples/declarative/tvtennis/tvtennis.qml
+++ b/examples/declarative/tvtennis/tvtennis.qml
@@ -31,7 +31,7 @@ Rectangle {
         }
 
         // Make y follow the target y coordinate, with a velocity of 200
-        SpringFollow on y { source: ball.targetY; velocity: 200 }
+        SpringFollow on y { to: ball.targetY; velocity: 200 }
 
         // Detect the ball hitting the top or bottom of the view and bounce it
         onYChanged: {
@@ -52,7 +52,7 @@ Rectangle {
         color: "Lime"
         x: 2; width: 20; height: 90
         SpringFollow on y {
-            source: ball.y - 45; velocity: 300
+            to: ball.y - 45; velocity: 300
             enabled: ball.direction == 'left'
         }
     }
@@ -61,7 +61,7 @@ Rectangle {
         color: "Lime"
         x: page.width - 22; width: 20; height: 90
         SpringFollow on y {
-            source: ball.y-45; velocity: 300
+            to: ball.y-45; velocity: 300
             enabled: ball.direction == 'right'
         }
     }
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index efaaf7a..fd937d0 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -17,7 +17,6 @@ Component {
 
         Repeater {
             model: notes
-
             Item {
                 property int randomX: Math.random() * 500 + 100
                 property int randomY: Math.random() * 200 + 50
@@ -26,7 +25,7 @@ Component {
                 x: randomX; y: randomY
 
                 SpringFollow on rotation {
-                    source: -flickable.horizontalVelocity / 100
+                    to: -flickable.horizontalVelocity / 100
                     spring: 2.0; damping: 0.15
                 }
 
diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp
index c42261d..7921735 100644
--- a/src/declarative/util/qdeclarativespringfollow.cpp
+++ b/src/declarative/util/qdeclarativespringfollow.cpp
@@ -59,13 +59,13 @@ class QDeclarativeSpringFollowPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QDeclarativeSpringFollow)
 public:
     QDeclarativeSpringFollowPrivate()
-        : currentValue(0), sourceValue(0), maxVelocity(0), lastTime(0)
+        : currentValue(0), to(0), maxVelocity(0), lastTime(0)
         , mass(1.0), spring(0.), damping(0.), velocity(0), epsilon(0.01)
         , modulus(0.0), useMass(false), haveModulus(false), enabled(true), mode(Track), clock(this) {}
 
     QDeclarativeProperty property;
     qreal currentValue;
-    qreal sourceValue;
+    qreal to;
     qreal maxVelocity;
     qreal velocityms;
     int lastTime;
@@ -102,7 +102,7 @@ void QDeclarativeSpringFollowPrivate::tick(int time)
     int elapsed = time - lastTime;
     if (!elapsed)
         return;
-    qreal srcVal = sourceValue;
+    qreal srcVal = to;
     if (haveModulus) {
         currentValue = fmod(currentValue, modulus);
         srcVal = fmod(srcVal, modulus);
@@ -158,16 +158,16 @@ void QDeclarativeSpringFollowPrivate::tick(int time)
             currentValue += moveBy;
             if (haveModulus)
                 currentValue = fmod(currentValue, modulus);
-            if (currentValue > sourceValue) {
-                currentValue = sourceValue;
+            if (currentValue > to) {
+                currentValue = to;
                 clock.stop();
             }
         } else {
             currentValue -= moveBy;
             if (haveModulus && currentValue < 0.0)
                 currentValue = fmod(currentValue, modulus) + modulus;
-            if (currentValue < sourceValue) {
-                currentValue = sourceValue;
+            if (currentValue < to) {
+                currentValue = to;
                 clock.stop();
             }
         }
@@ -196,9 +196,9 @@ void QDeclarativeSpringFollowPrivate::start()
 
     Q_Q(QDeclarativeSpringFollow);
     if (mode == QDeclarativeSpringFollowPrivate::Track) {
-        currentValue = sourceValue;
+        currentValue = to;
         property.write(currentValue);
-    } else if (sourceValue != currentValue && clock.state() != QAbstractAnimation::Running) {
+    } else if (to != currentValue && clock.state() != QAbstractAnimation::Running) {
         lastTime = 0;
         currentValue = property.read().toReal();
         clock.start(); // infinity??
@@ -239,7 +239,7 @@ void QDeclarativeSpringFollowPrivate::stop()
         x: rect1.width
         width: 20; height: 20
         color: "#ff0000"
-        SpringFollow on y { source: rect1.y; velocity: 200 }
+        SpringFollow on y { to: rect1.y; velocity: 200 }
     }
     \endcode
 */
@@ -260,26 +260,26 @@ void QDeclarativeSpringFollow::setTarget(const QDeclarativeProperty &property)
     d->currentValue = property.read().toReal();
 }
 
-qreal QDeclarativeSpringFollow::sourceValue() const
+qreal QDeclarativeSpringFollow::to() const
 {
     Q_D(const QDeclarativeSpringFollow);
-    return d->sourceValue;
+    return d->to;
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::source
-    This property holds the source value which will be tracked.
+    \qmlproperty qreal SpringFollow::to
+    This property holds the target value which will be tracked.
 
     Bind to a property in order to track its changes.
 */
 
-void QDeclarativeSpringFollow::setSourceValue(qreal value)
+void QDeclarativeSpringFollow::setTo(qreal value)
 {
     Q_D(QDeclarativeSpringFollow);
-    if (d->clock.state() == QAbstractAnimation::Running && d->sourceValue == value)
+    if (d->clock.state() == QAbstractAnimation::Running && d->to == value)
         return;
 
-    d->sourceValue = value;
+    d->to = value;
     d->start();
 }
 
@@ -307,7 +307,7 @@ void QDeclarativeSpringFollow::setVelocity(qreal velocity)
     This property holds the spring constant
 
     The spring constant describes how strongly the target is pulled towards the
-    source.  Setting spring to 0 turns off spring tracking.  Useful values 0 - 5.0
+    source. Setting spring to 0 turns off spring tracking.  Useful values 0 - 5.0
 
     When a spring constant is set and the velocity property is greater than 0,
     velocity limits the maximum speed.
@@ -417,13 +417,10 @@ void QDeclarativeSpringFollow::setMass(qreal mass)
 }
 
 /*!
-    \qmlproperty qreal SpringFollow::value
-    The current value.
-*/
-
-/*!
     \qmlproperty bool SpringFollow::enabled
     This property holds whether the target will track the source.
+
+    The default value of this property is 'true'.
 */
 bool QDeclarativeSpringFollow::enabled() const
 {
@@ -454,6 +451,10 @@ bool QDeclarativeSpringFollow::inSync() const
     return d->enabled && d->clock.state() != QAbstractAnimation::Running;
 }
 
+/*!
+    \qmlproperty qreal SpringFollow::value
+    The current value.
+*/
 qreal QDeclarativeSpringFollow::value() const
 {
     Q_D(const QDeclarativeSpringFollow);
diff --git a/src/declarative/util/qdeclarativespringfollow_p.h b/src/declarative/util/qdeclarativespringfollow_p.h
index 2ac0d82..b829c57 100644
--- a/src/declarative/util/qdeclarativespringfollow_p.h
+++ b/src/declarative/util/qdeclarativespringfollow_p.h
@@ -59,7 +59,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeSpringFollow : public QObject,
     Q_DECLARE_PRIVATE(QDeclarativeSpringFollow)
     Q_INTERFACES(QDeclarativePropertyValueSource)
 
-    Q_PROPERTY(qreal source READ sourceValue WRITE setSourceValue)
+    Q_PROPERTY(qreal to READ to WRITE setTo)
     Q_PROPERTY(qreal velocity READ velocity WRITE setVelocity)
     Q_PROPERTY(qreal spring READ spring WRITE setSpring)
     Q_PROPERTY(qreal damping READ damping WRITE setDamping)
@@ -76,22 +76,30 @@ public:
 
     virtual void setTarget(const QDeclarativeProperty &);
 
-    qreal sourceValue() const;
-    void setSourceValue(qreal value);
+    qreal to() const;
+    void setTo(qreal value);
+
     qreal velocity() const;
     void setVelocity(qreal velocity);
+
     qreal spring() const;
     void setSpring(qreal spring);
+
     qreal damping() const;
     void setDamping(qreal damping);
+
     qreal epsilon() const;
     void setEpsilon(qreal epsilon);
+
     qreal mass() const;
     void setMass(qreal modulus);
+
     qreal modulus() const;
     void setModulus(qreal modulus);
+
     bool enabled() const;
     void setEnabled(bool enabled);
+
     bool inSync() const;
 
     qreal value() const;
diff --git a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
index e8bbb86..cd732b6 100644
--- a/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
+++ b/tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
@@ -274,7 +274,7 @@ void tst_qdeclarativedom::loadComposite()
 void tst_qdeclarativedom::testValueSource()
 {
     QByteArray qml = "import Qt 4.6\n"
-                     "Rectangle { SpringFollow on height { spring: 1.4; damping: .15; source: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
+                     "Rectangle { SpringFollow on height { spring: 1.4; damping: .15; to: Math.min(Math.max(-130, value*2.2 - 130), 133); }}";
 
     QDeclarativeEngine freshEngine;
     QDeclarativeDomDocument document;
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
index 21bbc7f..fbab4b7 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/clock.qml
@@ -25,7 +25,7 @@ Rectangle {
             origin.x: 7.5; origin.y: 73; angle: 0
             SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
-                source: (clock.hours * 30) + (clock.minutes * 0.5)
+                to: (clock.hours * 30) + (clock.minutes * 0.5)
             }
         }
     }
@@ -39,7 +39,7 @@ Rectangle {
             origin.x: 6.5; origin.y: 83; angle: 0
             SpringFollow on angle {
                 spring: 2; damping: 0.2; modulus: 360
-                source: clock.minutes * 6
+                to: clock.minutes * 6
             }
         }
     }
@@ -53,7 +53,7 @@ Rectangle {
             origin.x: 2.5; origin.y: 80; angle: 0
             SpringFollow on angle {
                 spring: 5; damping: 0.25; modulus: 360
-                source: clock.seconds * 6
+                to: clock.seconds * 6
             }
         }
     }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
index 1659bb7..5368349 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringfollow/follow.qml
@@ -26,7 +26,7 @@ Rectangle {
         color: "#ff0000"
         x: rect.width; width: rect.width; height: 20
         y: 200
-        SpringFollow on y { source: rect.y; velocity: 200 }
+        SpringFollow on y { to: rect.y; velocity: 200 }
     }
 
     // Spring
@@ -34,13 +34,13 @@ Rectangle {
         color: "#ff0000"
         x: rect.width * 2; width: rect.width/2; height: 20
         y: 200
-        SpringFollow on y { source: rect.y; spring: 1.0; damping: 0.2 }
+        SpringFollow on y { to: rect.y; spring: 1.0; damping: 0.2 }
     }
     Rectangle {
         color: "#880000"
         x: rect.width * 2.5; width: rect.width/2; height: 20
         y: 200
-        SpringFollow on y { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
+        SpringFollow on y { to: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
     }
 
     // Follow mouse
@@ -52,8 +52,8 @@ Rectangle {
             width: 20; height: 20
             radius: 10
             color: "#0000ff"
-            SpringFollow on x { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
-            SpringFollow on y { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+            SpringFollow on x { id: f1; to: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+            SpringFollow on y { id: f2; to: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
             states: [
                 State {
                     name: "following"
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
index b14531d..9b88b53 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
@@ -8,8 +8,8 @@ Item { id:block
     property int targetX: 0
     property int targetY: 0
 
-    SpringFollow on x { enabled: spawned; source: targetX; spring: 2; damping: 0.2 }
-    SpringFollow on y { source: targetY; spring: 2; damping: 0.2 }
+    SpringFollow on x { enabled: spawned; to: targetX; spring: 2; damping: 0.2 }
+    SpringFollow on y { to: targetY; spring: 2; damping: 0.2 }
 
     Image { id: img
         source: {