diff options
Diffstat (limited to 'src/particles/qquickturbulence.cpp')
| -rw-r--r-- | src/particles/qquickturbulence.cpp | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/src/particles/qquickturbulence.cpp b/src/particles/qquickturbulence.cpp index dff266a6ea..ff892983f6 100644 --- a/src/particles/qquickturbulence.cpp +++ b/src/particles/qquickturbulence.cpp @@ -1,41 +1,7 @@ -/**************************************************************************** -** -** 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 + +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses #include "qquickturbulence_p.h" #include "qquickparticlepainter_p.h"//TODO: Why was this needed again? @@ -81,11 +47,11 @@ QT_BEGIN_NAMESPACE QQuickTurbulenceAffector::QQuickTurbulenceAffector(QQuickItem *parent) : QQuickParticleAffector(parent), - m_strength(10), m_lastT(0), m_gridSize(0), m_field(nullptr), m_vectorField(nullptr), m_inited(false) + m_strength(10), m_gridSize(0), m_field(nullptr), m_vectorField(nullptr), m_inited(false) { } -void QQuickTurbulenceAffector::geometryChanged(const QRectF &, const QRectF &) +void QQuickTurbulenceAffector::geometryChange(const QRectF &, const QRectF &) { initializeGrid(); } @@ -180,7 +146,7 @@ void QQuickTurbulenceAffector::affectSystem(qreal dt) updateOffsets();//### Needed if an ancestor is transformed. QRect boundsRect(0,0,m_gridSize,m_gridSize); - foreach (QQuickParticleGroupData *gd, m_system->groupData){ + for (QQuickParticleGroupData *gd : m_system->groupData) { if (!activeGroup(gd->index)) continue; foreach (QQuickParticleData *d, gd->data){ |