Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7

1 files changed, 5 insertions, 37 deletions

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;