1 files changed, 11 insertions, 46 deletions

diff --git a/src/particles/qquickturbulence_p.h b/src/particles/qquickturbulence_p.h
index e73f3ba153..bf18aa617a 100644
--- a/src/particles/qquickturbulence_p.h
+++ b/src/particles/qquickturbulence_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef TURBULENCEAFFECTOR_H
 #define TURBULENCEAFFECTOR_H
@@ -57,13 +21,16 @@ QT_BEGIN_NAMESPACE
 
 class QQuickParticlePainter;
 
-class QQuickTurbulenceAffector : public QQuickParticleAffector
+class Q_QUICKPARTICLES_EXPORT QQuickTurbulenceAffector : public QQuickParticleAffector
 {
     Q_OBJECT
     Q_PROPERTY(qreal strength READ strength WRITE setStrength NOTIFY strengthChanged)
     Q_PROPERTY(QUrl noiseSource READ noiseSource WRITE setNoiseSource NOTIFY noiseSourceChanged)
-    public:
-    explicit QQuickTurbulenceAffector(QQuickItem *parent = 0);
+    QML_NAMED_ELEMENT(Turbulence)
+    QML_ADDED_IN_VERSION(2, 0)
+
+public:
+    explicit QQuickTurbulenceAffector(QQuickItem *parent = nullptr);
     ~QQuickTurbulenceAffector();
     void affectSystem(qreal dt) override;
 
@@ -80,7 +47,7 @@ Q_SIGNALS:
 
     void strengthChanged(qreal arg);
 
-    void noiseSourceChanged(QUrl arg);
+    void noiseSourceChanged(const QUrl &arg);
 
 public Q_SLOTS:
 
@@ -92,7 +59,7 @@ public Q_SLOTS:
         }
     }
 
-    void setNoiseSource(QUrl arg)
+    void setNoiseSource(const QUrl &arg)
     {
         if (m_noiseSource != arg) {
             m_noiseSource = arg;
@@ -102,15 +69,13 @@ public Q_SLOTS:
     }
 
 protected:
-    void geometryChanged(const QRectF &newGeometry,
-                         const QRectF &oldGeometry) override;
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
 private:
     void ensureInit();
     void mapUpdate();
     void initializeGrid();
     qreal boundsRespectingField(int x, int y);
     qreal m_strength;
-    qreal m_lastT;
     int m_gridSize;
     qreal** m_field;
     QPointF** m_vectorField;