2 files changed, 46 insertions, 37 deletions

diff --git a/src/particles/qquickgravity.cpp b/src/particles/qquickgravity.cpp
index 90f305f336..835790ce7d 100644
--- a/src/particles/qquickgravity.cpp
+++ b/src/particles/qquickgravity.cpp
@@ -64,16 +64,54 @@ const qreal CONV = 0.017453292520444443;
 
     Pixels per second that objects will be accelerated by.
 */
+void QQuickGravityAffector::setMagnitude(qreal arg)
+{
+    if (m_magnitude != arg) {
+        m_magnitude = arg;
+        m_needRecalc = true;
+        emit magnitudeChanged(arg);
+    }
+}
+
+qreal QQuickGravityAffector::magnitude() const
+{
+    return m_magnitude;
+}
+
+
 /*!
     \qmlproperty real QtQuick.Particles::Gravity::acceleration
 
     Name changed to magnitude, will be removed soon.
 */
+void QQuickGravityAffector::setAcceleration(qreal arg)
+{
+    qWarning() << "Gravity::acceleration has been renamed Gravity::magnitude";
+    if (m_magnitude != arg) {
+        m_magnitude = arg;
+        m_needRecalc = true;
+        emit magnitudeChanged(arg);
+    }
+}
+
 /*!
     \qmlproperty real QtQuick.Particles::Gravity::angle
 
     Angle of acceleration.
 */
+void QQuickGravityAffector::setAngle(qreal arg)
+{
+    if (m_angle != arg) {
+        m_angle = arg;
+        m_needRecalc = true;
+        emit angleChanged(arg);
+    }
+}
+
+qreal QQuickGravityAffector::angle() const
+{
+    return m_angle;
+}
 
 QQuickGravityAffector::QQuickGravityAffector(QQuickItem *parent) :
     QQuickParticleAffector(parent), m_magnitude(-10), m_angle(90), m_needRecalc(true)
@@ -94,4 +132,7 @@ bool QQuickGravityAffector::affectParticle(QQuickParticleData *d, qreal dt)
     d->setInstantaneousVY(d->curVY(m_system) + m_dy*dt, m_system);
     return true;
 }
+
+
+
 QT_END_NAMESPACE
diff --git a/src/particles/qquickgravity_p.h b/src/particles/qquickgravity_p.h
index d3a7f6665c..333d3d1534 100644
--- a/src/particles/qquickgravity_p.h
+++ b/src/particles/qquickgravity_p.h
@@ -62,52 +62,20 @@ class QQuickGravityAffector : public QQuickParticleAffector
     Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged)
 public:
     explicit QQuickGravityAffector(QQuickItem *parent = 0);
-    qreal magnitude() const
-    {
-        return m_magnitude;
-    }
+    qreal magnitude() const;
+    qreal angle() const;
 
-    qreal angle() const
-    {
-        return m_angle;
-    }
 protected:
     bool affectParticle(QQuickParticleData *d, qreal dt) override;
 
 Q_SIGNALS:
-
     void magnitudeChanged(qreal arg);
-
     void angleChanged(qreal arg);
 
 public Q_SLOTS:
-void setAcceleration(qreal arg)
-{
-    qWarning() << "Gravity::acceleration has been renamed Gravity::magnitude";
-    if (m_magnitude != arg) {
-        m_magnitude = arg;
-        m_needRecalc = true;
-        Q_EMIT magnitudeChanged(arg);
-    }
-}
-
-void setMagnitude(qreal arg)
-{
-    if (m_magnitude != arg) {
-        m_magnitude = arg;
-        m_needRecalc = true;
-        Q_EMIT magnitudeChanged(arg);
-    }
-}
-
-void setAngle(qreal arg)
-{
-    if (m_angle != arg) {
-        m_angle = arg;
-        m_needRecalc = true;
-        Q_EMIT angleChanged(arg);
-    }
-}
+    void setMagnitude(qreal arg);
+    void setAcceleration(qreal arg);
+    void setAngle(qreal arg);
 
 private:
     qreal m_magnitude;