Indentation and whitespace fixes in animation api

6 files changed, 12 insertions, 15 deletions

diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp
index e4bce6a..48c8b3e 100644
--- a/src/corelib/animation/qparallelanimationgroup.cpp
+++ b/src/corelib/animation/qparallelanimationgroup.cpp
@@ -62,7 +62,7 @@
 
         group->start();
     \endcode
-    
+
     In this example, \c anim1 and \c anim2 are two
     \l{QPropertyAnimation}s that have already been set up.
 
diff --git a/src/corelib/animation/qpauseanimation.cpp b/src/corelib/animation/qpauseanimation.cpp
index 685fa98..c853745 100644
--- a/src/corelib/animation/qpauseanimation.cpp
+++ b/src/corelib/animation/qpauseanimation.cpp
@@ -52,7 +52,7 @@
     \l{QAbstractAnimation::finished()}{finish} before a specified
     number of milliseconds have elapsed from when it was started. You
     specify the duration of the pause in the constructor. It can also
-    be set directly with setDuration().    
+    be set directly with setDuration().
 
     It is not necessary to construct a QPauseAnimation yourself.
     QSequentialAnimationGroup provides the convenience functions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 96cfa6b..1755aa7 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -48,14 +48,14 @@
     QPropertyAnimation interpolates over \l{Qt's Property System}{Qt
     properties}. As property values are stored in \l{QVariant}s, the
     class inherits QVariantAnimation, and supports animation of the
-    same \l{QVariant::Type}{variant types} as its super class. 
+    same \l{QVariant::Type}{variant types} as its super class.
 
     A class declaring properties must be a QObject. To make it
     possible to animate a property, it must provide a setter (so that
     QPropertyAnimation can set the property's value). Note that this
     makes it possible to animate many of Qt's widgets. Let's look at
     an example:
-    
+
     \code
         QPropertyAnimation animation(myWidget, "geometry");
         animation.setDuration(10000);
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index ed3666d..9d9dd31 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -70,7 +70,6 @@ public:
     {
     }
 
-
     QPointer<QObject> target;
 
     //for the QProperty
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 73ed0df..58f0e03 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
     animates Qt \l{Qt's Property System}{properties}. See the
     QPropertyAnimation class description if you wish to animate such
     properties.
-    
+
     You can then set start and end values for the property by calling
     setStartValue() and setEndValue(), and finally call start() to
     start the animation. QVariantAnimation will interpolate the
@@ -111,12 +111,12 @@ QT_BEGIN_NAMESPACE
         \o \l{QMetaType::}{QSizeF}
         \o \l{QMetaType::}{QRect}
         \o \l{QMetaType::}{QRectF}
-    \endlist 
+    \endlist
 
     If you need to interpolate other variant types, including custom
     types, you have to implement interpolation for these yourself.
     You do this by reimplementing interpolated(), which returns
-    interpolation values for the value being interpolated. 
+    interpolation values for the value being interpolated.
 
     \omit We need some snippets around here. \endomit
 
@@ -152,7 +152,7 @@ template<> Q_INLINE_TEMPLATE QRectF _q_interpolate(const QRectF &f, const QRectF
     f.getRect(&x1, &y1, &w1, &h1);
     qreal x2, y2, w2, h2;
     t.getRect(&x2, &y2, &w2, &h2);
-    return QRectF( _q_interpolate(x1, x2, progress), _q_interpolate(y1, y2, progress),
+    return QRectF(_q_interpolate(x1, x2, progress), _q_interpolate(y1, y2, progress),
                   _q_interpolate(w1, w2, progress), _q_interpolate(h1, h2, progress));
 }
 
@@ -227,11 +227,10 @@ void QVariantAnimationPrivate::updateCurrentValue()
 #endif
     if (currentValue != ret) {
         //the value has changed
-            emit q->valueChanged(currentValue);
+        emit q->valueChanged(currentValue);
     }
 }
 
-
 QVariant QVariantAnimationPrivate::valueAt(qreal step) const
 {
     QVariantAnimation::KeyValues::const_iterator result =
@@ -242,7 +241,6 @@ QVariant QVariantAnimationPrivate::valueAt(qreal step) const
     return QVariant();
 }
 
-
 void QVariantAnimationPrivate::setValueAt(qreal step, const QVariant &value)
 {
     if (step < qreal(0.0) || step > qreal(1.0)) {
@@ -587,7 +585,7 @@ bool QVariantAnimation::event(QEvent *event)
     \reimp
 */
 void QVariantAnimation::updateState(QAbstractAnimation::State oldState,
-                             QAbstractAnimation::State newState)
+                                    QAbstractAnimation::State newState)
 {
     Q_UNUSED(oldState);
     Q_UNUSED(newState);
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index 2e5fd00..172950f 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -794,9 +794,9 @@ void tst_QPropertyAnimation::operationsInStates()
  *           | pause()    |start()    |resume()   |stop()
  * ----------+------------+-----------+-----------+-------------------+
  * Stopped   | Stopped    |Running    |Stopped    |Stopped            |
- *          _| qWarning   |           |qWarning   |-                  |
+ *          _| qWarning   |restart    |qWarning   |                   |
  * Paused    | Paused     |Running    |Running    |Stopped            |
- *          _| -          |           |           |                   |
+ *          _|            |           |           |                   |
  * Running   | Paused     |Running    |Running    |Stopped            |
  *           |            |restart    |qWarning   |                   |
  * ----------+------------+-----------+-----------+-------------------+